Hi, I've attached a few patches; they are based upon the new git repo, but it's currently identical to the svn repo, so they will apply to either.
0001-Apply-NMU-for-sysvinit-2.88dsf-13.8-2.88dsf-13.9-and.patch - this syncs the repo with what's currently in unstable. I did mail these changes as patches previously, but they aren't currently applied. 0002-initscripts-Ensure-run-sendsigs.omit.d-exists-in-pos.patch 0003-initscripts-Remove-support-for-dev-.udev.log-in-boot.patch 0004-initscripts-Remove-directory-creation-in-umountroot.patch 0005-Close-633541.patch - these are all for NMU. Would it be OK to upload these? The sendsigs.omit.d stuff is important to get into testing as other packages are already migrating to it, and without support in initscripts, they will fail to upgrade when doing an upgrade to testing, or upgrading a testing install without having rebooted to complete the /run transition. The others are less important-- just removing things unused now /run exists. Thanks, 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.
From 26d464ad051726987129f75418ccace0710b702c Mon Sep 17 00:00:00 2001 From: Roger Leigh <[email protected]> Date: Wed, 13 Jul 2011 19:37:40 +0100 Subject: [PATCH 1/5] Apply NMU for sysvinit 2.88dsf-13.8, 2.88dsf-13.9 and 2.88dsf-13.10 --- debian/changelog | 27 ++++++++++++++++++++++ debian/control | 1 + debian/patches/40_multiarch_libcrypt.patch | 21 +++++++++++++++++ debian/patches/series | 1 + debian/rules | 3 +- debian/src/initscripts/etc/init.d/mountkernfs.sh | 1 + 6 files changed, 53 insertions(+), 1 deletions(-) create mode 100644 debian/patches/40_multiarch_libcrypt.patch diff --git a/debian/changelog b/debian/changelog index f1e8b86..f0d7ef4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,30 @@ +sysvinit (2.88dsf-13.10) unstable; urgency=low + + * Non-maintainer upload. + * Correct selinux-policy-default Breaks versioning (use <= rather + than <<). + + -- Roger Leigh <[email protected]> Thu, 09 Jun 2011 20:31:00 +0100 + +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. + * 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 --git a/debian/control b/debian/control index 0b83c59..b7e674f 100644 --- a/debian/control +++ b/debian/control @@ -55,6 +55,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${mount:Depends}, debianutils (>= 4 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 --git a/debian/patches/40_multiarch_libcrypt.patch b/debian/patches/40_multiarch_libcrypt.patch new file mode 100644 index 0000000..54dcb05 --- /dev/null +++ b/debian/patches/40_multiarch_libcrypt.patch @@ -0,0 +1,21 @@ +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 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),) ++ SULOGINLIBS += -lcrypt ++else ++ifneq ($(wildcard $(LIBDIR)*/libcrypt.a),) + SULOGINLIBS += -lcrypt + endif ++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 $@ diff --git a/debian/src/initscripts/etc/init.d/mountkernfs.sh b/debian/src/initscripts/etc/init.d/mountkernfs.sh index 25653b1..644aed1 100755 --- a/debian/src/initscripts/etc/init.d/mountkernfs.sh +++ b/debian/src/initscripts/etc/init.d/mountkernfs.sh @@ -40,6 +40,7 @@ mount_filesystems () { 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 -- 1.7.5.4
From 8a9aa8f1ca49e4d17562b3eb9361e1a63048afad Mon Sep 17 00:00:00 2001 From: Roger Leigh <[email protected]> Date: Wed, 13 Jul 2011 19:41:57 +0100 Subject: [PATCH 2/5] initscripts: Ensure /run/sendsigs.omit.d exists in postinst --- debian/changelog | 8 ++++++++ debian/initscripts.postinst | 3 +++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/debian/changelog b/debian/changelog index f0d7ef4..5df53ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +sysvinit (2.88dsf-13.11) unstable; urgency=low + + * Non-maintainer upload. + * initscripts provides /run/sendsigs.omit.d as soon as /run is + available. + + -- Roger Leigh <[email protected]> Sat, 09 Jul 2011 10:47:49 +0100 + sysvinit (2.88dsf-13.10) unstable; urgency=low * Non-maintainer upload. diff --git a/debian/initscripts.postinst b/debian/initscripts.postinst index 544c124..1d956bf 100755 --- a/debian/initscripts.postinst +++ b/debian/initscripts.postinst @@ -247,6 +247,9 @@ else echo "Please reboot to complete migration to tmpfs-based /run" > /run/.run-transition fi +# Ensure presence of /run/sendsigs.omit.d +[ -d /run/sendsigs.omit.d ] || { mkdir --mode=755 /run/sendsigs.omit.d ; chown root:root /run/sendsigs.omit.d || [ "$FAKECHROOT" = true ]; } + tmpfs_fstab_migrate # -- 1.7.5.4
From db07110b2b9e15f14d55b07ab80cf5eea708f97f Mon Sep 17 00:00:00 2001 From: Roger Leigh <[email protected]> Date: Wed, 13 Jul 2011 19:43:48 +0100 Subject: [PATCH 3/5] initscripts: Remove support for /dev/.udev.log in bootlogs --- debian/changelog | 4 +++- debian/src/initscripts/etc/init.d/bootlogs | 10 +--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5df53ef..604cc2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ sysvinit (2.88dsf-13.11) unstable; urgency=low * Non-maintainer upload. * initscripts provides /run/sendsigs.omit.d as soon as /run is available. + * initscripts bootlogs: Remove support for /dev/.udev.log, + which is no longer needed now udev uses /run. - -- Roger Leigh <[email protected]> Sat, 09 Jul 2011 10:47:49 +0100 + -- Roger Leigh <[email protected]> Wed, 13 Jul 2011 19:42:34 +0100 sysvinit (2.88dsf-13.10) unstable; urgency=low diff --git a/debian/src/initscripts/etc/init.d/bootlogs b/debian/src/initscripts/etc/init.d/bootlogs index 769e644..a4b5e2a 100644 --- a/debian/src/initscripts/etc/init.d/bootlogs +++ b/debian/src/initscripts/etc/init.d/bootlogs @@ -34,18 +34,10 @@ do_start () { kill $! [ -f /var/log/dmesg ] && { chgrp adm /var/log/dmesg || : ; } fi - - # - # Save udev log in /var/log/udev - # - if [ -e /dev/.udev.log ] - then - mv -f /dev/.udev.log /var/log/udev - fi } do_status () { - if [ -f /var/run/motd ] && [ ! -f /dev/.udev.log ] ; then + if [ -f /var/run/motd ] ; then return 0 else return 4 -- 1.7.5.4
From ab76195fcdcec3df93cb7fa46d5cb12d05df1cf7 Mon Sep 17 00:00:00 2001 From: Roger Leigh <[email protected]> Date: Wed, 13 Jul 2011 19:45:22 +0100 Subject: [PATCH 4/5] initscripts: Remove directory creation in umountroot --- debian/changelog | 6 +++++- debian/src/initscripts/etc/init.d/umountroot | 8 -------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 604cc2b..a35046b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,12 @@ sysvinit (2.88dsf-13.11) unstable; urgency=low available. * initscripts bootlogs: Remove support for /dev/.udev.log, which is no longer needed now udev uses /run. + * initscripts umountroot: Remove ubuntu-specific patch which + created directories on the root filesystem prior to umounting it. + This was never applicable to Debian, and is now no longer required + following the introduction of /run. - -- Roger Leigh <[email protected]> Wed, 13 Jul 2011 19:42:34 +0100 + -- Roger Leigh <[email protected]> Wed, 13 Jul 2011 19:44:16 +0100 sysvinit (2.88dsf-13.10) unstable; urgency=low diff --git a/debian/src/initscripts/etc/init.d/umountroot b/debian/src/initscripts/etc/init.d/umountroot index 51c4eb8..c1f2a4c 100755 --- a/debian/src/initscripts/etc/init.d/umountroot +++ b/debian/src/initscripts/etc/init.d/umountroot @@ -16,14 +16,6 @@ PATH=/sbin:/bin do_stop () { [ "$VERBOSE" = no ] || log_action_begin_msg "Mounting root filesystem read-only" - # These directories must exist on the root filesystem as they are - # targets for system mountpoints. We've just unmounted all other - # filesystems, so either they are mounted now (in which case the - # mount point exists) or we can make the mountpoint. - for dir in /proc /sys /var/run /var/lock; do - mkdir -p $dir || true - done - MOUNT_FORCE_OPT= [ "$(uname -s)" = "GNU/kFreeBSD" ] && MOUNT_FORCE_OPT=-f # This: -- 1.7.5.4
From bdaba287ed139f7f8d53da21a43786272c0bd6c7 Mon Sep 17 00:00:00 2001 From: Roger Leigh <[email protected]> Date: Wed, 13 Jul 2011 19:47:47 +0100 Subject: [PATCH 5/5] Close #633541 --- debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a35046b..aace715 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,9 +8,9 @@ sysvinit (2.88dsf-13.11) unstable; urgency=low * initscripts umountroot: Remove ubuntu-specific patch which created directories on the root filesystem prior to umounting it. This was never applicable to Debian, and is now no longer required - following the introduction of /run. + following the introduction of /run (Closes: #633541). - -- Roger Leigh <[email protected]> Wed, 13 Jul 2011 19:44:16 +0100 + -- Roger Leigh <[email protected]> Wed, 13 Jul 2011 19:47:10 +0100 sysvinit (2.88dsf-13.10) unstable; urgency=low -- 1.7.5.4
signature.asc
Description: Digital signature
_______________________________________________ Pkg-sysvinit-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-sysvinit-devel
