[Pkg-cyrus-sasl2-commits] r296 - in /cyrus-sasl-2.1/trunk/debian: changelog control patches/0017_db4.6.dpatch patches/00list sasl2-bin.postinst
fabbe at users.alioth.debian.org
fabbe at users.alioth.debian.org
Mon Jan 7 15:22:20 UTC 2008
Author: fabbe
Date: Mon Jan 7 15:22:19 2008
New Revision: 296
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=296
Log:
Build against libdb4.6.
Added:
cyrus-sasl-2.1/trunk/debian/patches/0017_db4.6.dpatch (with props)
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=296&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Mon Jan 7 15:22:19 2008
@@ -1,11 +1,17 @@
cyrus-sasl2 (2.1.22.dfsg1-17) UNRELEASED; urgency=low
+ [ Roberto C. Sanchez ]
* NOT RELEASED YET
* debian/control: Add Vcs-Browser and Vcs-Svn tags.
* Add Patrick Koetter's saslfinger utility to the package.
* debian/cyrus-sasl2-doc.doc-base: add file
- -- Roberto C. Sanchez <roberto at connexer.com> Sat, 17 Nov 2007 13:51:57 -0500
+ [ Fabian Fagerholm ]
+ * debian/control, debian/patches/0017_db4.6.dpatch,
+ debian/sasl2-bin.postinst: Build against libdb4.6. Thanks to Martin Pitt
+ for the suggestion and patch. (Closes: #458861)
+
+ -- Fabian Fagerholm <fabbe at paniq.net> Mon, 07 Jan 2008 12:43:13 +0200
cyrus-sasl2 (2.1.22.dfsg1-16) 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=296&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/control (original)
+++ cyrus-sasl-2.1/trunk/debian/control Mon Jan 7 15:22:19 2008
@@ -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.7.2
-Build-Depends: debhelper (>= 5.0.0), dpatch, autotools-dev, automake1.9, autoconf, libtool, libdb4.4-dev (>= 4.4.16-2), libpam0g-dev (>= 0.76-22), libssl-dev (>= 0.9.7e-3), libmysqlclient15-dev (>= 5.0.20-1), libopie-dev (>= 2.32-10), libpq-dev (>= 8.1.3-4), libkrb5-dev, libsqlite0-dev (>= 2.8.16-1), 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, libdb-dev (>= 4.6.21-1), libpam0g-dev (>= 0.76-22), libssl-dev (>= 0.9.7e-3), libmysqlclient15-dev (>= 5.0.20-1), libopie-dev (>= 2.32-10), libpq-dev (>= 8.1.3-4), libkrb5-dev, libsqlite0-dev (>= 2.8.16-1), 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/svn/pkg-cyrus-sasl2/
Vcs-Svn: svn://svn.debian.org/svn/pkg-cyrus-sasl2/
@@ -13,7 +13,7 @@
Section: utils
Priority: optional
Architecture: any
-Depends: libsasl2-2 (>= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6), db4.4-util, debconf (>= 1.4.69) | cdebconf (>= 0.39)
+Depends: libsasl2-2 (>= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6), db4.6-util, debconf (>= 1.4.69) | cdebconf (>= 0.39)
Description: Cyrus SASL - administration programs for SASL users database
This is the Cyrus SASL API implementation, version 2.1. See package
libsasl2-2 and RFC 2222 for more information.
Added: cyrus-sasl-2.1/trunk/debian/patches/0017_db4.6.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/0017_db4.6.dpatch?rev=296&op=file
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/0017_db4.6.dpatch (added)
+++ cyrus-sasl-2.1/trunk/debian/patches/0017_db4.6.dpatch Mon Jan 7 15:22:19 2008
@@ -1,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0017_db4.6.dpatch by <martin.pitt at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Support and build against db4.6.
+
+ at DPATCH@
+diff -urNad trunk~/aclocal.m4 trunk/aclocal.m4
+--- trunk~/aclocal.m4 2008-01-07 13:15:47.000000000 +0200
++++ trunk/aclocal.m4 2008-01-07 13:18:00.000000000 +0200
+@@ -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.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 2008-01-07 13:18:01.000000000 +0200
+@@ -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.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 2008-01-07 13:18:23.000000000 +0200
+@@ -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.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.6.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=296&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/00list (original)
+++ cyrus-sasl-2.1/trunk/debian/patches/00list Mon Jan 7 15:22:19 2008
@@ -14,3 +14,4 @@
0014_avoid_pic_overwrite
0015_saslutil_decode64_fix
0016_pid_file_lock_creation_mask
+0017_db4.6
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=296&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/sasl2-bin.postinst (original)
+++ cyrus-sasl-2.1/trunk/debian/sasl2-bin.postinst Mon Jan 7 15:22:19 2008
@@ -17,7 +17,8 @@
# Upgrade SASL database if needed
# The libdb dependency was updated in the following versions:
# 2.1.22.dfsg1-14 (db4.2 -> db4.4)
- if dpkg --compare-versions "$2" "lt-nl" 2.1.22.dfsg1-14; then
+ # 2.1.22.dfsg1-17 (db.4.4 -> db4.6)
+ if dpkg --compare-versions "$2" "lt-nl" 2.1.22.dfsg1-17; then
# If the database contains no users, just wipe it out,
# it will be recreated later in the current format
@@ -36,7 +37,7 @@
fi
# Upgrade SASL database and handle errors
- if ! db4.4_upgrade $SASLDB_FILE >/dev/null 2>&1; then
+ if ! db4.6_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