[Pkg-shadow-devel] Bug#1059915: DEP17: move login and shadowconfig to /usr

[Helmut Grohne]

Source: shadow
Version: 1:4.13+dfsg1-3
Tags: patch
User: helmutg at debian.org
Usertags: dep17m2

Hi,

We want to finalize the /usr-merge transition via DEP17 by moving all
files to /usr. shadow is involved at this time, because login is
installed by debootstrap. I'm attaching a patch that moves both login
and shadowconfig. It seems fairly harmless to me and I think it can go
to unstable directly. This patch should not be included in
bookworm-backports or earlier. If you want to support backports, please
use dh_movetousr instead.

Helmut
-------------- next part --------------
diff --minimal -Nru shadow-4.13+dfsg1/debian/changelog shadow-4.13+dfsg1/debian/changelog
--- shadow-4.13+dfsg1/debian/changelog	2023-10-15 19:10:52.000000000 +0200
+++ shadow-4.13+dfsg1/debian/changelog	2024-01-03 11:41:32.000000000 +0100
@@ -1,3 +1,10 @@
+shadow (1:4.13+dfsg1-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * DEP17: Move login and shadowconfig to /usr. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Wed, 03 Jan 2024 11:41:32 +0100
+
 shadow (1:4.13+dfsg1-3) unstable; urgency=medium
 
   * Team upload
diff --minimal -Nru shadow-4.13+dfsg1/debian/login.install shadow-4.13+dfsg1/debian/login.install
--- shadow-4.13+dfsg1/debian/login.install	2023-10-15 19:10:52.000000000 +0200
+++ shadow-4.13+dfsg1/debian/login.install	2024-01-03 11:00:47.000000000 +0100
@@ -4,4 +4,4 @@
 usr/bin/faillog
 usr/bin/lastlog
 usr/bin/newgrp
-bin/login
+bin/login usr/bin
diff --minimal -Nru shadow-4.13+dfsg1/debian/passwd.install shadow-4.13+dfsg1/debian/passwd.install
--- shadow-4.13+dfsg1/debian/passwd.install	2023-10-15 19:10:52.000000000 +0200
+++ shadow-4.13+dfsg1/debian/passwd.install	2024-01-03 11:01:01.000000000 +0100
@@ -1,5 +1,5 @@
 debian/default/useradd etc/default
-debian/shadowconfig sbin
+debian/shadowconfig usr/sbin
 usr/bin/chage
 usr/bin/chfn
 usr/bin/chsh
diff --minimal -Nru shadow-4.13+dfsg1/debian/rules shadow-4.13+dfsg1/debian/rules
--- shadow-4.13+dfsg1/debian/rules	2023-10-15 19:10:52.000000000 +0200
+++ shadow-4.13+dfsg1/debian/rules	2024-01-03 11:00:01.000000000 +0100
@@ -42,7 +42,7 @@
 	dh_install -a
 ifeq ($(DEB_HOST_ARCH_OS),hurd)
 	# /bin/login is provided by the hurd package.
-	rm -f debian/login/bin/login
+	rm -f debian/login/usr/bin/login
 endif
 
 override_dh_installpam: