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 - jengelh@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
participants (1)
-
root@hilbert.suse.de