Source: libpam-ccreds
Version: 10-8
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

We want to finalize the /usr-merge via DEP17 by moving all files to
/usr. libpam-ccreds 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 libpam-ccreds-10/debian/changelog libpam-ccreds-10/debian/changelog
--- libpam-ccreds-10/debian/changelog   2019-10-26 00:28:29.000000000 +0200
+++ libpam-ccreds-10/debian/changelog   2024-01-25 14:15:34.000000000 +0100
@@ -1,3 +1,10 @@
+libpam-ccreds (10-8.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install PAM modules and binaries into /usr (Closes: #-1)
+
+ -- Michael Biebl <bi...@debian.org>  Thu, 25 Jan 2024 14:15:34 +0100
+
 libpam-ccreds (10-8) unstable; urgency=medium
 
   [ Helmut Grohne ]
diff -Nru libpam-ccreds-10/debian/dirs libpam-ccreds-10/debian/dirs
--- libpam-ccreds-10/debian/dirs        2009-08-01 19:57:03.000000000 +0200
+++ libpam-ccreds-10/debian/dirs        1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/sbin
-lib/security
diff -Nru libpam-ccreds-10/debian/libpam-ccreds.lintian-overrides 
libpam-ccreds-10/debian/libpam-ccreds.lintian-overrides
--- libpam-ccreds-10/debian/libpam-ccreds.lintian-overrides     2009-08-01 
19:57:03.000000000 +0200
+++ libpam-ccreds-10/debian/libpam-ccreds.lintian-overrides     2024-01-25 
14:15:34.000000000 +0100
@@ -1,2 +1,2 @@
 # yes, we know it's suid, that's the whole point...
-libpam-ccreds: setuid-binary sbin/ccreds_chkpwd 4755 root/root
+libpam-ccreds: setuid-binary usr/sbin/ccreds_chkpwd 4755 root/root
diff -Nru libpam-ccreds-10/debian/rules libpam-ccreds-10/debian/rules
--- libpam-ccreds-10/debian/rules       2019-10-26 00:27:03.000000000 +0200
+++ libpam-ccreds-10/debian/rules       2024-01-25 14:15:34.000000000 +0100
@@ -4,8 +4,6 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 DEB_CONFIGURE_EXTRA_ARGS := \
-       --libdir=/lib/$(DEB_HOST_GNU_TYPE) \
-       --sbindir=/sbin \
        --enable-gcrypt \
        $(NULL)
 
@@ -17,16 +15,15 @@
 
 override_dh_auto_install:
        dh_auto_install
-       chown root:root debian/libpam-ccreds/sbin/ccreds_chkpwd
-       chmod 4755 debian/libpam-ccreds/sbin/ccreds_chkpwd
+       chown root:root debian/libpam-ccreds/usr/sbin/ccreds_chkpwd
+       chmod 4755 debian/libpam-ccreds/usr/sbin/ccreds_chkpwd
 
        mkdir -p debian/libpam-ccreds/usr/share/pam-configs
        install -m 0644 debian/libpam-ccreds.pam-auth-update.ccreds-save \
                debian/libpam-ccreds/usr/share/pam-configs/ccreds-save
        install -m 0644 debian/libpam-ccreds.pam-auth-update.ccreds-check \
                debian/libpam-ccreds/usr/share/pam-configs/ccreds-check
-       rmdir debian/libpam-ccreds/lib/security
 
 override_dh_fixperms:
-       dh_fixperms -X/sbin/ccreds_chkpwd
+       dh_fixperms -X/usr/sbin/ccreds_chkpwd
 

Reply via email to