[Pkg-cyrus-sasl2-commits] r645 - in /cyrus-sasl-2.1/trunk/debian: changelog control patches/0027_db5_support.diff patches/series

[roberto at users.alioth.debian.org]

Author: roberto
Date: Sat Apr 23 20:31:35 2011
New Revision: 645

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=645
Log:
Patch to support newer Berkeley DB, thanks to Ondřej Surý (Closes: #621437)

Added:
    cyrus-sasl-2.1/trunk/debian/patches/0027_db5_support.diff
Modified:
    cyrus-sasl-2.1/trunk/debian/changelog
    cyrus-sasl-2.1/trunk/debian/control
    cyrus-sasl-2.1/trunk/debian/patches/series

Modified: cyrus-sasl-2.1/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/changelog?rev=645&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Sat Apr 23 20:31:35 2011
@@ -4,8 +4,9 @@
     default, and how change/stop it (Closes: #590598)
   * Bump Standards-Version to 3.9.2 (no changes)
   * Remove Build-Depends on libopie-dev, which was removed (Closes: #622221)
-
- -- Roberto C. Sanchez <roberto at connexer.com>  Sat, 23 Apr 2011 16:07:07 -0400
+  * Patch to support newer Berkeley DB, thanks to Ondřej Surý (Closes: #621437)
+
+ -- Roberto C. Sanchez <roberto at connexer.com>  Sat, 23 Apr 2011 16:30:25 -0400
 
 cyrus-sasl2 (2.1.23.dfsg1-8) unstable; urgency=low
 

Modified: cyrus-sasl-2.1/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/control?rev=645&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/control (original)
+++ cyrus-sasl-2.1/trunk/debian/control Sat Apr 23 20:31:35 2011
@@ -4,7 +4,7 @@
 Maintainer: Debian Cyrus SASL Team <pkg-cyrus-sasl2-debian-devel at lists.alioth.debian.org>
 Uploaders: Fabian Fagerholm <fabbe at debian.org>, Roberto C. Sanchez <roberto at connexer.com>
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 5.0.0), quilt (>= 0.40), autotools-dev, automake1.9, autoconf, libtool, libdb4.8-dev, libpam0g-dev (>= 0.76-22), libssl-dev (>= 0.9.7e-3), libmysqlclient-dev | libmysqlclient15-dev (>= 5.0.20), libpq-dev (>= 8.1.3-4), heimdal-multidev, krb5-multidev, libsqlite0-dev (>= 2.8.16), libldap2-dev (>= 2.1.30-8), chrpath, groff-base, debconf (>= 0.5) | debconf-2.0, po-debconf, docbook-to-man, hardening-wrapper
+Build-Depends: debhelper (>= 5.0.0), quilt (>= 0.40), autotools-dev, automake1.9, autoconf, libtool, libdb-dev, libpam0g-dev (>= 0.76-22), libssl-dev (>= 0.9.7e-3), libmysqlclient-dev | libmysqlclient15-dev (>= 5.0.20), libpq-dev (>= 8.1.3-4), heimdal-multidev, krb5-multidev, libsqlite0-dev (>= 2.8.16), libldap2-dev (>= 2.1.30-8), chrpath, groff-base, debconf (>= 0.5) | debconf-2.0, po-debconf, docbook-to-man, hardening-wrapper
 Build-Conflicts: heimdal-dev
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/

Added: cyrus-sasl-2.1/trunk/debian/patches/0027_db5_support.diff
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/0027_db5_support.diff?rev=645&op=file
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/0027_db5_support.diff (added)
+++ cyrus-sasl-2.1/trunk/debian/patches/0027_db5_support.diff Sat Apr 23 20:31:35 2011
@@ -1,0 +1,22 @@
+--- a/sasldb/db_berkeley.c
++++ b/sasldb/db_berkeley.c
+@@ -100,7 +100,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);
+--- a/utils/dbconverter-2.c
++++ b/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);

Modified: cyrus-sasl-2.1/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/series?rev=645&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/series (original)
+++ cyrus-sasl-2.1/trunk/debian/patches/series Sat Apr 23 20:31:35 2011
@@ -21,3 +21,4 @@
 0024_allow_detection_of_heimdal.diff
 0025_ld_as_needed.diff
 0026_drop_krb5support_dependency.diff
+0027_db5_support.diff