[Initscripts-ng-commits] r1023 - /trunk/src/insserv/debian/patches/
pere at users.alioth.debian.org
pere at users.alioth.debian.org
Sat Sep 26 20:36:30 UTC 2009
Author: pere
Date: Sat Sep 26 20:36:30 2009
New Revision: 1023
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=1023
Log:
Refreshed all patches.
Modified:
trunk/src/insserv/debian/patches/10_nosuse.patch
trunk/src/insserv/debian/patches/11_debian_conf.patch
trunk/src/insserv/debian/patches/20_install_perms_fixup.patch
trunk/src/insserv/debian/patches/21_tests_suite_new_functions.patch
trunk/src/insserv/debian/patches/30_deterministic_order.patch
trunk/src/insserv/debian/patches/40_badboy_segfault.patch
trunk/src/insserv/debian/patches/50_symlink_in_initddir.patch
trunk/src/insserv/debian/patches/61_interactive_keyword.patch
trunk/src/insserv/debian/patches/62_upstart_job.patch
trunk/src/insserv/debian/patches/70_req_start_all_depends.patch
trunk/src/insserv/debian/patches/71_complete_makefile.patch
trunk/src/insserv/debian/patches/80_manual_warnings.patch
trunk/src/insserv/debian/patches/81_lessverbose.patch
trunk/src/insserv/debian/patches/82_loop_exit_msg.patch
trunk/src/insserv/debian/patches/90_no_runlevel_spec_for_debian.patch
trunk/src/insserv/debian/patches/91_kfreebsd_nofadvice.patch
trunk/src/insserv/debian/patches/92_m68k_alignment.patch
trunk/src/insserv/debian/patches/93_hurd_no_path_max.patch
trunk/src/insserv/debian/patches/94_v1_12_2.patch
trunk/src/insserv/debian/patches/95_stop_all.patch
Modified: trunk/src/insserv/debian/patches/10_nosuse.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/10_nosuse.patch?rev=1023&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/10_nosuse.patch (original)
+++ trunk/src/insserv/debian/patches/10_nosuse.patch Sat Sep 26 20:36:30 2009
@@ -4,8 +4,8 @@
---
Index: insserv/Makefile
===================================================================
---- insserv.orig/Makefile 2009-09-26 12:24:07.000000000 +0200
-+++ insserv/Makefile 2009-09-26 12:25:47.000000000 +0200
+--- insserv.orig/Makefile 2009-09-26 22:35:26.000000000 +0200
++++ insserv/Makefile 2009-09-26 22:35:45.000000000 +0200
@@ -9,7 +9,7 @@
#DESTDIR = /tmp/root
#DEBUG = -DDEBUG=1 -Wpacked
Modified: trunk/src/insserv/debian/patches/11_debian_conf.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/11_debian_conf.patch?rev=1023&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/11_debian_conf.patch (original)
+++ trunk/src/insserv/debian/patches/11_debian_conf.patch Sat Sep 26 20:36:30 2009
@@ -4,8 +4,8 @@
---
Index: insserv/insserv.conf
===================================================================
---- insserv.orig/insserv.conf 2009-09-26 12:24:06.000000000 +0200
-+++ insserv/insserv.conf 2009-09-26 12:25:41.000000000 +0200
+--- insserv.orig/insserv.conf 2009-09-26 22:35:26.000000000 +0200
++++ insserv/insserv.conf 2009-09-26 22:35:39.000000000 +0200
@@ -1,29 +1,29 @@
#
# All local filesystems are mounted (done during boot phase)
Modified: trunk/src/insserv/debian/patches/20_install_perms_fixup.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/20_install_perms_fixup.patch?rev=1023&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/20_install_perms_fixup.patch (original)
+++ trunk/src/insserv/debian/patches/20_install_perms_fixup.patch Sat Sep 26 20:36:30 2009
@@ -6,8 +6,8 @@
Index: insserv/Makefile
===================================================================
---- insserv.orig/Makefile 2009-09-26 12:25:41.000000000 +0200
-+++ insserv/Makefile 2009-09-26 12:25:41.000000000 +0200
+--- insserv.orig/Makefile 2009-09-26 22:35:39.000000000 +0200
++++ insserv/Makefile 2009-09-26 22:35:39.000000000 +0200
@@ -41,14 +41,14 @@
RM = rm -f
MKDIR = mkdir -p
Modified: trunk/src/insserv/debian/patches/21_tests_suite_new_functions.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/21_tests_suite_new_functions.patch?rev=1023&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/21_tests_suite_new_functions.patch (original)
+++ trunk/src/insserv/debian/patches/21_tests_suite_new_functions.patch Sat Sep 26 20:36:30 2009
@@ -5,8 +5,8 @@
Index: insserv/tests/suite
===================================================================
---- insserv.orig/tests/suite 2009-09-26 12:24:06.000000000 +0200
-+++ insserv/tests/suite 2009-09-26 12:25:41.000000000 +0200
+--- insserv.orig/tests/suite 2009-09-26 22:35:26.000000000 +0200
++++ insserv/tests/suite 2009-09-26 22:35:39.000000000 +0200
@@ -94,6 +94,12 @@
$insserv $debug -c $insconf -p $initddir -o $overridedir -r $script
}
Modified: trunk/src/insserv/debian/patches/30_deterministic_order.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/30_deterministic_order.patch?rev=1023&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/30_deterministic_order.patch (original)
+++ trunk/src/insserv/debian/patches/30_deterministic_order.patch Sat Sep 26 20:36:30 2009
@@ -6,8 +6,8 @@
---
Index: insserv/insserv.c
===================================================================
---- insserv.orig/insserv.c 2009-09-26 12:24:06.000000000 +0200
-+++ insserv/insserv.c 2009-09-26 12:25:46.000000000 +0200
+--- insserv.orig/insserv.c 2009-09-26 22:35:25.000000000 +0200
++++ insserv/insserv.c 2009-09-26 22:35:44.000000000 +0200
@@ -2238,6 +2238,7 @@
boolean del = false;
boolean defaults = false;
Modified: trunk/src/insserv/debian/patches/40_badboy_segfault.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/40_badboy_segfault.patch?rev=1023&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/40_badboy_segfault.patch (original)
+++ trunk/src/insserv/debian/patches/40_badboy_segfault.patch Sat Sep 26 20:36:30 2009
@@ -5,8 +5,8 @@
---
Index: insserv/insserv.c
===================================================================
---- insserv.orig/insserv.c 2009-09-26 12:25:41.000000000 +0200
-+++ insserv/insserv.c 2009-09-26 12:25:46.000000000 +0200
+--- insserv.orig/insserv.c 2009-09-26 22:35:39.000000000 +0200
++++ insserv/insserv.c 2009-09-26 22:35:44.000000000 +0200
@@ -1696,6 +1696,11 @@
}
Modified: trunk/src/insserv/debian/patches/50_symlink_in_initddir.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/50_symlink_in_initddir.patch?rev=1023&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/50_symlink_in_initddir.patch (original)
+++ trunk/src/insserv/debian/patches/50_symlink_in_initddir.patch Sat Sep 26 20:36:30 2009
@@ -4,8 +4,8 @@
---
Index: insserv/insserv.c
===================================================================
---- insserv.orig/insserv.c 2009-09-26 12:25:41.000000000 +0200
-+++ insserv/insserv.c 2009-09-26 12:25:45.000000000 +0200
+--- insserv.orig/insserv.c 2009-09-26 22:35:39.000000000 +0200
++++ insserv/insserv.c 2009-09-26 22:35:44.000000000 +0200
@@ -2542,11 +2542,12 @@
errno = 0;
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=1023&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/61_interactive_keyword.patch (original)
+++ trunk/src/insserv/debian/patches/61_interactive_keyword.patch Sat Sep 26 20:36:30 2009
@@ -5,8 +5,8 @@
Index: insserv/insserv.8.in
===================================================================
---- insserv.orig/insserv.8.in 2009-09-26 12:24:06.000000000 +0200
-+++ insserv/insserv.8.in 2009-09-26 12:25:45.000000000 +0200
+--- insserv.orig/insserv.8.in 2009-09-26 22:35:25.000000000 +0200
++++ insserv/insserv.8.in 2009-09-26 22:35:43.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-09-26 12:25:41.000000000 +0200
-+++ insserv/insserv.c 2009-09-26 12:25:45.000000000 +0200
+--- insserv.orig/insserv.c 2009-09-26 22:35:39.000000000 +0200
++++ insserv/insserv.c 2009-09-26 22:35:43.000000000 +0200
@@ -97,6 +97,7 @@
#define DEFAULT_START DEFAULT START VALUE
#define DEFAULT_STOP DEFAULT STOP VALUE
Modified: trunk/src/insserv/debian/patches/62_upstart_job.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/62_upstart_job.patch?rev=1023&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/62_upstart_job.patch (original)
+++ trunk/src/insserv/debian/patches/62_upstart_job.patch Sat Sep 26 20:36:30 2009
@@ -5,8 +5,8 @@
Index: insserv/insserv.8.in
===================================================================
---- insserv.orig/insserv.8.in 2009-09-26 22:29:42.000000000 +0200
-+++ insserv/insserv.8.in 2009-09-26 22:32:50.000000000 +0200
+--- insserv.orig/insserv.8.in 2009-09-26 22:35:39.000000000 +0200
++++ insserv/insserv.8.in 2009-09-26 22:35:42.000000000 +0200
@@ -266,6 +266,10 @@
.BR \-f ,\ \-\-force
Ignore if a required service is missed.
@@ -33,8 +33,8 @@
.RS 7
Index: insserv/insserv.c
===================================================================
---- insserv.orig/insserv.c 2009-09-26 22:29:42.000000000 +0200
-+++ insserv/insserv.c 2009-09-26 22:33:18.000000000 +0200
+--- insserv.orig/insserv.c 2009-09-26 22:35:39.000000000 +0200
++++ insserv/insserv.c 2009-09-26 22:35:43.000000000 +0200
@@ -70,6 +70,8 @@
# define INSCONF "/etc/insserv.conf"
#endif
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=1023&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 Sat Sep 26 20:36:30 2009
@@ -5,9 +5,9 @@
---
Index: insserv/insserv.c
===================================================================
---- insserv.orig/insserv.c 2009-09-26 12:25:41.000000000 +0200
-+++ insserv/insserv.c 2009-09-26 12:25:44.000000000 +0200
-@@ -774,9 +774,6 @@
+--- insserv.orig/insserv.c 2009-09-26 22:35:39.000000000 +0200
++++ insserv/insserv.c 2009-09-26 22:35:42.000000000 +0200
+@@ -776,9 +776,6 @@
continue;
#endif /* not MINIMAL_RULES */
@@ -17,7 +17,7 @@
if (serv->start->lvl & LVL_BOOT)
out = boot;
else
-@@ -818,6 +815,10 @@
+@@ -820,6 +817,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=1023&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/71_complete_makefile.patch (original)
+++ trunk/src/insserv/debian/patches/71_complete_makefile.patch Sat Sep 26 20:36:30 2009
@@ -5,9 +5,9 @@
---
Index: insserv/insserv.c
===================================================================
---- insserv.orig/insserv.c 2009-09-26 12:25:41.000000000 +0200
-+++ insserv/insserv.c 2009-09-26 12:25:44.000000000 +0200
-@@ -2107,33 +2107,26 @@
+--- insserv.orig/insserv.c 2009-09-26 22:35:39.000000000 +0200
++++ insserv/insserv.c 2009-09-26 22:35:42.000000000 +0200
+@@ -2109,33 +2109,26 @@
goto out;
}
Modified: trunk/src/insserv/debian/patches/80_manual_warnings.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/80_manual_warnings.patch?rev=1023&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/80_manual_warnings.patch (original)
+++ trunk/src/insserv/debian/patches/80_manual_warnings.patch Sat Sep 26 20:36:30 2009
@@ -4,8 +4,8 @@
---
Index: insserv/insserv.8.in
===================================================================
---- insserv.orig/insserv.8.in 2009-09-26 12:25:41.000000000 +0200
-+++ insserv/insserv.8.in 2009-09-26 12:25:43.000000000 +0200
+--- insserv.orig/insserv.8.in 2009-09-26 22:35:39.000000000 +0200
++++ insserv/insserv.8.in 2009-09-26 22:35:41.000000000 +0200
@@ -12,11 +12,9 @@
@@BEGIN_SUSE@@
.TH INSSERV 8 "Jul 29, 2008" "Version 1.11" "The SuSE boot concept"
@@ -68,7 +68,7 @@
This may restore an edited runlevel link scheme.
.TP
.BR \-f ,\ \-\-force
-@@ -303,17 +301,16 @@
+@@ -307,17 +305,16 @@
For the runlevels the information found in
the script is used.
.TP
@@ -89,7 +89,7 @@
@@BEGIN_SUSE@@
is possible but ignored on SuSE Linux.
@@ELSE_SUSE@@
-@@ -330,9 +327,9 @@
+@@ -334,9 +331,9 @@
.\"
.SH OVERRIDES
Beside using the extensions
@@ -101,7 +101,7 @@
it is possible to use override files replace a LSB comment header
or simple provide a missing LSB comment header. This can be done
by placing a file with the new LSB comment header using the same
-@@ -391,7 +388,9 @@
+@@ -395,7 +392,9 @@
.sp 1
will be ignored.
.SH BUGS
Modified: trunk/src/insserv/debian/patches/81_lessverbose.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/81_lessverbose.patch?rev=1023&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/81_lessverbose.patch (original)
+++ trunk/src/insserv/debian/patches/81_lessverbose.patch Sat Sep 26 20:36:30 2009
@@ -5,8 +5,8 @@
Index: insserv/listing.h
===================================================================
---- insserv.orig/listing.h 2009-09-26 12:27:09.000000000 +0200
-+++ insserv/listing.h 2009-09-26 12:29:07.000000000 +0200
+--- insserv.orig/listing.h 2009-09-26 22:35:25.000000000 +0200
++++ insserv/listing.h 2009-09-26 22:35:39.000000000 +0200
@@ -283,7 +283,7 @@
extern const char *const delimeter;
extern void error(const char *restrict fmt, ...) attribute((noreturn,format(printf,1,2)));
@@ -46,9 +46,9 @@
# define xstat(d,x,s) (__extension__ ({ fstatat(d,x,s, 0); }))
Index: insserv/insserv.c
===================================================================
---- insserv.orig/insserv.c 2009-09-26 12:28:59.000000000 +0200
-+++ insserv/insserv.c 2009-09-26 12:29:39.000000000 +0200
-@@ -112,8 +112,8 @@
+--- insserv.orig/insserv.c 2009-09-26 22:35:39.000000000 +0200
++++ insserv/insserv.c 2009-09-26 22:35:41.000000000 +0200
+@@ -114,8 +114,8 @@
/* The main line buffer if unique */
static char buf[LINE_MAX];
@@ -59,7 +59,7 @@
/* When to be verbose */
static boolean dryrun = false;
-@@ -688,9 +688,9 @@
+@@ -690,9 +690,9 @@
if (dryrun) {
#ifdef USE_KILL_IN_BOOT
@@ -71,7 +71,7 @@
#endif /* not USE_KILL_IN_BOOT */
return;
}
-@@ -705,8 +705,8 @@
+@@ -707,8 +707,8 @@
return;
}
@@ -82,7 +82,7 @@
lsort('S'); /* Sort into start order, set new sorder */
-@@ -872,9 +872,9 @@
+@@ -874,9 +874,9 @@
return;
}
@@ -94,7 +94,7 @@
lsort('K'); /* Sort into stop order, set new korder */
-@@ -1012,9 +1012,9 @@
+@@ -1014,9 +1014,9 @@
/*
* Print message when verbose is enabled
*/
@@ -106,7 +106,7 @@
goto out;
va_start(ap, fmt);
_logger(fmt, ap);
-@@ -1060,7 +1060,7 @@
+@@ -1062,7 +1062,7 @@
if (stat(rcpath, &st) < 0) {
if (errno == ENOENT) {
@@ -115,7 +115,7 @@
if (!dryrun)
mkdir(rcpath, (S_IRWXU|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH));
} else
-@@ -1188,7 +1188,7 @@
+@@ -1190,7 +1190,7 @@
char *basenamestr = basename(path); /* GNU basename */
char *retval = is_upstart_job_recursive(path, basenamestr);
if (retval)
@@ -124,7 +124,7 @@
return retval;
}
-@@ -1223,7 +1223,7 @@
+@@ -1225,7 +1225,7 @@
#define description script_inf.description
#define interactive script_inf.interactive
@@ -133,7 +133,7 @@
if (NULL != (upstart_job = is_upstart_job(path))) {
char cmd[2048];
-@@ -1880,7 +1880,7 @@
+@@ -1882,7 +1882,7 @@
regmatch_t subloc[SUBCONFNUM], *val = (regmatch_t*)0;
FILE *conf;
@@ -142,7 +142,7 @@
do {
const char * fptr = file;
-@@ -2344,10 +2344,10 @@
+@@ -2347,10 +2347,10 @@
ignore = true;
break;
case 'v':
Modified: trunk/src/insserv/debian/patches/82_loop_exit_msg.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/82_loop_exit_msg.patch?rev=1023&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/82_loop_exit_msg.patch (original)
+++ trunk/src/insserv/debian/patches/82_loop_exit_msg.patch Sat Sep 26 20:36:30 2009
@@ -7,9 +7,9 @@
Index: insserv/insserv.c
===================================================================
---- insserv.orig/insserv.c 2009-09-26 12:25:41.000000000 +0200
-+++ insserv/insserv.c 2009-09-26 12:25:43.000000000 +0200
-@@ -3242,7 +3242,7 @@
+--- insserv.orig/insserv.c 2009-09-26 22:35:39.000000000 +0200
++++ insserv/insserv.c 2009-09-26 22:35:41.000000000 +0200
+@@ -3250,7 +3250,7 @@
*/
follow_all();
if (is_loop_detected() && !ignore)
Modified: trunk/src/insserv/debian/patches/90_no_runlevel_spec_for_debian.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/90_no_runlevel_spec_for_debian.patch?rev=1023&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/90_no_runlevel_spec_for_debian.patch (original)
+++ trunk/src/insserv/debian/patches/90_no_runlevel_spec_for_debian.patch Sat Sep 26 20:36:30 2009
@@ -4,8 +4,8 @@
---
Index: insserv/insserv.8.in
===================================================================
---- insserv.orig/insserv.8.in 2009-09-26 12:25:41.000000000 +0200
-+++ insserv/insserv.8.in 2009-09-26 12:25:41.000000000 +0200
+--- insserv.orig/insserv.8.in 2009-09-26 22:35:39.000000000 +0200
++++ insserv/insserv.8.in 2009-09-26 22:35:39.000000000 +0200
@@ -143,6 +143,7 @@
@@ELSE_SUSE@@
directories.
Modified: trunk/src/insserv/debian/patches/91_kfreebsd_nofadvice.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/91_kfreebsd_nofadvice.patch?rev=1023&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/91_kfreebsd_nofadvice.patch (original)
+++ trunk/src/insserv/debian/patches/91_kfreebsd_nofadvice.patch Sat Sep 26 20:36:30 2009
@@ -4,8 +4,8 @@
---
Index: insserv/insserv.c
===================================================================
---- insserv.orig/insserv.c 2009-09-26 12:25:41.000000000 +0200
-+++ insserv/insserv.c 2009-09-26 12:25:42.000000000 +0200
+--- insserv.orig/insserv.c 2009-09-26 22:35:39.000000000 +0200
++++ insserv/insserv.c 2009-09-26 22:35:40.000000000 +0200
@@ -40,6 +40,13 @@
#endif /* USE_RPMLIB */
#include "listing.h"
Modified: trunk/src/insserv/debian/patches/92_m68k_alignment.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/92_m68k_alignment.patch?rev=1023&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/92_m68k_alignment.patch (original)
+++ trunk/src/insserv/debian/patches/92_m68k_alignment.patch Sat Sep 26 20:36:30 2009
@@ -5,9 +5,9 @@
---
Index: insserv/insserv.c
===================================================================
---- insserv.orig/insserv.c 2009-09-26 12:25:41.000000000 +0200
-+++ insserv/insserv.c 2009-09-26 12:25:42.000000000 +0200
-@@ -129,6 +129,10 @@
+--- insserv.orig/insserv.c 2009-09-26 22:35:39.000000000 +0200
++++ insserv/insserv.c 2009-09-26 22:35:40.000000000 +0200
+@@ -131,6 +131,10 @@
static boolean set_override = false;
static boolean set_insconf = false;
Modified: trunk/src/insserv/debian/patches/93_hurd_no_path_max.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/93_hurd_no_path_max.patch?rev=1023&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/93_hurd_no_path_max.patch (original)
+++ trunk/src/insserv/debian/patches/93_hurd_no_path_max.patch Sat Sep 26 20:36:30 2009
@@ -3,9 +3,9 @@
---
Index: insserv/insserv.c
===================================================================
---- insserv.orig/insserv.c 2009-09-26 12:25:41.000000000 +0200
-+++ insserv/insserv.c 2009-09-26 12:25:42.000000000 +0200
-@@ -1425,6 +1425,11 @@
+--- insserv.orig/insserv.c 2009-09-26 22:35:39.000000000 +0200
++++ insserv/insserv.c 2009-09-26 22:35:40.000000000 +0200
+@@ -1427,6 +1427,11 @@
return ret;
}
Modified: trunk/src/insserv/debian/patches/94_v1_12_2.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/94_v1_12_2.patch?rev=1023&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/94_v1_12_2.patch (original)
+++ trunk/src/insserv/debian/patches/94_v1_12_2.patch Sat Sep 26 20:36:30 2009
@@ -3,9 +3,9 @@
Index: insserv/insserv.c
===================================================================
---- insserv.orig/insserv.c 2009-09-26 12:25:41.000000000 +0200
-+++ insserv/insserv.c 2009-09-26 12:25:42.000000000 +0200
-@@ -231,6 +231,7 @@
+--- insserv.orig/insserv.c 2009-09-26 22:35:39.000000000 +0200
++++ insserv/insserv.c 2009-09-26 22:35:39.000000000 +0200
+@@ -233,6 +233,7 @@
typedef struct repl {
list_t r_list;
string_t r[1];
@@ -13,7 +13,7 @@
} __align repl_t;
#define getrepl(arg) list_entry((arg), struct repl, r_list)
-@@ -1944,6 +1945,7 @@
+@@ -1946,6 +1947,7 @@
if (posix_memalign((void*)&subst, sizeof(void*), alignof(repl_t)) != 0)
error("%s", strerror(errno));
insert(&subst->r_list, r_list->prev);
@@ -21,7 +21,7 @@
r = &subst->r[0];
if (posix_memalign((void*)&r->ref, sizeof(void*), alignof(typeof(r->ref))+strsize(token)) != 0)
error("%s", strerror(errno));
-@@ -1973,6 +1975,7 @@
+@@ -1975,6 +1977,7 @@
error("%s", strerror(errno));
insert(&subst->r_list, r_list->prev);
r = &subst->r[0];
@@ -29,7 +29,7 @@
if (posix_memalign((void*)&r->ref, sizeof(void*), alignof(typeof(r->ref))+strsize(token)) != 0)
error("%s", strerror(errno));
*r->ref = 1;
-@@ -2125,13 +2128,19 @@
+@@ -2127,13 +2130,19 @@
list_for_each_safe(tmp, safe, ptr) {
repl_t * rnxt = getrepl(tmp);
@@ -49,7 +49,7 @@
(*deep)--;
} else if (*deep > 0) {
repl_t *restrict subst;
-@@ -2152,9 +2161,12 @@
+@@ -2154,9 +2163,12 @@
list_for_each(ptr, sysfaci_start) {
list_t * rlist, * safe, * head = &getfaci(ptr)->replace;
list_for_each_safe(rlist, safe, head) {
@@ -65,8 +65,8 @@
}
Index: insserv/listing.c
===================================================================
---- insserv.orig/listing.c 2009-09-26 12:24:05.000000000 +0200
-+++ insserv/listing.c 2009-09-26 12:25:42.000000000 +0200
+--- insserv.orig/listing.c 2009-09-26 22:35:24.000000000 +0200
++++ insserv/listing.c 2009-09-26 22:35:39.000000000 +0200
@@ -398,6 +398,12 @@
break; /* Loop detected, stop recursion */
}
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=1023&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/95_stop_all.patch (original)
+++ trunk/src/insserv/debian/patches/95_stop_all.patch Sat Sep 26 20:36:30 2009
@@ -6,9 +6,9 @@
Index: insserv/insserv.c
===================================================================
---- insserv.orig/insserv.c 2009-09-26 12:25:41.000000000 +0200
-+++ insserv/insserv.c 2009-09-26 12:25:41.000000000 +0200
-@@ -306,7 +306,10 @@
+--- insserv.orig/insserv.c 2009-09-26 22:35:39.000000000 +0200
++++ insserv/insserv.c 2009-09-26 22:35:39.000000000 +0200
+@@ -308,7 +308,10 @@
break;
case '$':
if (strcasecmp(token, "$all") == 0) {
@@ -20,7 +20,7 @@
break;
}
/* Expand the `$' token recursively down */
-@@ -628,8 +631,7 @@
+@@ -630,8 +633,7 @@
}
/*
@@ -30,7 +30,7 @@
*/
static inline void all_script(void) attribute((always_inline));
static inline void all_script(void)
-@@ -686,6 +688,50 @@
+@@ -688,6 +690,50 @@
}
/*
@@ -81,7 +81,7 @@
* Make the dependency files
*/
static inline void makedep(void) attribute((always_inline));
-@@ -3266,6 +3312,11 @@
+@@ -3274,6 +3320,11 @@
nonlsb_script();
/*
@@ -95,8 +95,8 @@
follow_all();
Index: insserv/listing.c
===================================================================
---- insserv.orig/listing.c 2009-09-26 12:25:41.000000000 +0200
-+++ insserv/listing.c 2009-09-26 12:25:41.000000000 +0200
+--- insserv.orig/listing.c 2009-09-26 22:35:39.000000000 +0200
++++ insserv/listing.c 2009-09-26 22:35:39.000000000 +0200
@@ -317,6 +317,7 @@
}
@@ -147,8 +147,8 @@
}
Index: insserv/listing.h
===================================================================
---- insserv.orig/listing.h 2009-09-26 12:25:41.000000000 +0200
-+++ insserv/listing.h 2009-09-26 12:25:41.000000000 +0200
+--- insserv.orig/listing.h 2009-09-26 22:35:39.000000000 +0200
++++ insserv/listing.h 2009-09-26 22:35:39.000000000 +0200
@@ -368,6 +368,7 @@
#define SERV_SCRIPT 0x0080
#define SERV_NOSTOP 0x0100
More information about the Initscripts-ng-commits
mailing list