severity 441624 important
tags 441624 patch
user [EMAIL PROTECTED]
usertags 441624 ubuntu-patch hardy
thanks
Hi Piotr,
This is really not a "wishlist" bug, it's important that packages migrate to
the current BDB in a timely manner where possible. libnss-db is currently
the highest-priority reverse-dependency (Priority: standard) of libdb4.3,
and as mentioned it needs to be fixed before another package can be rebuilt
against db4.6, so this needs to be dealt with so that db4.3 can be removed
from the archive (or at least, demoted) for the lenny release.
Attached then is a patch to build against db4.6. Please upload this fix, or
else please indicate if you would like me to NMU for this change.
Thanks,
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
[EMAIL PROTECTED] [EMAIL PROTECTED]
diff -u libnss-db-2.2.3pre1/debian/changelog libnss-db-2.2.3pre1/debian/changelog
--- libnss-db-2.2.3pre1/debian/changelog
+++ libnss-db-2.2.3pre1/debian/changelog
@@ -1,3 +1,12 @@
+libnss-db (2.2.3pre1-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Replaced 040-db4.3_api_change.patch with 040-db4.patch,
+ 020-db4.3_usage.patch with 020-db4.patch:
+ - Switch to db4.6. Closes: #441624.
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Mon, 07 Jan 2008 22:01:28 -0800
+
libnss-db (2.2.3pre1-2) unstable; urgency=high
* Renumbered Debian patches.
diff -u libnss-db-2.2.3pre1/debian/rules libnss-db-2.2.3pre1/debian/rules
--- libnss-db-2.2.3pre1/debian/rules
+++ libnss-db-2.2.3pre1/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
# Generated automatically from debian/packages
-# by yada v0.48, of Wed, 28 Sep 2005
+# by yada v0.54, of Sun, 28 Oct 2007
DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
@@ -201,7 +201,7 @@
yada patch "debian/patches/*.patch"
touch debian/build-arch-stamp
-debian/build-indep-stamp:
+debian/build-indep-stamp: debian/build-arch-stamp
@[ -f $(shell which yada) -a -f debian/rules ]
yada patch "debian/patches/*.patch"
touch debian/build-indep-stamp
@@ -215,7 +215,7 @@
rm -rf debian/tmp-libnss-db
umask 022 && install -d debian/tmp-libnss-db/DEBIAN
install -d debian/tmp-libnss-db/usr/share/doc/libnss-db
- umask 022; yada generate copyright \
+ umask 022; yada generate copyright libnss-db \
> debian/tmp-libnss-db/usr/share/doc/libnss-db/copyright
install -m 644 -p debian/changelog \
debian/tmp-libnss-db/usr/share/doc/libnss-db/changelog.Debian
reverted:
--- libnss-db-2.2.3pre1/debian/patches/020-db4.3_usage.patch
+++ libnss-db-2.2.3pre1.orig/debian/patches/020-db4.3_usage.patch
@@ -1,14 +0,0 @@
-Link against libdb4.3
-
-diff -urN nss_db-2.2.orig/configure.in nss_db-2.2/configure.in
---- nss_db-2.2.orig/configure.in Thu Nov 9 19:56:04 2000
-+++ nss_db-2.2/configure.in Sun Mar 25 13:25:01 2001
-@@ -43,7 +43,7 @@
- AC_CHECK_HEADER(db.h,, AC_MSG_ERROR([
- *** Could not find Berkeley DB headers.]))
-
--AC_CHECK_LIB(db, db_version,, AC_MSG_ERROR([
-+AC_CHECK_LIB(db-4.3, db_version,, AC_MSG_ERROR([
- *** Could not find Berkeley DB library.]))
-
- AC_CACHE_CHECK([Berkeley DB version], nss_db_cv_db_version,
reverted:
--- libnss-db-2.2.3pre1/debian/patches/040-db4.3_api_change.patch
+++ libnss-db-2.2.3pre1.orig/debian/patches/040-db4.3_api_change.patch
@@ -1,14 +0,0 @@
-DB 4.3 API change
-
-diff -uNr nss_db-2.2.orig/src/db-compat.c nss_db-2.2/src/db-compat.c
---- nss_db-2.2.orig/src/db-compat.c 2005-02-22 11:20:08.982739304 -0500
-+++ nss_db-2.2/src/db-compat.c 2005-02-22 11:20:15.872839511 -0500
-@@ -39,7 +39,7 @@
- if (err)
- return err;
-
-- err = db->open (db, file, NULL, type, flags, mode);
-+ err = db->open (db, NULL, file, NULL, type, flags, mode);
- if (err)
- {
- db->close (db, 0);
diff -u libnss-db-2.2.3pre1/debian/packages libnss-db-2.2.3pre1/debian/packages
--- libnss-db-2.2.3pre1/debian/packages
+++ libnss-db-2.2.3pre1/debian/packages
@@ -8,7 +8,7 @@
%define autoconf_version
%define automake_version 1.9
-%define libdb_version 4.3
+%define libdb_version 4.6
%define backup_files \
ABOUT-NLS Makefile.am Makefile.in acconfig.h aclocal.m4 config.guess \
diff -u libnss-db-2.2.3pre1/debian/control libnss-db-2.2.3pre1/debian/control
--- libnss-db-2.2.3pre1/debian/control
+++ libnss-db-2.2.3pre1/debian/control
@@ -3,7 +3,7 @@
Section: admin
Priority: standard
Standards-Version: 3.6.2
-Build-Depends: autoconf, automake1.9, libtool, gettext, libipc-run-perl, perl, libdb4.3-dev, libselinux1-dev [!hurd-i386 !kfreebsd-i386], yada (>= 0.48)
+Build-Depends: autoconf, automake1.9, libtool, gettext, libipc-run-perl, perl, libdb4.6-dev, libselinux1-dev [!hurd-i386 !kfreebsd-i386], yada (>= 0.54)
Package: libnss-db
Architecture: any
only in patch2:
unchanged:
--- libnss-db-2.2.3pre1.orig/debian/patches/040-db4.patch
+++ libnss-db-2.2.3pre1/debian/patches/040-db4.patch
@@ -0,0 +1,14 @@
+DB 4.3 API change
+
+diff -uNr nss_db-2.2.orig/src/db-compat.c nss_db-2.2/src/db-compat.c
+--- nss_db-2.2.orig/src/db-compat.c 2005-02-22 11:20:08.982739304 -0500
++++ nss_db-2.2/src/db-compat.c 2005-02-22 11:20:15.872839511 -0500
+@@ -39,7 +39,7 @@
+ if (err)
+ return err;
+
+- err = db->open (db, file, NULL, type, flags, mode);
++ err = db->open (db, NULL, file, NULL, type, flags, mode);
+ if (err)
+ {
+ db->close (db, 0);
only in patch2:
unchanged:
--- libnss-db-2.2.3pre1.orig/debian/patches/020-db4.patch
+++ libnss-db-2.2.3pre1/debian/patches/020-db4.patch
@@ -0,0 +1,14 @@
+Link against libdb4.6
+
+diff -urN nss_db-2.2.orig/configure.in nss_db-2.2/configure.in
+--- nss_db-2.2.orig/configure.in Thu Nov 9 19:56:04 2000
++++ nss_db-2.2/configure.in Sun Mar 25 13:25:01 2001
+@@ -43,7 +43,7 @@
+ AC_CHECK_HEADER(db.h,, AC_MSG_ERROR([
+ *** Could not find Berkeley DB headers.]))
+
+-AC_CHECK_LIB(db, db_version,, AC_MSG_ERROR([
++AC_CHECK_LIB(db-4.6, db_version,, AC_MSG_ERROR([
+ *** Could not find Berkeley DB library.]))
+
+ AC_CACHE_CHECK([Berkeley DB version], nss_db_cv_db_version,
