diff -u insserv-1.12.0/debian/control insserv-1.12.0/debian/control --- insserv-1.12.0/debian/control +++ insserv-1.12.0/debian/control @@ -1,14 +1,15 @@ Source: insserv Section: misc Priority: optional -Maintainer: Petter Reinholdtsen +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Petter Reinholdtsen Uploaders: Kel Modderman Build-Depends: debhelper (>= 6.0.7), po-debconf, quilt Standards-Version: 3.8.3 DM-Upload-Allowed: yes Homepage: http://ftp.suse.com/pub/projects/init/ -Vcs-Svn: svn://svn.debian.org/initscripts-ng/trunk/src/insserv -Vcs-Browser: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/ +XSBC-Debian-Vcs-Svn: svn://svn.debian.org/initscripts-ng/trunk/src/insserv +XSBC-Debian-Vcs-Browser: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/ Package: insserv Architecture: any diff -u insserv-1.12.0/debian/changelog insserv-1.12.0/debian/changelog --- insserv-1.12.0/debian/changelog +++ insserv-1.12.0/debian/changelog @@ -1,3 +1,11 @@ +insserv (1.12.0-14ubuntu1) lucid-proposed; urgency=low + + * Add 200_hide_insserv_on_ubuntu.patch: Move insserv out of system path + to disuade package maintainers from invoking it directly. (LP: + #897390) + + -- Adam Stokes Thu, 23 Feb 2012 13:14:48 +0000 + insserv (1.12.0-14) unstable; urgency=low * Remove obsolete rules targets missing-overrides, bin-by-inst.txt, diff -u insserv-1.12.0/debian/patches/series insserv-1.12.0/debian/patches/series --- insserv-1.12.0/debian/patches/series +++ insserv-1.12.0/debian/patches/series @@ -22,0 +23 @@ +200_hide_insserv_on_ubuntu.patch only in patch2: unchanged: --- insserv-1.12.0.orig/debian/patches/200_hide_insserv_on_ubuntu.patch +++ insserv-1.12.0/debian/patches/200_hide_insserv_on_ubuntu.patch @@ -0,0 +1,24 @@ +Description: Move insserv binaries out of the default path + On Ubuntu, running insserv directly can devastate your boot and + shutdown sequence. This can cause many problems, including data loss + and incomplete migrations on upgrades (such as the /run migration) + . + Since 3rd-party software packages are known to run insserv directly + if it's available, this patch makes it unavailable by moving it to + /usr/lib, where it can't cause as much trouble. +Author: Adam Stokes +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/insserv/+bug/858122 + +Index: insserv-1.12.0/Makefile +=================================================================== +--- insserv-1.12.0.orig/Makefile 2012-02-23 13:11:53.331391042 +0000 ++++ insserv-1.12.0/Makefile 2012-02-23 13:12:13.871388570 +0000 +@@ -52,7 +52,7 @@ endif + LINK = ln -sf + # + SDOCDIR = $(DESTDIR)/usr/share/man/man8 +- SBINDIR = $(DESTDIR)/sbin ++ SBINDIR = $(DESTDIR)/usr/lib/insserv + CONFDIR = $(DESTDIR)/etc + LSBDIR = $(DESTDIR)/lib/lsb + USRLSBDIR = $(DESTDIR)/usr/lib/lsb