summaryrefslogtreecommitdiff
path: root/imapd
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2006-07-19 13:51:04 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2006-07-19 13:51:04 (GMT)
commit6880b5ef12a4e104148eb8d929a4991fd00ea4e4 (patch)
tree9c25c9c117161e91c0ad6fbc5018d221f2bf9118 /imapd
parent60a52d06c69e3d2d82d7d036f99722f11d9c5a44 (diff)
downloadserver-6880b5ef12a4e104148eb8d929a4991fd00ea4e4.tar.gz
Removed obsolete imapd.spec and updated kolab.patch to use folderchar patch
Diffstat (limited to 'imapd')
-rw-r--r--imapd/imapd.spec312
-rw-r--r--imapd/kolab.patch32
2 files changed, 18 insertions, 326 deletions
diff --git a/imapd/imapd.spec b/imapd/imapd.spec
deleted file mode 100644
index a213cd7..0000000
--- a/imapd/imapd.spec
+++ /dev/null
@@ -1,312 +0,0 @@
-##
-## imapd.spec -- OpenPKG RPM Specification
-## Copyright (c) 2000-2004 The OpenPKG Project <http://www.openpkg.org/>
-## Copyright (c) 2000-2004 Ralf S. Engelschall <rse@engelschall.com>
-## Copyright (c) 2000-2004 Cable & Wireless <http://www.cw.com/>
-## Copyright (c) 2004 Tassilo Erlewein <tassilo.erlewein@erfrakon.de>
-## Copyright (c) 2004 Martin Konold <martin.konold@erfrakon.de>
-##
-## Permission to use, copy, modify, and distribute this software for
-## any purpose with or without fee is hereby granted, provided that
-## the above copyright notice and this permission notice appear in all
-## copies.
-##
-## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-## SUCH DAMAGE.
-##
-
-# package information
-Name: imapd
-Summary: Cyrus IMAP Server
-URL: http://asg.web.cmu.edu/cyrus/imapd/
-Vendor: Carnegie Mellon University
-Packager: The OpenPKG Project
-Distribution: OpenPKG
-Class: BASE
-Group: Mail
-License: BSD
-Version: 2.2.6
-Release: 20040706_kolab
-
-# package options
-%option with_fsl yes
-%option with_group no
-%option with_atvdom no
-%option with_drac no
-%option with_annotate no
-%option with_ldap no
-%option with_skiplist no
-
-# list of sources
-Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
-Source1: rc.imapd
-Source2: cyrus.conf
-Source3: imapd.conf
-Source4: fsl.imapd
-Patch0: imapd.patch
-Patch1: imapd.patch.group
-Patch2: imapd.annotate.patch
-Patch3: kolab-ldap.patch
-Patch4: imapd.folderchar.patch
-
-# build information
-Prefix: %{l_prefix}
-BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, perl >= 5.8.3, perl-openpkg >= 5.8.3, make
-PreReq: OpenPKG, openpkg >= 20040130, perl >= 5.8.3, MTA
-BuildPreReq: sasl, db >= 4.1.24, openssl
-PreReq: sasl, db >= 4.1.24, openssl
-%if "%{with_fsl}" == "yes"
-BuildPreReq: fsl >= 1.2.0
-PreReq: fsl >= 1.2.0
-%endif
-%if "%{with_ldap}" == "yes"
-BuildPreReq: openldap >= 2.2.14
-PreReq: openldap >= 2.2.14
-%endif
-AutoReq: no
-AutoReqProv: no
-
-%description
- The Cyrus IMAP server is an IMAP4 and POP3 daemon that differs from
- other IMAP server implementations in that it is generally intended to
- be run on sealed servers, where normal users are not permitted to log
- in. The mailbox database is stored in parts of the filesystem that are
- private to the Cyrus IMAP system. All user access to mail is through
- the IMAP, POP3, or KPOP protocols.
-
-%track
- prog imapd = {
- version = %{version}
- url = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
- regex = cyrus-imapd-(\d+\.\d+\.\d+)\.tar\.gz
- }
-
-%prep
- %setup -q -n cyrus-imapd-%{version}
- %patch -p0
-%if "%{with_group}" == "yes"
- %patch -p0 -P 1
- %{l_shtool} subst \
- -e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \
- lib/auth_unix.c
-%endif
-%if "%{with_drac}" == "yes"
- %{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch
- %{l_patch} -p0 <contrib/drac_auth.patch
- sleep 1
- touch configure
-%endif
-%if "%{with_annotate}" == "yes"
- %patch -p0 -P 2
-%endif
-%if "%{with_ldap}" == "yes"
- %patch -p0 -P 3
-%endif
-%if "%{with_folderchar}" == "yes"
- %patch -p0 -P 4
-%endif
-
- %{l_shtool} subst \
- -e 's;-L/usr/local/lib;;g' \
- -e 's;-I/usr/local/include;;g' \
- -e 's;db-4.1;db;g' \
- configure
-
- # ensure local com_err can be used
- %{l_shtool} subst -s \
- -e 's;#include <com_err.h>;#include "et/com_err.h";' \
- `find . -name *.[ch] -print`
-
- # ensure linking of Berkeley DB
- %{l_shtool} subst \
- -e 's;^\( *.LIBS..*\)\(\"\],.*\)$;\1 -ldb\2;' \
- perl/imap/Makefile.PL
-
- # ensure invocation of correct perl
- %{l_shtool} subst \
- -e 's;^\(.) exec\) \(perl .*\)$;\1 %{l_prefix}/bin/\2;' \
- perl/imap/cyradm.sh
- %{l_shtool} subst \
- -e 's;^\(exec\) \(perl .*\)$;\1 %{l_prefix}/bin/\2;' \
- perl/sieve/scripts/*.pl \
- snmp/[a-z]* \
- tools/[a-z]*
-
- # adjust hard-coded location of sieve
- %{l_shtool} subst \
- -e 's;"/usr/sieve";"%{l_prefix}/var/imapd/sieve";g' \
- imap/lmtpd.c \
- imap/mbdump.c \
- imap/user.c \
- timsieved/actions.c
-
- # adjust default config to install environment for use in mkimap install helper script
- %{l_shtool} install -c -m 644 \
- -e "s;\(@l_prefix@\);$RPM_BUILD_ROOT\1;g" \
- %{l_value -s -a} \
- %{SOURCE imapd.conf} \
- imapd.conf-mkimap
- %{l_shtool} subst \
- -e 's;^exec perl ;exec %{l_prefix}/bin/perl ;' \
- -e "s;/etc/imapd.conf;%{l_prefix}/etc/imapd/imapd.conf;" \
- -e "s;^\(\$sievedir = \).*$;\1 shift || \"%{l_prefix}/var/imapd/sieve\"\;;" \
- tools/mkimap
-
- # ajdust syslog ident of deliver program
- %{l_shtool} subst \
- -e '/config_init/s;"deliver";"cyrdeliver";' \
- imap/deliver.c
-
-%build
- cflags="%{l_cppflags}"
-%if "%{with_atvdom}" == "yes"
- cflags="$cflags -DATVDOM=yes"
-%endif
- ldflags="%{l_ldflags} %{l_fsl_ldflags}"
- case "%{l_platform -t}" in
- *-sunos* ) ldflags="$ldflags -lsocket -lnsl" ;;
- esac
-%if "%{with_drac}" == "yes"
- cflags="$cflags -DDRAC_AUTH"
-%endif
- CC="%{l_cc}" \
- CPPFLAGS="$cflags" \
- CFLAGS="%{l_cflags -O} $cflags" \
- LDFLAGS="$ldflags" \
- LIBS="%{l_fsl_libs}" \
- ./configure \
- --cache-file=./cache.config \
- --prefix=%{l_prefix} \
- --sysconfdir=%{l_prefix}/etc/imapd \
- --with-openssl=%{l_prefix} \
- --with-dbdir=%{l_prefix} \
- --with-sasl=%{l_prefix} \
- --with-statedir=%{l_prefix}/var/imapd \
- --with-auth=unix \
- --without-libwrap \
- --without-ucdsnmp \
- --with-cyrus-prefix=%{l_prefix} \
- --with-cyrus-user=%{l_rusr} \
- --with-cyrus-group=%{l_rgrp} \
-%if "%{with_skiplist}" == "yes"
- --with-duplicate-db=skiplist \
- --with-tls-db=skiplist \
- --with-pts-db=skiplist \
-%endif
- --with-perl
-
- # redirect the hard-coded file paths
- %{l_shtool} subst \
- -e 's;/etc/\(.*\).conf;%{l_prefix}/etc/imapd/\1.conf;' \
- imap/*.c imap/*.h master/*.c master/*.h
- %{l_make} %{l_mflags}
-
-%install
- rm -rf $RPM_BUILD_ROOT
-
- # install package
- %{l_make} %{l_mflags} install \
- DESTDIR=$RPM_BUILD_ROOT
-
- # create additional directories
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/etc/imapd \
- $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
- $RPM_BUILD_ROOT%{l_prefix}/var/imapd/spool \
- $RPM_BUILD_ROOT%{l_prefix}/bin
-
- # install sieve adminstration script
- %{l_shtool} install -c -m 755 \
- perl/sieve/scripts/sieveshell.pl \
- $RPM_BUILD_ROOT%{l_prefix}/bin/sieveshell
-
- # offer a sane configuration
- l_hostname=`%{l_shtool} echo -e %h`
- l_domainname=`%{l_shtool} echo -e %d | cut -c2-`
- %{l_shtool} install -c -m 644 %{l_value -s -a} \
- -e "s;@l_hostname@;$l_hostname;g" \
- -e "s;@l_domainname@;$l_domainname;g" \
- %{SOURCE cyrus.conf} \
- %{SOURCE imapd.conf} \
- $RPM_BUILD_ROOT%{l_prefix}/etc/imapd/
-
- # install the run command file
- %{l_shtool} install -c -m 755 %{l_value -s -a} \
- %{SOURCE rc.imapd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
-
- # use mkimap to create many directories for us
- tools/mkimap imapd.conf-mkimap $RPM_BUILD_ROOT%{l_prefix}/var/imapd/sieve
-
- # rename files which are likely to cause namespace conflicts
- ( cd $RPM_BUILD_ROOT%{l_prefix}
- for i in deliver master quota reconstruct; do
- mv bin/$i bin/cyr$i
- mv man/man8/$i.8 man/man8/cyr$i.8
- done
- ) || exit $?
-
- # install from tools
- %{l_shtool} install -c -m 755 \
- tools/mkimap \
- $RPM_BUILD_ROOT%{l_prefix}/bin/
-
- # install OSSP fsl configuration
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
- %{l_shtool} install -c -m 644 %{l_value -s -a} \
- %{SOURCE fsl.imapd} \
- $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
-
- # strip binaries
- strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
-
- # determine files
- %{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
- %{l_files_std} \
- '%not %dir %{l_prefix}/etc/fsl' \
- '%config %{l_prefix}/etc/fsl/fsl.imapd' \
- '%config %{l_prefix}/etc/imapd/imapd.conf' \
- '%config %{l_prefix}/etc/imapd/cyrus.conf' \
- '%dir %attr(0750,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/imapd' \
- '%dir %attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/imapd/*' \
- '%dir %attr(0770,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/imapd/*/*' \
- '%dir %attr(0770,%{l_musr},%{l_rgrp}) %{l_prefix}/var/imapd/socket' \
- `cat perl-openpkg-files`
-
-%files -f files
-
-%clean
- rm -rf $RPM_BUILD_ROOT
-
-%pre
- # before upgrade, save status and stop service
- [ $1 -eq 2 ] || exit 0
- eval `%{l_rc} imapd status 2>/dev/null | tee %{l_tmpfile}`
- %{l_rc} imapd stop 2>/dev/null
- exit 0
-
-%post
- if [ $1 -eq 2 ]; then
- # after upgrade, restore status
- eval `cat %{l_tmpfile}`; rm -f %{l_tmpfile}
- [ ".$imapd_active" = .yes ] && %{l_rc} imapd start
- fi
- exit 0
-
-%preun
- # before erase, stop service and remove log files
- [ $1 -eq 0 ] || exit 0
- %{l_rc} imapd stop 2>/dev/null
- exit 0
-
diff --git a/imapd/kolab.patch b/imapd/kolab.patch
index 0ee9fe7..dfa7c9c 100644
--- a/imapd/kolab.patch
+++ b/imapd/kolab.patch
@@ -1,5 +1,5 @@
---- imapd.spec.orig Wed Dec 7 13:05:58 2005
-+++ imapd.spec Wed Dec 7 15:06:46 2005
+--- imapd.spec.orig 2006-07-19 15:32:33.867230000 +0200
++++ imapd.spec 2006-07-19 15:41:21.484428413 +0200
@@ -2,6 +2,9 @@
## imapd.spec -- OpenPKG RPM Package Specification
## Copyright (c) 2000-2005 OpenPKG Foundation e.V. <http://openpkg.net/>
@@ -10,7 +10,7 @@
##
## Permission to use, copy, modify, and distribute this software for
## any purpose with or without fee is hereby granted, provided that
-@@ -33,13 +36,17 @@ Class: BASE
+@@ -33,13 +36,17 @@
Group: Mail
License: BSD
Version: 2.2.12
@@ -33,20 +33,21 @@
# list of sources
Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
-@@ -49,6 +56,12 @@ Source3: imapd.conf
+@@ -49,6 +56,13 @@
Source4: fsl.imapd
Patch0: imapd.patch
Patch1: imapd.patch.group
+Patch2: imapd.annotate.patch
-+Patch3: kolab-ldap.patch
-+Patch4: imapd.group2.patch
++Patch3: kolab-ldap.patch
++Patch4: imapd.group2.patch
+Patch5: imapd-goodchars.patch
+Patch6: cyradm.annotate.patch
-+Patch7: imapd.morelogging.patch
++Patch7: imapd.morelogging.patch
++Patch8: imapd.folderchar.patch
# build information
Prefix: %{l_prefix}
-@@ -61,6 +74,10 @@ PreReq: sasl, db >= 4.2.52, openss
+@@ -61,6 +75,10 @@
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
%endif
@@ -57,7 +58,7 @@
AutoReq: no
AutoReqProv: no
-@@ -91,6 +108,7 @@ AutoReqProv: no
+@@ -91,6 +109,7 @@
%{l_shtool} subst \
-e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \
lib/auth_unix.c
@@ -65,7 +66,7 @@
%endif
%if "%{with_drac}" == "yes"
%{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch
-@@ -98,10 +116,24 @@ AutoReqProv: no
+@@ -98,10 +117,27 @@
sleep 1
touch configure
%endif
@@ -82,6 +83,9 @@
+%if "%{with_morelogging}" == "yes"
+ %patch -p1 -P 7
+%endif
++%if "%{with_folderchar}" == "yes"
++ %patch -p0 -P 8
++%endif
%{l_shtool} subst \
-e 's;-L/usr/local/lib;;g' \
-e 's;-I/usr/local/include;;g' \
@@ -91,15 +95,15 @@
configure
# ensure local et/com_err can be found
-@@ -161,6 +193,11 @@ AutoReqProv: no
- %{l_shtool} subst \
+@@ -162,6 +198,11 @@
-e '/alt_config/s;"deliver";"cyrdeliver";' \
imap/deliver.c
-+
+
+ %{l_shtool} subst \
+ -e '/snprintf(buf, sizeof(buf), "%s/s;/reconstruct";/cyrreconstruct";' \
+ -e '/snprintf(buf, sizeof(buf), "%s/s;/quota";/cyrquota";' \
+ imap/imapd.c
-
++
%build
cflags="%{l_cppflags}"
+ %if "%{with_atvdom}" == "yes"