[Initscripts-ng-commits] r763 - in /trunk/src/insserv/debian: ./ patches/
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Mon Jun 2 05:34:09 UTC 2008
Author: kelmo-guest
Date: Mon Jun 2 05:34:07 2008
New Revision: 763
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=763
Log:
Add Status field to description of each dpatch, to describe how each
patch stands with respect to upstream inclusion.
Modified:
trunk/src/insserv/debian/changelog
trunk/src/insserv/debian/patches/32_debug_option.dpatch
trunk/src/insserv/debian/patches/33_nosuse_scripts.dpatch
trunk/src/insserv/debian/patches/40_segfault_virtprov.dpatch
trunk/src/insserv/debian/patches/41_cleansystem.dpatch
trunk/src/insserv/debian/patches/42_loopnochangemsg.dpatch
trunk/src/insserv/debian/patches/50_sign_warning.dpatch
trunk/src/insserv/debian/patches/51_overwrite_output.dpatch
trunk/src/insserv/debian/patches/52_shutdown_links.dpatch
trunk/src/insserv/debian/patches/60_disable_cfgfilter_stat.dpatch
trunk/src/insserv/debian/patches/62_warn_on_missing_required_fields.dpatch
trunk/src/insserv/debian/patches/63_warn_on_missing_default_fields.dpatch
trunk/src/insserv/debian/patches/64_missing_default_fields_fallback.dpatch
Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=763&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Mon Jun 2 05:34:07 2008
@@ -1,8 +1,13 @@
insserv (1.11.0-10) UNRELEASED; urgency=low
+ [ Petter Reinholdtsen ]
*
- -- Petter Reinholdtsen <pere at debian.org> Sun, 25 May 2008 22:10:49 +0200
+ [ Kel Modderman ]
+ * Add Status field to description of each dpatch, to describe how each
+ patch stands with respect to upstream inclusion.
+
+ -- Kel Modderman <kel at otaku42.de> Mon, 02 Jun 2008 15:32:27 +1000
insserv (1.11.0-9) unstable; urgency=low
Modified: trunk/src/insserv/debian/patches/32_debug_option.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/32_debug_option.dpatch?rev=763&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/32_debug_option.dpatch (original)
+++ trunk/src/insserv/debian/patches/32_debug_option.dpatch Mon Jun 2 05:34:07 2008
@@ -3,6 +3,9 @@
Implement new option -D instead of the compile time option DEBUG to
ease debugging.
+
+Status: Not submitted upstream. Does not apply to version 1.11.2
+ Need to drop or fix/improve and submit.
@DPATCH@
--- insserv-1.11.0.orig/insserv.c
Modified: trunk/src/insserv/debian/patches/33_nosuse_scripts.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/33_nosuse_scripts.dpatch?rev=763&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/33_nosuse_scripts.dpatch (original)
+++ trunk/src/insserv/debian/patches/33_nosuse_scripts.dpatch Mon Jun 2 05:34:07 2008
@@ -2,6 +2,8 @@
## 33_nosuse_scripts.dpatch by Petter Reinholdtsen <pere at hungry.com>
Disable some suse specific code.
+
+Status: Applied to version 1.11.2
@DPATCH@
diff -u insserv-1.11.0/insserv.c insserv-1.11.0/insserv.c
Modified: trunk/src/insserv/debian/patches/40_segfault_virtprov.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/40_segfault_virtprov.dpatch?rev=763&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/40_segfault_virtprov.dpatch (original)
+++ trunk/src/insserv/debian/patches/40_segfault_virtprov.dpatch Mon Jun 2 05:34:07 2008
@@ -3,6 +3,9 @@
Avoid segfault when an enabled service provide a virtual system
facility.
+
+Status: Suspect bug is fixed upstream with changes. This patch does not
+ apply to version 1.11.2
@DPATCH@
--- insserv/insserv.c
Modified: trunk/src/insserv/debian/patches/41_cleansystem.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/41_cleansystem.dpatch?rev=763&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/41_cleansystem.dpatch (original)
+++ trunk/src/insserv/debian/patches/41_cleansystem.dpatch Mon Jun 2 05:34:07 2008
@@ -1,6 +1,8 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
Remove the generated .system file when cleaning.
+
+Status: Applied to version 1.11.2
@DPATCH@
--- insserv-1.11.0.orig/Makefile
Modified: trunk/src/insserv/debian/patches/42_loopnochangemsg.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/42_loopnochangemsg.dpatch?rev=763&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/42_loopnochangemsg.dpatch (original)
+++ trunk/src/insserv/debian/patches/42_loopnochangemsg.dpatch Mon Jun 2 05:34:07 2008
@@ -5,8 +5,9 @@
existing boot sequence. Thanks to Frans Pop for the rationale for
this change.
+Status: Not applied in version 1.11.2
+
@DPATCH@
-
--- insserv-1.11.0.orig/insserv.c
+++ insserv-1.11.0/insserv.c
@@ -2647,7 +2647,7 @@
Modified: trunk/src/insserv/debian/patches/50_sign_warning.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/50_sign_warning.dpatch?rev=763&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/50_sign_warning.dpatch (original)
+++ trunk/src/insserv/debian/patches/50_sign_warning.dpatch Mon Jun 2 05:34:07 2008
@@ -3,6 +3,8 @@
Get rid of signed/unsigned compare warnings visible with gcc option
-W.
+
+Status: Applied to version 1.11.2
@DPATCH@
--- insserv-1.11.0.orig/insserv.c
Modified: trunk/src/insserv/debian/patches/51_overwrite_output.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/51_overwrite_output.dpatch?rev=763&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/51_overwrite_output.dpatch (original)
+++ trunk/src/insserv/debian/patches/51_overwrite_output.dpatch Mon Jun 2 05:34:07 2008
@@ -2,6 +2,8 @@
## 51_overwrite_output.dpatch by Petter Reinholdtsen
Include more information when overwriting the provide LSB defaults.
+
+Status: Does not apply to version 1.11.2. Need to refresh and submit.
@DPATCH@
diff -u insserv-1.11.0/insserv.c insserv-1.11.0/insserv.c
Modified: trunk/src/insserv/debian/patches/52_shutdown_links.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/52_shutdown_links.dpatch?rev=763&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/52_shutdown_links.dpatch (original)
+++ trunk/src/insserv/debian/patches/52_shutdown_links.dpatch Mon Jun 2 05:34:07 2008
@@ -3,6 +3,10 @@
Make sure to not not insert unwanted stop symlinks for scripts that
are already configured. BTS issue #464017.
+
+Status: Not applied to version 1.11.2. Although patch makes insserv behave
+ correctly, I believe the fix can be done cleaner. Need to reinvestigate
+ and submit.
@DPATCH@
--- insserv-1.11.0.orig/insserv.c
Modified: trunk/src/insserv/debian/patches/60_disable_cfgfilter_stat.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/60_disable_cfgfilter_stat.dpatch?rev=763&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/60_disable_cfgfilter_stat.dpatch (original)
+++ trunk/src/insserv/debian/patches/60_disable_cfgfilter_stat.dpatch Mon Jun 2 05:34:07 2008
@@ -1,17 +1,15 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 60_disable_cfgfilter_stat.dpatch by Kel Modderman <kel at otaku42.de>
-##
-## DP: Goal: Make sure /etc/insserv.conf.d/* are used.
-## DP:
-## DP: Fixes: none
-## DP:
-## DP: Status: Applied upstream
-## DP:
-## DP: Notes: The call to stat in scandir filter is flawed, it does not stat
-## DP: full path to file and prevents /etc/insserv.conf.d/* from being
-## DP: used. The filter function is called at one other location, and a
-## DP: stat + IS_REG() test is done before that.
-## DP: test_insserv_conf_d test suite case exposes this situation.
+
+Goal: Make sure /etc/insserv.conf.d/* are used.
+Fixes: none
+Status: Applied to version 1.11.2
+
+The call to stat in scandir filter is flawed, it does not stat
+full path to file and prevents /etc/insserv.conf.d/* from being
+used. The filter function is called at one other location, and a
+stat + IS_REG() test is done before that.
+test_insserv_conf_d test suite case exposes this situation.
@DPATCH@
diff -urNad insserv~/insserv.c insserv/insserv.c
Modified: trunk/src/insserv/debian/patches/62_warn_on_missing_required_fields.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/62_warn_on_missing_required_fields.dpatch?rev=763&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/62_warn_on_missing_required_fields.dpatch (original)
+++ trunk/src/insserv/debian/patches/62_warn_on_missing_required_fields.dpatch Mon Jun 2 05:34:07 2008
@@ -1,16 +1,14 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 62_warn_on_missing_required_fields.dpatch by Kel Modderman <kel at otaku42.de>
##
-## DP: Goal: Emit warning when script contains header with missing Provides,
-## DP: Required-Start or Required-Stop LSB comment keywords. This is
-## DP: consistent with lintian warning:
-## DP: http://lintian.debian.org/reports/tags/init.d-script-missing-lsb-keyword.html
-## DP:
-## DP: Fixes: none
-## DP:
-## DP: Status: Intend to submit upstream.
-## DP:
-## DP: Notes: test_broken_header test suite case exposes this situation.
+Goal: Emit warning when script contains header with missing Provides,
+Required-Start or Required-Stop LSB comment keywords. This is consistent
+with lintian warning:
+ http://lintian.debian.org/reports/tags/init.d-script-missing-lsb-keyword.html
+Fixes: none
+Status: Not applied to version 1.11.2. Need to submit.
+
+test_broken_header test suite case exposes this situation.
@DPATCH@
diff -urNad insserv~/insserv.c insserv/insserv.c
Modified: trunk/src/insserv/debian/patches/63_warn_on_missing_default_fields.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/63_warn_on_missing_default_fields.dpatch?rev=763&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/63_warn_on_missing_default_fields.dpatch (original)
+++ trunk/src/insserv/debian/patches/63_warn_on_missing_default_fields.dpatch Mon Jun 2 05:34:07 2008
@@ -1,18 +1,16 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 63_warn_on_missing_default_fields.dpatch by Kel Modderman <kel at otaku42.de>
##
-## DP: Goal: Emit warning when script contains header with missing
-## DP: Default-Start or Default-Stop LSB comment keywords in addition to
-## DP: Provides, Required-Start and Required-Stop. This is consistent with
-## DP: lintian warning:
-## DP: http://lintian.debian.org/reports/tags/init.d-script-missing-lsb-keyword.html
-## DP:
-## DP: Fixes: none
-## DP:
-## DP: Status: Intend to submit upstream.
-## DP:
-## DP: Notes: test_no_default_start and test_no_default_stop test suite cases
-## DP: expose this situation.
+Goal: Emit warning when script contains header with missing
+Default-Start or Default-Stop LSB comment keywords in addition to
+Provides, Required-Start and Required-Stop. This is consistent with
+lintian warning:
+ http://lintian.debian.org/reports/tags/init.d-script-missing-lsb-keyword.html
+Fixes: none
+Status: Not applied to version 1.11.2. Need to submit.
+
+test_no_default_start and test_no_default_stop test suite cases
+expose this situation.
@DPATCH@
diff -urNad insserv~/insserv.c insserv/insserv.c
Modified: trunk/src/insserv/debian/patches/64_missing_default_fields_fallback.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/64_missing_default_fields_fallback.dpatch?rev=763&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/64_missing_default_fields_fallback.dpatch (original)
+++ trunk/src/insserv/debian/patches/64_missing_default_fields_fallback.dpatch Mon Jun 2 05:34:07 2008
@@ -1,16 +1,13 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 64_missing_default_fields_fallback.dpatch by Kel Modderman <kel at otaku42.de>
##
-## DP: Goal: In the cases where Default-Start or Default-Stop are undefined for
-## DP: a script, assume runlevel links to be empty. If Default-Start is defined
-## DP: and empty, do not overwrite it. Likewise for Default-Stop.
-## DP:
-## DP: Fixes: none
-## DP:
-## DP: Status: Intend to submit upstream.
-## DP:
-## DP: Notes: test_no_default_start and test_no_default_stop expose these
-## DP: cases.
+Goal: In the cases where Default-Start or Default-Stop are undefined for
+a script, assume runlevel links to be empty. If Default-Start is defined
+and empty, do not overwrite it. Likewise for Default-Stop.
+Fixes: none
+Status: Not applied to version 1.11.2. Need to improve patch and submit.
+
+test_no_default_start and test_no_default_stop expose these cases.
@DPATCH@
diff -urNad insserv~/insserv.c insserv/insserv.c
More information about the Initscripts-ng-commits
mailing list