[Pkg-sysvinit-commits] r1475 - in sysvinit/trunk/debian: . startpar startpar/patches

[Kel Modderman]

Author: kelmo-guest
Date: 2009-07-18 17:14:25 +0000 (Sat, 18 Jul 2009)
New Revision: 1475

Added:
   sysvinit/trunk/debian/startpar/patches/04_makeboot_loop_upper_bound.patch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/startpar/makeboot.c
   sysvinit/trunk/debian/startpar/patches/series
Log:
Patch startpar maekboot.c to allow a much higher amount of loops when
calculating dependecies from make files.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-18 15:47:05 UTC (rev 1474)
+++ sysvinit/trunk/debian/changelog	2009-07-18 17:14:25 UTC (rev 1475)
@@ -36,8 +36,10 @@
     the origin of startpar upstream.
   * Update startpar to version 0.53.1 upstream. Add Debian quilt patch series
     to ./debian/startpar/patches, while they wait for inclusion upstream.
+  * Patch startpar maekboot.c to allow a much higher amount of loops when
+    calculating dependecies from make files.
 
- -- Kel Modderman <kel at otaku42.de>  Sun, 19 Jul 2009 01:42:21 +1000
+ -- Kel Modderman <kel at otaku42.de>  Sun, 19 Jul 2009 03:12:56 +1000
 
 sysvinit (2.86.ds1-65) unstable; urgency=low
 

Modified: sysvinit/trunk/debian/startpar/makeboot.c
===================================================================
--- sysvinit/trunk/debian/startpar/makeboot.c	2009-07-18 15:47:05 UTC (rev 1474)
+++ sysvinit/trunk/debian/startpar/makeboot.c	2009-07-18 17:14:25 UTC (rev 1475)
@@ -117,7 +117,7 @@
 			fprintf(stderr, "loop exists %s in %s!\n", dep->name, src->name);
 			return 1;
 		}
-		if (loop++ > 999)
+		if (loop++ > 99999)
 			return 1;
 		if (check_loop(s->node, src))
 			return 1;

Added: sysvinit/trunk/debian/startpar/patches/04_makeboot_loop_upper_bound.patch
===================================================================
--- sysvinit/trunk/debian/startpar/patches/04_makeboot_loop_upper_bound.patch	                        (rev 0)
+++ sysvinit/trunk/debian/startpar/patches/04_makeboot_loop_upper_bound.patch	2009-07-18 17:14:25 UTC (rev 1475)
@@ -0,0 +1,18 @@
+Purpose: Increase number of allowed dependency checking loops in makeboot.c.
+         999 seems to be too low, which causes make like boot to use an
+	 incorrect sequence.
+Fixes:   None.
+Status:  Not submitted upstream. Work in progress.
+         Needs further discussion/investigation.
+---
+--- a/makeboot.c
++++ b/makeboot.c
+@@ -117,7 +117,7 @@ static int check_loop(struct makenode *d
+ 			fprintf(stderr, "loop exists %s in %s!\n", dep->name, src->name);
+ 			return 1;
+ 		}
+-		if (loop++ > 999)
++		if (loop++ > 99999)
+ 			return 1;
+ 		if (check_loop(s->node, src))
+ 			return 1;

Modified: sysvinit/trunk/debian/startpar/patches/series
===================================================================
--- sysvinit/trunk/debian/startpar/patches/series	2009-07-18 15:47:05 UTC (rev 1474)
+++ sysvinit/trunk/debian/startpar/patches/series	2009-07-18 17:14:25 UTC (rev 1475)
@@ -2,3 +2,4 @@
 01_dev_pts_workaround.patch
 02_posix_fadvise_kfreebsd.patch 
 03_o_direct_undef.patch 
+04_makeboot_loop_upper_bound.patch