[Pkg-shadow-devel] Bug#737805: Bug#737805: Bug#737806: Bug#737805: coreutils: FTBFS on hurd-i386 due to /bin/su

Sun Mar 16 22:23:17 UTC 2014

Sounds good to me.

* Samuel Thibault (sthibault at debian.org) wrote:
> Hello,
> 
> Christian PERRIER, le Fri 14 Mar 2014 06:57:04 +0100, a écrit :
> > Quoting Samuel Thibault (sthibault at debian.org):
> > > Here are the changes I have just uploaded to DELAYED/5.
> > 
> > There might be a clash with Eric Dorland's NMU for #724734 which is
> > also on its way.
> 
> Ah, OK.  Since you so gladly welcome its changes, I'm currently
> cancelling Eric's upload, and will reupload to DELAYED/0 with both his
> and my changes, yielding to the attached patch.
> 
> Samuel

> diff -u shadow-4.1.5.1/debian/rules shadow-4.1.5.1/debian/rules
> --- shadow-4.1.5.1/debian/rules
> +++ shadow-4.1.5.1/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
>  
> @@ -21,9 +16,9 @@
>  
>  include /usr/share/cdbs/1/class/autotools.mk
>  # Automatically update autoconf, etc.
> -DEB_AUTO_UPDATE_ACLOCAL  = 1.9
> -DEB_AUTO_UPDATE_AUTOCONF = 1.9
> -DEB_AUTO_UPDATE_AUTOMAKE = 1.9
> +DEB_AUTO_UPDATE_ACLOCAL  = 1.11
> +DEB_AUTO_UPDATE_AUTOCONF = 1.11
> +DEB_AUTO_UPDATE_AUTOMAKE = 1.11
>  DEB_AUTO_UPDATE_LIBTOOL = pre
>  
>  # Adds extra options when calling the configure script:
> @@ -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
> diff -u shadow-4.1.5.1/debian/changelog shadow-4.1.5.1/debian/changelog
> --- shadow-4.1.5.1/debian/changelog
> +++ shadow-4.1.5.1/debian/changelog
> @@ -1,3 +1,16 @@
> +shadow (1:4.1.5.1-1.1) unstable; urgency=medium
> +
> +  * Non-maintainer upload.
> +
> +  [ Eric Dorland ]
> +  * Switch to automake1.11. (Closes: #724434)
> +
> +  [ Samuel Thibault ]
> +  * Enable the login package on hurd-any, but without /bin/login, still provided
> +    by the hurd package. Closes: #737805.
> +
> + -- Samuel Thibault <sthibault at debian.org>  Sun, 16 Mar 2014 20:58:24 +0100
> +
>  shadow (1:4.1.5.1-1) unstable; urgency=low
>  
>    * The "Gruyère" release.
> diff -u shadow-4.1.5.1/debian/control shadow-4.1.5.1/debian/control
> --- shadow-4.1.5.1/debian/control
> +++ shadow-4.1.5.1/debian/control
> @@ -4,7 +4,7 @@
>  Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
>  Standards-Version: 3.9.3
>  Uploaders: Christian Perrier <bubulle at debian.org>, Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>
> -Build-Depends: autoconf, automake1.9, libtool, gettext, libpam0g-dev, debhelper (>= 6.0.7~), quilt, dpkg-dev (>= 1.13.5), xsltproc, docbook-xsl, docbook-xml, libxml2-utils, cdbs, libselinux1-dev [linux-any], libsemanage1-dev [linux-any], gnome-doc-utils (>= 0.4.3)
> +Build-Depends: autoconf, automake1.11, libtool, gettext, libpam0g-dev, debhelper (>= 6.0.7~), quilt, dpkg-dev (>= 1.13.5), xsltproc, docbook-xsl, docbook-xml, libxml2-utils, cdbs, libselinux1-dev [linux-any], libsemanage1-dev [linux-any], gnome-doc-utils (>= 0.4.3)
>  Vcs-Svn: svn://svn.debian.org/svn/pkg-shadow/debian/trunk
>  Vcs-Browser: http://svn.debian.org/viewsvn/pkg-shadow/debian/trunk
>  Homepage: http://pkg-shadow.alioth.debian.org/
> @@ -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-1.1~) [hurd-any], passwd (<< 1:4.1.5.1-1.1~) [hurd-any], hurd (<< 1:0.5.git20140206~) [hurd-any]
> +Replaces: manpages-de (<< 0.5-3), manpages-tr (<<1.0.5), manpages-zh (<<1.5.1-1), coreutils (<< 8.21-1.1~) [hurd-any], passwd (<< 1:4.1.5.1-1.1~) [hurd-any], hurd (<< 1:0.5.git20140206~) [hurd-any]
>  Essential: yes
>  Description: system login tools
>   These tools are required to be able to login and use your system. The

-- 
Eric Dorland <eric at kuroneko.ca>
ICQ: #61138586, Jabber: hooty at jabber.com

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/attachments/20140316/337995f3/attachment-0002.sig>