[Initscripts-ng-commits] r958 - /trunk/src/insserv/debian/patches/94_v1_12_2.patch

[pere at users.alioth.debian.org]

Author: pere
Date: Tue Aug 18 14:01:11 2009
New Revision: 958

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=958
Log:
Update patch from upstream to initialize new variable.

Modified:
    trunk/src/insserv/debian/patches/94_v1_12_2.patch

Modified: trunk/src/insserv/debian/patches/94_v1_12_2.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/94_v1_12_2.patch?rev=958&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/94_v1_12_2.patch (original)
+++ trunk/src/insserv/debian/patches/94_v1_12_2.patch Tue Aug 18 14:01:11 2009
@@ -1,17 +1,35 @@
 Patch from upstream to detect and reject loops in virtual
 facilities (#541613) and warn about indirect dependencies to $all.
 
---- insserv/insserv.c
-+++ insserv/insserv.c	2009-08-17 14:00:25.841900763 +0200
-@@ -222,6 +222,7 @@ typedef struct string {
- 
+Index: insserv/insserv.c
+===================================================================
+--- insserv.orig/insserv.c	2009-08-18 15:59:23.000000000 +0200
++++ insserv/insserv.c	2009-08-18 15:59:23.000000000 +0200
+@@ -231,6 +231,7 @@
  typedef struct repl {
      list_t     r_list;
+     string_t	 r[1];
 +    ushort	flags;
-     string_t	 r[1];
  } __align repl_t;
  #define getrepl(arg)	list_entry((arg), struct repl, r_list)
-@@ -2060,13 +2061,19 @@ static void expand_faci(list_t *restrict
+ 
+@@ -1890,6 +1891,7 @@
+ 				if (posix_memalign((void*)&subst, sizeof(void*), alignof(repl_t)) != 0)
+ 				    error("%s", strerror(errno));
+ 				insert(&subst->r_list, r_list->prev);
++				subst->flags = 0;
+ 				r = &subst->r[0];
+ 				if (posix_memalign((void*)&r->ref, sizeof(void*), alignof(typeof(r->ref))+strsize(token)) != 0)
+ 				    error("%s", strerror(errno));
+@@ -1919,6 +1921,7 @@
+ 				error("%s", strerror(errno));
+ 			    insert(&subst->r_list, r_list->prev);
+ 			    r = &subst->r[0];
++			    subst->flags = 0;
+ 			    if (posix_memalign((void*)&r->ref, sizeof(void*), alignof(typeof(r->ref))+strsize(token)) != 0)
+ 				error("%s", strerror(errno));
+ 			    *r->ref = 1;
+@@ -2071,13 +2074,19 @@
  
  	list_for_each_safe(tmp, safe, ptr) {
  	    repl_t * rnxt = getrepl(tmp);
@@ -31,7 +49,7 @@
  		(*deep)--;
  	    } else if (*deep > 0) {
  		repl_t *restrict subst;
-@@ -2087,9 +2094,12 @@ static inline void expand_conf(void)
+@@ -2098,9 +2107,12 @@
      list_for_each(ptr, sysfaci_start) {
  	list_t * rlist, * safe, * head = &getfaci(ptr)->replace;
  	list_for_each_safe(rlist, safe, head) {
@@ -45,9 +63,11 @@
  	    }
  	}
      }
---- insserv/listing.c
-+++ insserv/listing.c	2009-08-17 14:15:48.893900934 +0200
-@@ -398,6 +399,12 @@ static void __follow (dir_t *restrict di
+Index: insserv/listing.c
+===================================================================
+--- insserv.orig/listing.c	2009-08-18 15:58:35.000000000 +0200
++++ insserv/listing.c	2009-08-18 15:59:23.000000000 +0200
+@@ -398,6 +398,12 @@
  		break;				/* Loop detected, stop recursion */
  	    }