diff options
| author | Sam Hartman <hartmans@debian.org> | 2021-08-26 14:17:22 -0600 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@canonical.com> | 2021-09-15 17:52:40 -0700 |
| commit | 3c81751953f00536c7528c8105c1327862b178ea (patch) | |
| tree | 983c3b77ca91458344fb690f6a7a95827f01b5eb | |
| parent | 33d1a0b0b105d585a512a28273de3866ddd947ed (diff) | |
| download | pam-3c81751953f00536c7528c8105c1327862b178ea.tar.gz pam-3c81751953f00536c7528c8105c1327862b178ea.tar.bz2 pam-3c81751953f00536c7528c8105c1327862b178ea.zip | |
pam-auth-update: support DPKG_ROOT
Patch from Johannes 'josch' Schauer to implement a --root argument to
pam-auth-update and to use it in the call in libpam-runtime.
* debian/local/pam-auth-update: support --root
* debian/libpam-runtime.postinst: call with --root $DPKG_ROOT
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/libpam-runtime.postinst | 2 | ||||
| -rw-r--r-- | debian/local/pam-auth-update | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 848f13c0..96dd28fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ pam (1.4.0-10) UNRELEASED; urgency=medium * Include upstream patch not to use crypt_checksalt; without this passwords set prior to bullseye were considered expired, Closes: #992848 + * Support DPKG_ROOT for pam-auth-update, thanks Johannes 'josch' Schauer + Closes: #983427 -- Sam Hartman <hartmans@debian.org> Thu, 26 Aug 2021 13:43:23 -0600 diff --git a/debian/libpam-runtime.postinst b/debian/libpam-runtime.postinst index 518e8d24..053fdae2 100644 --- a/debian/libpam-runtime.postinst +++ b/debian/libpam-runtime.postinst @@ -29,7 +29,7 @@ then done fi -pam-auth-update --package $force +pam-auth-update --root "$DPKG_ROOT" --package $force if [ -n "$force" ]; then rm -f /etc/pam.d/common-auth.pam-old \ diff --git a/debian/local/pam-auth-update b/debian/local/pam-auth-update index 5b3c8a07..6c4134bb 100644 --- a/debian/local/pam-auth-update +++ b/debian/local/pam-auth-update @@ -88,6 +88,11 @@ while ($#ARGV >= 0) { $force = 1; } elsif ($opt eq '--package') { $package = 1; + } elsif ($opt eq '--root') { + my $rootdir = shift @ARGV; + $savedir = "${rootdir}$savedir"; + $confdir = "${rootdir}$confdir"; + $inputdir = "${rootdir}$inputdir"; } elsif ($opt eq '--remove') { while ($#ARGV >= 0) { last if ($ARGV[0] =~ /^--/); |