[Pkg-sssd-devel] Bug#1061350: sssd: install PAM and NSS modules into /usr

[Michael Biebl]

Source: sssd
Version: 2.9.4-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. sssd installs files into /lib; these
should be moved into the respective directories 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
-------------- next part --------------
diff -Nru sssd-2.9.4/debian/changelog sssd-2.9.4/debian/changelog
--- sssd-2.9.4/debian/changelog	2024-01-22 23:33:21.000000000 +0100
+++ sssd-2.9.4/debian/changelog	2024-01-18 11:04:33.000000000 +0100
@@ -1,10 +1,3 @@
-sssd (2.9.4-1.1) UNRELEASED; urgency=medium
-
-  * Non-maintainer upload.
-  * Install PAM and NSS modules into /usr. (Closes: #-1)
-
- -- Michael Biebl <biebl at debian.org>  Mon, 22 Jan 2024 23:33:21 +0100
-
 sssd (2.9.4-1) unstable; urgency=medium
 
   [ Sergio Durigan Junior ]
diff -Nru sssd-2.9.4/debian/libnss-sss.install sssd-2.9.4/debian/libnss-sss.install
--- sssd-2.9.4/debian/libnss-sss.install	2024-01-22 23:27:25.000000000 +0100
+++ sssd-2.9.4/debian/libnss-sss.install	2024-01-18 11:01:26.000000000 +0100
@@ -1 +1 @@
-usr/lib/*/libnss_sss.so.2
+lib/*/libnss_sss.so.2
diff -Nru sssd-2.9.4/debian/libpam-sss.install sssd-2.9.4/debian/libpam-sss.install
--- sssd-2.9.4/debian/libpam-sss.install	2024-01-22 23:27:55.000000000 +0100
+++ sssd-2.9.4/debian/libpam-sss.install	2024-01-18 11:01:26.000000000 +0100
@@ -1,4 +1,4 @@
-usr/lib/*/security/pam_sss.so
-usr/lib/*/security/pam_sss_gss.so
+lib/*/security/pam_sss.so
+lib/*/security/pam_sss_gss.so
 usr/share/man/man8/pam_sss.8*
 usr/share/man/man8/pam_sss_gss.8*
diff -Nru sssd-2.9.4/debian/rules sssd-2.9.4/debian/rules
--- sssd-2.9.4/debian/rules	2024-01-22 23:26:56.000000000 +0100
+++ sssd-2.9.4/debian/rules	2024-01-18 11:01:26.000000000 +0100
@@ -31,8 +31,8 @@
 	--datadir=/usr/share/ \
 	--with-environment-file=/etc/default/sssd \
 	--with-krb5-plugin-path=/usr/lib/$(DEB_HOST_MULTIARCH)/krb5/plugins/libkrb5 \
-	--enable-nsslibdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
-	--enable-pammoddir=/usr/lib/$(DEB_HOST_MULTIARCH)/security \
+	--enable-nsslibdir=/lib/$(DEB_HOST_MULTIARCH) \
+	--enable-pammoddir=/lib/$(DEB_HOST_MULTIARCH)/security \
 	--enable-systemtap \
 	--disable-static \
 	--disable-rpath \