Hello community,
here is the log from the commit of package cyrus-imapd for openSUSE:Factory
checked in at 2013-06-17 10:03:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cyrus-imapd (Old)
and /work/SRC/openSUSE:Factory/.cyrus-imapd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cyrus-imapd"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cyrus-imapd/cyrus-imapd.changes 2013-06-05
11:45:22.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd.changes
2013-06-17 10:03:31.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Jun 14 01:06:46 UTC 2013 - jeng...@inai.de
+
+- Add cyrus-imapd-db6.diff to fix compile abort with db >= 5
+
+-------------------------------------------------------------------
New:
----
cyrus-imapd-db6.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cyrus-imapd.spec ++++++
--- /var/tmp/diff_new_pack.LCVNLE/_old 2013-06-17 10:03:34.000000000 +0200
+++ /var/tmp/diff_new_pack.LCVNLE/_new 2013-06-17 10:03:34.000000000 +0200
@@ -16,7 +16,6 @@
#
-#
%define prjname cyrus-imapd
# Define and use _name because the macro expansion is not smart enough.
Without
@@ -24,53 +23,26 @@
%if ! %{defined with_kolab}
%define with_kolab 0
%define _name cyrus-imapd
-
%else
%define _name cyrus-imapd-kolab
-
%endif
-Name: %_name
-
%if %{with_kolab}
%define pkg_perl_Cyrus_IMAP perl-Cyrus-IMAP-kolab
%define pkg_perl_Cyrus_SIEVE_managesieve
perl-Cyrus-SIEVE-managesieve-kolab
%else
%define pkg_perl_Cyrus_IMAP perl-Cyrus-IMAP
%define pkg_perl_Cyrus_SIEVE_managesieve perl-Cyrus-SIEVE-managesieve
-
%endif
-BuildRequires: automake
-BuildRequires: bison
-BuildRequires: cyrus-sasl-devel
-BuildRequires: db-devel
-BuildRequires: drac
-BuildRequires: ed
-BuildRequires: flex
-BuildRequires: krb5-devel
-BuildRequires: openldap2-devel
-BuildRequires: openslp-devel
-BuildRequires: openssl-devel
-BuildRequires: opie
-BuildRequires: perl-Digest-SHA1
-BuildRequires: pwdutils
-BuildRequires: tcpd-devel
+Name: %_name
Url: http://cyrusimap.web.cmu.edu/
-Requires: %pkg_perl_Cyrus_IMAP
-Requires: %pkg_perl_Cyrus_SIEVE_managesieve
-Recommends: perl-TermReadLine-Gnu
-Conflicts: imap courier-imap
-%if %{with_kolab}
-Conflicts: cyrus-imapd
-%else
-Conflicts: cyrus-imapd-kolab
-%endif
Summary: The Cyrus IMAP and POP Mail Server
License: BSD-3-Clause
Group: Productivity/Networking/Email/Servers
Version: 2.3.18
Release: 0
+
Source: %{prjname}-%{version}.tar.gz
Source1: cyrus-imapd-rc.tar.gz
Source2: DB_CONFIG
@@ -87,6 +59,7 @@
Patch22: cyrus-imapd_tls-session-leak.dif
Patch23: cyrus-imapd_references_header-dos.dif
Patch24: charset.patch
+Patch25: cyrus-imapd-db6.diff
%if %{with_kolab}
# KOLAB_cyrus-imapd patches are maintained at
# http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/imapd/patches/
@@ -98,12 +71,36 @@
Patch106: KOLAB_cyrus-imapd-%{version}_UID.patch
Patch107: KOLAB_cyrus-imapd-%{version}_cross-domain-acls.patch
%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: automake
+BuildRequires: bison
+BuildRequires: cyrus-sasl-devel
+BuildRequires: db-devel
+BuildRequires: drac
+BuildRequires: ed
+BuildRequires: flex
+BuildRequires: krb5-devel
+BuildRequires: openldap2-devel
+BuildRequires: openslp-devel
+BuildRequires: openssl-devel
+BuildRequires: opie
+BuildRequires: perl-Digest-SHA1
+BuildRequires: pwdutils
+BuildRequires: tcpd-devel
Requires(pre): /usr/sbin/useradd /usr/sbin/usermod %insserv_prereq
%fillup_prereq /bin/sed
Requires(pre): /bin/awk /bin/grep /bin/cat /usr/bin/find /usr/bin/db_verify
sh-utils
Requires(pre): fileutils cyrus-sasl netcfg /usr/bin/strings
Recommends: cron
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires: %pkg_perl_Cyrus_IMAP
+Requires: %pkg_perl_Cyrus_SIEVE_managesieve
+Recommends: perl-TermReadLine-Gnu
+Conflicts: imap courier-imap
+%if %{with_kolab}
+Conflicts: cyrus-imapd
+%else
+Conflicts: cyrus-imapd-kolab
+%endif
%package -n %pkg_perl_Cyrus_IMAP
@@ -170,6 +167,7 @@
%patch22 -p1
%patch23 -p1
%patch24 -p1
+%patch -P 25 -p1
%if %{with_kolab}
%patch100 -p1
++++++ cyrus-imapd-db6.diff ++++++
From: Jan Engelhardt <jeng...@inai.de>
Date: 2013-06-14 02:52:48.129456384 +0200
src: make compilation with libdb-6.0 succeed
db-6.0 has hit the scene.
The DB_VERSION_MAJOR version number juggling has been replaced in
cyrus-imapd-2.4.7 so that they are no longer necessary.
The changes for ->set_bt_compare (mbox_compar) are not yet present
in cyrus-imapd-2.4.17.
---
lib/cyrusdb_berkeley.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
Index: cyrus-imapd-2.3.18/lib/cyrusdb_berkeley.c
===================================================================
--- cyrus-imapd-2.3.18.orig/lib/cyrusdb_berkeley.c
+++ cyrus-imapd-2.3.18/lib/cyrusdb_berkeley.c
@@ -108,7 +108,7 @@ static void db_panic(DB_ENV *dbenv __att
exit(EC_TEMPFAIL);
}
-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3)
+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
static void db_err(const DB_ENV *dbenv __attribute__((unused)),
const char *db_prfx, const char *buffer)
#else
@@ -164,7 +164,7 @@ static int init(const char *dbdir, int m
#endif
}
-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3)
+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
dbenv->set_msgcall(dbenv, db_msg);
#endif
dbenv->set_errcall(dbenv, db_err);
@@ -282,7 +282,7 @@ static int mysync(void)
assert(dbinit);
-#if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
+#if !(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1))
do {
#endif
#if (DB_VERSION_MAJOR > 3) || ((DB_VERSION_MAJOR == 3) && (DB_VERSION_MINOR >
0))
@@ -290,7 +290,7 @@ static int mysync(void)
#else
r = txn_checkpoint(dbenv, 0, 0);
#endif
-#if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
+#if !(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1))
} while (r == DB_INCOMPLETE); /* Never returned by BDB 4.1 */
#endif
if (r) {
@@ -388,8 +388,13 @@ static int myarchive(const char **fnames
return 0;
}
+#if DB_VERSION_MAJOR >= 6
+static int mbox_compar(DB *db __attribute__((unused)),
+ const DBT *a, const DBT *b, size_t *locp)
+#else
static int mbox_compar(DB *db __attribute__((unused)),
const DBT *a, const DBT *b)
+#endif
{
return bsearch_ncompare((const char *) a->data, a->size,
(const char *) b->data, b->size);
@@ -413,7 +418,7 @@ static int myopen(const char *fname, DBT
/* xxx set comparator! */
if (flags & CYRUSDB_MBOXSORT) db->set_bt_compare(db, mbox_compar);
-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
r = (db->open)(db, NULL, fname, NULL, type, dbflags | DB_AUTO_COMMIT,
0664);
#else
r = (db->open)(db, fname, NULL, type, dbflags, 0664);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
