Author: pere
Date: Sat Feb 8 21:33:27 2014
New Revision: 1089
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=1089
Log:
Adjust debian patches to the new upstream version.
Added:
trunk/src/insserv/debian/patches/180_default_runlevels.patch
Modified:
trunk/src/insserv/debian/changelog
trunk/src/insserv/debian/patches/100_show.patch
trunk/src/insserv/debian/patches/10_nosuse.patch
trunk/src/insserv/debian/patches/130_crossbuild_fixes.patch
trunk/src/insserv/debian/patches/140_debian_test_suite.patch
trunk/src/insserv/debian/patches/150_core_string_test.patch
trunk/src/insserv/debian/patches/160_manual_page_update.patch
trunk/src/insserv/debian/patches/170_if-scope.patch
trunk/src/insserv/debian/patches/21_tweak_warnings.patch
trunk/src/insserv/debian/patches/30_interactive_regexp_match_fix.patch
trunk/src/insserv/debian/patches/92_m68k_alignment.patch
trunk/src/insserv/debian/patches/series
Modified: trunk/src/insserv/debian/changelog
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=1089&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Sat Feb 8 21:33:27 2014
@@ -1,5 +1,13 @@
-insserv (1.14.0-6) UNRELEASED; urgency=low
-
+insserv (1.16.0-1) UNRELEASED; urgency=low
+
+ * New upstream version.
+ - Add systemd support.
+ - Do not warn about missing LSB headers if override file exist.
+ - Keep .depend.* makefiles sorted and drop redundant dependencies.
+ * Drop patches 30_interactive_regexp_match_fix.patch and
+ 100_show.patch applied upstream.
+ * New patch 180_default_runlevels.patch fixing bug in the NONSUSE
+ handling of scripts without LSB headers.
* Add Roger Leigh as uploader.
* Move package into group maintenance by the pkg-sysvinit alioth group.
* Fix code bug by adding new patch 170_if-scope.patch (Closes: #736479).
Modified: trunk/src/insserv/debian/patches/100_show.patch
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/100_show.patch?rev=1089&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/100_show.patch (original)
+++ trunk/src/insserv/debian/patches/100_show.patch Sat Feb 8 21:33:27 2014
@@ -3,6 +3,8 @@
SK:NUM:RUNLEVELS:SCRIPT
Bug-Debian: http://bugs.debian.org/573004
From: Kel Modderman <[email protected]>
+Status: applied upstream
+
---
--- a/insserv.c
+++ b/insserv.c
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=1089&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/10_nosuse.patch (original)
+++ trunk/src/insserv/debian/patches/10_nosuse.patch Sat Feb 8 21:33:27 2014
@@ -2,14 +2,16 @@
Fixes: None, made as part of Debian porting.
Status: Debian specific, showed to upstream.
---
---- a/Makefile
-+++ b/Makefile
-@@ -10,7 +10,7 @@ INSCONF = /etc/insserv.conf
+Index: insserv/Makefile
+===================================================================
+--- insserv.orig/Makefile 2014-02-08 21:10:12.838450285 +0100
++++ insserv/Makefile 2014-02-08 21:10:14.766461140 +0100
+@@ -10,7 +10,7 @@
#DESTDIR = /tmp/root
#DEBUG = -DDEBUG=1 -Wpacked
DEBUG =
-ISSUSE = -DSUSE
+ISSUSE = -DNOTSUSE
DESTDIR =
- VERSION = 1.14.0
+ VERSION = 1.16.0
DATE = $(shell date +'%d%b%y' | tr '[:lower:]' '[:upper:]')
Modified: trunk/src/insserv/debian/patches/130_crossbuild_fixes.patch
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/130_crossbuild_fixes.patch?rev=1089&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/130_crossbuild_fixes.patch (original)
+++ trunk/src/insserv/debian/patches/130_crossbuild_fixes.patch Sat Feb 8
21:33:27 2014
@@ -7,11 +7,16 @@
Author: Wookey <[email protected]>
Last-Update: 2012-04-09
---- a/Makefile
-+++ b/Makefile
-@@ -25,20 +25,20 @@ else
+Index: insserv/Makefile
+===================================================================
+--- insserv.orig/Makefile 2014-02-08 21:07:48.000000000 +0100
++++ insserv/Makefile 2014-02-08 21:08:25.617848629 +0100
+@@ -24,15 +24,15 @@
+ else
+ ARCH = $(shell uname -i)
ifeq ($(ARCH),i386)
- COPTS = -g -O3 -mcpu=i586 -mtune=i686
+- COPTS = -g -O3 -mcpu=i586 -mtune=i686
++ COPTS ?= -g -O3 -mcpu=i586 -mtune=i686
else
- COPTS = -g -O2
+ COPTS ?= -g -O2
@@ -25,15 +30,16 @@
LIBS =
ifdef USE_RPMLIB
CFLAGS += -DUSE_RPMLIB=1
- LDFLAGS += -Wl,--as-needed
+@@ -40,7 +40,7 @@
LIBS += -lrpm
endif
+ LIBS += $(shell pkg-config --libs dbus-1)
- CC = gcc
+ CC ?= gcc
RM = rm -f
MKDIR = mkdir -p
RMDIR = rm -rf
-@@ -134,7 +134,7 @@ else
+@@ -139,7 +139,7 @@
tests/common
endif
Modified: trunk/src/insserv/debian/patches/140_debian_test_suite.patch
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/140_debian_test_suite.patch?rev=1089&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/140_debian_test_suite.patch
(original)
+++ trunk/src/insserv/debian/patches/140_debian_test_suite.patch Sat Feb
8 21:33:27 2014
@@ -1,8 +1,10 @@
Description: Execute the Debian test suite on `make check'.
Author: Kel Modderman <[email protected]>
---- a/Makefile
-+++ b/Makefile
-@@ -131,7 +131,8 @@ ifeq ($(ISSUSE),-DSUSE)
+Index: insserv/Makefile
+===================================================================
+--- insserv.orig/Makefile 2014-02-08 21:09:29.266205571 +0100
++++ insserv/Makefile 2014-02-08 21:09:30.006209729 +0100
+@@ -136,7 +136,8 @@
issuse=true tests/common
# issuse=true tests/suse
else
Modified: trunk/src/insserv/debian/patches/150_core_string_test.patch
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/150_core_string_test.patch?rev=1089&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/150_core_string_test.patch (original)
+++ trunk/src/insserv/debian/patches/150_core_string_test.patch Sat Feb 8
21:33:27 2014
@@ -10,9 +10,11 @@
Author: Ben Harris <[email protected]>
Bug-Debian: bugs.debian.org/611292
---
---- a/insserv.c
-+++ b/insserv.c
-@@ -2768,7 +2768,7 @@ int main (int argc, char *argv[])
+Index: insserv/insserv.c
+===================================================================
+--- insserv.orig/insserv.c 2014-02-08 21:09:24.530178990 +0100
++++ insserv/insserv.c 2014-02-08 21:09:33.682230366 +0100
+@@ -3169,7 +3169,7 @@
continue;
}
Modified: trunk/src/insserv/debian/patches/160_manual_page_update.patch
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/160_manual_page_update.patch?rev=1089&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/160_manual_page_update.patch
(original)
+++ trunk/src/insserv/debian/patches/160_manual_page_update.patch Sat Feb
8 21:33:27 2014
@@ -6,8 +6,10 @@
* use the package short summary in the manual page too, it mentions the
keyword "dependency" (Closes: #609655)
Author: Kel Modderman <[email protected]>
---- a/insserv.8.in
-+++ b/insserv.8.in
+Index: insserv/insserv.8.in
+===================================================================
+--- insserv.orig/insserv.8.in 2014-02-08 21:09:19.482150683 +0100
++++ insserv/insserv.8.in 2014-02-08 21:09:37.090249492 +0100
@@ -26,7 +26,7 @@
.UC 8
@@END_SUSE@@
@@ -17,7 +19,7 @@
.SH SYNOPSIS
.\"
.B insserv
-@@ -64,8 +64,10 @@ insserv \- Enable an installed system in
+@@ -64,8 +64,10 @@
@@END_SUSE@@
.SH DESCRIPTION
.B insserv
@@ -30,7 +32,7 @@
.sp 1
.in +1l
.nf
-@@ -86,7 +88,11 @@ by reading the comment header of the scr
+@@ -86,7 +88,11 @@
.fi
.in -1l
.sp 1
@@ -43,7 +45,7 @@
@@BEGIN_SUSE@@
Please note, that the
.B Default\-Stop
-@@ -456,13 +462,14 @@ with the help of
+@@ -459,13 +465,14 @@
@@BEGIN_SUSE@@
.BR init.d (7),
@@END_SUSE@@
Modified: trunk/src/insserv/debian/patches/170_if-scope.patch
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/170_if-scope.patch?rev=1089&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/170_if-scope.patch (original)
+++ trunk/src/insserv/debian/patches/170_if-scope.patch Sat Feb 8 21:33:27 2014
@@ -7,9 +7,11 @@
Reviewed-By: Petter Reinholdtsen <[email protected]>
Last-Update: 2014-02-08
---- insserv-1.14.0.orig/insserv.c
-+++ insserv-1.14.0/insserv.c
-@@ -3622,10 +3622,11 @@ int main (int argc, char *argv[])
+Index: insserv/insserv.c
+===================================================================
+--- insserv.orig/insserv.c 2014-02-08 21:09:33.682230366 +0100
++++ insserv/insserv.c 2014-02-08 21:09:39.650263888 +0100
+@@ -4144,10 +4144,11 @@
serv->attr.flags &= ~SERV_ENABLED;
# endif /* USE_KILL_IN_BOOT */
} else if (del && ignore) {
Added: trunk/src/insserv/debian/patches/180_default_runlevels.patch
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/180_default_runlevels.patch?rev=1089&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/180_default_runlevels.patch (added)
+++ trunk/src/insserv/debian/patches/180_default_runlevels.patch Sat Feb
8 21:33:27 2014
@@ -0,0 +1,34 @@
+Description: Fix the NONSUSE handling of scripts without LSB header
+
+ Make sure scripts without LSB header and no override get the default
+ settings defined in Debian.
+Author: Petter Reinholdtsen <[email protected]>
+
+Forwarded: no
+Reviewed-By: Petter Reinholdtsen <[email protected]>
+Last-Update: 2014-02-08
+
+Index: insserv/insserv.c
+===================================================================
+--- insserv.orig/insserv.c 2014-02-08 21:54:22.265290998 +0100
++++ insserv/insserv.c 2014-02-08 22:20:09.046218370 +0100
+@@ -3259,11 +3259,14 @@
+ #endif /* SUSE */
+
+ #ifndef SUSE
+- if (!lsb) {
+- script_inf.required_start = xstrdup(DEFAULT_DEPENDENCY);
+- script_inf.required_stop = xstrdup(DEFAULT_DEPENDENCY);
+- script_inf.default_start = xstrdup(DEFAULT_START_LVL);
+- script_inf.default_stop = xstrdup(DEFAULT_STOP_LVL);
++ if ((lsb & FOUND_LSB_HEADER) == 0) {
++ if (lsb & FOUND_LSB_DEFAULT) {
++ warn("Missing LSB header and overrides, inserting default
runlevel(s) and dependencies\n");
++ script_inf.required_start = xstrdup(DEFAULT_DEPENDENCY);
++ script_inf.required_stop = xstrdup(DEFAULT_DEPENDENCY);
++ script_inf.default_start = xstrdup(DEFAULT_START_LVL);
++ script_inf.default_stop = xstrdup(DEFAULT_STOP_LVL);
++ }
+ }
+ #endif /* not SUSE */
+
Modified: trunk/src/insserv/debian/patches/21_tweak_warnings.patch
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/21_tweak_warnings.patch?rev=1089&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/21_tweak_warnings.patch (original)
+++ trunk/src/insserv/debian/patches/21_tweak_warnings.patch Sat Feb 8
21:33:27 2014
@@ -4,9 +4,11 @@
From: Kel Modderman <[email protected]>
Bug-Debian: bugs.debian.org/668559
---
---- a/insserv.c
-+++ b/insserv.c
-@@ -3081,7 +3081,7 @@ int main (int argc, char *argv[])
+Index: insserv/insserv.c
+===================================================================
+--- insserv.orig/insserv.c 2014-02-08 21:09:07.918085784 +0100
++++ insserv/insserv.c 2014-02-08 21:09:20.486156317 +0100
+@@ -3484,7 +3484,7 @@
*/
if (!defaults && (deflvls != service->start->lvl)) {
if (!del && isarg && !(argr[curr_argc]))
@@ -15,7 +17,7 @@
service->start->lvl ?
lvl2str(service->start->lvl) : "empty", d->d_name, lvl2str(deflvls));
}
} else
-@@ -3100,8 +3100,9 @@ int main (int argc, char *argv[])
+@@ -3503,8 +3503,9 @@
* of the current script.
*/
if (!defaults && service->start->lvl != 0) {
@@ -27,7 +29,7 @@
script_inf.default_start =
lvl2str(service->start->lvl);
}
}
-@@ -3143,7 +3144,7 @@ int main (int argc, char *argv[])
+@@ -3546,7 +3547,7 @@
*/
if (!defaults && (deflvlk != service->stopp->lvl)) {
if (!del && isarg && !(argr[curr_argc]))
@@ -36,7 +38,7 @@
service->stopp->lvl ?
lvl2str(service->stopp->lvl) : "empty", d->d_name, lvl2str(deflvlk));
}
} else
-@@ -3162,8 +3163,9 @@ int main (int argc, char *argv[])
+@@ -3565,8 +3566,9 @@
* of the current script.
*/
if (!defaults && service->stopp->lvl != 0) {
Modified: trunk/src/insserv/debian/patches/30_interactive_regexp_match_fix.patch
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/30_interactive_regexp_match_fix.patch?rev=1089&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/30_interactive_regexp_match_fix.patch
(original)
+++ trunk/src/insserv/debian/patches/30_interactive_regexp_match_fix.patch
Sat Feb 8 21:33:27 2014
@@ -1,6 +1,8 @@
Description: Fix regular expression match for X-Interactive keyword, it was
off-by-one match group and thus always returned 'X-'.
From: Kel Modderman <[email protected]>
+Status: applied upstream
+
---
--- a/insserv.c
+++ b/insserv.c
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=1089&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/92_m68k_alignment.patch (original)
+++ trunk/src/insserv/debian/patches/92_m68k_alignment.patch Sat Feb 8
21:33:27 2014
@@ -3,11 +3,13 @@
Fixes: #493637
Status: Not yet submitted upstream.
---
---- a/insserv.c
-+++ b/insserv.c
-@@ -53,6 +53,10 @@
- #endif /* SUSE */
+Index: insserv/insserv.c
+===================================================================
+--- insserv.orig/insserv.c 2014-02-08 21:09:20.486156317 +0100
++++ insserv/insserv.c 2014-02-08 21:09:24.530178990 +0100
+@@ -68,6 +68,10 @@
#include "listing.h"
+ #include "systemd.h"
+#ifdef __m68k__ /* Fix #493637 */
+# define aligned(a)
Modified: trunk/src/insserv/debian/patches/series
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/series?rev=1089&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/series (original)
+++ trunk/src/insserv/debian/patches/series Sat Feb 8 21:33:27 2014
@@ -2,12 +2,11 @@
11_debian_conf.patch
20_manpage_spelling.patch
21_tweak_warnings.patch
-30_interactive_regexp_match_fix.patch
92_m68k_alignment.patch
-100_show.patch
110_portmap.patch
130_crossbuild_fixes.patch
140_debian_test_suite.patch
150_core_string_test.patch
160_manual_page_update.patch
170_if-scope.patch
+180_default_runlevels.patch
_______________________________________________
Initscripts-ng-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/initscripts-ng-commits
