[Pkg-cyrus-sasl2-commits] r539 - in /cyrus-sasl-2.1/branches/heimdal/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 11:35:55 UTC 2009
Author: fabbe
Date: Mon Dec 28 11:35:54 2009
New Revision: 539
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=539
Log:
Sync with main package.
Added:
cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.8.dpatch
- copied, changed from r533, cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.7.dpatch
Removed:
cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.7.dpatch
Modified:
cyrus-sasl-2.1/branches/heimdal/debian/changelog
cyrus-sasl-2.1/branches/heimdal/debian/control
cyrus-sasl-2.1/branches/heimdal/debian/patches/00list
cyrus-sasl-2.1/branches/heimdal/debian/sasl2-bin.postinst
Modified: cyrus-sasl-2.1/branches/heimdal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/changelog?rev=539&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/changelog (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/changelog Mon Dec 28 11:35:54 2009
@@ -1,9 +1,13 @@
cyrus-sasl2-heimdal (2.1.23.dfsg1-4) UNRELEASED; urgency=low
+ [ Roberto C. Sanchez ]
* debian/rules: Change --enable-gss_mutexes to --disable-gss_mutexes
(Closes: #556887)
- -- Roberto C. Sanchez <roberto at connexer.com> Tue, 22 Dec 2009 20:14:58 -0500
+ [ Fabian Fagerholm ]
+ * Sync with main package.
+
+ -- Fabian Fagerholm <fabbe at debian.org> Mon, 28 Dec 2009 13:32:05 +0200
cyrus-sasl2-heimdal (2.1.23.dfsg1-3) unstable; urgency=low
Modified: cyrus-sasl-2.1/branches/heimdal/debian/control
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/control?rev=539&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/control (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/control Mon Dec 28 11:35:54 2009
@@ -4,11 +4,11 @@
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), heimdal-dev, libsqlite0-dev (>= 2.8.16), libldap2-dev (>= 2.1.30-8), chrpath, groff-base
+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), heimdal-dev, libsqlite0-dev (>= 2.8.16), libldap2-dev (>= 2.1.30-8), chrpath, groff-base
Build-Conflicts: libkrb5-dev
Vcs-Browser: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/
Vcs-Svn: svn://svn.debian.org/svn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/
-Homepage: http://asg.web.cmu.edu/sasl/sasl-library.html
+Homepage: http://cyrusimap.web.cmu.edu/
Package: libsasl2-modules-gssapi-heimdal
Architecture: any
Copied: cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.8.dpatch (from r533, cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.7.dpatch)
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.8.dpatch?rev=539&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.7.dpatch (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/patches/0017_db4.8.dpatch Mon Dec 28 11:35:54 2009
@@ -1,8 +1,8 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 0017_db4.7.dpatch by Fabian Fagerholm <fabbe at debian.org>
+## 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.7.
+## DP: Support and build against db4.8.
@DPATCH@
diff -urNad trunk~/aclocal.m4 trunk/aclocal.m4
@@ -13,7 +13,7 @@
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.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
++ 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>],
@@ -25,7 +25,7 @@
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.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
++ for dbname in i 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>],
@@ -37,7 +37,7 @@
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.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
++ 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>],
Modified: cyrus-sasl-2.1/branches/heimdal/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/patches/00list?rev=539&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/patches/00list (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/patches/00list Mon Dec 28 11:35:54 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_build_with_gcc44
Modified: cyrus-sasl-2.1/branches/heimdal/debian/sasl2-bin.postinst
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/sasl2-bin.postinst?rev=539&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/sasl2-bin.postinst (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/sasl2-bin.postinst Mon Dec 28 11:35:54 2009
@@ -21,15 +21,16 @@
# 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
if [ -e $SASLDB_FILE ] && \
[ `sasldblistusers2 | wc -l` -eq 0 ]; then
rm $SASLDB_FILE
- else
- # The database had users, begin upgrade procedure
+ elif [ -e $SASLDB_FILE ]; then
+ # The database exists and has users, begin upgrade procedure
# Make backup and handle errors
db_get cyrus-sasl2/backup-sasldb2
@@ -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
@@ -68,6 +69,12 @@
dpkg-statoverride --update --add root sasl 660 $SASLDB_FILE
fi
+ # In 2.1.23.dfsg1-4 and later versions, saslauthd is no longer
+ # explicitly stopped on shutdown and reboot.
+ if dpkg --compare-versions "$2" lt "2.1.23.dfsg1-4"; then
+ rm -f /etc/rc0.d/K20saslauthd /etc/rc6.d/K20saslauthd
+ fi
+
db_stop
;;
More information about the Pkg-cyrus-sasl2-commits
mailing list