From c7e2932be4bf69298086cef2798631e28523661d Mon Sep 17 00:00:00 2001 From: Christian Perrier Date: Wed, 30 Apr 2014 22:20:05 +0200 Subject: [PATCH] Enable the login package on hurd-any, but without /bin/login, still provided by the hurd package. Closes: #737805. This fix was accidentally forgotten in 1:4.2-1 --- debian/changelog | 5 +++++ debian/control | 3 ++- debian/rules | 14 ++++---------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 74ff8014..23dd452a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,11 @@ shadow (1:4.2-2) UNRELEASED; urgency=low effect then Eric Dorland's patch in 1:4.1.5.1-1.1 NMU to drop the use of automake1.9. Closes: #724434 + [ Samuel Thibault ] + * Enable the login package on hurd-any, but without /bin/login, still provided + by the hurd package. Closes: #737805. + This fix was accidentally forgotten in 1:4.2-1 + -- Christian Perrier Wed, 30 Apr 2014 22:14:23 +0200 shadow (1:4.2-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 97f293c0..951c5f9a 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,8 @@ Package: login 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 --git a/debian/rules b/debian/rules index 4fd83cc6..2a626645 100755 --- a/debian/rules +++ b/debian/rules @@ -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 @@ -34,6 +29,10 @@ CFLAGS += -DDEFAULT_EDITOR=\\\"sensible-editor\\\" # 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 @@ -52,11 +51,6 @@ binary-install/passwd:: 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