From 3c9308fa83cb26e54287a61890452966798da96f6daff864fc40ad6b4baa177b Mon Sep 17 00:00:00 2001 From: Andrey Karepin Date: Fri, 14 Jun 2013 06:21:28 +0000 Subject: [PATCH] Accepting request 178927 from home:jengelh:db6 - Add cyrus-sasl-db6.diff to fix compile abort with db >= 5 OBS-URL: https://build.opensuse.org/request/show/178927 OBS-URL: https://build.opensuse.org/package/show/network/cyrus-sasl?expand=0&rev=34 --- cyrus-sasl-db6.diff | 39 ++++++++++++++++++++++++++++++++++++ cyrus-sasl-saslauthd.changes | 6 ++++++ cyrus-sasl-saslauthd.spec | 5 ++++- cyrus-sasl.changes | 6 ++++++ cyrus-sasl.spec | 7 +++++-- 5 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 cyrus-sasl-db6.diff diff --git a/cyrus-sasl-db6.diff b/cyrus-sasl-db6.diff new file mode 100644 index 0000000..f3a0e62 --- /dev/null +++ b/cyrus-sasl-db6.diff @@ -0,0 +1,39 @@ +From: Jan Engelhardt +Date: 2013-06-14 02:40:23.947245857 +0200 +X-Upstream: This patch becomes obsolete with cyrus-sasl-2.1.26 + +src: fix sloppy DB version >= 4.1 check + +Look! db-6.0 has hit the scene. + +--- + sasldb/db_berkeley.c | 2 +- + utils/dbconverter-2.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: cyrus-sasl-2.1.25/sasldb/db_berkeley.c +=================================================================== +--- cyrus-sasl-2.1.25.orig/sasldb/db_berkeley.c ++++ cyrus-sasl-2.1.25/sasldb/db_berkeley.c +@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut + ret = db_create(mbdb, NULL, 0); + if (ret == 0 && *mbdb != NULL) + { +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 ++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); +Index: cyrus-sasl-2.1.25/utils/dbconverter-2.c +=================================================================== +--- cyrus-sasl-2.1.25.orig/utils/dbconverter-2.c ++++ cyrus-sasl-2.1.25/utils/dbconverter-2.c +@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p + ret = db_create(mbdb, NULL, 0); + if (ret == 0 && *mbdb != NULL) + { +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 ++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/cyrus-sasl-saslauthd.changes b/cyrus-sasl-saslauthd.changes index b4c6edc..010d19f 100644 --- a/cyrus-sasl-saslauthd.changes +++ b/cyrus-sasl-saslauthd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 14 00:41:55 UTC 2013 - jengelh@inai.de + +- Add cyrus-sasl-db6.diff to fix compile abort with db >= 5 +- Simpler delete of .la files with find + ------------------------------------------------------------------- Mon Aug 13 07:55:11 UTC 2012 - rhafer@suse.de diff --git a/cyrus-sasl-saslauthd.spec b/cyrus-sasl-saslauthd.spec index 7851de9..261f53c 100644 --- a/cyrus-sasl-saslauthd.spec +++ b/cyrus-sasl-saslauthd.spec @@ -1,7 +1,7 @@ # # spec file for package cyrus-sasl-saslauthd # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -43,6 +43,7 @@ Patch4: gssapi-null-deref.dif Patch5: cyrus-sasl-no_rpath.patch Patch6: cyrus-sasl-lfs.patch Patch7: Fix-abort_if_no_fqdn-behavior.patch +Patch8: cyrus-sasl-db6.diff PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -77,6 +78,8 @@ The SQL auxprop plugin supports PostgreSQL and MySQL %patch5 -p1 %patch6 %patch7 -p1 +%patch -P 8 -p1 + %build find . -name \*.cvsignore -print0 | xargs -0 rm -vf autoreconf -f -i diff --git a/cyrus-sasl.changes b/cyrus-sasl.changes index b4c6edc..010d19f 100644 --- a/cyrus-sasl.changes +++ b/cyrus-sasl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 14 00:41:55 UTC 2013 - jengelh@inai.de + +- Add cyrus-sasl-db6.diff to fix compile abort with db >= 5 +- Simpler delete of .la files with find + ------------------------------------------------------------------- Mon Aug 13 07:55:11 UTC 2012 - rhafer@suse.de diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index 8eb2727..b52c407 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -1,7 +1,7 @@ # # spec file for package cyrus-sasl # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -46,6 +46,7 @@ Patch4: gssapi-null-deref.dif Patch5: cyrus-sasl-no_rpath.patch Patch6: cyrus-sasl-lfs.patch Patch7: Fix-abort_if_no_fqdn-behavior.patch +Patch8: cyrus-sasl-db6.diff PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -162,6 +163,8 @@ fi %patch5 -p1 %patch6 %patch7 -p1 +%patch -P 8 -p1 + %build find . -name \*.cvsignore -print0 | xargs -0 rm -fv autoreconf -f -i @@ -192,7 +195,7 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/cat?/* rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/saslauthd* rm -f $RPM_BUILD_ROOT/usr/sbin/saslauthd rm -f $RPM_BUILD_ROOT/usr/sbin/testsaslauthd -find $RPM_BUILD_ROOT -type f -name "*.la" -exec %{__rm} -fv {} + +find "%buildroot" -type f -name "*.la" -print -delete %post -p /sbin/ldconfig