[Pkg-auth-maintainers] Bug#1064121: yubico-pam: install PAM module into /usr

[Michael Biebl]

Source: yubico-pam
Version: 2.26-1.1
Severity: normal
Tags: patch
User: helmutg at debian.org
Usertags: dep17m2

We want to finalize the /usr-merge via DEP17 by moving all files to
/usr. yubico-pam 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 1: this change includes moving the .so into a multiarch path which
is recommended on Debian nowadays.

Note 2: 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
-------------- next part --------------
diff -Nru yubico-pam-2.26/debian/changelog yubico-pam-2.26/debian/changelog
--- yubico-pam-2.26/debian/changelog	2020-05-29 16:37:57.000000000 +0200
+++ yubico-pam-2.26/debian/changelog	2024-02-17 13:14:52.000000000 +0100
@@ -1,3 +1,10 @@
+yubico-pam (2.26-1.2) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install PAM module into multiarch path in /usr. (Closes: #-1)
+
+ -- Michael Biebl <biebl at debian.org>  Sat, 17 Feb 2024 13:14:52 +0100
+
 yubico-pam (2.26-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru yubico-pam-2.26/debian/rules yubico-pam-2.26/debian/rules
--- yubico-pam-2.26/debian/rules	2018-08-04 08:50:40.000000000 +0200
+++ yubico-pam-2.26/debian/rules	2024-02-17 13:14:52.000000000 +0100
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/architecture.mk
+
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
@@ -7,14 +9,14 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--with-pam-dir=$(DESTDIR)/lib/security \
+		--with-pam-dir=/usr/lib/$(DEB_HOST_MULTIARCH)/security \
 		--includedir=/usr/include/libpam-yubico
 
 override_dh_install:
 	install -D -m 0644 debian/pam-auth-update \
 		debian/libpam-yubico/usr/share/libpam-yubico/pam-auth-update.template
 	chrpath -d debian/libpam-yubico/usr/bin/ykpamcfg
-	chrpath -d debian/libpam-yubico/lib/security/pam_yubico.so
-	rm debian/libpam-yubico/lib/security/pam_yubico.la
+	chrpath -d debian/libpam-yubico/usr/lib/*/security/pam_yubico.so
+	rm debian/libpam-yubico/usr/lib/*/security/pam_yubico.la
 	rm -rf debian/libpam-yubico/usr/include
 	dh_install --fail-missing