Merge in janitor changes.

8 files changed, 38 insertions, 22 deletions

diff --git a/debian/changelog b/debian/changelog
index a0e31f64..35bdb972 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,19 @@
 pam (1.5.3-1) UNRELEASED; urgency=medium
 
+  [ Sam Hartman ]
   * New upstream version
-  * Since we no longer build with NIS support, drop Debian patches related to NIS
+  * Since we no longer build with NIS support, drop Debian patches related
+    to NIS
+  [ Debian Janitor]
+  * Update lintian override info to new format:
+    + debian/libpam-runtime.lintian-overrides: line 5, 7, 9-13
+    + debian/libpam-modules.lintian-overrides: line 5-10, 14
+  * Trim trailing whitespace.
+  * Move source package lintian overrides to debian/source.
+  * Update renamed lintian tag names in lintian overrides.
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository-Browse.
+  * Drop unnecessary dependency on dh-autoreconf.
+  * Update standards version to 4.6.2, no changes needed.
 
  -- Sam Hartman <hartmans@debian.org>  Wed, 13 Sep 2023 13:26:06 -0600
 
@@ -264,7 +276,7 @@ pam (1.4.0-2) unstable; urgency=medium
   * Restart services on upgrade to 1.4.0.  Closes: #978555.
 
  -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 28 Dec 2020 19:20:38 -0800
-    
+
 pam (1.4.0-1) unstable; urgency=medium
 
   * New upstream release.  Closes: #948188.
diff --git a/debian/control b/debian/control
index bb940764..cfc1e275 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: libs
 Priority: optional
 Maintainer: Sam Hartman <hartmans@debian.org>
 Uploaders: Steve Langasek <vorlon@debian.org>
-Standards-Version: 4.6.0
-Build-Depends: debhelper-compat (= 13), dh-exec,  flex, libdb-dev, libcrypt-dev, libselinux1-dev [linux-any], libsystemd-dev [linux-any] <!stage1>, po-debconf, dh-autoreconf, autopoint, libaudit-dev [linux-any] <!stage1>, pkg-config, libfl-dev, libfl-dev:native, docbook-xsl, docbook-xml, xsltproc, libxml2-utils, w3m
+Standards-Version: 4.6.2
+Build-Depends: debhelper-compat (= 13), dh-exec,  flex, libdb-dev, libcrypt-dev, libselinux1-dev [linux-any], libsystemd-dev [linux-any] <!stage1>, po-debconf, autopoint, libaudit-dev [linux-any] <!stage1>, pkg-config, libfl-dev, libfl-dev:native, docbook-xsl, docbook-xml, xsltproc, libxml2-utils, w3m
 Build-Conflicts-Indep: fop
 Build-Conflicts: libdb4.2-dev, libxcrypt-dev
 Vcs-Browser: https://salsa.debian.org/vorlon/pam
diff --git a/debian/libpam-modules-bin.lintian-overrides b/debian/libpam-modules-bin.lintian-overrides
index 8c185917..895133f7 100644
--- a/debian/libpam-modules-bin.lintian-overrides
+++ b/debian/libpam-modules-bin.lintian-overrides
@@ -1,2 +1,2 @@
 # yes, we know it's sgid, that's the whole point...
-libpam-modules-bin: setgid-binary *sbin/unix_chkpwd* 2755 root/shadow
+libpam-modules-bin: elevated-privileges *sbin/unix_chkpwd* 2755 root/shadow
diff --git a/debian/libpam-modules.lintian-overrides b/debian/libpam-modules.lintian-overrides
index 531ff4de..8594dd3a 100644
--- a/debian/libpam-modules.lintian-overrides
+++ b/debian/libpam-modules.lintian-overrides
@@ -2,13 +2,13 @@
 # fortifying.  Since we know we have hardening turned on globally, suppress
 # them.  If we ever see this warning again for *other* modules, then we know
 # there's a real problem.
-libpam-modules: hardening-no-fortify-functions *lib/*/security/pam_echo.so*
-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_localuser.so*
-libpam-modules: hardening-no-fortify-functions *lib/*/security/pam_shells.so*
-libpam-modules: hardening-no-fortify-functions *lib/*/security/pam_wheel.so*
+libpam-modules: hardening-no-fortify-functions [*lib/*/security/pam_echo.so*]
+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_localuser.so*]
+libpam-modules: hardening-no-fortify-functions [*lib/*/security/pam_shells.so*]
+libpam-modules: hardening-no-fortify-functions [*lib/*/security/pam_wheel.so*]
 # pam_deny.so does not use any symbol from libc.
-libpam-modules: shared-lib-without-dependency-information *lib/*/security/pam_deny.so*
+libpam-modules: shared-library-lacks-prerequisites *lib/*/security/pam_deny.so*
 # lintian doesn't know what to do with manpages for pam modules
-libpam-modules: spare-manual-page *
+libpam-modules: spare-manual-page [*]
diff --git a/debian/libpam-runtime.lintian-overrides b/debian/libpam-runtime.lintian-overrides
index 1385c591..d7ad72be 100644
--- a/debian/libpam-runtime.lintian-overrides
+++ b/debian/libpam-runtime.lintian-overrides
@@ -2,12 +2,12 @@
 libpam-runtime: no-debconf-config
 # this warning is just plain crack, there's no reason that using debconf
 # outside of a maintainer script implies an error.
-libpam-runtime: debconf-is-not-a-registry *usr/sbin/pam-auth-update*
+libpam-runtime: debconf-is-not-a-registry [*usr/sbin/pam-auth-update*:*]
 # false positive, we have to load the debconf templates from here
-libpam-runtime: uses-dpkg-database-directly usr/sbin/pam-auth-update
+libpam-runtime: uses-dpkg-database-directly [usr/sbin/pam-auth-update]
 # and lintian also says these templates are unused, which is false
-libpam-runtime: unused-debconf-template libpam-runtime/conflicts
-libpam-runtime: unused-debconf-template libpam-runtime/no_profiles_chosen
-libpam-runtime: unused-debconf-template libpam-runtime/override
-libpam-runtime: unused-debconf-template libpam-runtime/profiles
-libpam-runtime: unused-debconf-template libpam-runtime/title
+libpam-runtime: unused-debconf-template libpam-runtime/conflicts [*:*]
+libpam-runtime: unused-debconf-template libpam-runtime/no_profiles_chosen [*:*]
+libpam-runtime: unused-debconf-template libpam-runtime/override [*:*]
+libpam-runtime: unused-debconf-template libpam-runtime/profiles [*:*]
+libpam-runtime: unused-debconf-template libpam-runtime/title [*:*]
diff --git a/debian/rules b/debian/rules
index 21b157bf..07bc9d47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,12 +18,12 @@ d = $(CURDIR)/debian
 dl = $(d)/local
 
 %:
-	dh $@ --with autoreconf
+	dh $@
 
 # avoid libaudit-dev when bootstrapping
 ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
   CONFIGURE_OPTS += --disable-audit
-endif  
+endif
 
 CONFIGURE_OPTS += --enable-logind
 
diff --git a/debian/source.lintian-overrides b/debian/source/lintian-overrides
index 85133c70..85133c70 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source/lintian-overrides
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 00000000..9728068d
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,4 @@
+---
+Bug-Database: https://github.com/linux-pam/linux-pam/issues
+Bug-Submit: https://github.com/linux-pam/linux-pam/issues/new
+Repository-Browse: https://github.com/linux-pam/linux-pam