[Initscripts-ng-commits] r947 - in /trunk/src/insserv/debian: changelog patches/20_install_perms_fixup.patch patches/21_tests_suite_new_functions.patch patches/series run-testsuite testsuite-common

[pere at users.alioth.debian.org]

Author: pere
Date: Sun Aug  2 08:56:00 2009
New Revision: 947

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=947
Log:
* New patch 20_install_perms_fixup making sure to install binaries
  with mode 755 and documentation with omde 644.
* New patch 21_tests_suite_new_functions adding two functions to the
  test suite.

Added:
    trunk/src/insserv/debian/patches/20_install_perms_fixup.patch
    trunk/src/insserv/debian/patches/21_tests_suite_new_functions.patch
Removed:
    trunk/src/insserv/debian/testsuite-common
Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/patches/series
    trunk/src/insserv/debian/run-testsuite

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=947&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Sun Aug  2 08:56:00 2009
@@ -11,6 +11,10 @@
   * Drop dependencies on sysv-rc, initscripts and sysvinit-utils, and
     leave it for sys-rc to pull in the packages needed for dependency
     based boot sequencing to work properly.
+  * New patch 20_install_perms_fixup making sure to install binaries
+    with mode 755 and documentation with omde 644.
+  * New patch 21_tests_suite_new_functions adding two functions to the
+    test suite.
 
  -- Petter Reinholdtsen <pere at debian.org>  Tue, 28 Jul 2009 19:16:21 +0200
 

Added: trunk/src/insserv/debian/patches/20_install_perms_fixup.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/20_install_perms_fixup.patch?rev=947&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/20_install_perms_fixup.patch (added)
+++ trunk/src/insserv/debian/patches/20_install_perms_fixup.patch Sun Aug  2 08:56:00 2009
@@ -1,0 +1,27 @@
+Purpose: Use correct permissions for installing /sbin/insserv and
+         /etc/insserv.conf
+Authour: Kel Modderman
+Fixes:   -
+Status:  Not yet submitted upstream.
+
+--- a/Makefile
++++ b/Makefile
+@@ -41,14 +41,14 @@ endif
+ 	     RM = rm -f
+ 	  MKDIR = mkdir -p
+ 	  RMDIR = rm -rf
+-   INSTBINFLAGS = -m 0700
++   INSTBINFLAGS = -m 0755
+ 	INSTBIN = install $(INSTBINFLAGS)
+-   INSTSRPFLAGS = -m 0700
++   INSTSRPFLAGS = -m 0755
+ 	INSTSRP = install $(INSTSRPFLAGS)
+-   INSTDOCFLAGS = -c -m 0444
++   INSTDOCFLAGS = -c -m 0644
+ 	INSTDOC = install $(INSTDOCFLAGS)
+    INSTCONFLAGS = -c -m 0644
+-	INSTCON = install $(INSTDOCFLAGS)
++	INSTCON = install $(INSTCONFLAGS)
+ 	   LINK = ln -sf
+ #
+ 	SDOCDIR = $(DESTDIR)/usr/share/man/man8

Added: trunk/src/insserv/debian/patches/21_tests_suite_new_functions.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/21_tests_suite_new_functions.patch?rev=947&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/21_tests_suite_new_functions.patch (added)
+++ trunk/src/insserv/debian/patches/21_tests_suite_new_functions.patch Sun Aug  2 08:56:00 2009
@@ -1,0 +1,34 @@
+Purpose: Add some extra functions used by Debian test suite script
+Authour: Kel Modderman
+Fixes:   -
+Status:  Should be sent upstream
+
+--- a/tests/suite
++++ b/tests/suite
+@@ -94,6 +94,12 @@ insserv_del ()
+     $insserv $debug -c $insconf -p $initddir -o $overridedir -r $script
+ }
+ 
++initdir_purge ()
++{
++    rm -rf ${initddir}/../rc*.d ${initddir}
++    mkdir -p ${initddir}
++}
++
+ relpath ()
+ {
+     local OLDIFS IFS
+@@ -201,6 +207,13 @@ addscript ()
+     chmod u+w,a+rx $script
+ }
+ 
++remscript ()
++{
++    local scriptname=$1
++    local script=${initddir}/$scriptname
++    rm -f $script
++}
++
+ insertscript ()
+ {
+     local scriptname=$1

Modified: trunk/src/insserv/debian/patches/series
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/series?rev=947&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/series (original)
+++ trunk/src/insserv/debian/patches/series Sun Aug  2 08:56:00 2009
@@ -1,5 +1,7 @@
 10_nosuse.patch
 11_debian_conf.patch
+20_install_perms_fixup.patch
+21_tests_suite_new_functions.patch
 30_deterministic_order.patch
 40_badboy_segfault.patch
 50_symlink_in_initddir.patch

Modified: trunk/src/insserv/debian/run-testsuite
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/run-testsuite?rev=947&op=diff
==============================================================================
--- trunk/src/insserv/debian/run-testsuite (original)
+++ trunk/src/insserv/debian/run-testsuite Sun Aug  2 08:56:00 2009
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 basedir=$(dirname $0)
-. $basedir/testsuite-common
+. $basedir/../tests/suite
 
 if head -1 debian/changelog | grep -q UNRELEASED ; then
     severity=check