[Pkg-shadow-devel] Bug#737805: shadow: Build the login package on hurd-any

[Samuel Thibault]

Package: shadow
Version: 1:4.1.5.1-1
Severity: important
User: debian-hurd at lists.debian.org
Usertags: hurd
Tags: patch

Hello,

src:shadow used not to build the login package, because the hurd package
provides /bin/login.  However, since coreutils does not provide /bin/su
any more, hurd-any now needs /bin/su from src:shadow.  Instead of making
hurd-any diverge even more from other archs, I suggest building the
login package, but without /bin/login (because the hurd package still
provides its own version), as the attached patch does.  It makes login
replace coreutils due to /bin/su, replace passwd due to /etc/login.defs,
and replace hurd due to /etc/securetty.

Samuel

-- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.13.0 (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

-- 
Samuel
<B> l'alim je sais où elle est, elle est juste à côté de la dame qui dort
<g> B: clairement faut revoir les priorités dans la vie
<g> B: une dame ça se retrouve, un uptime...
-------------- next part --------------
diff -ur shadow-4.1.5.1/debian/changelog shadow-4.1.5.1.mine/debian/changelog
--- shadow-4.1.5.1/debian/changelog	2014-02-05 22:42:16.000000000 +0000
+++ shadow-4.1.5.1.mine/debian/changelog	2014-02-05 22:51:42.000000000 +0000
@@ -1,3 +1,10 @@
+shadow (1:4.1.5.1-2~hurd.0) unreleased; urgency=low
+
+  * Enable the login package on hurd-any, but without /bin/login, still provided
+    by the hurd package.
+
+ -- Samuel Thibault <sthibault at debian.org>  Wed, 05 Feb 2014 22:43:29 +0000
+
 shadow (1:4.1.5.1-1) unstable; urgency=low
 
   * The "Gruyère" release.
diff -ur shadow-4.1.5.1/debian/control shadow-4.1.5.1.mine/debian/control
--- shadow-4.1.5.1/debian/control	2014-02-05 22:42:16.000000000 +0000
+++ shadow-4.1.5.1.mine/debian/control	2014-02-06 02:12:17.000000000 +0000
@@ -24,7 +24,8 @@
 Architecture: any
 Pre-Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime, libpam-modules
 Conflicts: gnunet (<< 0.7.0c-2), amavisd-new (<<2.3.3-8), python-4suite (<< 0.99cvs20060405-1), backupninja (<< 0.9.3-5), echolot (<< 2.1.8-4)
-Replaces: manpages-de (<< 0.5-3), manpages-tr (<<1.0.5), manpages-zh (<<1.5.1-1)
+Breaks: coreutils (<< 8.21~) [hurd-any], passwd (<< 1:4.1.5.1-2~) [hurd-any], hurd (<< 20140206~) [hurd-any]
+Replaces: manpages-de (<< 0.5-3), manpages-tr (<<1.0.5), manpages-zh (<<1.5.1-1), passwd (<< 1:4.1.5.1-2~) [hurd-any], coreutils (<< 8.21~) [hurd-any], hurd (<< 20140206~) [hurd-any]
 Essential: yes
 Description: system login tools
  These tools are required to be able to login and use your system. The
diff -ur shadow-4.1.5.1/debian/rules shadow-4.1.5.1.mine/debian/rules
--- shadow-4.1.5.1/debian/rules	2014-02-05 22:42:16.000000000 +0000
+++ shadow-4.1.5.1.mine/debian/rules	2014-02-05 22:46:30.000000000 +0000
@@ -3,11 +3,6 @@
 
 DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
-ifeq ($(DEB_HOST_ARCH_OS),hurd)
-# Do not build login on The Hurd
-override DEB_ARCH_PACKAGES=passwd
-endif
-
 # Enable PIE, BINDNOW, and possible future flags.
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
@@ -37,6 +32,10 @@
 
 # Add extras to the install process:
 binary-install/login::
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
+	# /bin/login is provided by the hurd package.
+	rm -f debian/login/bin/login
+endif
 	dh_installpam -p login
 	dh_installpam -p login --name=su
 	install -c -m 444 debian/login.defs debian/login/etc/login.defs
@@ -55,11 +54,6 @@
 	dh_installpam -p passwd --name=chsh
 	dh_installpam -p passwd --name=chpasswd
 	dh_installpam -p passwd --name=newusers
-ifeq ($(DEB_HOST_ARCH_OS),hurd)
-# login is not built on The Hurd, but some utilities of passwd depends on
-# /etc/login.defs.
-	install -c -m 444 debian/login.defs debian/passwd/etc/login.defs
-endif
 	install -c -m 644 debian/useradd.default debian/passwd/etc/default/useradd
 	install -d debian/passwd/sbin
 	install -c -m 555 debian/shadowconfig.sh debian/passwd/sbin/shadowconfig