I have made an NMU of libnss-db to fix longstanding bugs. Please find
attached the diff of the NMU.
--
.''`. Aurelien Jarno | GPG: 1024D/F1BCDB73
: :' : Debian developer | Electrical Engineer
`. `' [EMAIL PROTECTED] | [EMAIL PROTECTED]
`- people.debian.org/~aurel32 | www.aurel32.net
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,17 @@
+libnss-db (2.2.3pre1-2.1) unstable; urgency=low
+
+ * Non-maintainer upload from the Zürich BSP.
+ * Don't build-depends on libselinux1-dev on kfreebsd-amd64. Closes:
+ #361464.
+ * Apply patch by Steve Langasek to switch to db4.6 (Closes: #441624):
+ - Replaced 040-db4.3_api_change.patch with 040-db4.patch,
+ 020-db4.3_usage.patch with 020-db4.patch.
+ * Add Swedish translation from Daniel Nylander (Closes: #386615).
+ * Fix selinux detection in debian/patches/070-selinux.patch (Closes:
+ #344277).
+
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Sun, 13 Jan 2008 13:16:01 +0100
+
libnss-db (2.2.3pre1-2) unstable; urgency=high
* Renumbered Debian patches.
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
@@ -55,6 +55,7 @@
Major-Changes:
%`cd debian/patches; ls *.patch | sed -e 's/^/ /'`
Build: bash
+ SHELL=/bin/bash
CC=${CC:-gcc}
CFLAGS=${CFLAGS:--Wall -pedantic -g}
if [ "${DEB_BUILD_OPTIONS#*noopt}" != "$DEB_BUILD_OPTIONS" ]; then
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
@@ -115,6 +115,7 @@
&& export DEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \
&& export DEB_BUILD_GNU_SYSTEM="$(DEB_BUILD_GNU_SYSTEM)" && (\
echo -E 'eval "yada () { perl $$(which yada) \"[EMAIL PROTECTED]"; }"; set -e; set -v';\
+ echo -E 'SHELL=/bin/bash';\
echo -E 'CC=$${CC:-gcc}';\
echo -E 'CFLAGS=$${CFLAGS:--Wall -pedantic -g}';\
echo -E 'if [ "$${DEB_BUILD_OPTIONS#*noopt}" != "$$DEB_BUILD_OPTIONS" ]; then';\
diff -u libnss-db-2.2.3pre1/debian/patches/070-selinux.patch libnss-db-2.2.3pre1/debian/patches/070-selinux.patch
--- libnss-db-2.2.3pre1/debian/patches/070-selinux.patch
+++ libnss-db-2.2.3pre1/debian/patches/070-selinux.patch
@@ -38,7 +38,7 @@
+ fi
+ fi
+fi
-+if test x$selinux != no ; then
++if test x$selinux != xno ; then
+ AC_DEFINE(SELINUX,1,[Define to have makedb set SELinux file contexts on created files.])
+fi
+
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);
only in patch2:
unchanged:
--- libnss-db-2.2.3pre1.orig/po/sv.po
+++ libnss-db-2.2.3pre1/po/sv.po
@@ -0,0 +1,113 @@
+# Swedish translation for libnss-db
+# Copyright (c) 2006 Free Software Foundation, Inc.
+# This file is distributed under the same license as the libnss-db package.
+# Daniel Nylander <[EMAIL PROTECTED]>, 2006.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: libnss-db\n"
+"Report-Msgid-Bugs-To: FULL NAME <[EMAIL PROTECTED]>\n"
+"POT-Creation-Date: 2000-09-10 16:37+0200\n"
+"PO-Revision-Date: 2006-09-08 20:27+0000\n"
+"Last-Translator: Daniel Nylander <[EMAIL PROTECTED]>\n"
+"Language-Team: Swedish <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/makedb.c:68
+msgid "Convert key to lower case"
+msgstr "Konvertera nyckel till gemen"
+
+#: src/makedb.c:69
+msgid "NAME"
+msgstr "NAMN"
+
+#: src/makedb.c:69
+msgid "Write output to file NAME"
+msgstr "Skriv utdata till filen NAMN"
+
+#: src/makedb.c:71
+msgid "Do not print messages while building database"
+msgstr "Visa inte meddelanden när databasen byggs"
+
+#: src/makedb.c:73
+msgid "Print content of database file, one entry a line"
+msgstr "Skriv ut innehåller i databasfilen, en post per rad"
+
+#: src/makedb.c:78
+msgid "Create simple DB database from textual input."
+msgstr "Skapa en enkelt DB-databas från textinmatning."
+
+#: src/makedb.c:81
+msgid ""
+"INPUT-FILE OUTPUT-FILE\n"
+"-o OUTPUT-FILE INPUT-FILE\n"
+"-u INPUT-FILE"
+msgstr ""
+"INDATAFIL UTDATAFIL\n"
+"-o UTDATAFIL INDATAFIL\n"
+"-u INDATAFIL"
+
+#: src/makedb.c:132
+msgid "wrong number of arguments"
+msgstr "fel antal argument"
+
+#: src/makedb.c:154
+#, c-format
+msgid "cannot open database file `%s': %s"
+msgstr "kan inte öppna databasfilen \"%s\": %s"
+
+#: src/makedb.c:173
+#, c-format
+msgid "cannot open input file `%s'"
+msgstr "kan inte öppna indatafilen \"%s\""
+
+#: src/makedb.c:187
+#, c-format
+msgid "cannot open output file `%s': %s"
+msgstr "kan inte öppna utdatafilen \"%s\": %s"
+
+#: src/makedb.c:235
+msgid "Report bugs using the `glibcbug' script to <[EMAIL PROTECTED]>.\n"
+msgstr ""
+"Rapportera fel med skriptet \"glibcbug\" till <[EMAIL PROTECTED]>.\n"
+"Skicka synpunkter på översättningen till <[EMAIL PROTECTED]>.\n"
+
+#: src/makedb.c:248
+#, c-format
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"This is free software; see the source for copying conditions. There is NO\n"
+"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+msgstr ""
+"Copyright © %s Free Software Foundation, Inc.\n"
+"Detta är fri programvara; se källkoden för kopieringsvillkor. Det finns "
+"INGEN\n"
+"garanti; inte ens för SÄLJBARHET eller LÄMPLIGHET FÖR ETT SPECIFIKT "
+"ÄNDAMÅL.\n"
+
+#: src/makedb.c:253
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Skrivet av %s.\n"
+
+#: src/makedb.c:330
+msgid "duplicate key"
+msgstr "dubblettnyckel"
+
+#: src/makedb.c:336
+#, c-format
+msgid "while writing database file: %s"
+msgstr "vid skrivning av databasfil: %s"
+
+#: src/makedb.c:348
+#, c-format
+msgid "problems while reading `%s'"
+msgstr "problem vid inläsning av \"%s\""
+
+#: src/makedb.c:371 src/makedb.c:389
+#, c-format
+msgid "while reading database: %s"
+msgstr "vid inläsning av databas: %s"
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,
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);
