Merging debian version 1:4.13+dfsg1-5.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

15 files changed, 102 insertions, 71 deletions

diff --git a/debian/README.debian b/debian/README.Debian
index e7ef263..e7ef263 100644
--- a/debian/README.debian
+++ b/debian/README.Debian
diff --git a/debian/changelog b/debian/changelog
index e29d066..4816eeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+shadow (1:4.13+dfsg1-5) unstable; urgency=medium
+
+  * Add myself to Uploaders, per discussion with Serge Hallyn
+  * Apply wrap-and-sort -kas style
+  * Use debputy to avoid Rules-Requires-Root: binary-targets
+  * libsubid4: tighten package-internal dependencies
+
+  [ Serge Hallyn ]
+  * Drop pam_lastlog.so from config. (Closes: #1068229)
+  * Stop installing lastlog binary.
+
+ -- Chris Hofstaedtler <zeha@debian.org>  Sun, 02 Jun 2024 20:01:51 +0200
+
 shadow (1:4.13+dfsg1-4~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/control b/debian/control
index bb3535a..6fc4f81 100644
--- a/debian/control
+++ b/debian/control
@@ -2,39 +2,43 @@ Source: shadow
 Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org>
 XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
 XSBC-Original-Maintainer: Shadow package maintainers <pkg-shadow-devel@lists.alioth.debian.org>
-XSBC-Original-Uploaders: Serge Hallyn <serge@hallyn.com>
+XSBC-Original-Uploaders:
+ Serge Hallyn <serge@hallyn.com>,
+ Chris Hofstaedtler <zeha@debian.org>
 Bugs: mailto:maintainers@lists.progress-linux.org
 Section: admin
 Priority: required
-Build-Depends: debhelper-compat (= 13),
-               gettext,
-               libcrypt-dev,
-               libpam0g-dev,
-               quilt,
-               xsltproc <!nodoc>,
-               docbook-xsl <!nodoc>,
-               docbook-xml <!nodoc>,
-               libxml2-utils <!nodoc>,
-               libselinux1-dev [linux-any],
-               libsemanage-dev [linux-any],
-               itstool <!nodoc>,
-               bison,
-               libaudit-dev [linux-any]
+Build-Depends:
+ bison,
+ debhelper-compat (= 13),
+ dh-sequence-zz-debputy-rrr (>= 0.1.23~),
+ docbook-xml <!nodoc>,
+ docbook-xsl <!nodoc>,
+ gettext,
+ itstool <!nodoc>,
+ libaudit-dev [linux-any],
+ libcrypt-dev,
+ libpam0g-dev,
+ libselinux1-dev [linux-any],
+ libsemanage-dev [linux-any],
+ libxml2-utils <!nodoc>,
+ quilt,
+ xsltproc <!nodoc>
 Standards-Version: 4.6.1
 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/shadow
 Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/shadow
 XSBC-Original-Vcs-Browser: https://salsa.debian.org/debian/shadow
 XSBC-Original-Vcs-Git: https://salsa.debian.org/debian/shadow.git -b master
 Homepage: https://github.com/shadow-maint/shadow
-Rules-Requires-Root: binary-targets
+Rules-Requires-Root: no
 
 Package: passwd
 Architecture: any
 Multi-Arch: foreign
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libpam-modules
-Recommends: sensible-utils
+Depends:
+ libpam-modules
+Recommends:
+ sensible-utils
 Description: change and administer password and group data
  This package includes passwd, chsh, chfn, and many other programs to
  maintain password and group data.
@@ -45,13 +49,15 @@ Package: login
 Architecture: any
 Multi-Arch: foreign
 Essential: yes
-Pre-Depends: ${shlibs:Depends},
-             ${misc:Depends},
-             libpam-runtime,
-             libpam-modules
-Breaks: hurd (<< 20140206~) [hurd-any]
-Conflicts: python-4suite (<< 0.99cvs20060405-1)
-Replaces: hurd (<< 20140206~) [hurd-any]
+Pre-Depends:
+ libpam-modules,
+ libpam-runtime
+Breaks:
+ hurd (<< 20140206~) [hurd-any]
+Conflicts:
+ python-4suite (<< 0.99cvs20060405-1)
+Replaces:
+ hurd (<< 20140206~) [hurd-any]
 Description: system login tools
  This package provides some required infrastructure for logins and for
  changing effective user or group IDs, including:
@@ -62,8 +68,6 @@ Package: uidmap
 Architecture: any
 Multi-Arch: foreign
 Priority: optional
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
 Description: programs to help use subuids
  These programs help unprivileged users to create uid and gid mappings in
  user namespaces.
@@ -73,8 +77,6 @@ Section: libs
 Priority: optional
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: subordinate id handling library -- shared library
  The library provides an interface for querying, granding and ungranting
  subordinate user and group ids.
@@ -84,7 +86,8 @@ Section: libdevel
 Priority: optional
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, libsubid4 (= ${binary:Version})
+Depends:
+ libsubid4 (= ${binary:Version})
 Description: subordinate id handling library -- shared library
  The library provides an interface for querying, granding and ungranting
  subordinate user and group ids.
diff --git a/debian/debputy.manifest b/debian/debputy.manifest
new file mode 100644
index 0000000..d4e1ef7
--- /dev/null
+++ b/debian/debputy.manifest
@@ -0,0 +1,37 @@
+manifest-version: '0.1'
+packages:
+  passwd:
+    transformations:
+    - path-metadata:
+        path: usr/bin/chfn
+        mode: "u=rwxs,go=rx"
+    - path-metadata:
+        path: usr/bin/chsh
+        mode: "u=rwxs,go=rx"
+    - path-metadata:
+        path: usr/bin/gpasswd
+        mode: "u=rwxs,go=rx"
+    - path-metadata:
+        path: usr/bin/passwd
+        mode: "u=rwxs,go=rx"
+    - path-metadata:
+        path: usr/bin/chage
+        group: "shadow"
+        mode: "u=rwx,go=rxs"
+    - path-metadata:
+        path: usr/bin/expiry
+        group: "shadow"
+        mode: "u=rwx,go=rxs"
+  login:
+    transformations:
+    - path-metadata:
+        path: usr/bin/newgrp
+        mode: "u=rwxs,go=rx"
+  uidmap:
+    transformations:
+    - path-metadata:
+        path: usr/bin/newgidmap
+        mode: "u=rwxs,go=rx"
+    - path-metadata:
+        path: usr/bin/newuidmap
+        mode: "u=rwxs,go=rx"
diff --git a/debian/login.install b/debian/login.install
index 96fe109..fd8bd12 100644
--- a/debian/login.install
+++ b/debian/login.install
@@ -1,7 +1,6 @@
+bin/login usr/bin
 debian/login.defs etc
-usr/share/locale/*/LC_MESSAGES/shadow.mo
 sbin/nologin usr/sbin
 usr/bin/faillog
-usr/bin/lastlog
 usr/bin/newgrp
-bin/login usr/bin
+usr/share/locale/*/LC_MESSAGES/shadow.mo
diff --git a/debian/login.manpages b/debian/login.manpages
index 2792cb2..6bb716f 100644
--- a/debian/login.manpages
+++ b/debian/login.manpages
@@ -4,7 +4,6 @@ usr/share/man/*/man1/sg.1
 usr/share/man/*/man5/faillog.5
 usr/share/man/*/man5/login.defs.5
 usr/share/man/*/man8/faillog.8
-usr/share/man/*/man8/lastlog.8
 usr/share/man/*/man8/nologin.8
 usr/share/man/man1/login.1
 usr/share/man/man1/newgrp.1
@@ -12,5 +11,4 @@ usr/share/man/man1/sg.1
 usr/share/man/man5/faillog.5
 usr/share/man/man5/login.defs.5
 usr/share/man/man8/faillog.8
-usr/share/man/man8/lastlog.8
 usr/share/man/man8/nologin.8
diff --git a/debian/login.pam b/debian/login.pam
index 0c8d0b6..a6b22a0 100644
--- a/debian/login.pam
+++ b/debian/login.pam
@@ -77,10 +77,6 @@ account    required   pam_access.so
 # (Replaces the use of /etc/limits in old login)
 session    required   pam_limits.so
 
-# Prints the last login info upon successful login
-# (Replaces the `LASTLOG_ENAB' option from login.defs)
-session    optional   pam_lastlog.so
-
 # Prints the status of the user's mailbox upon successful login
 # (Replaces the `MAIL_CHECK_ENAB' option from login.defs). 
 #
diff --git a/debian/not-installed b/debian/not-installed
index 9d7299a..e542a49 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -15,6 +15,7 @@ etc/pam.d/passwd
 etc/pam.d/useradd
 etc/pam.d/userdel
 etc/pam.d/usermod
+usr/bin/lastlog
 usr/bin/sg
 usr/lib/*/libsubid.la
 usr/sbin/logoutd
@@ -25,6 +26,7 @@ usr/share/man/*/man1/su.1
 usr/share/man/*/man3/getspnam.3
 usr/share/man/*/man3/shadow.3
 usr/share/man/*/man5/suauth.5
+usr/share/man/*/man8/lastlog.8
 usr/share/man/*/man8/logoutd.8
 usr/share/man/man1/groups.1
 usr/share/man/man1/logoutd.1
@@ -32,5 +34,6 @@ usr/share/man/man1/su.1
 usr/share/man/man3/getspnam.3
 usr/share/man/man3/shadow.3
 usr/share/man/man5/suauth.5
+usr/share/man/man8/lastlog.8
 usr/share/man/man8/logoutd.8
 
diff --git a/debian/passwd.dirs b/debian/passwd.dirs
index d2a6c07..dca9027 100644
--- a/debian/passwd.dirs
+++ b/debian/passwd.dirs
@@ -1,2 +1,2 @@
-usr/share/lintian/overrides
 etc/default
+usr/share/lintian/overrides
diff --git a/debian/passwd.install b/debian/passwd.install
index 4feedc1..f2cb3e3 100644
--- a/debian/passwd.install
+++ b/debian/passwd.install
@@ -6,13 +6,13 @@ usr/bin/chsh
 usr/bin/expiry
 usr/bin/gpasswd
 usr/bin/passwd
-usr/sbin/chpasswd
 usr/sbin/chgpasswd
+usr/sbin/chpasswd
 usr/sbin/cppw
 usr/sbin/groupadd
 usr/sbin/groupdel
-usr/sbin/groupmod
 usr/sbin/groupmems
+usr/sbin/groupmod
 usr/sbin/grpck
 usr/sbin/grpconv
 usr/sbin/grpunconv
diff --git a/debian/passwd.links b/debian/passwd.links
index 57b529e..3d7cc84 100644
--- a/debian/passwd.links
+++ b/debian/passwd.links
@@ -1,2 +1,2 @@
-usr/sbin/vipw usr/sbin/vigr
 usr/sbin/cppw usr/sbin/cpgr
+usr/sbin/vipw usr/sbin/vigr
diff --git a/debian/passwd.manpages b/debian/passwd.manpages
index 8e552c8..fee633b 100644
--- a/debian/passwd.manpages
+++ b/debian/passwd.manpages
@@ -6,17 +6,17 @@ usr/share/man/*/man1/chsh.1
 usr/share/man/*/man1/expiry.1
 usr/share/man/*/man1/gpasswd.1
 usr/share/man/*/man1/passwd.1
+usr/share/man/*/man5/gshadow.5
 usr/share/man/*/man5/passwd.5
+usr/share/man/*/man5/shadow.5
 usr/share/man/*/man5/subgid.5
 usr/share/man/*/man5/subuid.5
-usr/share/man/*/man5/shadow.5
-usr/share/man/*/man5/gshadow.5
-usr/share/man/*/man8/chpasswd.8
 usr/share/man/*/man8/chgpasswd.8
+usr/share/man/*/man8/chpasswd.8
 usr/share/man/*/man8/groupadd.8
 usr/share/man/*/man8/groupdel.8
-usr/share/man/*/man8/groupmod.8
 usr/share/man/*/man8/groupmems.8
+usr/share/man/*/man8/groupmod.8
 usr/share/man/*/man8/grpck.8
 usr/share/man/*/man8/grpconv.8
 usr/share/man/*/man8/grpunconv.8
@@ -35,11 +35,11 @@ usr/share/man/man1/chsh.1
 usr/share/man/man1/expiry.1
 usr/share/man/man1/gpasswd.1
 usr/share/man/man1/passwd.1
+usr/share/man/man5/gshadow.5
 usr/share/man/man5/passwd.5
 usr/share/man/man5/shadow.5
-usr/share/man/man5/gshadow.5
-usr/share/man/man5/subuid.5
 usr/share/man/man5/subgid.5
+usr/share/man/man5/subuid.5
 usr/share/man/man8/chgpasswd.8
 usr/share/man/man8/chpasswd.8
 usr/share/man/man8/groupadd.8
diff --git a/debian/rules b/debian/rules
index b7ff08b..6256182 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,25 +55,6 @@ override_dh_installpam:
 	dh_installpam -p passwd --name=chpasswd
 	dh_installpam -p passwd --name=newusers
 
-override_dh_builddeb-arch:
-	# uidmap
-	chmod u+s debian/uidmap/usr/bin/newuidmap
-	chmod u+s debian/uidmap/usr/bin/newgidmap
-	# login
-	# No real need for login to be setuid root
-	# chmod u+s debian/login/bin/login
-	chmod u+s debian/login/usr/bin/newgrp
-	# passwd
-	chmod u+s debian/passwd/usr/bin/chfn
-	chmod u+s debian/passwd/usr/bin/chsh
-	chmod u+s debian/passwd/usr/bin/gpasswd
-	chmod u+s debian/passwd/usr/bin/passwd
-	chgrp shadow debian/passwd/usr/bin/chage
-	chgrp shadow debian/passwd/usr/bin/expiry
-	chmod g+s debian/passwd/usr/bin/chage
-	chmod g+s debian/passwd/usr/bin/expiry
-	dh_builddeb -a
-
 override_dh_auto_clean:
 	sed -i 's/# Linux only # //' debian/login.pam
 	dh_auto_clean
diff --git a/debian/shlibs.local b/debian/shlibs.local
new file mode 100644
index 0000000..29d7bc6
--- /dev/null
+++ b/debian/shlibs.local
@@ -0,0 +1 @@
+deb: libsubid 4 libsubid4 (= ${binary:Version})
diff --git a/debian/uidmap.install b/debian/uidmap.install
index 48eb9e1..3824648 100644
--- a/debian/uidmap.install
+++ b/debian/uidmap.install
@@ -1,3 +1,3 @@
 bin/getsubids usr/bin
-usr/bin/newuidmap
 usr/bin/newgidmap
+usr/bin/newuidmap