[Initscripts-ng-commits] r875 - in /trunk/src/insserv/debian: changelog patches/70_req_start_all_depends.patch patches/series

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

Author: kelmo-guest
Date: Sat Mar 14 15:52:12 2009
New Revision: 875

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=875
Log:
Add debian/patches/70_req_start_all_depends.patch to correct
dependency information written to .depend.* files for scripts which
declare Required-Start: $all. Thanks to upstream developer Werner
Fink for giving us th heads up about this problem and patch.

Added:
    trunk/src/insserv/debian/patches/70_req_start_all_depends.patch
Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/patches/series

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=875&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Sat Mar 14 15:52:12 2009
@@ -3,8 +3,12 @@
   * Convert dpatches to quilt series and adjust debian/rules and
     debian/control.
   * Refresh debian/patches/10_nosuse.patch to apply without fuzz.
-
- -- Kel Modderman <kel at otaku42.de>  Sun, 15 Mar 2009 01:47:45 +1000
+  * Add debian/patches/70_req_start_all_depends.patch to correct
+    dependency information written to .depend.* files for scripts which
+    declare Required-Start: $all. Thanks to upstream developer Werner
+    Fink for giving us th heads up about this problem and patch.
+
+ -- Kel Modderman <kel at otaku42.de>  Sun, 15 Mar 2009 01:51:45 +1000
 
 insserv (1.12.0-4) unstable; urgency=low
 

Added: trunk/src/insserv/debian/patches/70_req_start_all_depends.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/70_req_start_all_depends.patch?rev=875&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/70_req_start_all_depends.patch (added)
+++ trunk/src/insserv/debian/patches/70_req_start_all_depends.patch Sat Mar 14 15:52:12 2009
@@ -1,0 +1,28 @@
+Purpose: Correct dependency information written to .depend.* files
+         for scripts which declare Required-Start: $all
+Fixes:   nil
+Status:  Applied upstream.
+---
+--- a/insserv.c
++++ b/insserv.c
+@@ -776,9 +776,6 @@ static inline void makedep(void)
+ 	    continue;
+ #endif /* not MINIMAL_RULES */
+ 
+-	if (list_empty(&serv->sort.req))
+-	    continue;
+-
+ 	if (serv->start->lvl & LVL_BOOT)
+ 	    out = boot;
+ 	else
+@@ -820,6 +817,10 @@ static inline void makedep(void)
+ 		fprintf(out, " %s", name);
+ 	    }
+ 	} else {
++
++	    if (list_empty(&serv->sort.req))
++		continue;
++
+ 	    np_list_for_each(pos, &serv->sort.req) {
+ 		req_t * req = getreq(pos);
+ 		service_t * dep = req->serv;

Modified: trunk/src/insserv/debian/patches/series
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/series?rev=875&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/series (original)
+++ trunk/src/insserv/debian/patches/series Sat Mar 14 15:52:12 2009
@@ -4,3 +4,4 @@
 40_badboy_segfault.patch
 50_symlink_in_initddir.patch
 60_all_keyword_start_only.patch
+70_req_start_all_depends.patch