Author: pere
Date: Wed Jul 22 21:49:16 2009
New Revision: 925
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=925
Log:
New patch 71_complete_makefile from upstream fixing .depend.*
content when processing virtual facility definitions refering to
other virtual facilities (Closes: #534526).
Added:
trunk/src/insserv/debian/patches/71_complete_makefile.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=925&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Wed Jul 22 21:49:16 2009
@@ -5,6 +5,9 @@
* Simplify test for bug #534526, while still triggering the bug.
* Change definition of $time to make hwclock optional, as it might
be dropped from the boot sequence in the future.
+ * New patch 71_complete_makefile from upstream fixing .depend.*
+ content when processing virtual facility definitions refering to
+ other virtual facilities (Closes: #534526).
[ Kel Modderman ]
* Before inserting an initscript with insserv, check that
Added: 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=925&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/71_complete_makefile.patch (added)
+++ trunk/src/insserv/debian/patches/71_complete_makefile.patch Wed Jul 22
21:49:16 2009
@@ -1,0 +1,49 @@
+Purpose: Make sure the .depend.* files have complete dependencies when
+ recursive virtual facilities are used.
+Fixes: #534526
+Status: From upstream
+---
+Index: insserv/insserv.c
+--- insserv-1.12.0.orig/insserv.c
++++ insserv-1.12.0/insserv.c
+@@ -2028,29 +2028,22 @@
+ goto out;
+ }
+
+- if ((*deep)++ > 10) {
+- 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 == '$') {
+- expand_faci(tmp, head, deep);
+- } else {
+- if (*deep == 1) {
+- if (--(*rent->r[0].ref) <= 0)
+- free(rent->r[0].ref);
+- rent->r[0] = rnxt->r[0];
+- ++(*rent->r[0].ref);
+- } else {
+- repl_t *restrict subst;
+- if (posix_memalign((void*)&subst, sizeof(void*),
alignof(repl_t)) != 0)
+- error("%s", strerror(errno));
+- insert(&subst->r_list, head);
+- subst->r[0] = rnxt->r[0];
+- ++(*subst->r[0].ref);
++ if ((*deep)++ > 10) {
++ warn("The nested level of the system facilities in the
insserv.conf file(s) is to large\n");
++ goto out;
+ }
++ expand_faci(tmp, head, deep);
++ } else if (*deep > 0) {
++ repl_t *restrict subst;
++ if (posix_memalign((void*)&subst, sizeof(void*),
alignof(repl_t)) != 0)
++ error("%s", strerror(errno));
++ insert(&subst->r_list, head->prev);
++ subst->r[0] = rnxt->r[0];
++ (*subst->r[0].ref) = 1;
+ }
+ }
+ out:
Modified: trunk/src/insserv/debian/patches/series
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/series?rev=925&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/series (original)
+++ trunk/src/insserv/debian/patches/series Wed Jul 22 21:49:16 2009
@@ -6,6 +6,7 @@
60_all_keyword_start_only.patch
61_interactive_keyword.patch
70_req_start_all_depends.patch
+71_complete_makefile.patch
80_manual_warnings.patch
90_no_runlevel_spec_for_debian.patch
91_kfreebsd_nofadvice.patch
_______________________________________________
Initscripts-ng-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/initscripts-ng-commits
