On Thu, Jun 09, 2011 at 10:49:49PM +1000, Kel Modderman wrote: > On Thu, 9 Jun 2011 10:43:42 PM Roger Leigh wrote: > > > > Hopefully final patch attached for /run support. This > > > > - adds the Breaks discussed above > > > > - adds a missing restorecon call to add selinux support for /run > > > > > > > > With these changes in place, it should be safe to migrate to testing. > > > > The SELinux maintainer will be uploading a new refpolicy package; he > > > > aims for this to be done by the weekend. This will mean initscripts > > > > will migrate to testing when it migrates, which should be in about > > > > two weeks if it isn't delayed. > > > > > > > > Are you happy if I upload a new build containing the above patch? > > > > Are there any other changes which need including? > > > > The patch is against current SVN, so it's OK to commit. > > > > > > We need to look at #629677 for the next upload. That aside the work on > > > /run should continue as you see fit. > > > > Patch attached to fix #629677. The upstream check for libcrypt > > breaks with multiarch paths. The patch preserves existing upstream > > behaviour but allows it to be overridden with the Debian multiarch > > path from debian/rules. > > > > OK to upload? > > Sure.
Please find an a supplementary patch attached. It turns out that not all the buildds have a multiarch libc installed yet, so we need to cater for both the old and new paths, which the earlier patch did not. Regards, Roger -- .''`. Roger Leigh : :' : Debian GNU/Linux http://people.debian.org/~rleigh/ `. `' Printing on GNU/Linux? http://gutenprint.sourceforge.net/ `- GPG Public Key: 0x25BFB848 Please GPG sign your mail.
diff -urN sysvinit-2.88dsf.original/debian/changelog b/ex/sysvinit-2.88dsf/debian/changelog --- sysvinit-2.88dsf.original/debian/changelog 2011-06-09 14:45:17.438273526 +0100 +++ sysvinit-2.88dsf/debian/changelog 2011-06-09 14:58:05.000000000 +0100 @@ -1,3 +1,11 @@ +sysvinit (2.88dsf-13.9) unstable; urgency=low + + * Non-maintainer upload. + * Try both old and multiarch paths to cope with buildds which don't + yet have a multiarch libc installed. + + -- Roger Leigh <[email protected]> Thu, 09 Jun 2011 14:50:53 +0100 + sysvinit (2.88dsf-13.8) unstable; urgency=low * Non-maintainer upload. diff -urN sysvinit-2.88dsf.original/debian/patches/40_multiarch_libcrypt.patch b/ex/sysvinit-2.88dsf/debian/patches/40_multiarch_libcrypt.patch --- sysvinit-2.88dsf.original/debian/patches/40_multiarch_libcrypt.patch 2011-06-09 14:45:17.438273526 +0100 +++ sysvinit-2.88dsf/debian/patches/40_multiarch_libcrypt.patch 2011-06-09 14:58:05.000000000 +0100 @@ -3,16 +3,19 @@ Fixes: #629677 Status: Not sent upstream. ---- sysvinit-2.88dsf.original/src/Makefile 2010-04-11 10:30:27.000000000 +0100 -+++ sysvinit-2.88dsf/src/Makefile 2011-06-09 13:26:50.134117128 +0100 -@@ -77,8 +77,9 @@ +--- sysvinit-2.88dsf.original/src/Makefile 2011-06-09 14:45:17.442273576 +0100 ++++ sysvinit-2.88dsf/src/Makefile 2011-06-09 14:46:43.267345934 +0100 +@@ -77,10 +77,15 @@ SULOGINLIBS = endif +LIBDIR=/usr/lib # Additional libs for GNU libc. --ifneq ($(wildcard /usr/lib*/libcrypt.a),) + ifneq ($(wildcard /usr/lib*/libcrypt.a),) ++ SULOGINLIBS += -lcrypt ++else +ifneq ($(wildcard $(LIBDIR)*/libcrypt.a),) SULOGINLIBS += -lcrypt endif ++endif
signature.asc
Description: Digital signature
_______________________________________________ Pkg-sysvinit-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-sysvinit-devel
