summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSteve Langasek <steve.langasek@canonical.com>2020-08-12 16:27:12 +0000
committerSteve Langasek <steve.langasek@canonical.com>2020-08-12 16:27:12 +0000
commit9349b8a094eec8a8c719e64db484f4c2e2908015 (patch)
tree7a08640473e2e727687d93dc05be709034d1614e /debian
parent9653a38ff3740c281770076d0e118070c7ba741e (diff)
Drop pam_tally and pam_tally2 modules, which have been deprecated upstream in favor of pam_faillock. Closes: #569746, LP: #772121.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/libpam-modules-bin.install2
-rw-r--r--debian/libpam-modules-bin.lintian-overrides4
-rw-r--r--debian/libpam-modules.lintian-overrides2
4 files changed, 2 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index 06938ae9..de210048 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ pam (1.4.0-1) UNRELEASED; urgency=medium
* debian/patches-applied/nullok_secure-compat.patch: Support
nullok_secure as a deprecated alias for nullok.
* debian/pam-configs/unix: use nullok, not nullok_secure.
+ * Drop pam_tally and pam_tally2 modules, which have been deprecated
+ upstream in favor of pam_faillock. Closes: #569746, LP: #772121.
-- Steve Langasek <vorlon@debian.org> Tue, 11 Aug 2020 14:58:13 -0700
diff --git a/debian/libpam-modules-bin.install b/debian/libpam-modules-bin.install
index fee3bced..097c27d6 100644
--- a/debian/libpam-modules-bin.install
+++ b/debian/libpam-modules-bin.install
@@ -1,6 +1,4 @@
sbin/unix_chkpwd sbin
sbin/unix_update sbin
-sbin/pam_tally sbin
-sbin/pam_tally2 sbin
sbin/mkhomedir_helper sbin
sbin/pam_timestamp_check usr/sbin
diff --git a/debian/libpam-modules-bin.lintian-overrides b/debian/libpam-modules-bin.lintian-overrides
index 56345417..a40efeaf 100644
--- a/debian/libpam-modules-bin.lintian-overrides
+++ b/debian/libpam-modules-bin.lintian-overrides
@@ -1,6 +1,2 @@
# yes, we know it's sgid, that's the whole point...
libpam-modules-bin: setgid-binary sbin/unix_chkpwd 2755 root/shadow
-# these manpages are in libpam-modules as they document both the module and
-# the helper binary
-libpam-modules-bin: binary-without-manpage sbin/pam_tally
-libpam-modules-bin: binary-without-manpage sbin/pam_tally2
diff --git a/debian/libpam-modules.lintian-overrides b/debian/libpam-modules.lintian-overrides
index d21c3530..9e2dca55 100644
--- a/debian/libpam-modules.lintian-overrides
+++ b/debian/libpam-modules.lintian-overrides
@@ -7,8 +7,6 @@ libpam-modules: hardening-no-fortify-functions lib/*/security/pam_filter.so
libpam-modules: hardening-no-fortify-functions lib/*/security/pam_group.so
libpam-modules: hardening-no-fortify-functions lib/*/security/pam_limits.so
libpam-modules: hardening-no-fortify-functions lib/*/security/pam_shells.so
-libpam-modules: hardening-no-fortify-functions lib/*/security/pam_tally.so
-libpam-modules: hardening-no-fortify-functions lib/*/security/pam_tally2.so
libpam-modules: hardening-no-fortify-functions lib/*/security/pam_time.so
libpam-modules: hardening-no-fortify-functions lib/*/security/pam_wheel.so
# pam_deny.so does not use any symbol from libc.