[Initscripts-ng-commits] r827 - in /trunk/src/insserv/debian: changelog patches/00list patches/91_xlstat_initddir_to_detect_illegal_symlink.dpatch run-testsuite

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Tue Jul 29 13:02:06 2008
New Revision: 827

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=827
Log:
Drop 91_xlstat_initddir_to_detect_illegal_symlink.dpatch, adjust symlink test function to error if insserv make links for illegally symlinked initscripts.

Removed:
    trunk/src/insserv/debian/patches/91_xlstat_initddir_to_detect_illegal_symlink.dpatch
Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/patches/00list
    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=827&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Tue Jul 29 13:02:06 2008
@@ -57,15 +57,12 @@
     they are present, but not fail otherwise.
   * Add test_initd_symlink() test suite function to test if illegal
     symlinks in /etc/init.d/ cause problems.
-  * Add 91_xlstat_initddir_to_detect_illegal_symlink.dpatch to detect
-    and avoid illegal symlinks to other script in /etc/init.d/.
-    (Closes: #485045)
   * Add 80_debian_lvl_constants.dpatch to correct assign bit values to
     runlevel constants.
   * Bump Standards Version to 3.8.0, add debian/README.source to describe patch
     system to conform. No other changes required.
 
- -- Kel Modderman <kel at otaku42.de>  Tue, 29 Jul 2008 21:43:09 +1000
+ -- Kel Modderman <kel at otaku42.de>  Tue, 29 Jul 2008 23:00:46 +1000
 
 insserv (1.11.0-9) unstable; urgency=low
 

Modified: trunk/src/insserv/debian/patches/00list
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/00list?rev=827&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/00list (original)
+++ trunk/src/insserv/debian/patches/00list Tue Jul 29 13:02:06 2008
@@ -3,4 +3,3 @@
 80_debian_lvl_constants
 81_debian_default_start_stop_warnings
 90_fix_bashism_in_makefile
-91_xlstat_initddir_to_detect_illegal_symlink

Modified: trunk/src/insserv/debian/run-testsuite
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/run-testsuite?rev=827&op=diff
==============================================================================
--- trunk/src/insserv/debian/run-testsuite (original)
+++ trunk/src/insserv/debian/run-testsuite Tue Jul 29 13:02:06 2008
@@ -1478,19 +1478,15 @@
 # Now make an illegal symlink to see if it causes problems, #485045
 ln -s symlinked ${initddir}/symlink
 
-# First try to insert service provided by symlink. It should be ignored.
-insserv_reg symlink || true
-
-# Now insert the symlink target, the actual script.
 insserv_reg symlinked || true
 
 list_rclinks
 
-check_script_present 1 symlinked
-check_script_present 2 symlinked
-check_script_present 3 symlinked
-check_script_present 4 symlinked
-check_script_present 5 symlinked
+check_script_not_present 1 symlinked
+check_script_not_present 2 symlinked
+check_script_not_present 3 symlinked
+check_script_not_present 4 symlinked
+check_script_not_present 5 symlinked
 }
 ##########################################################################