Author: pere
Date: Thu Jul 23 17:50:40 2009
New Revision: 929
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=929
Log:
Adjust patch 71_complete_makefile again, this time with version from upstream.
Modified:
trunk/src/insserv/debian/patches/71_complete_makefile.patch
Modified: trunk/src/insserv/debian/patches/71_complete_makefile.patch
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/71_complete_makefile.patch?rev=929&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/71_complete_makefile.patch (original)
+++ trunk/src/insserv/debian/patches/71_complete_makefile.patch Thu Jul 23
17:50:40 2009
@@ -1,20 +1,12 @@
Purpose: Make sure the .depend.* files have complete dependencies when
recursive virtual facilities are used.
Fixes: #534526
-Status: From upstream, adjusted by Petter Reinholdtsen.
+Status: From upstream.
---
Index: insserv-1.12.0/insserv.c
--- insserv-1.12.0.orig/insserv.c
+++ insserv-1.12.0/insserv.c
-@@ -2012,6 +2012,7 @@
- {
- repl_t * rent = getrepl(rlist);
- list_t * tmp, * safe, * ptr = (list_t*)0;
-+ (*deep)++;
-
- list_for_each(tmp, sysfaci_start) {
- if (!strcmp(getfaci(tmp)->name, rent->r[0].name)) {
-@@ -2028,29 +2029,22 @@
+@@ -2058,33 +2058,26 @@ static void expand_faci(list_t *restrict
goto out;
}
@@ -22,7 +14,7 @@
- warn("The nested level of the system facilities in the insserv.conf
file(s) is to large\n");
- goto out;
- }
-
+-
list_for_each_safe(tmp, safe, ptr) {
repl_t * rnxt = getrepl(tmp);
if (*rnxt->r[0].name == '$') {
@@ -44,7 +36,9 @@
+ warn("The nested level of the system facilities in the
insserv.conf file(s) is to large\n");
+ goto out;
}
++ (*deep)++;
+ expand_faci(tmp, head, deep);
++ (*deep)--;
+ } else if (*deep > 0) {
+ repl_t *restrict subst;
+ if (posix_memalign((void*)&subst, sizeof(void*),
alignof(repl_t)) != 0)
@@ -55,3 +49,7 @@
}
}
out:
+- (*deep)--;
+ return;
+ }
+
_______________________________________________
Initscripts-ng-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/initscripts-ng-commits
