On Thu, Jun 09, 2011 at 09:11:58PM +1000, Kel Modderman wrote: > On Thu, 9 Jun 2011 08:23:57 PM Roger Leigh wrote: > > On Fri, May 20, 2011 at 01:07:54PM +0100, Roger Leigh wrote: > > > On Mon, May 16, 2011 at 08:44:48PM +1000, Kel Modderman wrote: > > > > On Sun, 15 May 2011 08:46:38 PM Roger Leigh wrote: > > > > > I've attached a new patch. Note one (-deb) is a debdiff against > > > > > the version in unstable. The other is against SVN. I've gzipped > > > > > them to ensure saving the attachments won't result in encoding > > > > > issues to correct the encoding issue. > > > > > > > > Thanks very much for it. It was applied. > > > > > > Additional patch attached which follows the previous. This fixes > > > up chroot detection on kfreebsd using new ischroot program in > > > debianutils, and also fixes SELinux support. > > > > > > Note that the selinux patch requires an updates refpolicy so that > > > we can Breaks: refpolicy (<< $newver), but this isn't available > > > yet, so will need fixing in a future upload. I've included the > > > changes here so that selinux users will get a working system as > > > soon as refpoicy is updated, and we can add the Breaks after this > > > is done. > > > > Hi folks, > > > > 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? 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.
commit b19e4f4a56e2928b98deaf3ddb922131c7b93f5e Author: Roger Leigh <[email protected]> Date: Thu Jun 9 13:36:56 2011 +0100 Search for libcrypt using multiarch paths Closes: #629677 diff --git a/debian/changelog b/debian/changelog index e33beca..d69c7a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,9 @@ sysvinit (2.88dsf-13.8) unstable; urgency=low including 2:0.2.20100524-9, which do not support /run. * Add restorecon support for selinux to /run in mountkernfs. (Closes: #628107). Thanks to Martin Orr for this patch. + * Search for libcrypt using multiarch path (Closes: #629677). - -- Roger Leigh <[email protected]> Thu, 09 Jun 2011 11:14:59 +0100 + -- Roger Leigh <[email protected]> Thu, 09 Jun 2011 13:35:56 +0100 sysvinit (2.88dsf-13.7) unstable; urgency=low diff --git a/debian/patches/40_multiarch_libcrypt.patch b/debian/patches/40_multiarch_libcrypt.patch new file mode 100644 index 0000000..c9635ef --- /dev/null +++ b/debian/patches/40_multiarch_libcrypt.patch @@ -0,0 +1,18 @@ +Purpose: Use multiarch library search path to find and link with libcrypt +Author: Roger Leigh +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 @@ + SULOGINLIBS = + endif + ++LIBDIR=/usr/lib + # Additional libs for GNU libc. +-ifneq ($(wildcard /usr/lib*/libcrypt.a),) ++ifneq ($(wildcard $(LIBDIR)*/libcrypt.a),) + SULOGINLIBS += -lcrypt + endif + diff --git a/debian/patches/series b/debian/patches/series index 62cecc9..dc73532 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,7 @@ 10_doc_manuals.dpatch 20_init_freebsd_vswtc.patch 30_killall5_hurd.patch +40_multiarch_libcrypt.patch 63_init_keep_utf8_ttyflag.patch 64_init_selinux_enabled.patch 91_sulogin_lockedpw.dpatch diff --git a/debian/rules b/debian/rules index dfc9e58..7f90a16 100755 --- a/debian/rules +++ b/debian/rules @@ -22,6 +22,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) INSTALL_DATA = install -o root -g root -m 644 INSTALL = install -o root -g root -m 755 @@ -58,7 +59,7 @@ build: build-stamp build-stamp: patch # Builds the binary package. dh_testdir - $(MAKE) $(CROSS) $(CONFFLAGS) -C src DISTRO=Debian + $(MAKE) $(CROSS) $(CONFFLAGS) -C src DISTRO=Debian LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) $(MAKE) $(CROSS) -C debian/startpar touch $@
signature.asc
Description: Digital signature
_______________________________________________ Pkg-sysvinit-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-sysvinit-devel
