Author: pere
Date: Thu Jul 23 03:03:12 2009
New Revision: 928
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=928
Log:
Adjust patch 71_complete_makefile to make sure the recursion depth
calculation is done correctly in expand_faci().
Modified:
trunk/src/insserv/debian/changelog
trunk/src/insserv/debian/patches/71_complete_makefile.patch
Modified: trunk/src/insserv/debian/changelog
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=928&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Thu Jul 23 03:03:12 2009
@@ -1,3 +1,10 @@
+insserv (1.12.0-9) UNRELEASED; urgency=low
+
+ * Adjust patch 71_complete_makefile to make sure the recursion depth
+ calculation is done correctly in expand_faci().
+
+ -- Petter Reinholdtsen <[email protected]> Thu, 23 Jul 2009 05:01:25 +0200
+
insserv (1.12.0-8) unstable; urgency=low
[ Petter Reinholdtsen ]
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=928&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/71_complete_makefile.patch (original)
+++ trunk/src/insserv/debian/patches/71_complete_makefile.patch Thu Jul 23
03:03:12 2009
@@ -1,12 +1,20 @@
Purpose: Make sure the .depend.* files have complete dependencies when
recursive virtual facilities are used.
Fixes: #534526
-Status: From upstream
+Status: From upstream, adjusted by Petter Reinholdtsen.
---
-Index: insserv/insserv.c
+Index: insserv-1.12.0/insserv.c
--- insserv-1.12.0.orig/insserv.c
+++ insserv-1.12.0/insserv.c
-@@ -2028,29 +2028,22 @@
+@@ -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 @@
goto out;
}
@@ -32,7 +40,7 @@
- insert(&subst->r_list, head);
- subst->r[0] = rnxt->r[0];
- ++(*subst->r[0].ref);
-+ if ((*deep)++ > 10) {
++ if (*deep > 10) {
+ warn("The nested level of the system facilities in the
insserv.conf file(s) is to large\n");
+ goto out;
}
_______________________________________________
Initscripts-ng-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/initscripts-ng-commits
