Hi Steve,

Quoting Johannes Schauer Marin Rodrigues (2021-12-08 10:00:31)
> support for DPKG_ROOT has been accepted by the maintainers of base-passwd,
> bash, coreutils, dash, dbus, debconf, debhelper, debianutils, dpkg, glibc, and
> shadow.
> 
> base-files and pam are the only two remaining source packages in the Essential
> set for which their maintainers did not yet agree to add support even though 
> we
> have tested patches for both source packages.
> 
> It has also (again) been more than a month without maintainer action for both
> bugs.
> 
> Please tell me what else needs to be done from our side before our patches can
> be accepted or explain why they cannot be accepted. We are still at the
> beginning of the release cycle, so right now is the best time to merge changes
> in order for them to get sufficient testing before the next stable release.
> Should bugs be found related to our patches in the future, I'm here to fix
> them.

Since it has been more than a month without any reply I just uploaded a NMU of
pam with the attached debdiff to DELAYED/10.  Those are the same changes as
from https://salsa.debian.org/vorlon/pam/-/merge_requests/7 and our CI passes
with those changes to pam
https://salsa.debian.org/helmutg/dpkg-root-demo/-/jobs

Should there be any problems related to these changes, please don't hesitate to
contact me so that I can fix them.

Thanks!

cheers, josch
diff -Nru pam-1.4.0/debian/changelog pam-1.4.0/debian/changelog
--- pam-1.4.0/debian/changelog	2021-12-06 20:11:31.000000000 +0100
+++ pam-1.4.0/debian/changelog	2022-01-17 11:10:48.000000000 +0100
@@ -1,3 +1,10 @@
+pam (1.4.0-11.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * support DPKG_ROOT in postinst (closes: #993161)
+
+ -- Johannes Schauer Marin Rodrigues <jo...@debian.org>  Mon, 17 Jan 2022 11:10:48 +0100
+
 pam (1.4.0-11) unstable; urgency=medium
 
   * Whitespace fixes in debconf templates.
diff -Nru pam-1.4.0/debian/libpam-modules.postinst pam-1.4.0/debian/libpam-modules.postinst
--- pam-1.4.0/debian/libpam-modules.postinst	2021-12-06 20:10:15.000000000 +0100
+++ pam-1.4.0/debian/libpam-modules.postinst	2022-01-17 11:10:24.000000000 +0100
@@ -5,16 +5,16 @@
 
 if [ -z "$2" ] || dpkg --compare-versions "$2" lt 0.99.7.1-3
 then
-	if ! [ -f /etc/security/opasswd ]; then
+	if ! [ -f "$DPKG_ROOT/etc/security/opasswd" ]; then
 		umask 066
-		touch /etc/security/opasswd
+		touch "$DPKG_ROOT/etc/security/opasswd"
 		umask 022
 	fi
 fi
 
-if dpkg --compare-versions "$2" lt 0.99.9.0-1 && ! [ -f /etc/environment ]
+if dpkg --compare-versions "$2" lt 0.99.9.0-1 && ! [ -f "$DPKG_ROOT/etc/environment" ]
 then
-	touch /etc/environment
+	touch "$DPKG_ROOT/etc/environment"
 fi
 
 if dpkg --compare-versions "$2" lt-nl 1.1.2-1 \
diff -Nru pam-1.4.0/debian/libpam-runtime.postinst pam-1.4.0/debian/libpam-runtime.postinst
--- pam-1.4.0/debian/libpam-runtime.postinst	2021-10-26 17:18:00.000000000 +0200
+++ pam-1.4.0/debian/libpam-runtime.postinst	2022-01-17 11:10:24.000000000 +0100
@@ -20,9 +20,9 @@
 	for configfile in common-auth common-account common-session  \
 	    common-password
 	do
-		if [ -f /etc/pam.d/$configfile ] && \
+		if [ -f "$DPKG_ROOT/etc/pam.d/$configfile" ] && \
 		    ! fgrep -q $(calculate_md5sum $configfile) \
-		    /usr/share/pam/$configfile.md5sums 2>/dev/null
+		    "$DPKG_ROOT/usr/share/pam/$configfile.md5sums" 2>/dev/null
 		then
 			force=
 		fi

Attachment: signature.asc
Description: signature

Reply via email to