stephan: server/imapd kolab.patch,1.6,1.7
cvs at intevation.de
cvs at intevation.de
Sat Oct 25 09:44:02 CEST 2003
- Previous message: stephan: server/horde Makefile,1.6,1.7
- Next message: stephan: server/kolab/kolab httpd.conf.template, 1.13, 1.14 imapd.conf.template, 1.6, 1.7 kolab_bootstrap, 1.13, 1.14 main.cf.template, 1.6, 1.7 slapd.conf.template, 1.8, 1.9 smtpd.conf.template, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: stephan
Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv11569/imapd
Modified Files:
kolab.patch
Log Message:
Update to bring Kolab HEAD up to speed with Kolab 1_0
Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolab.patch 9 Jun 2003 12:49:37 -0000 1.6
+++ kolab.patch 25 Oct 2003 07:44:00 -0000 1.7
@@ -93,17 +93,23 @@
+ return newstate;
+ }
+
---- imapd.spec.orig 2003-05-30 21:42:25.000000000 +0200
-+++ imapd.spec 2003-06-06 18:04:24.000000000 +0200
-@@ -37,6 +37,7 @@
+--- imapd.spec.orig 2003-07-07 22:06:04.000000000 +0200
++++ imapd.spec 2003-07-07 22:06:42.000000000 +0200
+@@ -33,11 +33,12 @@
+ Group: Mail
+ License: BSD
+ Version: 2.1.14
+-Release: 20030707
++Release: 20030708_kolab
# package options
+ %option with_fsl yes
%option with_vhost_hack no
+%option with_groupfile_hack no
# list of sources
Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
-@@ -46,6 +47,7 @@
+@@ -47,6 +48,7 @@
Source4: fsl.imapd
Patch0: imapd.patch
Patch1: vhosthack.patch
@@ -111,7 +117,7 @@
# build information
Prefix: %{l_prefix}
-@@ -66,7 +68,9 @@
+@@ -73,7 +75,9 @@
%prep
%setup -q -n cyrus-imapd-%{version}
@@ -122,48 +128,20 @@
%{l_shtool} subst \
-e 's;db-4.1;db;g' \
configure
-@@ -141,6 +145,13 @@
- # 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_shtool} subst -e "s;/etc/mail/cyrusmap\.db;%{l_prefix}/var/imapd/cyrusmap\.db;" \
-+ imap/sendmail-map.c
-+%if "%{with_groupfile_hack}" == "yes"
-+ %{l_shtool} subst -e "s;/etc/imapd.group;%{l_prefix}/halole/etc/imapd/imapd.group;" \
-+ lib/auth_unix.c
-+%endif
+@@ -152,6 +156,11 @@
+ %{l_shtool} subst \
+ -e 's;/etc/mail/cyrusmap\.db;%{l_prefix}/var/imapd/cyrusmap.db;' \
+ imap/sendmail-map.c
++ %if "%{with_groupfile_hack}" == "yes"
++ %{l_shtool} subst -e "s;/etc/imapd.group;%{l_prefix}/etc/imapd/imapd.group;" \
++ lib/auth_unix.c
++ %endif
+
%{l_make} %{l_mflags}
- # build (and install) Perl-based administration stuff
-@@ -149,8 +160,23 @@
- export SASL_INC="%{l_cppflags}"
- export SASL_LIB="%{l_ldflags} -lsasl2"
- export OPENSSL_INC="%{l_cppflags}"
-- export OPENSSL_LIB="%{l_ldflags} -lssl -lcrypto"
-- %{l_prefix}/bin/perl-openpkg install )
-+ export OPENSSL_LIB="%{l_ldflags} -lssl -lcrypto" )
-+
-+ ( cd perl/sieve && make )
-+
-+ %{l_prefix}/bin/perl-openpkg prolog
-+ ( cd perl/sieve/managesieve
-+ export SASL_INC="%{l_cppflags}"
-+ export SASL_LIB="%{l_ldflags} -lsasl2"
-+ export OPENSSL_INC="%{l_cppflags}"
-+ export OPENSSL_LIB="%{l_ldflags} -lssl -lcrypto" )
-+
-+ %{l_prefix}/bin/perl-openpkg prolog
-+ ( cd perl/sieve/acap
-+ export SASL_INC="%{l_cppflags}"
-+ export SASL_LIB="%{l_ldflags} -lsasl2"
-+ export OPENSSL_INC="%{l_cppflags}"
-+ export OPENSSL_LIB="%{l_ldflags} -lssl -lcrypto" )
-
%install
- # FIXME: clean up disabled due to 'perl-openpkg install'
-@@ -165,6 +191,13 @@
- $RPM_BUILD_ROOT%{l_prefix}/etc/fsl \
+@@ -182,6 +191,13 @@
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/var/imapd/spool \
$RPM_BUILD_ROOT%{l_prefix}/bin
+ %{l_shtool} install -c -m 755 \
@@ -174,5 +152,5 @@
+ ( cd perl/sieve/managesieve && %{l_prefix}/bin/perl-openpkg install )
+ ( cd perl/sieve/acap && %{l_prefix}/bin/perl-openpkg install )
- # offer a sane configuration
-
+ # install sieve adminstration script
+ %{l_shtool} install -c -m 755 \
- Previous message: stephan: server/horde Makefile,1.6,1.7
- Next message: stephan: server/kolab/kolab httpd.conf.template, 1.13, 1.14 imapd.conf.template, 1.6, 1.7 kolab_bootstrap, 1.13, 1.14 main.cf.template, 1.6, 1.7 slapd.conf.template, 1.8, 1.9 smtpd.conf.template, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list