Bug#349356: [Pkg-shadow-devel] Bug#349356: shadow: Builds login package on hurd-i386 again, with su manpages conflicting with coreutils

Christian Perrier bubulle at debian.org
Mon Jan 23 06:11:54 UTC 2006


Quoting Michael Banck (mbanck at debian.org):
> Package: shadow
> Version: 1:4.0.14-3
> Severity: important
> Tags: patch
> 
> Hi,
> 
> since the switch to CDBS, the login package is being built again, as
> CDBS unconditionally calls dh_builddeb -pfoo etc:

Michael, Nicolas François made a change in our SVN to address this
issue. Please find his changes below.

Could you please tell us whether this would fix the problem: I'm not
sure that Nicolas François could test his fix. If needed, please /join
#shadow on freenode so that we can discuss this, preferrably with
Nicolas (nekral on IRC).

My unwritten policy for shadow is waiting for the current release to
enter testing before building a new one, with the exception of
bugs tagged as important, with patches. So, if the fix happens to be
correct, we'll immediately rebuild a shadow package.

I like Nicolas changes because they seem quite "clean"...but some
things in your initial report make me think that we're not sure it
would achieved what's intended..:)

Author: nekral-guest
Date: 2006-01-22 15:37:11 +0000 (Sun, 22 Jan 2006)
New Revision: 820

Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
Do not build login on The Hurd (#349356)


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-01-22 15:30:35 UTC (rev 819)
+++ trunk/debian/changelog	2006-01-22 15:37:11 UTC (rev 820)
@@ -4,6 +4,8 @@
   * Debian specific fixes:
     - recode_manpages.sh was not called after the switch to CDBS.
       The man pages were all distributed in UTF-8
+    - do not build login on The Hurd
+      Closes: #349356
   * Upstream bugs or fixes not already fixed in upstream releases or CVS:
     - 485_shell-env-exitcodes:
       - explicitly pass environment to shell() as 3rd argument

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2006-01-22 15:30:35 UTC (rev 819)
+++ trunk/debian/rules	2006-01-22 15:37:11 UTC (rev 820)
@@ -1,11 +1,20 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
+# Do not build login on The Hurd
+override DEB_ARCH_PACKAGES=passwd
+endif
+
 export DH_COMPAT = 4
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 # Specify where dh_install will find the files that it needs to move:
 DEB_DH_INSTALL_SOURCEDIR=debian/tmp
+# Specify the destination of shadow's "make install"
+# (This is only needed on The Hurd, where only one package is built. On
+# the other arch, DEB_DESTDIR already points to debian/tmp)
+DEB_DESTDIR=$(CURDIR)/debian/tmp
 
 include /usr/share/cdbs/1/class/autotools.mk
 # Automatically update autoconf, etc.


_______________________________________________
Pkg-shadow-commits mailing list
Pkg-shadow-commits at lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-shadow-commits


> 
> On Sun, Jan 22, 2006 at 02:53:21PM +0100, Debian autobuilder wrote:
> Automatic build of shadow_1:4.0.14-3 on beethoven by sbuild/hurd-i386 79
> Build started at 20060122-1431
> ******************************************************************************
> [...]
> echo "loginpam=login, libpam-modules (>= 0.72-5)" >> debian/passwd.substvars
> dh_installdeb -Nlogin
> dh_gencontrol -Nlogin
> dpkg-gencontrol: warning: unknown substitution variable ${shlibs:Depends}
> dh_md5sums -Nlogin
> dh_builddeb -Nlogin
> dpkg-deb: building package `passwd' in `../passwd_4.0.14-3_hurd-i386.deb'.
> dh_shlibdeps -ppasswd  
> dh_gencontrol -ppasswd 
> dh_md5sums -ppasswd 
> dh_builddeb -ppasswd 
> dpkg-deb: building package `passwd' in `../passwd_4.0.14-3_hurd-i386.deb'.
> dh_shlibdeps -plogin  
> dh_gencontrol -plogin 
> dh_md5sums -plogin 
> dh_builddeb -plogin 
> dpkg-deb: building package `login' in `../login_4.0.14-3_hurd-i386.deb'.
>  dpkg-genchanges -B -mDebian GNU/Hurd Build Daemon <buildd at beethoven.theo.chemie.tu-muenchen.de>
> dpkg-genchanges: arch-specific upload - not including arch-independent packages
> dpkg-genchanges: binary-only upload - not including any source code
> 
> So even though the hurd-i386 specific parts are executed (-Nlogin),
> -plogin is done later on.  AFAIK there is no way to tell CDBS to not
> build one package, at least a of trying with internal variables etc. did
> not help.  
> 
> As CDBS is currently not very actively maintained, I propose to go the
> other possibility we discussed before:  Make su an alternative in
> coordination with the coreutils package.
> 
> I am not sure how the localized manpages will be handled in this case,
> AFAIK coreutils only has su.1.gz and no translations.
> 
> As an interim fix, could you apply the attached patch, so login and
> coreutils can be installed together?
> 
> 
> thanks,
> 
> Michael

> diff -u shadow-4.0.14/debian/rules shadow-4.0.14/debian/rules
> --- shadow-4.0.14/debian/rules
> +++ shadow-4.0.14/debian/rules
> @@ -86,10 +86,7 @@
>  	chmod u+s debian/login/usr/bin/newgrp
>  ifeq ($(DEB_HOST_ARCH_OS),hurd)
>  	echo "loginpam=login, libpam-modules (>= 0.72-5)" >> debian/passwd.substvars
> -	dh_installdeb -Nlogin
> -	dh_gencontrol -Nlogin
> -	dh_md5sums -Nlogin
> -	dh_builddeb -Nlogin
> +	find debian/login -name "su.1*" | xargs rm
>  else
>  	echo "loginpam=login (>= 970502-1), libpam-modules (>= 0.72-5)" >> debian/passwd.substvars
>  endif

> _______________________________________________
> Pkg-shadow-devel mailing list
> Pkg-shadow-devel at lists.alioth.debian.org
> http://lists.alioth.debian.org/mailman/listinfo/pkg-shadow-devel


-- 






More information about the Pkg-shadow-devel mailing list