diff -Nru libnss-db-2.2.3pre1/debian/changelog libnss-db-2.2.3pre1/debian/changelog --- libnss-db-2.2.3pre1/debian/changelog 2022-02-04 12:44:49.000000000 +0000 +++ libnss-db-2.2.3pre1/debian/changelog 2022-08-08 10:40:08.000000000 +0000 @@ -1,80 +1,11 @@ -libnss-db (2.2.3pre1-6ubuntu3) jammy; urgency=medium +libnss-db (2.2.3pre1-7) unstable; urgency=medium - * No-change rebuild for private glibc symbols. + * QA upload. + * debian/patches/400-nss-files.patch: stop linking against libnss_files. + Closes: #1016820. + * debian/control: build-depends on libc-dev-bin (>= 2.34) - -- Matthias Klose Fri, 04 Feb 2022 13:44:49 +0100 - -libnss-db (2.2.3pre1-6ubuntu2) jammy; urgency=medium - - * No-change rebuild for glibc private symbols. - - -- Matthias Klose Fri, 04 Feb 2022 13:42:39 +0100 - -libnss-db (2.2.3pre1-6ubuntu1) impish; urgency=medium - - * Drop -lnss_files, which is now built into glibc as of 2.34. - - -- Dan Bungert Fri, 13 Aug 2021 12:29:37 -0600 - -libnss-db (2.2.3pre1-6build8.1.1) impish; urgency=medium - - * No-change rebuild for glibc private symbol change. - - -- Matthias Klose Thu, 12 Aug 2021 17:34:19 +0200 - -libnss-db (2.2.3pre1-6build8.1) impish; urgency=medium - - * No-change rebuild for glibc private symbol change. - - -- Matthias Klose Fri, 16 Jul 2021 13:24:24 +0200 - -libnss-db (2.2.3pre1-6build8) hirsute; urgency=medium - - * No-change rebuild for glibc update. - - -- Matthias Klose Fri, 05 Feb 2021 11:03:27 +0100 - -libnss-db (2.2.3pre1-6build7) groovy; urgency=high - - * No change rebuild against glibc 2.32 - - -- Balint Reczey Thu, 10 Sep 2020 14:28:28 +0200 - -libnss-db (2.2.3pre1-6build6) focal; urgency=medium - - * No-change rebuild for glibc 2.31. - - -- Matthias Klose Fri, 06 Mar 2020 12:18:37 +0100 - -libnss-db (2.2.3pre1-6build5) eoan; urgency=medium - - * No-change rebuild for glibc 2.30 - - -- Matthias Klose Sat, 31 Aug 2019 01:38:12 +0000 - -libnss-db (2.2.3pre1-6build4) disco; urgency=medium - - * No-change rebuild for glibc 2.29 - - -- Matthias Klose Fri, 22 Feb 2019 08:50:23 +0100 - -libnss-db (2.2.3pre1-6build3) cosmic; urgency=medium - - * No-change rebuild for glibc 2.28 - - -- Matthias Klose Tue, 28 Aug 2018 07:27:45 +0200 - -libnss-db (2.2.3pre1-6build2) bionic; urgency=medium - - * No-change rebuild for glibc 2.27 - - -- Steve Langasek Sun, 25 Feb 2018 19:30:03 -0800 - -libnss-db (2.2.3pre1-6build1) artful; urgency=medium - - * No-change upload to build with glibc-2.26. - - -- Matthias Klose Tue, 05 Sep 2017 22:36:01 +0200 + -- Aurelien Jarno Mon, 08 Aug 2022 12:40:08 +0200 libnss-db (2.2.3pre1-6) unstable; urgency=medium diff -Nru libnss-db-2.2.3pre1/debian/control libnss-db-2.2.3pre1/debian/control --- libnss-db-2.2.3pre1/debian/control 2016-09-15 18:57:08.000000000 +0000 +++ libnss-db-2.2.3pre1/debian/control 2022-08-08 10:26:01.000000000 +0000 @@ -14,6 +14,7 @@ libselinux1-dev [linux-any], debhelper (>> 9), dh-autoreconf, + libc-dev-bin (>= 2.34) Homepage: http://www.gnu.org/software/libc/ Vcs-Browser: http://svn.debian.org/wsvn/cvsdebuild/libnss-db/ Vcs-Svn: svn://svn.debian.org/cvsdebuild/libnss-db diff -Nru libnss-db-2.2.3pre1/debian/patches/310-nss-files.patch libnss-db-2.2.3pre1/debian/patches/310-nss-files.patch --- libnss-db-2.2.3pre1/debian/patches/310-nss-files.patch 2021-08-13 18:29:37.000000000 +0000 +++ libnss-db-2.2.3pre1/debian/patches/310-nss-files.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -Description: Drop linkage against nss_files -Author: Dan Bungert -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1939918 -Forwarded: "yes" -Last-Update: Aug-13-2021 - -In glibc 2.34, nss_files is no longer a distinct library, -and is built into glibc. ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -25,7 +25,7 @@ - libnss_db_la_LDFLAGS = -version-info $(INTERFACE) \ - -Wl,--version-script=$(srcdir)/libnss_db.map - libnss_db_la_DEPENDENCIES = libnss_db.map --libnss_db_la_LIBADD = @DB_LIBS@ -lnss_files -+libnss_db_la_LIBADD = @DB_LIBS@ - - bin_PROGRAMS = makedb - makedb_SOURCES = makedb.c db-compat-copy-makedb.c diff -Nru libnss-db-2.2.3pre1/debian/patches/400-nss-files.patch libnss-db-2.2.3pre1/debian/patches/400-nss-files.patch --- libnss-db-2.2.3pre1/debian/patches/400-nss-files.patch 1970-01-01 00:00:00.000000000 +0000 +++ libnss-db-2.2.3pre1/debian/patches/400-nss-files.patch 2022-08-08 10:26:01.000000000 +0000 @@ -0,0 +1,17 @@ +Description: Do not link against libnss_files + libnss_files got integrated into libc in glibc 2.34. Therefore it is not + necessary nor possible to link with it anymore. +Author: Aurelien Jarno +Last-Update: 2022-08-08 + +--- libnss-db-2.2.3pre1.orig/src/Makefile.am ++++ libnss-db-2.2.3pre1/src/Makefile.am +@@ -25,7 +25,7 @@ EXTRA_libnss_db_la_SOURCES = libnss_db.m + libnss_db_la_LDFLAGS = -version-info $(INTERFACE) \ + -Wl,--version-script=$(srcdir)/libnss_db.map + libnss_db_la_DEPENDENCIES = libnss_db.map +-libnss_db_la_LIBADD = @DB_LIBS@ -lnss_files ++libnss_db_la_LIBADD = @DB_LIBS@ + + bin_PROGRAMS = makedb + makedb_SOURCES = makedb.c db-compat-copy-makedb.c diff -Nru libnss-db-2.2.3pre1/debian/patches/series libnss-db-2.2.3pre1/debian/patches/series --- libnss-db-2.2.3pre1/debian/patches/series 2021-08-13 18:29:37.000000000 +0000 +++ libnss-db-2.2.3pre1/debian/patches/series 2022-08-08 10:26:01.000000000 +0000 @@ -10,4 +10,4 @@ 200-set-db-environment.dpatch intl.patch 300-multiarch-libdir.patch -310-nss-files.patch +400-nss-files.patch