[Initscripts-ng-commits] r898 - in /trunk/src/insserv/debian/patches: 61_interactive_keyword.patch 70_req_start_all_depends.patch 80_manual_warnings.patch 90_no_runlevel_spec_for_debian.patch
pere at users.alioth.debian.org
pere at users.alioth.debian.org
Fri Jun 26 10:44:09 UTC 2009
Author: pere
Date: Fri Jun 26 10:44:08 2009
New Revision: 898
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=898
Log:
Refresh patches.
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/80_manual_warnings.patch
trunk/src/insserv/debian/patches/90_no_runlevel_spec_for_debian.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=898&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/61_interactive_keyword.patch (original)
+++ trunk/src/insserv/debian/patches/61_interactive_keyword.patch Fri Jun 26 10:44:08 2009
@@ -3,10 +3,10 @@
Status: Work in progress.
---
-Index: insserv.8.in
+Index: insserv/insserv.8.in
===================================================================
---- a/insserv.8.in (revision 885)
-+++ b/insserv.8.in (working copy)
+--- 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
@@ -76,6 +76,7 @@
# X-Stop-After: boot_facility_1 [ boot_facility_2 ...]
# Default-Start: run_level_1 [ run_level_2 ...]
@@ -27,10 +27,10 @@
The optional
.B X\-Start\-Before
keyword implies that the script using this keyword
-Index: insserv.c
+Index: insserv/insserv.c
===================================================================
---- a/insserv.c (revision 885)
-+++ b/insserv.c (working copy)
+--- insserv.orig/insserv.c 2009-06-26 12:34:19.000000000 +0200
++++ insserv/insserv.c 2009-06-26 12:34:19.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 {
-@@ -1132,6 +1135,7 @@
+@@ -1137,6 +1140,7 @@
regcompiler(®.def_start, DEFAULT_START, REG_EXTENDED|REG_ICASE|REG_NEWLINE);
regcompiler(®.def_stop, DEFAULT_STOP, REG_EXTENDED|REG_ICASE|REG_NEWLINE);
regcompiler(®.desc, DESCRIPTION, REG_EXTENDED|REG_ICASE|REG_NEWLINE);
@@ -63,7 +63,7 @@
}
static inline void scan_script_reset(void) attribute((always_inline));
-@@ -1147,6 +1151,7 @@
+@@ -1152,6 +1156,7 @@
xreset(script_inf.default_start);
xreset(script_inf.default_stop);
xreset(script_inf.description);
@@ -71,7 +71,7 @@
}
#define FOUND_LSB_HEADER 0x01
-@@ -1177,6 +1182,7 @@
+@@ -1182,6 +1187,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);
-@@ -1273,6 +1279,14 @@
+@@ -1278,6 +1284,14 @@
description = empty;
}
@@ -94,7 +94,7 @@
/* Skip scanning below from LSB magic end */
if ((end = strstr(buf, "### END INIT INFO")))
break;
-@@ -1341,6 +1355,7 @@
+@@ -1346,6 +1360,7 @@
#undef default_start
#undef default_stop
#undef description
@@ -102,7 +102,7 @@
return ret;
}
-@@ -1503,6 +1518,7 @@
+@@ -1508,6 +1523,7 @@
regfree(®.def_start);
regfree(®.def_stop);
regfree(®.desc);
@@ -110,7 +110,7 @@
}
static struct {
-@@ -1776,6 +1792,9 @@
+@@ -1786,6 +1802,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)
-@@ -2807,6 +2826,9 @@
+@@ -2886,6 +2905,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=898&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 Fri Jun 26 10:44:08 2009
@@ -3,9 +3,11 @@
Fixes: nil
Status: Applied upstream.
---
---- a/insserv.c
-+++ b/insserv.c
-@@ -776,9 +776,6 @@ static inline void makedep(void)
+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 @@
continue;
#endif /* not MINIMAL_RULES */
@@ -15,7 +17,7 @@
if (serv->start->lvl & LVL_BOOT)
out = boot;
else
-@@ -820,6 +817,10 @@ static inline void makedep(void)
+@@ -823,6 +820,10 @@
fprintf(out, " %s", name);
}
} else {
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=898&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/80_manual_warnings.patch (original)
+++ trunk/src/insserv/debian/patches/80_manual_warnings.patch Fri Jun 26 10:44:08 2009
@@ -2,8 +2,10 @@
Fixes: lintian - manpage-has-errors-from-man
Status: Not yet submitted upstream.
---
---- a/insserv.8.in
-+++ b/insserv.8.in
+Index: insserv/insserv.8.in
+===================================================================
+--- insserv.orig/insserv.8.in 2009-06-26 12:34:19.000000000 +0200
++++ insserv/insserv.8.in 2009-06-26 12:34:19.000000000 +0200
@@ -12,11 +12,9 @@
@@BEGIN_SUSE@@
.TH INSSERV 8 "Jul 29, 2008" "Version 1.11" "The SuSE boot concept"
@@ -16,7 +18,7 @@
@@END_SUSE@@
.SH NAME
insserv \- Enable an installed system init script
-@@ -35,9 +33,9 @@ insserv \- Enable an installed system in
+@@ -35,9 +33,9 @@
.RB [ \-c\ <config> ]
.RB [ \-p\ <path> ]
@@BEGIN_SUSE@@
@@ -28,7 +30,7 @@
@@END_SUSE@@
.PP
.B insserv
-@@ -123,7 +121,7 @@ keyword implies that the script using th
+@@ -129,7 +127,7 @@
should be started
.B before
the specified service names.
@@ -37,7 +39,7 @@
.B X\-Stop\-After
keyword implies that the script using this keyword
should be stopped
-@@ -217,7 +215,7 @@ as an interactive one, e.g. a service wh
+@@ -223,7 +221,7 @@
a passphrase or password input during boot
or runlevel change.
.P
@@ -46,7 +48,7 @@
.B System Facilities
in the configuration file
.IR /etc/insserv.conf ,
-@@ -240,8 +238,8 @@ Specify path to the insserv.conf file an
+@@ -246,8 +244,8 @@
directory. Useful for testing.
.TP
.BR \-o\ <path> ,\ \-\-override\ <path>
@@ -57,7 +59,7 @@
.IR /etc/insserv/overrides/ ).
.TP
.BR \-p\ <path> ,\ \-\-path\ <path>
-@@ -254,7 +252,7 @@ Do not update symlinks.
+@@ -260,7 +258,7 @@
Remove the listed scripts from all runlevels.
.TP
.BR \-d ,\ \-\-default
@@ -66,7 +68,7 @@
This may restore an edited runlevel link scheme.
.TP
.BR \-f ,\ \-\-force
-@@ -297,17 +295,16 @@ checks for the existence of these script
+@@ -303,17 +301,16 @@
For the runlevels the information found in
the script is used.
.TP
@@ -87,7 +89,7 @@
@@BEGIN_SUSE@@
is possible but ignored on SuSE Linux.
@@ELSE_SUSE@@
-@@ -324,9 +321,9 @@ checks for the existence of these script
+@@ -330,9 +327,9 @@
.\"
.SH OVERRIDES
Beside using the extensions
@@ -99,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
-@@ -379,7 +376,9 @@ of the following characters
+@@ -385,7 +382,9 @@
.sp 1
will be ignored.
.SH BUGS
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=898&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 Fri Jun 26 10:44:08 2009
@@ -2,9 +2,11 @@
Fixes: #500542
Status: Not yet submitted upstream.
---
---- a/insserv.8.in
-+++ b/insserv.8.in
-@@ -137,6 +137,7 @@ directories (see \fI init.d\fR (7)).
+Index: insserv/insserv.8.in
+===================================================================
+--- insserv.orig/insserv.8.in 2009-06-26 12:33:36.000000000 +0200
++++ insserv/insserv.8.in 2009-06-26 12:33:36.000000000 +0200
+@@ -143,6 +143,7 @@
@@ELSE_SUSE@@
directories.
@@END_SUSE@@
@@ -12,7 +14,7 @@
Known runlevels are:
.sp 1
.in +1l
-@@ -148,15 +149,12 @@ Known runlevels are:
+@@ -154,15 +155,12 @@
\fB4\fR\ reserved for local use
\fB5\fR\ used for full multiuser with network and xdm
\fB6\fR\ used for System reboot
More information about the Initscripts-ng-commits
mailing list