Author: pere
Date: Sun Aug 23 22:11:30 2009
New Revision: 963
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=963
Log:
Refresh patch.
Modified:
trunk/src/insserv/debian/patches/95_stop_all.patch
Modified: trunk/src/insserv/debian/patches/95_stop_all.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/95_stop_all.patch?rev=963&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/95_stop_all.patch (original)
+++ trunk/src/insserv/debian/patches/95_stop_all.patch Sun Aug 23 22:11:30 2009
@@ -4,11 +4,13 @@
Fixes #542043
---- insserv/insserv.c
-+++ insserv/insserv.c 2009-08-18 13:26:15.805902273 +0200
-@@ -300,7 +300,10 @@ static void rememberreq(service_t * rest
- if (strcasecmp(token, "$null") == 0)
- break;
+Index: insserv/insserv.c
+===================================================================
+--- insserv.orig/insserv.c 2009-08-24 00:07:51.000000000 +0200
++++ insserv/insserv.c 2009-08-24 00:07:51.000000000 +0200
+@@ -306,7 +306,10 @@
+ break;
+ case '$':
if (strcasecmp(token, "$all") == 0) {
- serv->attr.flags |= SERV_ALL;
+ if (bit & REQ_KILL)
@@ -18,7 +20,7 @@
break;
}
/* Expand the `$' token recursively down */
-@@ -622,8 +625,7 @@ static inline void active_script(void)
+@@ -628,8 +631,7 @@
}
/*
@@ -28,7 +30,7 @@
*/
static inline void all_script(void) attribute((always_inline));
static inline void all_script(void)
-@@ -680,6 +682,50 @@ static inline void all_script(void)
+@@ -686,6 +688,50 @@
}
/*
@@ -79,7 +81,7 @@
* Make the dependency files
*/
static inline void makedep(void) attribute((always_inline));
-@@ -3194,6 +3240,11 @@ int main (int argc, char *argv[])
+@@ -3212,6 +3258,11 @@
nonlsb_script();
/*
@@ -91,9 +93,11 @@
* Now generate for all scripts the dependencies
*/
follow_all();
---- insserv/listing.c
-+++ insserv/listing.c 2009-08-18 13:53:47.693917907 +0200
-@@ -317,6 +317,7 @@ static void __follow (dir_t *restrict di
+Index: insserv/listing.c
+===================================================================
+--- insserv.orig/listing.c 2009-08-24 00:07:51.000000000 +0200
++++ insserv/listing.c 2009-08-24 00:07:51.000000000 +0200
+@@ -317,6 +317,7 @@
}
for (tmp = dir; tmp; tmp = getnextlink(l_list)) {
@@ -101,7 +105,7 @@
register boolean recursion = true;
handle_t * ptmp = (mode == 'K') ? &tmp->stopp : &tmp->start;
uchar * order = &ptmp->deep;
-@@ -382,6 +383,7 @@ static void __follow (dir_t *restrict di
+@@ -381,6 +382,7 @@
np_list_for_each(dent, l_list) {
dir_t * target = getlink(dent)->target;
handle_t * ptrg = (mode == 'K') ? &target->stopp : &target->start;
@@ -109,7 +113,7 @@
if ((peg->run.lvl & ptrg->run.lvl) == 0)
continue; /* Not same boot level */
-@@ -399,10 +401,18 @@ static void __follow (dir_t *restrict di
+@@ -398,10 +400,18 @@
break; /* Loop detected, stop recursion */
}
@@ -132,7 +136,7 @@
}
if (ptrg->deep >= deep) /* Nothing new */
-@@ -848,7 +858,7 @@ void follow_all(void)
+@@ -847,7 +857,7 @@
list_for_each(tmp, d_start) {
maxorder = &maxstart;
guess_order(getdir(tmp), 'S');
@@ -141,9 +145,11 @@
guess_order(getdir(tmp), 'K');
}
}
---- insserv/listing.h
-+++ insserv/listing.h 2009-08-18 12:54:12.185901887 +0200
-@@ -368,6 +368,7 @@ static inline char * xstrdup(const char
+Index: insserv/listing.h
+===================================================================
+--- insserv.orig/listing.h 2009-08-20 13:39:12.000000000 +0200
++++ insserv/listing.h 2009-08-24 00:07:51.000000000 +0200
+@@ -368,6 +368,7 @@
#define SERV_SCRIPT 0x0080
#define SERV_NOSTOP 0x0100
#define SERV_CMDLINE 0x0200