Source: pam-geoip Version: 2.1.1-7 Severity: normal Tags: patch User: [email protected] Usertags: dep17m2
We want to finalize the /usr-merge via DEP17 by moving all files to /usr. pam-geiop installs files into /lib, these should be moved into the respective canonical locations in /usr/. Please find a patch attached. It has been build-tested. Note: this should not be backported to bookworm. If you intend to backport, please use dh_movetousr instead. If your package will change for the t64 transition or otherwise rename/split/move its binaries (packages) during trixie, please then upload to experimental and get in touch with the UsrMerge driver, please see the wiki [1]. Michael [1] https://wiki.debian.org/UsrMerge
diff -Nru pam-geoip-2.1.1/debian/changelog pam-geoip-2.1.1/debian/changelog --- pam-geoip-2.1.1/debian/changelog 2023-08-22 16:34:22.000000000 +0200 +++ pam-geoip-2.1.1/debian/changelog 2024-01-28 20:29:05.000000000 +0100 @@ -1,3 +1,10 @@ +pam-geoip (2.1.1-7.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install PAM module into /usr. (Closes: #-1) + + -- Michael Biebl <[email protected]> Sun, 28 Jan 2024 20:29:05 +0100 + pam-geoip (2.1.1-7) unstable; urgency=medium * Remove leftover file in dh_clean. diff -Nru pam-geoip-2.1.1/debian/libpam-geoip.lintian-overrides pam-geoip-2.1.1/debian/libpam-geoip.lintian-overrides --- pam-geoip-2.1.1/debian/libpam-geoip.lintian-overrides 2023-08-22 16:34:22.000000000 +0200 +++ pam-geoip-2.1.1/debian/libpam-geoip.lintian-overrides 2024-01-28 20:29:05.000000000 +0100 @@ -1,3 +1,3 @@ -libpam-geoip: hardening-no-fortify-functions [lib/*/security/pam_geoip.so] -libpam-geoip: hardening-no-bindnow [lib/*/security/pam_geoip.so] +libpam-geoip: hardening-no-fortify-functions [usr/lib/*/security/pam_geoip.so] +libpam-geoip: hardening-no-bindnow [usr/lib/*/security/pam_geoip.so] libpam-geoip: spare-manual-page [usr/share/man/man8/pam_geoip.8.gz] diff -Nru pam-geoip-2.1.1/debian/patches/02-install-into-usr.patch pam-geoip-2.1.1/debian/patches/02-install-into-usr.patch --- pam-geoip-2.1.1/debian/patches/02-install-into-usr.patch 1970-01-01 01:00:00.000000000 +0100 +++ pam-geoip-2.1.1/debian/patches/02-install-into-usr.patch 2024-01-28 20:29:04.000000000 +0100 @@ -0,0 +1,13 @@ +Index: pam-geoip-2.1.1/Makefile +=================================================================== +--- pam-geoip-2.1.1.orig/Makefile 2024-01-26 21:46:08.000000000 +0100 ++++ pam-geoip-2.1.1/Makefile 2024-01-28 20:29:02.525498983 +0100 +@@ -10,7 +10,7 @@ + LDFLAGS=-shared + LIBS=-lpam -lmaxminddb -lm + CCFLAGS=-Wall +-PAM_LIB_DIR=$(DESTDIR)/lib/$(MULTIARCH)/security ++PAM_LIB_DIR=$(DESTDIR)/usr/lib/$(MULTIARCH)/security + INSTALL=/usr/bin/install + + all: pam_geoip.so doc diff -Nru pam-geoip-2.1.1/debian/patches/series pam-geoip-2.1.1/debian/patches/series --- pam-geoip-2.1.1/debian/patches/series 2023-08-22 16:34:22.000000000 +0200 +++ pam-geoip-2.1.1/debian/patches/series 2024-01-28 20:28:49.000000000 +0100 @@ -1 +1,2 @@ 01-missing-ldflags.diff +02-install-into-usr.patch
