Re: [CVS] OpenPKG: openpkg-src/imapd/ imapd.spec
"Ralf S. Engelschall" <[EMAIL PROTECTED]> writes: > On Thu, Dec 06, 2007, Gunnar Wrobel wrote: > >> [...] >> Cyrus IMAPd did link to the bdb instance outside of the OpenPKG >> environment in the release we are currently building. >> >> We observed the same for the sasl: >> >> root# ldd /kolabrelease/sbin/saslauthd >> libcrypt.so.1 => /lib/libcrypt.so.1 (0xb7fb) >> libresolv.so.2 => /lib/libresolv.so.2 (0xb7f9e000) >> libdb-4.3.so => /usr/lib/libdb-4.3.so (0xb7ead000) >> libnsl.so.1 => /lib/libnsl.so.1 (0xb7e97000) >> libc.so.6 => /lib/libc.so.6 (0xb7d78000) >> /lib/ld-linux.so.2 (0xb7fe6000) >> >> I tried copying the stanza from imapd.spec to sasl.spec but that >> didn't work. >> >> For the Kolab release this problem does not matter but we thought we >> should mention it. > > I've tried to fix it now. Just retry with latest "sasl" package... Thomas tested it and reported that everything works fine. Thanks a lot! Cheers, Gunnar > >Ralf S. Engelschall >[EMAIL PROTECTED] >www.engelschall.com > > __ > OpenPKG http://openpkg.org > Developer Communication List openpkg-dev@openpkg.org -- __ http://kdab.com ___ http://kolab-konsortium.com _ [EMAIL PROTECTED] Kolab work is funded in part by KDAB and the Kolab Konsortium http://www.pardus.de _ http://gunnarwrobel.de _ E-mail : [EMAIL PROTECTED] Dr. Gunnar Wrobel Tel. : +49 40 432 72335 Bundesstrasse 29 Fax: +49 40 432 70855D-20146 Hamburg >> Mail at ease - Rent a kolab groupware server at [EMAIL PROTECTED] << __ OpenPKG http://openpkg.org Developer Communication List openpkg-dev@openpkg.org
Re: [CVS] OpenPKG: openpkg-src/imapd/ imapd.spec
On Thu, Dec 06, 2007, Gunnar Wrobel wrote: > [...] > Cyrus IMAPd did link to the bdb instance outside of the OpenPKG > environment in the release we are currently building. > > We observed the same for the sasl: > > root# ldd /kolabrelease/sbin/saslauthd > libcrypt.so.1 => /lib/libcrypt.so.1 (0xb7fb) > libresolv.so.2 => /lib/libresolv.so.2 (0xb7f9e000) > libdb-4.3.so => /usr/lib/libdb-4.3.so (0xb7ead000) > libnsl.so.1 => /lib/libnsl.so.1 (0xb7e97000) > libc.so.6 => /lib/libc.so.6 (0xb7d78000) > /lib/ld-linux.so.2 (0xb7fe6000) > > I tried copying the stanza from imapd.spec to sasl.spec but that > didn't work. > > For the Kolab release this problem does not matter but we thought we > should mention it. I've tried to fix it now. Just retry with latest "sasl" package... Ralf S. Engelschall [EMAIL PROTECTED] www.engelschall.com __ OpenPKG http://openpkg.org Developer Communication List openpkg-dev@openpkg.org
Re: [CVS] OpenPKG: openpkg-src/imapd/ imapd.spec
"Kolab Konsortium via Gunnar Wrobel" <[EMAIL PROTECTED]> writes: > OpenPKG CVS Repository > http://cvs.openpkg.org/ > > > Server: cvs.openpkg.org Name: Kolab Konsortium via > Gunnar Wro$ > Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] > Module: openpkg-src Date: 06-Dec-2007 07:47:40 > Branch: HEAD Handle: 2007120606473900 > > Modified files: > openpkg-src/imapd imapd.spec > > Log: > Reverted 1.182 -> 1.183 because imapd suddenly links to the bdb lib > outside of the OpenPKG environment. > > Summary: > RevisionChanges Path > 1.186 +11 -1 openpkg-src/imapd/imapd.spec > > > patch -p0 <<'@@ .' > Index: openpkg-src/imapd/imapd.spec > > $ cvs diff -u -r1.185 -r1.186 imapd.spec > --- openpkg-src/imapd/imapd.spec30 Nov 2007 10:50:15 - 1.185 > +++ openpkg-src/imapd/imapd.spec6 Dec 2007 06:47:39 - 1.186 > @@ -33,7 +33,7 @@ >Group:Mail >License: BSD >Version: 2.3.10 > -Release: 20071130 > +Release: 20071206 > ># package options >%option with_fsl yes > @@ -162,6 +162,14 @@ ># make sure config2header rebuilds imapopts based on imapoptions >rm -f lib/imapopts.h lib/imapopts.c >/dev/null 2>&1 || true > > +# fix Berkeley-DB detection > +%{l_shtool} subst\ > +-e 's;-L/usr/local/lib;;g' \ > +-e 's;-I/usr/local/include;;g' \ > +-e 's;db-4\.[0-9];db;g' \ > +-e 's;-l\$dbname;%{l_prefix}/lib/lib$dbname.a;g' \ > +configure > + ># ensure correct linking of Berkeley-DB in perl bindings >loclibs="" >case "%{l_platform -t}" in > @@ -249,6 +257,8 @@ >--with-lib-subdir=%{l_prefix}/lib \ >--with-openssl=%{l_prefix} \ >--with-bdb=%{l_prefix} \ > +--with-bdb-incdir=%{l_prefix}/include \ > +--with-bdb-libdir=%{l_prefix}/lib \ >--with-sasl=%{l_prefix} \ >--with-staticsasl=%{l_prefix} \ >--with-com_err \ > @@ . > __ > OpenPKG http://openpkg.org > CVS Repository Commit List [EMAIL PROTECTED] Cyrus IMAPd did link to the bdb instance outside of the OpenPKG environment in the release we are currently building. We observed the same for the sasl: root# ldd /kolabrelease/sbin/saslauthd libcrypt.so.1 => /lib/libcrypt.so.1 (0xb7fb) libresolv.so.2 => /lib/libresolv.so.2 (0xb7f9e000) libdb-4.3.so => /usr/lib/libdb-4.3.so (0xb7ead000) libnsl.so.1 => /lib/libnsl.so.1 (0xb7e97000) libc.so.6 => /lib/libc.so.6 (0xb7d78000) /lib/ld-linux.so.2 (0xb7fe6000) I tried copying the stanza from imapd.spec to sasl.spec but that didn't work. For the Kolab release this problem does not matter but we thought we should mention it. Cheers, Gunnar -- __ http://kdab.com ___ http://kolab-konsortium.com _ [EMAIL PROTECTED] Kolab work is funded in part by KDAB and the Kolab Konsortium http://www.pardus.de _ http://gunnarwrobel.de _ E-mail : [EMAIL PROTECTED] Dr. Gunnar Wrobel Tel. : +49 40 432 72335 Bundesstrasse 29 Fax: +49 40 432 70855D-20146 Hamburg >> Mail at ease - Rent a kolab groupware server at [EMAIL PROTECTED] << __ OpenPKG http://openpkg.org Developer Communication List openpkg-dev@openpkg.org
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 14-Apr-2004 16:57:13 Branch: HEAD Handle: 2004041415571300 Modified files: openpkg-src/imapd imapd.spec Log: add optional DRAC support Summary: RevisionChanges Path 1.117 +11 -1 openpkg-src/imapd/imapd.spec patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.116 -r1.117 imapd.spec --- openpkg-src/imapd/imapd.spec 28 Mar 2004 21:48:01 - 1.116 +++ openpkg-src/imapd/imapd.spec 14 Apr 2004 14:57:13 - 1.117 @@ -34,12 +34,13 @@ Group:Mail License: BSD Version: 2.2.3 -Release: 20040328 +Release: 20040414 # package options %option with_fslyes %option with_group no %option with_atvdom no +%option with_drac no # list of sources Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz @@ -88,6 +89,12 @@ -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
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 18-Feb-2004 13:19:01 Branch: HEAD Handle: 2004021812190100 Modified files: openpkg-src/imapd imapd.spec Log: fix dependencies Summary: RevisionChanges Path 1.112 +3 -3 openpkg-src/imapd/imapd.spec patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.111 -r1.112 imapd.spec --- openpkg-src/imapd/imapd.spec 17 Feb 2004 09:28:03 - 1.111 +++ openpkg-src/imapd/imapd.spec 18 Feb 2004 12:19:01 - 1.112 @@ -34,7 +34,7 @@ Group:Mail License: BSD Version: 2.2.3 -Release: 20040217 +Release: 20040218 # package options %option with_fslyes @@ -52,8 +52,8 @@ # build information Prefix: %{l_prefix} BuildRoot:%{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, perl, perl-openpkg >= 20040126, make -PreReq: OpenPKG, openpkg >= 20040130, perl, MTA +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" @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 17-Feb-2004 10:28:03 Branch: HEAD Handle: 2004021709280300 Modified files: openpkg-src/imapd imapd.spec Log: solve the com_err problems (contribution from Stephan Buys) Summary: RevisionChanges Path 1.111 +2 -2 openpkg-src/imapd/imapd.spec patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.110 -r1.111 imapd.spec --- openpkg-src/imapd/imapd.spec 9 Feb 2004 10:41:04 - 1.110 +++ openpkg-src/imapd/imapd.spec 17 Feb 2004 09:28:03 - 1.111 @@ -34,7 +34,7 @@ Group:Mail License: BSD Version: 2.2.3 -Release: 20040209 +Release: 20040217 # package options %option with_fslyes @@ -95,7 +95,7 @@ # ensure local com_err can be used %{l_shtool} subst -s \ --e 's;#include ;#include "com_err.h";' \ +-e 's;#include ;#include "et/com_err.h";' \ `find . -name *.[ch] -print` # ensure linking of Berkeley DB @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 09-Feb-2004 11:41:05 Branch: HEAD Handle: 2004020910410400 Modified files: openpkg-src/imapd imapd.spec Log: remove obsolete patching and add a new one to hopefully solve the com_err problems Summary: RevisionChanges Path 1.110 +6 -5 openpkg-src/imapd/imapd.spec patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.109 -r1.110 imapd.spec --- openpkg-src/imapd/imapd.spec 7 Feb 2004 17:55:37 - 1.109 +++ openpkg-src/imapd/imapd.spec 9 Feb 2004 10:41:04 - 1.110 @@ -34,7 +34,7 @@ Group:Mail License: BSD Version: 2.2.3 -Release: 20040207 +Release: 20040209 # package options %option with_fslyes @@ -93,6 +93,11 @@ -e 's;db-4.1;db;g' \ configure +# ensure local com_err can be used +%{l_shtool} subst -s \ +-e 's;#include ;#include "com_err.h";' \ +`find . -name *.[ch] -print` + # ensure linking of Berkeley DB %{l_shtool} subst \ -e 's;^\( *.LIBS..*\)\(\"\],.*\)$;\1 -ldb\2;' \ @@ -109,7 +114,6 @@ imap/lmtpd.c \ imap/mbdump.c \ imap/user.c \ -man/imapd.conf.5 \ timsieved/actions.c # adjust default config to install environment for use in mkimap install helper script @@ -160,9 +164,6 @@ %{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 %{l_make} %{l_mflags} %install @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec rc.imapd openpkg-web/ new...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Michael Schloh Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 27-Nov-2003 14:37:58 Branch: HEAD Handle: 2003112713375602 Modified files: openpkg-src/imapd imapd.spec rc.imapd openpkg-web news.txt Log: Better handle removal of pid files Summary: RevisionChanges Path 1.100 +1 -1 openpkg-src/imapd/imapd.spec 1.20+3 -4 openpkg-src/imapd/rc.imapd 1.7562 +2 -0 openpkg-web/news.txt patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.99 -r1.100 imapd.spec --- openpkg-src/imapd/imapd.spec 20 Nov 2003 19:08:06 - 1.99 +++ openpkg-src/imapd/imapd.spec 27 Nov 2003 13:37:58 - 1.100 @@ -33,7 +33,7 @@ Group:Mail License: BSD Version: 2.1.16 -Release: 20031120 +Release: 20031127 # package options %option with_fslyes @@ . patch -p0 <<'@@ .' Index: openpkg-src/imapd/rc.imapd $ cvs diff -u -r1.19 -r1.20 rc.imapd --- openpkg-src/imapd/rc.imapd6 Aug 2003 16:05:17 - 1.19 +++ openpkg-src/imapd/rc.imapd27 Nov 2003 13:37:58 - 1.20 @@ -63,16 +63,15 @@ rcService imapd enable yes || exit 0 rcService imapd active no && exit 0 imapd_signal TERM -rm $imapd_pidfile +rm -f $imapd_pidfile >/dev/null 2>&1 || true %restart -u @l_susr@ rcService imapd enable yes || exit 0 rcService imapd active no && exit 0 imapd_signal TERM -rm $imapd_pidfile +rc imapd stop sleep 2 -@l_prefix@/bin/cyrmaster & -echo $! >$imapd_pidfile +rc imapd start %reload -u @l_susr@ rcService imapd enable yes || exit 0 @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.7561 -r1.7562 news.txt --- openpkg-web/news.txt 27 Nov 2003 13:23:09 - 1.7561 +++ openpkg-web/news.txt 27 Nov 2003 13:37:56 - 1.7562 @@ -1,3 +1,5 @@ +27-Nov-2003: Upgraded package: P +27-Nov-2003: Upgraded package: P 27-Nov-2003: Upgraded package: P 27-Nov-2003: New package: P 27-Nov-2003: Upgraded package: P @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec openpkg-web/ news.txt
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 22-Sep-2003 13:13:05 Branch: HEAD Handle: 2003092212130301 Modified files: openpkg-src/imapd imapd.spec openpkg-web news.txt Log: requires later perl-openpkg version Summary: RevisionChanges Path 1.97+2 -2 openpkg-src/imapd/imapd.spec 1.6678 +1 -0 openpkg-web/news.txt patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.96 -r1.97 imapd.spec --- openpkg-src/imapd/imapd.spec 18 Sep 2003 15:38:15 - 1.96 +++ openpkg-src/imapd/imapd.spec 22 Sep 2003 11:13:04 - 1.97 @@ -33,7 +33,7 @@ Group:Mail License: BSD Version: 2.1.15 -Release: 20030918 +Release: 20030922 # package options %option with_fslyes @@ -51,7 +51,7 @@ # build information Prefix: %{l_prefix} BuildRoot:%{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20030909, perl, perl-openpkg, make +BuildPreReq: OpenPKG, openpkg >= 20030909, perl, perl-openpkg >= 20030514, make PreReq: OpenPKG, openpkg >= 20030909, perl, MTA BuildPreReq: sasl, db >= 4.1.24, openssl PreReq: sasl, db >= 4.1.24, openssl @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.6677 -r1.6678 news.txt --- openpkg-web/news.txt 22 Sep 2003 08:24:32 - 1.6677 +++ openpkg-web/news.txt 22 Sep 2003 11:13:03 - 1.6678 @@ -1,3 +1,4 @@ +22-Sep-2003: Upgraded package: P 22-Sep-2003: Upgraded package: P 22-Sep-2003: Upgraded package: P 22-Sep-2003: Upgraded package: P @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec rc.imapd openpkg-web/ new...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Michael Schloh Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 06-Aug-2003 18:05:18 Branch: HEAD Handle: 2003080617051502 Modified files: openpkg-src/imapd imapd.spec rc.imapd openpkg-web news.txt Log: #202, corrected and completed logging logic Summary: RevisionChanges Path 1.92+3 -3 openpkg-src/imapd/imapd.spec 1.19+71 -12 openpkg-src/imapd/rc.imapd 1.6060 +1 -0 openpkg-web/news.txt patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.91 -r1.92 imapd.spec --- openpkg-src/imapd/imapd.spec 31 Jul 2003 09:55:29 - 1.91 +++ openpkg-src/imapd/imapd.spec 6 Aug 2003 16:05:17 - 1.92 @@ -33,7 +33,7 @@ Group:Mail License: BSD Version: 2.1.14 -Release: 20030731 +Release: 20030806 # package options %option with_fslyes @@ -51,8 +51,8 @@ # build information Prefix: %{l_prefix} BuildRoot:%{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20030718, perl, perl-openpkg, make -PreReq: OpenPKG, openpkg >= 20030718, perl, MTA +BuildPreReq: OpenPKG, openpkg >= 20030806, perl, perl-openpkg, make +PreReq: OpenPKG, openpkg >= 20030806, perl, MTA BuildPreReq: sasl, db >= 4.1.24, openssl PreReq: sasl, db >= 4.1.24, openssl %if "%{with_fsl}" == "yes" @@ . patch -p0 <<'@@ .' Index: openpkg-src/imapd/rc.imapd $ cvs diff -u -r1.18 -r1.19 rc.imapd --- openpkg-src/imapd/rc.imapd22 Jul 2003 08:10:48 - 1.18 +++ openpkg-src/imapd/rc.imapd6 Aug 2003 16:05:17 - 1.19 @@ -5,11 +5,36 @@ %config imapd_enable="$openpkg_rc_def" -imapd_log_prolog="true" -imapd_log_epilog="true" -imapd_log_numfiles="10" -imapd_log_minsize="1M" -imapd_log_complevel="9" +imapd_cyrdel_file="@l_prefix@/var/imapd/cyrdeliver.log" +imapd_cyrdel_prolog="true" +imapd_cyrdel_epilog="true" +imapd_cyrdel_numfiles="10" +imapd_cyrdel_minsize="1M" +imapd_cyrdel_complevel="9" +imapd_imapd_file="@l_prefix@/var/imapd/imapd.log" +imapd_imapd_prolog="true" +imapd_imapd_epilog="true" +imapd_imapd_numfiles="10" +imapd_imapd_minsize="1M" +imapd_imapd_complevel="9" +imapd_lmtpd_file="@l_prefix@/var/imapd/lmtpd.log" +imapd_lmtpd_prolog="true" +imapd_lmtpd_epilog="true" +imapd_lmtpd_numfiles="10" +imapd_lmtpd_minsize="1M" +imapd_lmtpd_complevel="9" +imapd_master_file="@l_prefix@/var/imapd/master.log" +imapd_master_prolog="true" +imapd_master_epilog="true" +imapd_master_numfiles="10" +imapd_master_minsize="1M" +imapd_master_complevel="9" +imapd_popd_file="@l_prefix@/var/imapd/pop3d.log" +imapd_popd_prolog="true" +imapd_popd_epilog="true" +imapd_popd_numfiles="10" +imapd_popd_minsize="1M" +imapd_popd_complevel="9" POP_type="cyrus" POP_logfile="@l_prefix@/var/imapd/log/pop3d.log" @@ -30,16 +55,19 @@ %start -u @l_susr@ rcService imapd enable yes || exit 0 +rcService imapd active yes && exit 0 @l_prefix@/bin/cyrmaster & echo $! >$imapd_pidfile %stop -u @l_susr@ rcService imapd enable yes || exit 0 +rcService imapd active no && exit 0 imapd_signal TERM rm $imapd_pidfile %restart -u @l_susr@ rcService imapd enable yes || exit 0 +rcService imapd active no && exit 0 imapd_signal TERM rm $imapd_pidfile sleep 2 @@ -48,16 +76,47 @@ %reload -u @l_susr@ rcService imapd enable yes || exit 0 +rcService imapd active no && exit 0 imapd_signal HUP -%daily -u @l_rusr@ +%daily -u @l_susr@ rcService imapd enable yes || exit 0 -# rotate logfile +# rotate logfiles +rcTmp -i +hintfile=`rcTmp -f -n hint` shtool rotate -f \ --n ${imapd_log_numfiles} -s ${imapd_log_minsize} -d \ --z ${imapd_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \ --P "${imapd_log_prolog}" \ --E "${imapd_log_epilog}" \ -@l_prefix@/var/imapd/log/*.log +-n ${imapd_cyrdel_numfiles} -s ${imapd_cyrdel_minsize} -d \ +-z ${imapd_cyrdel_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \ +-P "${imapd_cyrdel_prolog}" \
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec openpkg-web/ news.txt
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Michael Schloh Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 11-Aug-2003 11:11:48 Branch: HEAD Handle: 2003081110114602 Modified files: openpkg-src/imapd imapd.spec openpkg-web news.txt Log: Correct section order Summary: RevisionChanges Path 1.94+7 -6 openpkg-src/imapd/imapd.spec 1.6118 +1 -0 openpkg-web/news.txt patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.93 -r1.94 imapd.spec --- openpkg-src/imapd/imapd.spec 8 Aug 2003 14:22:54 - 1.93 +++ openpkg-src/imapd/imapd.spec 11 Aug 2003 09:11:48 - 1.94 @@ -33,7 +33,7 @@ Group:Mail License: BSD Version: 2.1.14 -Release: 20030808 +Release: 20030811 # package options %option with_fslyes @@ -239,6 +239,12 @@ '%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' + +%files -f files + +%clean +rm -rf $RPM_BUILD_ROOT + %pre # before upgrade, save status and stop service [ $1 -eq 2 ] || exit 0 @@ -259,9 +265,4 @@ [ $1 -eq 0 ] || exit 0 %{l_rc} imapd stop 2>/dev/null exit 0 - -%files -f files - -%clean -rm -rf $RPM_BUILD_ROOT @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.6117 -r1.6118 news.txt --- openpkg-web/news.txt 11 Aug 2003 08:13:28 - 1.6117 +++ openpkg-web/news.txt 11 Aug 2003 09:11:46 - 1.6118 @@ -1,3 +1,4 @@ +11-Aug-2003: Upgraded package: P 11-Aug-2003: Upgraded package: P 11-Aug-2003: Upgraded package: P 11-Aug-2003: Upgraded package: P @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Michael Schloh Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 08-Aug-2003 16:22:55 Branch: HEAD Handle: 2003080815225400 Modified files: openpkg-src/imapd imapd.spec Log: Complete for compliance with features described by ticket #202 Summary: RevisionChanges Path 1.93+21 -1 openpkg-src/imapd/imapd.spec patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.92 -r1.93 imapd.spec --- openpkg-src/imapd/imapd.spec 6 Aug 2003 16:05:17 - 1.92 +++ openpkg-src/imapd/imapd.spec 8 Aug 2003 14:22:54 - 1.93 @@ -33,7 +33,7 @@ Group:Mail License: BSD Version: 2.1.14 -Release: 20030806 +Release: 20030808 # package options %option with_fslyes @@ -239,6 +239,26 @@ '%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' +%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 %files -f files @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec openpkg-web/ news.txt
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Michael van Elst Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 31-Jul-2003 11:55:29 Branch: HEAD Handle: 2003073110552801 Modified files: openpkg-src/imapd imapd.spec openpkg-web news.txt Log: avoid picking up random stuff from /usr/local Summary: RevisionChanges Path 1.91+3 -1 openpkg-src/imapd/imapd.spec 1.5940 +1 -0 openpkg-web/news.txt patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.90 -r1.91 imapd.spec --- openpkg-src/imapd/imapd.spec 23 Jul 2003 14:02:35 - 1.90 +++ openpkg-src/imapd/imapd.spec 31 Jul 2003 09:55:29 - 1.91 @@ -33,7 +33,7 @@ Group:Mail License: BSD Version: 2.1.14 -Release: 20030723 +Release: 20030731 # package options %option with_fslyes @@ -77,6 +77,8 @@ %patch1 -p0 %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 @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.5939 -r1.5940 news.txt --- openpkg-web/news.txt 31 Jul 2003 09:47:04 - 1.5939 +++ openpkg-web/news.txt 31 Jul 2003 09:55:28 - 1.5940 @@ -1,3 +1,4 @@ +31-Jul-2003: Upgraded package: P 31-Jul-2003: Upgraded package: P 31-Jul-2003: Upgraded package: P 31-Jul-2003: Upgraded package: P @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec openpkg-web/ news.txt
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Michael van Elst Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 18-Jul-2003 11:21:41 Branch: HEAD Handle: 2003071810213901 Modified files: openpkg-src/imapd imapd.spec openpkg-web news.txt Log: fix building Summary: RevisionChanges Path 1.84+7 -4 openpkg-src/imapd/imapd.spec 1.5635 +1 -0 openpkg-web/news.txt patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.83 -r1.84 imapd.spec --- openpkg-src/imapd/imapd.spec 17 Jul 2003 15:32:44 - 1.83 +++ openpkg-src/imapd/imapd.spec 18 Jul 2003 09:21:40 - 1.84 @@ -33,7 +33,7 @@ Group:Mail License: BSD Version: 2.1.14 -Release: 20030717 +Release: 20030718 # package options %option with_fsl yes @@ -98,7 +98,9 @@ timsieved/actions.c # adjust default config to install environment for use in mkimap install helper script -%{l_shtool} install -c -m 644 %{l_value -s -a} \ +%{l_shtool} install -c -m 644 \ +-e "s;\(@[EMAIL PROTECTED]);$RPM_BUILD_ROOT\1;g" \ +%{l_value -s -a} \ %{SOURCE imapd.conf} \ imapd.conf-mkimap %{l_shtool} subst \ @@ -166,7 +168,7 @@ tag="${RPM_PACKAGE_NAME}-${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE}" perl="${RPM_BUILD_DIR}/perl-$tag" %{l_make} PERL="$perl" -) || exit 1 +) || exit $? %{l_prefix}/bin/perl-openpkg install -d perl/sieve/managesieve %{l_prefix}/bin/perl-openpkg install -d perl/sieve/acap %{l_prefix}/bin/perl-openpkg epilog @@ -209,7 +211,8 @@ for i in deliver master quota reconstruct; do mv bin/$ibin/cyr$i mv man/man8/$i.8 man/man8/cyr$i.8 - done ) + done +) || exit $? # install from tools %{l_shtool} install -c -m 755 \ @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.5634 -r1.5635 news.txt --- openpkg-web/news.txt 18 Jul 2003 09:20:09 - 1.5634 +++ openpkg-web/news.txt 18 Jul 2003 09:21:39 - 1.5635 @@ -1,3 +1,4 @@ +18-Jul-2003: Upgraded package: P 18-Jul-2003: Upgraded package: P 18-Jul-2003: Upgraded package: P 18-Jul-2003: Upgraded package: P @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec rc.imapd openpkg-src/pb4s...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 09-Jul-2003 17:10:05 Branch: HEAD Handle: 2003070916100104 Modified files: openpkg-src/imapd imapd.spec rc.imapd openpkg-src/pb4sd pb4sd.spec rc.pb4sd openpkg-src/qpopper qpopper.spec rc.qpopper openpkg-src/teapop rc.teapop teapop.spec openpkg-web news.txt Log: remove pop special case Summary: RevisionChanges Path 1.80+1 -1 openpkg-src/imapd/imapd.spec 1.12+2 -2 openpkg-src/imapd/rc.imapd 1.18+1 -1 openpkg-src/pb4sd/pb4sd.spec 1.7 +2 -2 openpkg-src/pb4sd/rc.pb4sd 1.52+1 -1 openpkg-src/qpopper/qpopper.spec 1.16+3 -3 openpkg-src/qpopper/rc.qpopper 1.8 +2 -2 openpkg-src/teapop/rc.teapop 1.28+1 -1 openpkg-src/teapop/teapop.spec 1.5480 +4 -0 openpkg-web/news.txt patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.79 -r1.80 imapd.spec --- openpkg-src/imapd/imapd.spec 8 Jul 2003 14:40:06 - 1.79 +++ openpkg-src/imapd/imapd.spec 9 Jul 2003 15:10:02 - 1.80 @@ -33,7 +33,7 @@ Group:Mail License: BSD Version: 2.1.14 -Release: 20030708 +Release: 20030709 # package options %option with_fsl yes @@ . patch -p0 <<'@@ .' Index: openpkg-src/imapd/rc.imapd $ cvs diff -u -r1.11 -r1.12 rc.imapd --- openpkg-src/imapd/rc.imapd8 Jul 2003 20:04:43 - 1.11 +++ openpkg-src/imapd/rc.imapd9 Jul 2003 15:10:02 - 1.12 @@ -10,8 +10,8 @@ imapd_log_numfiles="10" imapd_log_minsize="1M" imapd_log_complevel="9" -pop_type="cyrus" -pop_logfile="@l_prefix@/var/imapd/log/pop3d.log" +POP_type="cyrus" +POP_logfile="@l_prefix@/var/imapd/log/pop3d.log" %start -p 200 -u @l_susr@ opServiceEnabled imapd || exit 0 @@ . patch -p0 <<'@@ .' Index: openpkg-src/pb4sd/pb4sd.spec $ cvs diff -u -r1.17 -r1.18 pb4sd.spec --- openpkg-src/pb4sd/pb4sd.spec 8 Jul 2003 14:41:29 - 1.17 +++ openpkg-src/pb4sd/pb4sd.spec 9 Jul 2003 15:10:03 - 1.18 @@ -33,7 +33,7 @@ Group:Mail License: PD Version: 1.2 -Release: 20030328 +Release: 20030709 # list of sources Source0: pb4sd @@ . patch -p0 <<'@@ .' Index: openpkg-src/pb4sd/rc.pb4sd $ cvs diff -u -r1.6 -r1.7 rc.pb4sd --- openpkg-src/pb4sd/rc.pb4sd24 Jun 2003 12:07:58 - 1.6 +++ openpkg-src/pb4sd/rc.pb4sd9 Jul 2003 15:10:03 - 1.7 @@ -18,8 +18,8 @@ %start -p 200 -u @l_susr@ opServiceEnabled pb4sd || exit 0 -pb4sd_popserver="${pop_type:-qpopper}" -pb4sd_infile="${pop_logfile:[EMAIL PROTECTED]@/var/qpopper/qpopper.log}" +pb4sd_popserver="${POP_type:-qpopper}" +pb4sd_infile="${POP_logfile:[EMAIL PROTECTED]@/var/qpopper/qpopper.log}" @l_prefix@/sbin/pb4sd \ --daemon \ --popserver="${pb4sd_popserver}" \ @@ . patch -p0 <<'@@ .' Index: openpkg-src/qpopper/qpopper.spec $ cvs diff -u -r1.51 -r1.52 qpopper.spec --- openpkg-src/qpopper/qpopper.spec 8 Jul 2003 14:42:06 - 1.51 +++ openpkg-src/qpopper/qpopper.spec 9 Jul 2003 15:10:04 - 1.52 @@ -33,7 +33,7 @@ Group:Mail License: GPL Version: 4.0.5 -Release: 20030708 +Release: 20030709 # package options %option with_fsl yes @@ . patch -p0 <<'@@ .' Index: openpkg-src/qpopper/rc.qpopper $ cvs diff -u -r1.15 -r1.16 rc.qpopper --- openpkg-src/qpopper/rc.qpopper7 Jul 2003 21:54:31 - 1.15 +++ openpkg-src/qpopper/rc.qpopper9 Jul 2003 15:10:04 - 1.16 @@ -11,8 +11,8 @@ qpopper_log_numfiles="10" qpopper_log_minsize="1M" qpopper_log_complevel="9" -pop_type="qpopper" -pop_logfile="@l_prefix@/var/qpopper/qpopper.log" +POP_type="qpopper" +POP_logfile="@l_prefix@/var/qpop
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec openpkg-web/ news.txt
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Michael van Elst Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 07-Jul-2003 12:23:38 Branch: HEAD Handle: 2003070711233701 Modified files: openpkg-src/imapd imapd.spec openpkg-web news.txt Log: add libraries to PreReq Summary: RevisionChanges Path 1.76+5 -3 openpkg-src/imapd/imapd.spec 1.5316 +1 -0 openpkg-web/news.txt patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.75 -r1.76 imapd.spec --- openpkg-src/imapd/imapd.spec 4 Jul 2003 11:11:04 - 1.75 +++ openpkg-src/imapd/imapd.spec 7 Jul 2003 10:23:38 - 1.76 @@ -33,7 +33,7 @@ Group:Mail License: BSD Version: 2.1.14 -Release: 20030704 +Release: 20030707 # package options %option with_fsl yes @@ -51,8 +51,10 @@ # build information Prefix: %{l_prefix} BuildRoot:%{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20030415, sasl, db >= 4.1.24, openssl, make, perl, perl-openpkg -PreReq: OpenPKG, openpkg >= 20030415, sasl, openssl, perl, MTA +BuildPreReq: OpenPKG, openpkg >= 20030415, perl, perl-openpkg, make +PreReq: OpenPKG, openpkg >= 20030415, perl, MTA +BuildPreReq: sasl, db >= 4.1.24, openssl +PreReq: sasl, db >= 4.1.24, openssl %if "%{with_fsl}" == "yes" BuildPreReq: fsl PreReq: fsl @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.5315 -r1.5316 news.txt --- openpkg-web/news.txt 7 Jul 2003 10:22:06 - 1.5315 +++ openpkg-web/news.txt 7 Jul 2003 10:23:37 - 1.5316 @@ -1,3 +1,4 @@ +07-Jul-2003: Upgraded package: P 07-Jul-2003: Upgraded package: P 07-Jul-2003: Upgraded package: P 07-Jul-2003: Upgraded package: P @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
Re: [CVS] OpenPKG: openpkg-src/imapd/ imapd.spec vhosthack.patch
On Fri, Jul 04, 2003, Michael Schloh wrote: > Modified files: > openpkg-src/imapd imapd.spec vhosthack.patch > > Log: > Fix vhost build problems by rewriting patch and adjusting the specfile > Let's pay close attention to package update builds, especially with release packages and so close to the 1.3 release date. That way we won't accidentally break packages with patches (even conditional ones like this one). Regards, Michael pgp0.pgp Description: PGP signature
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec vhosthack.patch
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Michael Schloh Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 04-Jul-2003 13:11:04 Branch: HEAD Handle: 2003070412110400 Modified files: openpkg-src/imapd imapd.spec vhosthack.patch Log: Fix vhost build problems by rewriting patch and adjusting the specfile Summary: RevisionChanges Path 1.75+1 -1 openpkg-src/imapd/imapd.spec 1.2 +8 -7 openpkg-src/imapd/vhosthack.patch patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.74 -r1.75 imapd.spec --- openpkg-src/imapd/imapd.spec 4 Jul 2003 09:39:41 - 1.74 +++ openpkg-src/imapd/imapd.spec 4 Jul 2003 11:11:04 - 1.75 @@ -114,7 +114,7 @@ %if "%{with_vhost_hack}" == "yes" # allow @ in LMTP mailbox names -%{l_patch} -p0 <%{SOURCE vhosthack.patch} +%{l_patch} -p1 <%{SOURCE vhosthack.patch} %endif %build @@ . patch -p0 <<'@@ .' Index: openpkg-src/imapd/vhosthack.patch $ cvs diff -u -r1.1 -r1.2 vhosthack.patch --- openpkg-src/imapd/vhosthack.patch 8 Apr 2003 12:49:02 - 1.1 +++ openpkg-src/imapd/vhosthack.patch 4 Jul 2003 11:11:04 - 1.2 @@ -1,6 +1,7 @@ imap/lmtpengine.c.dist Wed Jun 5 20:32:15 2002 -+++ imap/lmtpengine.cSun Jun 23 02:15:51 2002 -@@ -440,7 +440,7 @@ +diff -Naur cyrus-imapd-2.1.14.orig/imap/lmtpengine.c cyrus-imapd-2.1.14/imap/lmtpengine.c +--- cyrus-imapd-2.1.14.orig/imap/lmtpengine.cWed Jun 25 05:34:01 2003 cyrus-imapd-2.1.14/imap/lmtpengine.c Fri Jul 4 11:42:39 2003 +@@ -536,7 +536,7 @@ if (!*p++) return 0; } else { @@ -9,7 +10,7 @@ if (*p == '\\') { if (!*++p) return 0; } -@@ -461,7 +461,7 @@ +@@ -557,7 +557,7 @@ if (*p++ != ']') return 0; } else { @@ -18,10 +19,10 @@ } } -@@ -942,7 +942,7 @@ +@@ -1160,7 +1160,7 @@ } - } - else { + + /* Now finish the remainder of the localpart */ -while (*addr != '@' && *addr != '>') { +while (/* *addr != '@' && */ *addr != '>') { if (*addr == '\\') addr++; @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec openpkg-web/ news.txt
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 04-Jul-2003 11:39:41 Branch: HEAD Handle: 2003070410394001 Modified files: openpkg-src/imapd imapd.spec openpkg-web news.txt Log: upgrade from EVAL to PLUS class those packages which build correctly and which are stable enough or at least look promising enough Summary: RevisionChanges Path 1.74+2 -2 openpkg-src/imapd/imapd.spec 1.5226 +1 -0 openpkg-web/news.txt patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.73 -r1.74 imapd.spec --- openpkg-src/imapd/imapd.spec 3 Jul 2003 17:43:07 - 1.73 +++ openpkg-src/imapd/imapd.spec 4 Jul 2003 09:39:41 - 1.74 @@ -29,11 +29,11 @@ URL: http://asg.web.cmu.edu/cyrus/imapd/ Vendor: Carnegie Mellon University Packager: The OpenPKG Project -Distribution: OpenPKG [EVAL] +Distribution: OpenPKG [PLUS] Group:Mail License: BSD Version: 2.1.14 -Release: 20030703 +Release: 20030704 # package options %option with_fsl yes @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.5225 -r1.5226 news.txt --- openpkg-web/news.txt 4 Jul 2003 09:39:30 - 1.5225 +++ openpkg-web/news.txt 4 Jul 2003 09:39:40 - 1.5226 @@ -1,3 +1,4 @@ +04-Jul-2003: Upgraded package: P 04-Jul-2003: Upgraded package: P 04-Jul-2003: Upgraded package: P 04-Jul-2003: Upgraded package: P @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec rc.imapd
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Michael van Elst Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Jun-2003 18:36:51 Branch: HEAD Handle: 2003062417365100 Modified files: openpkg-src/imapd imapd.spec rc.imapd Log: fix rc script Summary: RevisionChanges Path 1.72+5 -2 openpkg-src/imapd/imapd.spec 1.9 +1 -1 openpkg-src/imapd/rc.imapd patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.71 -r1.72 imapd.spec --- openpkg-src/imapd/imapd.spec 24 Jun 2003 13:26:54 - 1.71 +++ openpkg-src/imapd/imapd.spec 24 Jun 2003 16:36:51 - 1.72 @@ -200,8 +200,11 @@ $RPM_BUILD_ROOT%{l_prefix}/etc/imapd/ # install the run command file -%{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \ --e 's;@l_susr@;%{l_susr};g' -e 's;@l_sgrp@;%{l_sgrp};g' \ +%{l_shtool} install -c -m 755 \ +-e 's;@l_prefix@;%{l_prefix};g' \ +-e 's;@l_susr@;%{l_susr};g' \ +-e 's;@l_rusr@;%{l_rusr};g' \ +-e 's;@l_rgrp@;%{l_rgrp};g' \ %{SOURCE rc.imapd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ # use mkimap to create many directories for us @@ . patch -p0 <<'@@ .' Index: openpkg-src/imapd/rc.imapd $ cvs diff -u -r1.8 -r1.9 rc.imapd --- openpkg-src/imapd/rc.imapd24 Jun 2003 13:26:54 - 1.8 +++ openpkg-src/imapd/rc.imapd24 Jun 2003 16:36:51 - 1.9 @@ -40,7 +40,7 @@ kill -HUP `cat @l_prefix@/var/imapd/imapd.pid` fi -%daily -u @l_susr@ +%daily -u @l_rusr@ opServiceEnabled imapd || exit 0 # rotate logfile @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec rc.imapd openpkg-web/ new...
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 24-Jun-2003 15:26:55 Branch: HEAD Handle: 2003062414265301 Modified files: openpkg-src/imapd imapd.spec rc.imapd openpkg-web news.txt Log: add/unify log file trimming Summary: RevisionChanges Path 1.71+1 -1 openpkg-src/imapd/imapd.spec 1.8 +2 -1 openpkg-src/imapd/rc.imapd 1.4986 +1 -0 openpkg-web/news.txt patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.70 -r1.71 imapd.spec --- openpkg-src/imapd/imapd.spec 23 Jun 2003 20:47:55 - 1.70 +++ openpkg-src/imapd/imapd.spec 24 Jun 2003 13:26:54 - 1.71 @@ -33,7 +33,7 @@ Group:Mail License: BSD Version: 2.1.13 -Release: 20030623 +Release: 20030624 # package options %option with_fsl yes @@ . patch -p0 <<'@@ .' Index: openpkg-src/imapd/rc.imapd $ cvs diff -u -r1.7 -r1.8 rc.imapd --- openpkg-src/imapd/rc.imapd24 Jun 2003 12:07:47 - 1.7 +++ openpkg-src/imapd/rc.imapd24 Jun 2003 13:26:54 - 1.8 @@ -42,10 +42,11 @@ %daily -u @l_susr@ opServiceEnabled imapd || exit 0 + +# rotate logfile shtool rotate -f \ -n${imapd_log_numfiles} -s${imapd_log_minsize} -d \ -z${imapd_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \ -P "${imapd_log_prolog}" \ -E "${imapd_log_epilog}" \ @l_prefix@/var/imapd/log/*.log - @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.4985 -r1.4986 news.txt --- openpkg-web/news.txt 24 Jun 2003 13:26:44 - 1.4985 +++ openpkg-web/news.txt 24 Jun 2003 13:26:53 - 1.4986 @@ -1,3 +1,4 @@ +24-Jun-2003: Upgraded package: P 24-Jun-2003: Upgraded package: P 24-Jun-2003: Upgraded package: P 24-Jun-2003: Upgraded package: P @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec openpkg-web/ news.txt
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 23-Jun-2003 22:47:55 Branch: HEAD Handle: 2003062321475401 Modified files: openpkg-src/imapd imapd.spec openpkg-web news.txt Log: make fsl optional with default yes, as promised for the next release Summary: RevisionChanges Path 1.70+19 -12 openpkg-src/imapd/imapd.spec 1.4958 +1 -0 openpkg-web/news.txt patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.69 -r1.70 imapd.spec --- openpkg-src/imapd/imapd.spec 17 Jun 2003 06:58:54 - 1.69 +++ openpkg-src/imapd/imapd.spec 23 Jun 2003 20:47:55 - 1.70 @@ -33,9 +33,10 @@ Group:Mail License: BSD Version: 2.1.13 -Release: 20030617 +Release: 20030623 # package options +%option with_fsl yes %option with_vhost_hack no # list of sources @@ -50,8 +51,12 @@ # build information Prefix: %{l_prefix} BuildRoot:%{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20030103, sasl, db >= 4.1.24, openssl, make, perl, perl-openpkg, fsl -PreReq: OpenPKG, openpkg >= 20030103, sasl, openssl, perl, MTA, fsl +BuildPreReq: OpenPKG, openpkg >= 20030415, sasl, db >= 4.1.24, openssl, make, perl, perl-openpkg +PreReq: OpenPKG, openpkg >= 20030415, sasl, openssl, perl, MTA +%if "%{with_fsl}" == "yes" +BuildPreReq: fsl +PreReq: fsl +%endif AutoReq: no AutoReqProv: no Provides: IMAP @@ -114,7 +119,7 @@ %build cflags="%{l_cppflags}" -ldflags="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags`" +ldflags="%{l_ldflags} %{l_fsl_ldflags}" case "%{l_target}" in *-solaris* ) ldflags="$ldflags -lsocket -lnsl" ;; esac @@ -122,7 +127,7 @@ CPPFLAGS="$cflags" \ CFLAGS="%{l_cflags -O} $cflags" \ LDFLAGS="$ldflags" \ -LIBS="`%{l_prefix}/bin/fsl-config --all --libs`" \ +LIBS="%{l_fsl_libs}" \ ./configure \ --cache-file=./cache.config \ --prefix=%{l_prefix} \ @@ -173,7 +178,6 @@ %{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}/etc/fsl \ $RPM_BUILD_ROOT%{l_prefix}/var/imapd/spool \ $RPM_BUILD_ROOT%{l_prefix}/bin @@ -200,10 +204,6 @@ -e 's;@l_susr@;%{l_susr};g' -e 's;@l_sgrp@;%{l_sgrp};g' \ %{SOURCE rc.imapd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ -# install fsl configuration -%{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \ -%{SOURCE fsl.imapd} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ - # use mkimap to create many directories for us tools/mkimap imapd.conf-mkimap $RPM_BUILD_ROOT%{l_prefix}/var/imapd/sieve @@ -219,16 +219,23 @@ tools/mkimap \ $RPM_BUILD_ROOT%{l_prefix}/bin/ +# OSSP fake syslog library +%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl +%{l_shtool} install -c -m 644 \ +-e 's;@l_prefix@;%{l_prefix};g' \ +%{SOURCE fsl.%{name}} \ +$RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ + # strip binaries strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true # determine files %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ %{l_files_std} \ +'%not %dir %{l_prefix}/etc/fsl' \ +'%config %{l_prefix}/etc/fsl/fsl.%{name}' \ '%config %{l_prefix}/etc/imapd/imapd.conf' \ '%config %{l_prefix}/etc/imapd/cyrus.conf' \ -'%config %{l_prefix}/etc/fsl/fsl.imapd' \ -'%not %dir %{l_prefix}/etc/fsl' \ '%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/*/*' \ @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.4957 -r1.4958 news.txt --- openpkg-web/news.txt 23 Jun 2003 20:47:44 - 1.4957 +++ openpkg-web/news.txt 23 Jun 2003 20:47:54 - 1.4958 @@ -1,3 +1,4 @@ +23-Jun-2003: Upgraded package: P 23-Jun-2003: Upgraded package: P 23-Jun-2003: Upgraded package: P 23-Jun-200
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec openpkg-web/ news.txt
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 30-May-2003 21:46:43 Branch: HEAD Handle: 2003053020464002 Modified files: openpkg-src/imapd imapd.spec openpkg-web news.txt Log: OSSP fsl is link-time only; modernize flags Summary: RevisionChanges Path 1.67+5 -5 openpkg-src/imapd/imapd.spec 1.4661 +1 -0 openpkg-web/news.txt patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.66 -r1.67 imapd.spec --- openpkg-src/imapd/imapd.spec 2 May 2003 18:40:10 - 1.66 +++ openpkg-src/imapd/imapd.spec 30 May 2003 19:46:42 - 1.67 @@ -33,7 +33,7 @@ Group:Mail License: BSD Version: 2.1.13 -Release: 20030502 +Release: 20030530 # package options %option with_vhost_hack no @@ -50,8 +50,8 @@ # build information Prefix: %{l_prefix} BuildRoot:%{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20020206, sasl, db >= 4.1.24, openssl, make, perl, perl-openpkg, fsl -PreReq: OpenPKG, openpkg >= 20020206, sasl, openssl, perl, MTA, fsl +BuildPreReq: OpenPKG, openpkg >= 20030103, sasl, db >= 4.1.24, openssl, make, perl, perl-openpkg, fsl +PreReq: OpenPKG, openpkg >= 20030103, sasl, openssl, perl, MTA, fsl AutoReq: no AutoReqProv: no Provides: IMAP @@ -113,8 +113,8 @@ %endif %build -cflags="-I%{l_prefix}/include `%{l_prefix}/bin/fsl-config --all --cflags`" -ldflags="-L%{l_prefix}/lib `%{l_prefix}/bin/fsl-config --all --ldflags`" +cflags="%{l_cppflags}" +ldflags="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags`" case "%{l_target}" in *-solaris* ) ldflags="$ldflags -lsocket -lnsl" ;; esac @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.4660 -r1.4661 news.txt --- openpkg-web/news.txt 30 May 2003 19:45:15 - 1.4660 +++ openpkg-web/news.txt 30 May 2003 19:46:40 - 1.4661 @@ -1,3 +1,4 @@ +30-May-2003: Upgraded package: P 30-May-2003: Upgraded package: P 30-May-2003: Upgraded package: P 30-May-2003: Upgraded package: P @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Michael van Elst Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 11-Mar-2003 16:47:31 Branch: HEAD Handle: 2003031115472900 Modified files: openpkg-src/imapd imapd.spec Log: revoke Summary: RevisionChanges Path 1.55+1 -11 openpkg-src/imapd/imapd.spec patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.54 -r1.55 imapd.spec --- openpkg-src/imapd/imapd.spec 11 Mar 2003 10:38:13 - 1.54 +++ openpkg-src/imapd/imapd.spec 11 Mar 2003 15:47:29 - 1.55 @@ -45,7 +45,7 @@ # build information Prefix: %{l_prefix} BuildRoot:%{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20020206, sasl, db >= 4.1.24, openssl, make, perl, perl-openpkg, libtool +BuildPreReq: OpenPKG, openpkg >= 20020206, sasl, db >= 4.1.24, openssl, make, perl, perl-openpkg PreReq: OpenPKG, openpkg >= 20020206, sasl, openssl, perl, MTA AutoReq: no AutoReqProv: no @@ -96,16 +96,6 @@ -e "s;/etc/imapd.conf;$RPM_BUILD_DIR/cyrus-imapd-%{version}/imapd.conf-mkimap;" \ -e "s;^\(\$sievedir = \"\).*$;\1$RPM_BUILD_ROOT%{l_prefix}/var/imapd/sieve\"\;;" \ tools/mkimap - -# avoid sasl2 test in case of dependent libraries from sasl package -( echo 'ac_cv_lib_sasl2_prop_get=yes' - echo 'ac_cv_lib_sasl2_sasl_checkapop=yes' -) >cache.config - -# use libtool to catch dependencies -%{l_shtool} subst \ --e 's;\$(CC) \(\$(LDFLAGS)\);%{l_libtool} --mode=link \$(CC);g' \ -*/Makefile.in %build cflags="-I%{l_prefix}/include" @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec openpkg-web/ news.txt
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Michael van Elst Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 11-Mar-2003 11:38:14 Branch: HEAD Handle: 2003031110381102 Modified files: openpkg-src/imapd imapd.spec openpkg-web news.txt Log: use libtool hammer to nail dependent libraries pulled in by sasl Summary: RevisionChanges Path 1.54+13 -2 openpkg-src/imapd/imapd.spec 1.3645 +1 -0 openpkg-web/news.txt patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.53 -r1.54 imapd.spec --- openpkg-src/imapd/imapd.spec 28 Feb 2003 17:07:55 - 1.53 +++ openpkg-src/imapd/imapd.spec 11 Mar 2003 10:38:13 - 1.54 @@ -33,7 +33,7 @@ Group:Mail License: BSD Version: 2.1.12 -Release: 20030228 +Release: 20030311 # list of sources Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz @@ -45,7 +45,7 @@ # build information Prefix: %{l_prefix} BuildRoot:%{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20020206, sasl, db >= 4.1.24, openssl, make, perl, perl-openpkg +BuildPreReq: OpenPKG, openpkg >= 20020206, sasl, db >= 4.1.24, openssl, make, perl, perl-openpkg, libtool PreReq: OpenPKG, openpkg >= 20020206, sasl, openssl, perl, MTA AutoReq: no AutoReqProv: no @@ -97,6 +97,16 @@ -e "s;^\(\$sievedir = \"\).*$;\1$RPM_BUILD_ROOT%{l_prefix}/var/imapd/sieve\"\;;" \ tools/mkimap +# avoid sasl2 test in case of dependent libraries from sasl package +( echo 'ac_cv_lib_sasl2_prop_get=yes' + echo 'ac_cv_lib_sasl2_sasl_checkapop=yes' +) >cache.config + +# use libtool to catch dependencies +%{l_shtool} subst \ +-e 's;\$(CC) \(\$(LDFLAGS)\);%{l_libtool} --mode=link \$(CC);g' \ +*/Makefile.in + %build cflags="-I%{l_prefix}/include" ldflags="-L%{l_prefix}/lib" @@ -108,6 +118,7 @@ CFLAGS="%{l_cflags -O} $cflags" \ LDFLAGS="$ldflags" \ ./configure \ +--cache-file=./cache.config \ --prefix=%{l_prefix} \ --with-openssl=%{l_prefix} \ --with-dbdir=%{l_prefix} \ @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.3644 -r1.3645 news.txt --- openpkg-web/news.txt 10 Mar 2003 19:48:50 - 1.3644 +++ openpkg-web/news.txt 11 Mar 2003 10:38:11 - 1.3645 @@ -1,3 +1,4 @@ +11-Mar-2003: Upgraded package: P 10-Mar-2003: Upgraded package: P 10-Mar-2003: Upgraded package: P 10-Mar-2003: Upgraded package: P @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Christoph Schug Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 27-Feb-2003 15:26:38 Branch: HEAD Handle: 2003022714263700 Modified files: openpkg-src/imapd imapd.spec Log: fixed cyradm (unresolved symbol to db_create) Summary: RevisionChanges Path 1.50+6 -1 openpkg-src/imapd/imapd.spec patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.49 -r1.50 imapd.spec --- openpkg-src/imapd/imapd.spec 27 Feb 2003 09:16:52 - 1.49 +++ openpkg-src/imapd/imapd.spec 27 Feb 2003 14:26:37 - 1.50 @@ -62,11 +62,16 @@ %setup -q -n cyrus-imapd-%{version} %patch -p0 %{l_shtool} subst \ +-e 's;db-4.1;db;g' \ +configure +%{l_shtool} subst \ +-e 's;^\( *.LIBS..*\)\(\"\],.*\)$;\1 -ldb\2;' \ +perl/imap/Makefile.PL +%{l_shtool} subst \ -e 's;^\(.) exec\) \(perl .*\)$;\1 %{l_prefix}/bin/\2;' \ perl/imap/cyradm.sh %build -%{l_shtool} subst -e 's;db-4.1;db;g' configure cflags="-I%{l_prefix}/include" ldflags="-L%{l_prefix}/lib" case "%{l_target}" in @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Christoph Schug Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 27-Feb-2003 10:16:53 Branch: HEAD Handle: 2003022709165200 Modified files: openpkg-src/imapd imapd.spec Log: ensure invocation of correct perl Summary: RevisionChanges Path 1.49+5 -2 openpkg-src/imapd/imapd.spec patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.48 -r1.49 imapd.spec --- openpkg-src/imapd/imapd.spec 24 Feb 2003 15:45:22 - 1.48 +++ openpkg-src/imapd/imapd.spec 27 Feb 2003 09:16:52 - 1.49 @@ -33,7 +33,7 @@ Group:Mail License: BSD Version: 2.1.12 -Release: 20030224 +Release: 20030227 # list of sources Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz @@ -45,7 +45,7 @@ Prefix: %{l_prefix} BuildRoot:%{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20020206, sasl, db >= 4.1.24, openssl, make, perl, perl-openpkg -PreReq: OpenPKG, openpkg >= 20020206, sasl, openssl, MTA +PreReq: OpenPKG, openpkg >= 20020206, sasl, openssl, perl, MTA AutoReq: no AutoReqProv: no Provides: IMAP @@ -61,6 +61,9 @@ %prep %setup -q -n cyrus-imapd-%{version} %patch -p0 +%{l_shtool} subst \ +-e 's;^\(.) exec\) \(perl .*\)$;\1 %{l_prefix}/bin/\2;' \ +perl/imap/cyradm.sh %build %{l_shtool} subst -e 's;db-4.1;db;g' configure @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd/ imapd.spec openpkg-web/ news.txt
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 24-Feb-2003 16:45:23 Branch: HEAD Handle: 2003022415452002 Modified files: openpkg-src/imapd imapd.spec openpkg-web news.txt Log: add cyradm stuff Summary: RevisionChanges Path 1.48+16 -7 openpkg-src/imapd/imapd.spec 1.3436 +1 -0 openpkg-web/news.txt patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.47 -r1.48 imapd.spec --- openpkg-src/imapd/imapd.spec 4 Feb 2003 08:45:58 - 1.47 +++ openpkg-src/imapd/imapd.spec 24 Feb 2003 15:45:22 - 1.48 @@ -33,7 +33,7 @@ Group:Mail License: BSD Version: 2.1.12 -Release: 20030204 +Release: 20030224 # list of sources Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz @@ -44,14 +44,13 @@ # build information Prefix: %{l_prefix} BuildRoot:%{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20020206, sasl, db >= 4.1.24, openssl, make, perl +BuildPreReq: OpenPKG, openpkg >= 20020206, sasl, db >= 4.1.24, openssl, make, perl, perl-openpkg PreReq: OpenPKG, openpkg >= 20020206, sasl, openssl, MTA AutoReq: no AutoReqProv: no Provides: IMAP %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 @@ -61,7 +60,7 @@ %prep %setup -q -n cyrus-imapd-%{version} -%patch0 -p0 +%patch -p0 %build %{l_shtool} subst -e 's;db-4.1;db;g' configure @@ -92,8 +91,18 @@ imap/*.c imap/*.h master/*.c master/*.h %{l_make} %{l_mflags} +# build (and install) Perl-based administration stuff +%{l_prefix}/bin/perl-openpkg prolog +( cd perl/imap + 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 ) + %install -rm -rf $RPM_BUILD_ROOT +#rm -rf $RPM_BUILD_ROOT + %{l_make} %{l_mflags} install \ prefix=$RPM_BUILD_ROOT%{l_prefix} \ exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \ @@ -110,8 +119,8 @@ %{l_shtool} install -c -m 644 \ -e 's;@l_prefix@;%{l_prefix};g' \ -e 's;@l_musr@;%{l_musr};g' \ -%{SOURCE imapd.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/imapd/ \ -master/conf/cyrus.conf $RPM_BUILD_ROOT%{l_prefix}/etc/imapd/ +%{SOURCE imapd.conf} master/conf/cyrus.conf \ +$RPM_BUILD_ROOT%{l_prefix}/etc/imapd/ # install the run command file %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt $ cvs diff -u -r1.3435 -r1.3436 news.txt --- openpkg-web/news.txt 24 Feb 2003 14:22:38 - 1.3435 +++ openpkg-web/news.txt 24 Feb 2003 15:45:20 - 1.3436 @@ -1,3 +1,4 @@ +24-Feb-2003: Upgraded package: P 24-Feb-2003: Upgraded package: P 24-Feb-2003: Upgraded package: P 24-Feb-2003: Upgraded package: P @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd imapd.spec openpkg-web news.txt
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Michael Schloh Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-web, openpkg-src Date: 22-Oct-2002 15:49:59 Branch: HEAD Handle: 2002102214495801 Modified files: openpkg-src/imapd imapd.spec openpkg-web news.txt Log: Be more exact about db version requirement. Summary: RevisionChanges Path 1.40+3 -3 openpkg-src/imapd/imapd.spec 1.1860 +1 -0 openpkg-web/news.txt Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.39 -r1.40 imapd.spec --- openpkg-src/imapd/imapd.spec 16 Oct 2002 16:16:08 - 1.39 +++ openpkg-src/imapd/imapd.spec 22 Oct 2002 13:49:59 - 1.40 @@ -32,7 +32,7 @@ Group:Mail License: BSD Version: 2.1.9 -Release: 20021016 +Release: 20021022 # list of sources Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz @@ -44,8 +44,8 @@ # build information Prefix: %{l_prefix} BuildRoot:%{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20020206, sasl, db, openssl, make, perl -PreReq: OpenPKG, openpkg >= 20020206, sasl, db, openssl, MTA +BuildPreReq: OpenPKG, openpkg >= 20020206, sasl, db >= 4.1.24, openssl, make, perl +PreReq: OpenPKG, openpkg >= 20020206, sasl, openssl, MTA AutoReq: no AutoReqProv: no Provides: IMAP Index: openpkg-web/news.txt $ cvs diff -u -r1.1859 -r1.1860 news.txt --- openpkg-web/news.txt 22 Oct 2002 13:49:45 - 1.1859 +++ openpkg-web/news.txt 22 Oct 2002 13:49:58 - 1.1860 @@ -1,3 +1,4 @@ +22-Oct-2002: Upgraded package: P 22-Oct-2002: Upgraded package: P 22-Oct-2002: Upgraded package: P 22-Oct-2002: Upgraded package: P __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd imapd.spec openpkg-web news.txt
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Michael Schloh Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-web, openpkg-src Date: 16-Oct-2002 18:16:08 Branch: HEAD Handle: 2002101617160602 Modified files: openpkg-src/imapd imapd.spec openpkg-web news.txt Log: Repair build to comply with the new Berkley db 4.1.24 API. Summary: RevisionChanges Path 1.39+6 -4 openpkg-src/imapd/imapd.spec 1.1803 +1 -0 openpkg-web/news.txt Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.38 -r1.39 imapd.spec --- openpkg-src/imapd/imapd.spec 2 Oct 2002 15:16:37 - 1.38 +++ openpkg-src/imapd/imapd.spec 16 Oct 2002 16:16:08 - 1.39 @@ -32,19 +32,20 @@ Group:Mail License: BSD Version: 2.1.9 -Release: 20021002 +Release: 20021016 # list of sources Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz Source1: imapd.conf Source2: rc.imapd Patch0: imapd.patch +Patch1: imapd-db4.patch # build information Prefix: %{l_prefix} BuildRoot:%{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20020206, sasl, db3, openssl, make, perl -PreReq: OpenPKG, openpkg >= 20020206, sasl, db3, openssl, MTA +BuildPreReq: OpenPKG, openpkg >= 20020206, sasl, db, openssl, make, perl +PreReq: OpenPKG, openpkg >= 20020206, sasl, db, openssl, MTA AutoReq: no AutoReqProv: no Provides: IMAP @@ -60,7 +61,8 @@ %prep %setup -q -n cyrus-imapd-%{version} -%patch -p0 +%patch0 -p0 +%patch1 -p1 %build cflags="-I%{l_prefix}/include" Index: openpkg-web/news.txt $ cvs diff -u -r1.1802 -r1.1803 news.txt --- openpkg-web/news.txt 16 Oct 2002 16:10:47 - 1.1802 +++ openpkg-web/news.txt 16 Oct 2002 16:16:06 - 1.1803 @@ -1,3 +1,4 @@ +16-Oct-2002: Upgraded package: P 16-Oct-2002: New package: P 16-Oct-2002: Upgraded package: P 16-Oct-2002: Upgraded package: P __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd imapd.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Michael Schloh Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 02-Oct-2002 17:16:38 Branch: HEAD Handle: 2002100216163700 Modified files: openpkg-src/imapd imapd.spec Log: Backout change due to false positive build result, since imapd was using the old db3 binaries after all. Summary: RevisionChanges Path 1.38+2 -2 openpkg-src/imapd/imapd.spec Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.37 -r1.38 imapd.spec --- openpkg-src/imapd/imapd.spec 2 Oct 2002 15:08:40 - 1.37 +++ openpkg-src/imapd/imapd.spec 2 Oct 2002 15:16:37 - 1.38 @@ -43,8 +43,8 @@ # build information Prefix: %{l_prefix} BuildRoot:%{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20020206, sasl, db, openssl, make, perl -PreReq: OpenPKG, openpkg >= 20020206, sasl, db, openssl, MTA +BuildPreReq: OpenPKG, openpkg >= 20020206, sasl, db3, openssl, make, perl +PreReq: OpenPKG, openpkg >= 20020206, sasl, db3, openssl, MTA AutoReq: no AutoReqProv: no Provides: IMAP __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd imapd.spec openpkg-web news.txt
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Michael Schloh Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-web, openpkg-src Date: 02-Oct-2002 17:08:41 Branch: HEAD Handle: 2002100216084000 Modified files: openpkg-src/imapd imapd.spec openpkg-web news.txt Log: Successfully replace db3 dependency with db. Summary: RevisionChanges Path 1.37+3 -3 openpkg-src/imapd/imapd.spec 1.1674 +1 -0 openpkg-web/news.txt Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.36 -r1.37 imapd.spec --- openpkg-src/imapd/imapd.spec 5 Sep 2002 13:24:13 - 1.36 +++ openpkg-src/imapd/imapd.spec 2 Oct 2002 15:08:40 - 1.37 @@ -32,7 +32,7 @@ Group:Mail License: BSD Version: 2.1.9 -Release: 20020905 +Release: 20021002 # list of sources Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz @@ -43,8 +43,8 @@ # build information Prefix: %{l_prefix} BuildRoot:%{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20020206, sasl, db3, openssl, make, perl -PreReq: OpenPKG, openpkg >= 20020206, sasl, db3, openssl, MTA +BuildPreReq: OpenPKG, openpkg >= 20020206, sasl, db, openssl, make, perl +PreReq: OpenPKG, openpkg >= 20020206, sasl, db, openssl, MTA AutoReq: no AutoReqProv: no Provides: IMAP Index: openpkg-web/news.txt $ cvs diff -u -r1.1673 -r1.1674 news.txt --- openpkg-web/news.txt 2 Oct 2002 13:48:01 - 1.1673 +++ openpkg-web/news.txt 2 Oct 2002 15:08:40 - 1.1674 @@ -1,3 +1,4 @@ +02-Oct-2002: Upgraded package: P 02-Oct-2002: Upgraded package: P 02-Oct-2002: Upgraded package: P 02-Oct-2002: Upgraded package: P __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd imapd.spec
OpenPKG CVS Repository http://www.openpkg.org/cvsweb/cvsweb.cgi Server: cvs.openpkg.org Name: Michael Schloh Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 12-Aug-2002 17:12:59 Branch: HEAD Handle: 2002081216125800 Modified files: openpkg-src/imapd imapd.spec Log: Corrected missing 'Provides' of email delivery agent. Summary: RevisionChanges Path 1.29+2 -1 openpkg-src/imapd/imapd.spec Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.28 -r1.29 imapd.spec --- openpkg-src/imapd/imapd.spec 12 Aug 2002 14:43:03 - 1.28 +++ openpkg-src/imapd/imapd.spec 12 Aug 2002 15:12:58 - 1.29 @@ -32,7 +32,7 @@ Group:Mail License: BSD Version: 2.1.5 -Release: 20020626 +Release: 20020812 # list of sources Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz @@ -45,6 +45,7 @@ PreReq: OpenPKG, openpkg >= 20020206, sasl, db3, MTA, openssl AutoReq: no AutoReqProv: no +Provides: IMAP %description Cyrus IMAP Server is an IMAP4 and POP3 daemon. __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/imapd imapd.spec
OpenPKG CVS Repository http://www.openpkg.org/cvsweb/cvsweb.cgi Server: cvs.openpkg.org Name: Michael Schloh Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 12-Aug-2002 16:43:03 Branch: HEAD Handle: 2002081215430300 Modified files: openpkg-src/imapd imapd.spec Log: Corrected runtime requirements. Summary: RevisionChanges Path 1.28+1 -1 openpkg-src/imapd/imapd.spec Index: openpkg-src/imapd/imapd.spec $ cvs diff -u -r1.27 -r1.28 imapd.spec --- openpkg-src/imapd/imapd.spec 26 Jun 2002 09:15:28 - 1.27 +++ openpkg-src/imapd/imapd.spec 12 Aug 2002 14:43:03 - 1.28 @@ -42,7 +42,7 @@ Prefix: %{l_prefix} BuildRoot:%{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20020206, sasl, db3, openssl, make -PreReq: OpenPKG, openpkg >= 20020206, sasl, db3, openssl +PreReq: OpenPKG, openpkg >= 20020206, sasl, db3, MTA, openssl AutoReq: no AutoReqProv: no __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]