[Initscripts-ng-commits] r964 - in /trunk/src/insserv/debian/patches: 61_interactive_keyword.patch 70_req_start_all_depends.patch 71_complete_makefile.patch

Sun Aug 23 22:12:28 UTC 2009

Author: pere
Date: Sun Aug 23 22:12:28 2009
New Revision: 964

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=964
Log:
Refresh patch.

Modified:
    trunk/src/insserv/debian/patches/61_interactive_keyword.patch
    trunk/src/insserv/debian/patches/70_req_start_all_depends.patch
    trunk/src/insserv/debian/patches/71_complete_makefile.patch

Modified: trunk/src/insserv/debian/patches/61_interactive_keyword.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/61_interactive_keyword.patch?rev=964&op=diff
==============================================================================

--- trunk/src/insserv/debian/patches/61_interactive_keyword.patch (original)
+++ trunk/src/insserv/debian/patches/61_interactive_keyword.patch Sun Aug 23 22:12:28 2009
@@ -5,8 +5,8 @@
 
 Index: insserv/insserv.8.in
 ===================================================================
---- insserv.orig/insserv.8.in	2009-06-26 12:34:17.000000000 +0200
-+++ insserv/insserv.8.in	2009-06-26 12:34:19.000000000 +0200
+--- insserv.orig/insserv.8.in	2009-08-24 00:10:54.000000000 +0200
++++ insserv/insserv.8.in	2009-08-24 00:11:53.000000000 +0200
 @@ -76,6 +76,7 @@
   # X-Stop-After:      boot_facility_1 [ boot_facility_2 ...]
   # Default-Start:     run_level_1 [ run_level_2 ...]
@@ -29,8 +29,8 @@
  keyword implies that the script using this keyword
 Index: insserv/insserv.c
 ===================================================================
---- insserv.orig/insserv.c	2009-06-26 12:34:19.000000000 +0200
-+++ insserv/insserv.c	2009-06-26 12:34:19.000000000 +0200
+--- insserv.orig/insserv.c	2009-08-24 00:11:22.000000000 +0200
++++ insserv/insserv.c	2009-08-24 00:12:02.000000000 +0200
 @@ -97,6 +97,7 @@
  #define DEFAULT_START	DEFAULT  START VALUE
  #define DEFAULT_STOP	DEFAULT  STOP  VALUE
@@ -55,7 +55,7 @@
  } attribute((aligned(sizeof(regex_t)))) reg_t;
  
  typedef struct creg_struct {
-@@ -1137,6 +1140,7 @@
+@@ -1132,6 +1135,7 @@
      regcompiler(&reg.def_start, DEFAULT_START,  REG_EXTENDED|REG_ICASE|REG_NEWLINE);
      regcompiler(&reg.def_stop,  DEFAULT_STOP,   REG_EXTENDED|REG_ICASE|REG_NEWLINE);
      regcompiler(&reg.desc,      DESCRIPTION,    REG_EXTENDED|REG_ICASE|REG_NEWLINE);
@@ -63,7 +63,7 @@
  }
  
  static inline void scan_script_reset(void) attribute((always_inline));
-@@ -1152,6 +1156,7 @@
+@@ -1147,6 +1151,7 @@
      xreset(script_inf.default_start);
      xreset(script_inf.default_stop);
      xreset(script_inf.description);
@@ -71,7 +71,7 @@
  }
  
  #define FOUND_LSB_HEADER   0x01
-@@ -1182,6 +1187,7 @@
+@@ -1177,6 +1182,7 @@
  #define default_start	script_inf.default_start
  #define default_stop	script_inf.default_stop
  #define description	script_inf.description
@@ -79,7 +79,7 @@
  
      info("Loading %s\n", path);
  
-@@ -1278,6 +1284,14 @@
+@@ -1273,6 +1279,14 @@
  		description = empty;
  	}
  
@@ -94,7 +94,7 @@
  	/* Skip scanning below from LSB magic end */
  	if ((end = strstr(buf, "### END INIT INFO")))
  	    break;
-@@ -1346,6 +1360,7 @@
+@@ -1341,6 +1355,7 @@
  #undef default_start
  #undef default_stop
  #undef description
@@ -102,7 +102,7 @@
      return ret;
  }
  
-@@ -1508,6 +1523,7 @@
+@@ -1503,6 +1518,7 @@
      regfree(&reg.def_start);
      regfree(&reg.def_stop);
      regfree(&reg.desc);
@@ -110,7 +110,7 @@
  }
  
  static struct {
-@@ -1786,6 +1802,9 @@
+@@ -1781,6 +1797,9 @@
  		if (script_inf.stop_after && script_inf.stop_after != empty) {
  		    reversereq(service, REQ_SHLD|REQ_KILL, script_inf.stop_after);
  		}
@@ -120,7 +120,7 @@
  	    }
  
  	    if (name) 
-@@ -2886,6 +2905,9 @@
+@@ -2881,6 +2900,9 @@
  			if (script_inf.should_stop && script_inf.should_stop != empty) {
  			    rememberreq(service, REQ_SHLD|REQ_KILL, script_inf.should_stop);
  			}

Modified: trunk/src/insserv/debian/patches/70_req_start_all_depends.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/70_req_start_all_depends.patch?rev=964&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/70_req_start_all_depends.patch (original)
+++ trunk/src/insserv/debian/patches/70_req_start_all_depends.patch Sun Aug 23 22:12:28 2009
@@ -5,9 +5,9 @@
 ---
 Index: insserv/insserv.c
 ===================================================================
---- insserv.orig/insserv.c	2009-06-26 08:14:31.000000000 +0200
-+++ insserv/insserv.c	2009-06-26 08:14:31.000000000 +0200
-@@ -779,9 +779,6 @@
+--- insserv.orig/insserv.c	2009-08-24 00:11:22.000000000 +0200
++++ insserv/insserv.c	2009-08-24 00:11:59.000000000 +0200
+@@ -774,9 +774,6 @@
  	    continue;
  #endif /* not MINIMAL_RULES */
  
@@ -17,7 +17,7 @@
  	if (serv->start->lvl & LVL_BOOT)
  	    out = boot;
  	else
-@@ -823,6 +820,10 @@
+@@ -818,6 +815,10 @@
  		fprintf(out, " %s", name);
  	    }
  	} else {

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=964&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/71_complete_makefile.patch (original)
+++ trunk/src/insserv/debian/patches/71_complete_makefile.patch Sun Aug 23 22:12:28 2009
@@ -3,10 +3,11 @@
 Fixes:   #534526
 Status:  From upstream.
 ---
-Index: insserv-1.12.0/insserv.c
---- insserv-1.12.0.orig/insserv.c
-+++ insserv-1.12.0/insserv.c
-@@ -2058,33 +2058,26 @@ static void expand_faci(list_t *restrict
+Index: insserv/insserv.c
+===================================================================
+--- insserv.orig/insserv.c	2009-08-24 00:11:22.000000000 +0200
++++ insserv/insserv.c	2009-08-24 00:11:51.000000000 +0200
+@@ -2053,33 +2053,26 @@
  	    goto out;
  	}
  


