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.
Done. I've attached the diff between 2.88dsf-13.7 and 2.88dsf-13.8 which can be applied to SVN. This is just the previous two patches together. 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 sysvinit-2.88dsf/debian/changelog --- sysvinit-2.88dsf.original/debian/changelog 2011-06-09 14:10:21.000000000 +0100 +++ sysvinit-2.88dsf/debian/changelog 2011-06-09 14:10:36.760014400 +0100 @@ -1,3 +1,14 @@ +sysvinit (2.88dsf-13.8) unstable; urgency=low + + * Non-maintainer upload. + * initscripts Breaks all selinux-policy-default versions up to and + 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 13:35:56 +0100 + sysvinit (2.88dsf-13.7) unstable; urgency=low [ Roger Leigh ] diff -urN sysvinit-2.88dsf.original/debian/control sysvinit-2.88dsf/debian/control --- sysvinit-2.88dsf.original/debian/control 2011-06-09 14:10:21.000000000 +0100 +++ sysvinit-2.88dsf/debian/control 2011-06-09 14:10:36.760014400 +0100 @@ -55,6 +55,7 @@ Recommends: psmisc, e2fsprogs Conflicts: libdevmapper1.02.1 (<< 2:1.02.24-1) Replaces: libc6, libc6.1, libc0.1, libc0.3 +Breaks: selinux-policy-default (<< 2:0.2.20100524-9) Description: scripts for initializing and shutting down the system The scripts in this package initialize a standard Debian system at boot time and shut it down at halt or reboot time. diff -urN sysvinit-2.88dsf.original/debian/patches/40_multiarch_libcrypt.patch sysvinit-2.88dsf/debian/patches/40_multiarch_libcrypt.patch --- sysvinit-2.88dsf.original/debian/patches/40_multiarch_libcrypt.patch 1970-01-01 01:00:00.000000000 +0100 +++ sysvinit-2.88dsf/debian/patches/40_multiarch_libcrypt.patch 2011-06-09 14:10:36.760014400 +0100 @@ -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 -urN sysvinit-2.88dsf.original/debian/patches/series sysvinit-2.88dsf/debian/patches/series --- sysvinit-2.88dsf.original/debian/patches/series 2011-06-09 14:10:21.000000000 +0100 +++ sysvinit-2.88dsf/debian/patches/series 2011-06-09 14:10:36.760014400 +0100 @@ -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 -urN sysvinit-2.88dsf.original/debian/rules sysvinit-2.88dsf/debian/rules --- sysvinit-2.88dsf.original/debian/rules 2011-06-09 14:10:21.000000000 +0100 +++ sysvinit-2.88dsf/debian/rules 2011-06-09 14:10:36.760014400 +0100 @@ -22,6 +22,7 @@ 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-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 $@ diff -urN sysvinit-2.88dsf.original/debian/src/initscripts/etc/init.d/mountkernfs.sh sysvinit-2.88dsf/debian/src/initscripts/etc/init.d/mountkernfs.sh --- sysvinit-2.88dsf.original/debian/src/initscripts/etc/init.d/mountkernfs.sh 2011-06-09 14:10:21.000000000 +0100 +++ sysvinit-2.88dsf/debian/src/initscripts/etc/init.d/mountkernfs.sh 2011-06-09 14:10:36.760014400 +0100 @@ -40,6 +40,7 @@ fi # TODO: Add -onodev once checkroot no longer creates a device node. domount "$MNTMODE" tmpfs shmfs /run tmpfs "-onosuid$RUNEXEC$RUN_OPT" + [ -x /sbin/restorecon ] && /sbin/restorecon -r /run [ -f /run/.ramfs ] || touch /run/.ramfs # Make lock directory as the replacement for /var/lock
signature.asc
Description: Digital signature
_______________________________________________ Pkg-sysvinit-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-sysvinit-devel
