From 915c7e67a665eef13b2860c907e433b43d4a3d17 Mon Sep 17 00:00:00 2001 From: Brendan O'Dea Date: Thu, 5 Dec 2024 10:52:45 +1100 Subject: [PATCH 1/2] Remove stale Debian configuration. This was last updated for 0.17-1 and no longer up to date with the current Debian packaging. https://salsa.debian.org/debian/libnss-cache should be the canonical location for that packaging, and ideally the contents of the debian subirectory will be the only difference between that repository and this one (https://github.com/google/libnss-cache). --- debian/changelog | 116 ------------------------------------ debian/control | 21 ------- debian/copyright | 25 -------- debian/gbp.conf | 4 -- debian/lintian-overrides | 2 - debian/rules | 19 ------ debian/source/format | 1 - debian/source/local-options | 1 - debian/source/options | 1 - debian/watch | 3 - 10 files changed, 193 deletions(-) delete mode 100644 debian/changelog delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/gbp.conf delete mode 100644 debian/lintian-overrides delete mode 100755 debian/rules delete mode 100644 debian/source/format delete mode 100644 debian/source/local-options delete mode 100644 debian/source/options delete mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index cccfc1d..0000000 --- a/debian/changelog +++ /dev/null @@ -1,116 +0,0 @@ -libnss-cache (0.17-1) unstable; urgency=medium - - * New upstram release. - * Trim trailing whitespace. - * Bump debhelper from old 9 to 12. - * Set debhelper-compat version in Build-Depends. - * Use canonical URL in Vcs-Git. - * Update standards-version to 4.4.0. - * Add build hardening flags. - * Run the test suite now one exists. - - -- Jamie Wilkinson Tue, 14 Jan 2020 16:08:39 +1100 - -libnss-cache (0.16-3) unstable; urgency=medium - - * Add missing Multi-Arch header to debian/control. - - -- Jamie Wilkinson Mon, 07 Nov 2016 15:18:25 +1100 - -libnss-cache (0.16-2) unstable; urgency=medium - - * Bump standards version. - - -- Jamie Wilkinson Tue, 01 Nov 2016 16:04:27 +1100 - -libnss-cache (0.16-1) unstable; urgency=medium - - * New upstream release. - - -- Jamie Wilkinson Tue, 01 Nov 2016 15:39:14 +1100 - -libnss-cache (0.15-2) unstable; urgency=medium - - * Fix nss.h include for BSD. - - -- Jamie Wilkinson Wed, 30 Dec 2015 17:54:57 +1100 - -libnss-cache (0.15-1) unstable; urgency=medium - - * New upstream release. - * Change obsolete homepage URL. - - -- Jamie Wilkinson Wed, 30 Dec 2015 16:20:07 +1100 - -libnss-cache (0.14-1) unstable; urgency=medium - - * New upstream release. - - -- Jamie Wilkinson Wed, 20 May 2015 09:00:53 +1000 - -libnss-cache (0.13-1) unstable; urgency=medium - - * Update control file with VCS URLs. - * New upstream version. - * Update watch file to match new github upstream. - * Bump standards version. - - -- Jamie Wilkinson Wed, 22 Oct 2014 10:41:44 +1100 - -libnss-cache (0.12-1) unstable; urgency=medium - - * New upstream release. (Closes: #745258; thanks Arthur Marble). - * Ignore tarballs in debian/source/options. - - -- Jamie Wilkinson Thu, 22 May 2014 18:24:55 +1000 - -libnss-cache (0.11-2) unstable; urgency=low - - * Fix FTBFS with clang - - Fixed the potential usage of an uninitialized variable error in - nss_cache.c - - -- Arthur Marble Sat, 19 Apr 2014 16:02:56 -0500 - -libnss-cache (0.11-1) unstable; urgency=medium - - * New upstream release. - * Change to arch: any, now builds on all architectures. - * Update standards-version. - * Depend on new debhelper. - - -- Jamie Wilkinson Sun, 23 Mar 2014 16:55:37 +1100 - -libnss-cache (0.10.2-1) unstable; urgency=low - - * New upstream release. - - -- Jamie Wilkinson Fri, 10 Feb 2012 01:05:46 +0000 - -libnss-cache (0.10.1-1) unstable; urgency=low - - * New upstream release. - * Speeds up the name / uid / gid lookup in the nss-cache library. - * don't search groups if the provided buffer is small enough that the - chance of succeeding is small - * create simple index structure with uniformly sized entries and - mmap/bsearch as a replacement for a heuristic binary search - * if the entry was not found in the index, do not fall back to linear - search; still fall back if the entry was outdated, not accessible or - if a value was not found at the expected offset - * replace strcoll with strcmp for checking equality of the index, as - the index is built based on a simple string sort - - -- Jamie Wilkinson Fri, 10 Feb 2012 11:11:07 +1100 - -libnss-cache (0.10-2) unstable; urgency=low - - * Remove post{inst,rm}, as dh_makeshlibs already does the ldconfig for us. - - -- Jamie Wilkinson Sat, 20 Aug 2011 09:04:28 +1000 - -libnss-cache (0.10-1) unstable; urgency=low - - * Initial release. (Closes: #609626) - - -- Jamie Wilkinson Fri, 22 Jul 2011 12:17:00 +1000 diff --git a/debian/control b/debian/control deleted file mode 100644 index cf17e98..0000000 --- a/debian/control +++ /dev/null @@ -1,21 +0,0 @@ -Source: libnss-cache -Section: admin -Priority: optional -Maintainer: Jamie Wilkinson -Build-Depends: debhelper-compat (= 12), - dpkg-dev (>= 1.16.1.1~), - time -Standards-Version: 4.4.0 -Homepage: https://github.com/google/libnss-cache -Vcs-Browser: https://github.com/google/libnss-cache/tree/debian -Vcs-Git: https://github.com/google/libnss-cache.git -b debian - -Package: libnss-cache -Architecture: any -Multi-Arch: same -Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: nsscache -Description: NSS module for using nsscache-generated files - This package provides a Name Service Switch module that uses .cache - files as a name service. This means providing user account - information, group ids, netgroups, and automounts. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index acdb978..0000000 --- a/debian/copyright +++ /dev/null @@ -1,25 +0,0 @@ -This package was debianized by Jamie Wilkinson on -Mon, 15 Aug 2011 14:49:23 +1100. - -Copyright: - - Copyright 2007-2011 Google, Inc. - -License: - - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. diff --git a/debian/gbp.conf b/debian/gbp.conf deleted file mode 100644 index 024d096..0000000 --- a/debian/gbp.conf +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] -upstream-tag = version/%(version)s -debian-branch=debian -upstream-branch=master diff --git a/debian/lintian-overrides b/debian/lintian-overrides deleted file mode 100644 index 9fe3142..0000000 --- a/debian/lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# This shared library is only for NSS. -libnss-cache binary: package-name-doesnt-match-sonames libnss-cache2 diff --git a/debian/rules b/debian/rules deleted file mode 100755 index e8f9c3f..0000000 --- a/debian/rules +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/make -f - -# Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 -export DEB_BUILD_MAINT_OPTIONS=hardening=+all -DPKG_EXPORT_BUILD_FLAGS=1 -include /usr/share/dpkg/buildflags.mk - -include /usr/share/dpkg/default.mk - -DESTDIR=$(CURDIR)/debian/libnss-cache -LIBDIR=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH) - -%: - dh $@ - -override_dh_auto_install: - mkdir -p $(LIBDIR) - dh_auto_install -- LIBDIR=$(LIBDIR) diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/debian/source/local-options b/debian/source/local-options deleted file mode 100644 index 4aceb10..0000000 --- a/debian/source/local-options +++ /dev/null @@ -1 +0,0 @@ -unapply-patches diff --git a/debian/source/options b/debian/source/options deleted file mode 100644 index 7423a2d..0000000 --- a/debian/source/options +++ /dev/null @@ -1 +0,0 @@ -single-debian-patch diff --git a/debian/watch b/debian/watch deleted file mode 100644 index b6bb6f8..0000000 --- a/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/libnss-cache-$1\.tar\.gz/ \ - https://github.com/google/libnss-cache/tags .*/version\/(\d\S*)\.tar\.gz From 5824715d5b00cc19c50e21a24d6da1b03f7c7078 Mon Sep 17 00:00:00 2001 From: Brendan O'Dea Date: Thu, 5 Dec 2024 11:30:48 +1100 Subject: [PATCH 2/2] Stop installing multiple copies of the shared library. This is never linked into programs by ld, so the symlink redirections from .so and soname are not required. Moreover, the Debian package was ending up with three copies of the same file (rather than one file and two symlinks). The only copy will be installed as libnss_cache.so.2, to meet the API for NSS which expects to load libnss_.so., where x is 2 for glibc 2.1 and later (see nsswitch.conf(5)). --- Makefile | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index a144788..4090abb 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,9 @@ CC ?= gcc CFLAGS ?= -Wall -Wstrict-prototypes CFLAGS += -fPIC -LIBRARY=libnss_cache.so +LIBRARY=libnss_cache.so.2 PREFIX=$(DESTDIR)/usr LIBDIR=$(PREFIX)/lib -SONAME=libnss_cache.so.2 -LD_SONAME=-Wl,-soname,$(SONAME) TESTDATA=.testdata LIBNSSCACHE = nss_cache.o compat/getpwent_r.o compat/getgrent_r.o @@ -119,24 +117,18 @@ $(GETENT_DATA_TOUCH): scripts/gentestdata.sh last_pw_errno_test: test/last_pw_errno_test.c -$(LIBRARY): LDFLAGS += -shared $(LD_SONAME) +$(LIBRARY): LDFLAGS += -shared $(LIBRARY): $(LIBNSSCACHE) $(CC) $(CFLAGS) $(LDFLAGS) -o $(LIBRARY) $+ -$(SONAME): $(LIBRARY) - ln -sf $(LIBRARY) $(SONAME) - ln -sf $(LIBRARY) $(SONAME).0 - .PHONY: install -install: $(SONAME) +install: $(LIBRARY) install -d $(LIBDIR) install $(LIBRARY) $(LIBDIR) - install $(SONAME) $(LIBDIR) - install $(SONAME).0 $(LIBDIR) .PHONY: clean clean: - rm -f $(LIBRARY)* *.o compat/*.o *.gcov *.gcda *.gcno compat/*.gcda compat/*.gcno lookup gen_getent last_pw_errno_test + rm -f $(LIBRARY) *.o compat/*.o *.gcov *.gcda *.gcno compat/*.gcda compat/*.gcno lookup gen_getent last_pw_errno_test .PHONY: veryclean veryclean: clean