aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Langasek <steve.langasek@canonical.com>2022-08-18 11:34:08 -0700
committerSteve Langasek <steve.langasek@canonical.com>2022-08-18 11:35:05 -0700
commite04fc4e0527e765a7d463422443a4b700028ccc6 (patch)
treea30949a0f15ea415586c862719aec6e9002dfdc6
parentf46cdd601d0270d8a3d7450a307aea30d7fc0e8d (diff)
downloadpam-e04fc4e0527e765a7d463422443a4b700028ccc6.tar.gz
pam-e04fc4e0527e765a7d463422443a4b700028ccc6.tar.bz2
pam-e04fc4e0527e765a7d463422443a4b700028ccc6.zip
Drop obsolete upgrade code from maintainer scripts which is no longer used
-rw-r--r--debian/changelog2
-rw-r--r--debian/libpam-modules.postinst8
-rw-r--r--debian/libpam-modules.preinst14
-rw-r--r--debian/libpam-runtime.postinst4
4 files changed, 3 insertions, 25 deletions
diff --git a/debian/changelog b/debian/changelog
index bed171fd..a1af29c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ pam (1.5.2-3) UNRELEASED; urgency=medium
* Add missing manpages for pam_namespace which for some reason don't get
installed by the upstream rules
+ * Drop obsolete upgrade code from maintainer scripts which is no longer
+ used
-- Steve Langasek <vorlon@debian.org> Thu, 18 Aug 2022 18:26:29 +0000
diff --git a/debian/libpam-modules.postinst b/debian/libpam-modules.postinst
index ce03090b..723877cf 100644
--- a/debian/libpam-modules.postinst
+++ b/debian/libpam-modules.postinst
@@ -17,12 +17,4 @@ then
touch /etc/environment
fi
-if dpkg --compare-versions "$2" lt-nl 1.1.2-1 \
- && grep -q 'pam_unix.*\bmin=[0-9]\+' /etc/pam.d/common-password
-then
- echo "'min=' option to pam_unix is obsolete."
- echo "replacing with 'minlen=' in /etc/pam.d/common-password."
- sed -i -e'/pam_unix/ s/\bmin=/minlen=/' /etc/pam.d/common-password
-fi
-
#DEBHELPER#
diff --git a/debian/libpam-modules.preinst b/debian/libpam-modules.preinst
index fe0d6eb9..50505eff 100644
--- a/debian/libpam-modules.preinst
+++ b/debian/libpam-modules.preinst
@@ -35,19 +35,7 @@ handle_profiles_with_removed_modules() {
if dpkg --compare-versions "$2" lt-nl 1.4.0-5; then
- db_version 2.0
- handle_profiles_with_removed_modules pam_tally
- # We have a generic template for removing pam-profiles because
- # there is a sane automatic action. If we detect the modules in
- # user configurations we want a specific template so we can
- # recommend a replacement
- # /dev/null reference is to make sure we don't grep stdin if
- # somehow ls returns empty
- if grep -qe '^[^#]*pam_tally' $(ls -1d /etc/pam.d/* | grep -e '^/etc/pam.d/[0-9a-zA-Z/-]*$' ) /dev/null ; then
- db_input critical libpam-modules/deprecate-tally ||true
- db_go ||true
- exit 2
- fi
+ db_version 2.0
if pidof xscreensaver xlockmore >/dev/null; then
db_input critical libpam-modules/disable-screensaver || true
diff --git a/debian/libpam-runtime.postinst b/debian/libpam-runtime.postinst
index 053fdae2..b13bf75c 100644
--- a/debian/libpam-runtime.postinst
+++ b/debian/libpam-runtime.postinst
@@ -36,10 +36,6 @@ if [ -n "$force" ]; then
/etc/pam.d/common-account.pam-old \
/etc/pam.d/common-password.pam-old \
/etc/pam.d/common-session.pam-old
-elif dpkg --compare-versions "$2" lt-nl 1.1.0-1 \
- && [ ! -e /etc/pam.d/common-session-noninteractive ]
-then
- cp -a /etc/pam.d/common-session /etc/pam.d/common-session-noninteractive
fi
#DEBHELPER#