[Pkg-cyrus-sasl2-commits] r534 - in /cyrus-sasl-2.1/trunk/debian: changelog control patches/0017_db4.7.dpatch patches/0017_db4.8.dpatch patches/00list sasl2-bin.postinst

fabbe at users.alioth.debian.org fabbe at users.alioth.debian.org
Mon Dec 28 09:59:46 UTC 2009 

Author: fabbe
Date: Mon Dec 28 09:59:45 2009
New Revision: 534

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=534
Log:
Move to libdb4.8.

Added:
    cyrus-sasl-2.1/trunk/debian/patches/0017_db4.8.dpatch   (with props)
Removed:
    cyrus-sasl-2.1/trunk/debian/patches/0017_db4.7.dpatch
Modified:
    cyrus-sasl-2.1/trunk/debian/changelog
    cyrus-sasl-2.1/trunk/debian/control
    cyrus-sasl-2.1/trunk/debian/patches/00list
    cyrus-sasl-2.1/trunk/debian/sasl2-bin.postinst

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=534&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Mon Dec 28 09:59:45 2009
@@ -1,8 +1,14 @@
 cyrus-sasl2 (2.1.23.dfsg1-4) UNRELEASED; urgency=low
 
+  [ Roberto C. Sanchez ]
   * NOT RELEASED YET
 
- -- Roberto C. Sanchez <roberto at connexer.com>  Sat, 07 Nov 2009 10:24:06 -0500
+  [ Fabian Fagerholm ]
+  * debian/control, debian/sasl2-bin.postinst,
+    debian/patches/0017_db4.8.dpatch: Bump libdb version to 4.8.
+    (Closes: #556609)
+
+ -- Fabian Fagerholm <fabbe at debian.org>  Mon, 28 Dec 2009 11:58:42 +0200
 
 cyrus-sasl2 (2.1.23.dfsg1-3) 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=534&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/control (original)
+++ cyrus-sasl-2.1/trunk/debian/control Mon Dec 28 09:59:45 2009
@@ -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.8.3
-Build-Depends: debhelper (>= 5.0.0), dpatch, autotools-dev, automake1.9, autoconf, libtool, libdb4.7-dev, libpam0g-dev (>= 0.76-22), libssl-dev (>= 0.9.7e-3), libmysqlclient-dev | libmysqlclient15-dev (>= 5.0.20), libopie-dev (>= 2.32-10), libpq-dev (>= 8.1.3-4), libkrb5-dev, 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
+Build-Depends: debhelper (>= 5.0.0), dpatch, 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), libopie-dev (>= 2.32-10), libpq-dev (>= 8.1.3-4), libkrb5-dev, 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
 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/0017_db4.8.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/0017_db4.8.dpatch?rev=534&op=file
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/0017_db4.8.dpatch (added)
+++ cyrus-sasl-2.1/trunk/debian/patches/0017_db4.8.dpatch Mon Dec 28 09:59:45 2009
@@ -1,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0017_db4.8.dpatch by Fabian Fagerholm <fabbe at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Support and build against db4.8.
+
+ at DPATCH@
+diff -urNad trunk~/aclocal.m4 trunk/aclocal.m4
+--- trunk~/aclocal.m4	2008-01-07 13:15:47.000000000 +0200
++++ trunk/aclocal.m4	2009-05-10 08:35:13.000000000 +0300
+@@ -1691,7 +1691,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.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 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 -urNad trunk~/cmulocal/berkdb.m4 trunk/cmulocal/berkdb.m4
+--- trunk~/cmulocal/berkdb.m4	2008-01-07 13:15:48.000000000 +0200
++++ trunk/cmulocal/berkdb.m4	2009-05-10 08:35:38.000000000 +0300
+@@ -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.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 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 -urNad trunk~/saslauthd/aclocal.m4 trunk/saslauthd/aclocal.m4
+--- trunk~/saslauthd/aclocal.m4	2008-01-07 13:17:52.000000000 +0200
++++ trunk/saslauthd/aclocal.m4	2009-05-10 08:36:30.000000000 +0300
+@@ -2016,7 +2016,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.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 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>],

Propchange: cyrus-sasl-2.1/trunk/debian/patches/0017_db4.8.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: cyrus-sasl-2.1/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/00list?rev=534&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/00list (original)
+++ cyrus-sasl-2.1/trunk/debian/patches/00list Mon Dec 28 09:59:45 2009
@@ -15,7 +15,7 @@
 0013_fix_hurd_build
 0014_avoid_pic_overwrite
 0016_pid_file_lock_creation_mask
-0017_db4.7
+0017_db4.8
 0018_auth_rimap_quotes
 0019_ldap_deprecated
 0021_no_mutex_changes_after_init

Modified: cyrus-sasl-2.1/trunk/debian/sasl2-bin.postinst
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/sasl2-bin.postinst?rev=534&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/sasl2-bin.postinst (original)
+++ cyrus-sasl-2.1/trunk/debian/sasl2-bin.postinst Mon Dec 28 09:59:45 2009
@@ -21,7 +21,8 @@
 		#  2.1.22.dfsg1-14 (db4.2 -> db4.4)
 		#  2.1.22.dfsg1-17 (db4.4 -> db4.6)
 		#  2.1.22.dfsg1-24 (db4.6 -> db4.7)
-		if dpkg --compare-versions "$2" "lt-nl" 2.1.22.dfsg1-24; then
+		#  2.1.23.dfsg1-4 (db4.7 -> db4.8)
+		if dpkg --compare-versions "$2" "lt-nl" 2.1.23.dfsg1-4; then
 			
 			# If the database contains no users, just wipe it out,
 			# it will be recreated later in the current format
@@ -40,7 +41,7 @@
 				fi
 
 				# Upgrade SASL database and handle errors
-				if ! db4.7_upgrade $SASLDB_FILE >/dev/null 2>&1; then
+				if ! db4.8_upgrade $SASLDB_FILE >/dev/null 2>&1; then
 					db_input high cyrus-sasl2/upgrade-sasldb2-failed || true
 					db_go || true
 					cp --archive "$RET" $SASLDB_FILE >/dev/null 2>&1

More information about the Pkg-cyrus-sasl2-commits mailing list