Hello community, here is the log from the commit of package cyrus-imapd checked in at Wed May 23 15:08:47 CEST 2007. -------- --- cyrus-imapd/cyrus-imapd.changes 2007-03-26 16:45:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/cyrus-imapd/cyrus-imapd.changes 2007-05-23 14:27:31.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 23 14:24:04 CEST 2007 - rhafer@suse.de + +- enabled replication feature (Bug #264293) +- Fixed rpmlint errors +- backported fix from CVS to build against berkeley db 4.5 + +------------------------------------------------------------------- New: ---- cyrus-imapd-bdb45.patch cyrus-imapd-perl-path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cyrus-imapd.spec ++++++ --- /var/tmp/diff_new_pack.dO2169/_old 2007-05-23 15:08:27.000000000 +0200 +++ /var/tmp/diff_new_pack.dO2169/_new 2007-05-23 15:08:27.000000000 +0200 @@ -12,7 +12,7 @@ Name: cyrus-imapd BuildRequires: cyrus-sasl-devel db-devel drac ed krb5-devel openslp-devel openssl-devel opie tcpd-devel -URL: http://asg.web.cmu.edu/cyrus/ +URL: http://cyrusimap.web.cmu.edu/ License: BSD License and BSD-like Group: Productivity/Networking/Email/Servers Requires: perl-Cyrus-IMAP perl-Cyrus-SIEVE-managesieve @@ -20,7 +20,7 @@ Autoreqprov: on Summary: An IMAP and POP Mail Server Version: 2.3.8 -Release: 6 +Release: 19 Source: %{name}-%{version}.tar.bz2 Source1: cyrus-imapd-rc.tar.gz Patch1: cyrus-imapd-2.3.8-autocreate-0.10-0.diff @@ -35,6 +35,8 @@ Patch14: impl_decl.patch Patch15: cyrus-imapd-strip.patch Patch16: gcc-warnings.patch +Patch17: cyrus-imapd-bdb45.patch +Patch18: cyrus-imapd-perl-path.patch Prereq: /usr/sbin/useradd %insserv_prereq %fillup_prereq /bin/sed /bin/awk /bin/grep /bin/cat /usr/bin/find /usr/bin/db_verify sh-utils fileutils cyrus-sasl netcfg /usr/bin/strings BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n perl-Cyrus-IMAP @@ -101,11 +103,14 @@ %patch4 %patch5 %patch7 +%patch8 %patch10 %patch12 -p1 %patch14 -p1 %patch15 %patch16 -p1 +%patch17 +%patch18 %build #%{?suse_update_config:%{suse_update_config -l -f build}} @@ -132,6 +137,7 @@ --with-drac=%{_libdir} \ --libdir=%{_libdir} \ --enable-murder \ + --enable-replication \ --with-mboxlist-db=skiplist \ --enable-annotatemore \ --with-perl=/usr/bin/perl \ @@ -162,6 +168,11 @@ install -m 755 SuSE/rc.cyrus $RPM_BUILD_ROOT/etc/init.d/cyrus ln -sf ../etc/init.d/cyrus $RPM_BUILD_ROOT/sbin/rccyrus install -m 755 SuSE/cron.daily.cyrus $RPM_BUILD_ROOT/etc/cron.daily/suse.de-cyrus-imapd +rm -f tools/config2* +rm -rf tools/CVS +rm -rf contrib +mkdir -p $RPM_BUILD_ROOT/usr/lib/cyrus/tools/ +install -m 755 tools/* $RPM_BUILD_ROOT/usr/lib/cyrus/tools/ #***************************************************************************** # SuSEfirewall2 Services #***************************************************************************** @@ -313,7 +324,7 @@ %config /etc/cron.daily/suse.de-cyrus-imapd %config(noreplace) /etc/imapd.conf %config(noreplace) /etc/cyrus.conf -/etc/sysconfig/SuSEfirewall2.d/services/cyrus-imapd +%config /etc/sysconfig/SuSEfirewall2.d/services/cyrus-imapd %dir %attr(0750, cyrus, mail) /var/lib/imap %attr(0750, cyrus, mail) /var/lib/imap/deliverdb %attr(0750, cyrus, mail) /var/lib/imap/log @@ -334,7 +345,7 @@ %doc %{_mandir}/man5/*.gz %doc %{_mandir}/man8/*.gz %doc COPYRIGHT README README.andrew doc -%doc SuSE/README.SuSE contrib tools +%doc SuSE/README.SuSE %files -n cyrus-imapd-devel %defattr(-,root,root) @@ -364,6 +375,10 @@ %doc %{_mandir}/man3/Cyrus::SIEVE::managesieve.3pm.gz %changelog +* Wed May 23 2007 - rhafer@suse.de +- enabled replication feature (Bug #264293) +- Fixed rpmlint errors +- backported fix from CVS to build against berkeley db 4.5 * Mon Mar 26 2007 - rhafer@suse.de - Corrected configure switch for idled. It's --enable-idled not --with-idle=idled now (Bug #255998) ++++++ cyrus-imapd-bdb45.patch ++++++ --- lib/cyrusdb_berkeley.c 2007/02/05 18:43:26 1.16 +++ lib/cyrusdb_berkeley.c 2007/03/23 13:35:54 1.18 @@ -39,7 +39,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: cyrusdb_berkeley.c,v 1.16 2007/02/05 18:43:26 jeaton Exp $ */ +/* $Id: cyrusdb_berkeley.c,v 1.18 2007/03/23 13:35:54 murch Exp $ */ #include <config.h> @@ -176,7 +176,15 @@ static int init(const char *dbdir, int m syslog(LOG_WARNING, "DBERROR: invalid berkeley_locks_max value, using internal default"); } else { +#if DB_VERSION_MAJOR >= 4 + r = dbenv->set_lk_max_locks(dbenv, opt); + if (!r) + r = dbenv->set_lk_max_lockers(dbenv, opt); + if (!r) + r = dbenv->set_lk_max_objects(dbenv, opt); +#else r = dbenv->set_lk_max(dbenv, opt); +#endif if (r) { dbenv->err(dbenv, r, "set_lk_max"); syslog(LOG_ERR, "DBERROR: set_lk_max(): %s", db_strerror(r)); ++++++ cyrus-imapd-perl-path.patch ++++++ --- tools/arbitronsort.pl 2007/05/23 11:53:02 1.1 +++ tools/arbitronsort.pl 2007/05/23 11:53:12 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # # This script takes the output of arbitron (run without the -o option) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org