[Pkg-sysvinit-commits] r1965 - in sysvinit/trunk/debian: . patches src/initscripts/etc/init.d

Sun Jul 24 08:15:45 UTC 2011

Author: pere
Date: 2011-07-24 08:15:45 +0000 (Sun, 24 Jul 2011)
New Revision: 1965

Added:
   sysvinit/trunk/debian/patches/40_multiarch_libcrypt.patch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/control
   sysvinit/trunk/debian/initscripts.postinst
   sysvinit/trunk/debian/patches/series
   sysvinit/trunk/debian/rules
   sysvinit/trunk/debian/src/initscripts/etc/init.d/bootlogs
   sysvinit/trunk/debian/src/initscripts/etc/init.d/mountkernfs.sh
   sysvinit/trunk/debian/src/initscripts/etc/init.d/umountroot
Log:
Integrate changes done in NMUs.

Modified: sysvinit/trunk/debian/changelog
===================================================================

--- sysvinit/trunk/debian/changelog	2011-05-22 12:14:17 UTC (rev 1964)
+++ sysvinit/trunk/debian/changelog	2011-07-24 08:15:45 UTC (rev 1965)
@@ -1,3 +1,44 @@
+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.
+  * 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 (Closes: #633541).
+
+ -- Roger Leigh <rleigh at debian.org>  Wed, 13 Jul 2011 19:47:10 +0100
+
+sysvinit (2.88dsf-13.10) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Correct selinux-policy-default Breaks versioning (use <= rather
+    than <<).
+
+ -- Roger Leigh <rleigh at debian.org>  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 <rleigh at debian.org>  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 <rleigh at debian.org>  Thu, 09 Jun 2011 13:35:56 +0100
+
 sysvinit (2.88dsf-13.7) unstable; urgency=low
 
   [ Roger Leigh ]

Modified: sysvinit/trunk/debian/control
===================================================================
--- sysvinit/trunk/debian/control	2011-05-22 12:14:17 UTC (rev 1964)
+++ sysvinit/trunk/debian/control	2011-07-24 08:15:45 UTC (rev 1965)
@@ -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.

Modified: sysvinit/trunk/debian/initscripts.postinst
===================================================================
--- sysvinit/trunk/debian/initscripts.postinst	2011-05-22 12:14:17 UTC (rev 1964)
+++ sysvinit/trunk/debian/initscripts.postinst	2011-07-24 08:15:45 UTC (rev 1965)
@@ -247,6 +247,9 @@
 	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
 
 #

Added: sysvinit/trunk/debian/patches/40_multiarch_libcrypt.patch
===================================================================
--- sysvinit/trunk/debian/patches/40_multiarch_libcrypt.patch	                        (rev 0)
+++ sysvinit/trunk/debian/patches/40_multiarch_libcrypt.patch	2011-07-24 08:15:45 UTC (rev 1965)
@@ -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
+ 

Modified: sysvinit/trunk/debian/patches/series
===================================================================
--- sysvinit/trunk/debian/patches/series	2011-05-22 12:14:17 UTC (rev 1964)
+++ sysvinit/trunk/debian/patches/series	2011-07-24 08:15:45 UTC (rev 1965)
@@ -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

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2011-05-22 12:14:17 UTC (rev 1964)
+++ sysvinit/trunk/debian/rules	2011-07-24 08:15:45 UTC (rev 1965)
@@ -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 $@
 

Modified: sysvinit/trunk/debian/src/initscripts/etc/init.d/bootlogs
===================================================================
--- sysvinit/trunk/debian/src/initscripts/etc/init.d/bootlogs	2011-05-22 12:14:17 UTC (rev 1964)
+++ sysvinit/trunk/debian/src/initscripts/etc/init.d/bootlogs	2011-07-24 08:15:45 UTC (rev 1965)
@@ -34,18 +34,10 @@
 		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

Modified: sysvinit/trunk/debian/src/initscripts/etc/init.d/mountkernfs.sh
===================================================================
--- sysvinit/trunk/debian/src/initscripts/etc/init.d/mountkernfs.sh	2011-05-22 12:14:17 UTC (rev 1964)
+++ sysvinit/trunk/debian/src/initscripts/etc/init.d/mountkernfs.sh	2011-07-24 08:15:45 UTC (rev 1965)
@@ -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

Modified: sysvinit/trunk/debian/src/initscripts/etc/init.d/umountroot
===================================================================
--- sysvinit/trunk/debian/src/initscripts/etc/init.d/umountroot	2011-05-22 12:14:17 UTC (rev 1964)
+++ sysvinit/trunk/debian/src/initscripts/etc/init.d/umountroot	2011-07-24 08:15:45 UTC (rev 1965)
@@ -16,14 +16,6 @@
 
 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:


