Ubuntu cyrus-imapd-2.2 2.2.13-13ubuntu2
Ubuntu Merge-o-Matic
mom at ubuntu.com
Wed Mar 5 22:43:53 UTC 2008
This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes. It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.7
Date: Wed, 05 Mar 2008 13:49:02 -0500
Source: cyrus-imapd-2.2
Binary: cyrus-dev-2.2 libcyrus-imap-perl22 cyrus-common-2.2 cyrus-doc-2.2 cyrus-clients-2.2 cyrus-pop3d-2.2 cyrus-imapd-2.2 cyrus-admin-2.2 cyrus-nntpd-2.2 cyrus-murder-2.2
Architecture: source
Version: 2.2.13-13ubuntu2
Distribution: hardy
Urgency: low
Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
Changed-By: Chuck Short <zulcss at ubuntu.com>
Description:
cyrus-admin-2.2 - Cyrus mail system (administration tools)
cyrus-clients-2.2 - Cyrus mail system (test clients)
cyrus-common-2.2 - Cyrus mail system (common files)
cyrus-dev-2.2 - Cyrus mail system (developer files)
cyrus-doc-2.2 - Cyrus mail system (documentation files)
cyrus-imapd-2.2 - Cyrus mail system (IMAP support)
cyrus-murder-2.2 - Cyrus mail system (proxies and aggregator)
cyrus-nntpd-2.2 - Cyrus mail system (NNTP support)
cyrus-pop3d-2.2 - Cyrus mail system (POP3 support)
libcyrus-imap-perl22 - Interface to Cyrus imap client imclient library
Changes:
cyrus-imapd-2.2 (2.2.13-13ubuntu2) hardy; urgency=low
.
* Rebuild for libddb4.3 -> libdb4.6 migration.
-Added debian/patches/99-bereklydb-4.6.dpatch which enables us to
drop libdb4.3 as a build dependency.
-Updated debian/patches/99-update-autoconf.dpatch to support db4.6.
Files:
c5970e0659dacadc6cace178aef406f2 1482 mail extra cyrus-imapd-2.2_2.2.13-13ubuntu2.dsc
2fd2ef14788a120a466dbed598c975c5 243988 mail extra cyrus-imapd-2.2_2.2.13-13ubuntu2.diff.gz
Original-Maintainer: Debian Cyrus Team <pkg-cyrus-imapd-debian-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 2.2.13-13ubuntu1/debian/changelog 2.2.13-13ubuntu2/debian/changelog
--- 2.2.13-13ubuntu1/debian/changelog 2008-03-05 22:21:39.000000000 +0000
+++ 2.2.13-13ubuntu2/debian/changelog 2008-03-05 22:21:38.000000000 +0000
@@ -1,3 +1,12 @@
+cyrus-imapd-2.2 (2.2.13-13ubuntu2) hardy; urgency=low
+
+ * Rebuild for libddb4.3 -> libdb4.6 migration.
+ -Added debian/patches/99-bereklydb-4.6.dpatch which enables us to
+ drop libdb4.3 as a build dependency.
+ -Updated debian/patches/99-update-autoconf.dpatch to support db4.6.
+
+ -- Chuck Short <zulcss at ubuntu.com> Wed, 05 Mar 2008 13:49:02 -0500
+
cyrus-imapd-2.2 (2.2.13-13ubuntu1) hardy; urgency=low
* Merge from debian unstable, remaining changes:
diff -pruN 2.2.13-13ubuntu1/debian/control 2.2.13-13ubuntu2/debian/control
--- 2.2.13-13ubuntu1/debian/control 2008-03-05 22:21:39.000000000 +0000
+++ 2.2.13-13ubuntu2/debian/control 2008-03-05 22:21:38.000000000 +0000
@@ -5,7 +5,7 @@ Maintainer: Ubuntu MOTU Developers <ubun
XSBC-Original-Maintainer: Debian Cyrus Team <pkg-cyrus-imapd-debian-devel at lists.alioth.debian.org>
Uploaders: Henrique de Moraes Holschuh <hmh at debian.org>, Sven Mueller <sven at debian.org>, Benjamin Seidenberg <benjamin at debian.org>, Ondřej Surý <ondrej at debian.org>
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4.1.68), tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.3-dev, libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, libsnmp9-dev | libsnmp5-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf, dpatch, transfig, gs, groff, libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64], heimdal-dev
+Build-Depends: debhelper (>= 4.1.68), tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.6-dev, libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, libsnmp9-dev | libsnmp5-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf, dpatch, transfig, gs, groff, libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64], heimdal-dev
Xs-Vcs-Browser: https://mail.incase.de/viewcvs/trunk/?root=cyrus22
Xs-Vcs-Svn: https://mail.incase.de/svn/cyrus22/trunk
diff -pruN 2.2.13-13ubuntu1/debian/patches/00list 2.2.13-13ubuntu2/debian/patches/00list
--- 2.2.13-13ubuntu1/debian/patches/00list 2008-03-05 22:21:39.000000000 +0000
+++ 2.2.13-13ubuntu2/debian/patches/00list 2008-03-05 22:21:38.000000000 +0000
@@ -57,8 +57,9 @@
72-faster-isdigit.dpatch
75-update-imapd.conf-documentation.dpatch
77-change-missing-sieve-notice.dpatch
-80-berkelydb-version.dpatch
+#80-berkelydb-version.dpatch
80-kbsd-no-psstrings.dpatch
# optional patch: Allow upload of mails with "From " headers
# 82-allow-from_-header.dpatch
99-update-autoconf.dpatch
+99-berkelydb-4.6.dpatch
diff -pruN 2.2.13-13ubuntu1/debian/patches/99-berkelydb-4.6.dpatch 2.2.13-13ubuntu2/debian/patches/99-berkelydb-4.6.dpatch
--- 2.2.13-13ubuntu1/debian/patches/99-berkelydb-4.6.dpatch 1970-01-01 01:00:00.000000000 +0100
+++ 2.2.13-13ubuntu2/debian/patches/99-berkelydb-4.6.dpatch 2008-03-05 22:21:38.000000000 +0000
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+diff -Naur cyrus-imapd-2.2.13.orig/cmulocal/berkdb.m4 cyrus-imapd-2.2.13/cmulocal/berkdb.m4
+--- cyrus-imapd-2.2.13.orig/cmulocal/berkdb.m4 2005-04-26 15:14:07.000000000 -0400
++++ cyrus-imapd-2.2.13/cmulocal/berkdb.m4 2008-03-05 13:39:55.000000000 -0500
+@@ -213,7 +213,7 @@
+ fi
+
+ saved_LIBS=$LIBS
+- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++ for dbname in db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+ do
+ LIBS="$saved_LIBS -l$dbname"
+ AC_TRY_LINK([#include <db.h>],
+diff -Naur cyrus-imapd-2.2.13.orig/lib/cyrusdb_berkeley.c cyrus-imapd-2.2.13/lib/cyrusdb_berkeley.c
+--- cyrus-imapd-2.2.13.orig/lib/cyrusdb_berkeley.c 2006-03-17 11:12:32.000000000 -0500
++++ cyrus-imapd-2.2.13/lib/cyrusdb_berkeley.c 2008-03-05 13:43:52.000000000 -0500
+@@ -173,7 +173,15 @@
+ 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));
diff -pruN 2.2.13-13ubuntu1/debian/patches/99-update-autoconf.dpatch 2.2.13-13ubuntu2/debian/patches/99-update-autoconf.dpatch
--- 2.2.13-13ubuntu1/debian/patches/99-update-autoconf.dpatch 2008-03-05 22:21:39.000000000 +0000
+++ 2.2.13-13ubuntu2/debian/patches/99-update-autoconf.dpatch 2008-03-05 22:21:38.000000000 +0000
@@ -10642,7 +10642,7 @@ diff -urNad cyrus-imapd-2.2-2.2.13-11ubu
saved_LIBS=$LIBS
- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+ for dbname in db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++ for dbname in db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
do
LIBS="$saved_LIBS -l$dbname"
cat >conftest.$ac_ext <<_ACEOF
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list