Author: kelmo-guest
Date: Tue Jul 22 15:48:11 2008
New Revision: 792
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=792
Log:
Adjust patch series for new upstream.
Removed:
branches/insserv-1.11.10/debian/patches/11_more_warnings.patch
branches/insserv-1.11.10/debian/patches/42_loopnochangemsg.patch
branches/insserv-1.11.10/debian/patches/62_warn_on_missing_required_fields.patch
branches/insserv-1.11.10/debian/patches/70_test_suite_failed_count.patch
branches/insserv-1.11.10/debian/patches/80_do_not_mangle_argv_pointer.patch
Modified:
branches/insserv-1.11.10/debian/changelog
branches/insserv-1.11.10/debian/patches/10_nosuse.patch
branches/insserv-1.11.10/debian/patches/81_debian_default_start_stop_warnings.patch
branches/insserv-1.11.10/debian/patches/series
Modified: branches/insserv-1.11.10/debian/changelog
URL:
http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.10/debian/changelog?rev=792&op=diff
==============================================================================
--- branches/insserv-1.11.10/debian/changelog (original)
+++ branches/insserv-1.11.10/debian/changelog Tue Jul 22 15:48:11 2008
@@ -6,52 +6,42 @@
*
[ Kel Modderman ]
- * Discard patches no longer relevant to new upstream:
+ * Discard patches applied to or no longer relevant to new upstream:
+ - 11_more_warnings.dpatch
- 32_debug_option.dpatch
- 33_nosuse_scripts.dpatch
- 40_segfault_virtprov.dpatch
- 41_cleansystem.dpatch
+ - 42_loopnochangemsg.dpatch
- 50_sign_warning.dpatch
- 51_overwrite_output.dpatch
- 52_shutdown_links.dpatch
- 60_disable_cfgfilter_stat.dpatch
+ - 62_warn_on_missing_required_fields.dpatch
+ - 63_warn_on_missing_default_fields.dpatch
- 64_missing_default_fields_fallback.dpatch
* Discard patches not applied in series:
- 32_debug_option.dpatch
- 34_debian_fixedscripts.dpatch
* Refresh patches that still apply to new upstream:
- 10_nosuse.dpatch
- - 11_more_warnings.dpatch
- - 42_loopnochangemsg.dpatch
- - 62_warn_on_missing_required_fields.dpatch
- - 63_warn_on_missing_default_fields.dpatch
+ - 31_debian_conf.dpatch
* Convert patches to a quilt series, adjust debian/{rules,control}
accordingly. Build-Depend on quilt.
- * Merge 63_warn_on_missing_default_fields.patch into
- 62_warn_on_missing_required_fields.patch.
- * Add 70_test_suite_failed_count.patch to close delta between SUSE and
- Debian common test suite shlib.
- * Add 80_do_not_mangle_argv_pointer.patch to revert optimisation that
- modifies argv pointer and causes chkfor() function to be impotent
- thereafter, completely wrecking the test suite.
- * Add 81_debian_default_start_stop_warnings.patch to harden Default-Start
- and Default-Stop handling for Debian. Improve warnings when defaults are
- overriden by on disk link due to unhandled change in script LSB header.
- Don't provide default fallbacks to scripts without LSB header information.
- * Refresh 31_debian_conf.patch.
+ * Add 81_debian_default_start_stop_warnings.patch to generate warnings when
+ empty start|stop runlevel configuration is attempted to be changed.
* Add an extra call to list_rclinks() in test_newbug_keepoldorder()
function of run-testsuite, after introducing the bug.
* Make test_adding_start() and test_adding_stop() run-testsuite
functions unconditionally fatal on failure.
* Make test_bogus_facility() run-testsuite function non-fatal.
- * Mark tests that are currently failing with a comment in run-
- testsuite.
+ * Mark tests that are currently failing with a comment in run-testsuite.
* Add test_removing_start() and test_removing_stop() to run-testsuite,
showing that insserv will preserve existing links when script header is
unproperly replaced with empty Default-Start or Default-Stop.
* Make test_adding_start() case a more realistic example.
- -- Kel Modderman <[EMAIL PROTECTED]> Wed, 23 Jul 2008 01:32:37 +1000
+ -- Kel Modderman <[EMAIL PROTECTED]> Wed, 23 Jul 2008 01:44:33 +1000
insserv (1.11.0-9) unstable; urgency=low
Modified: branches/insserv-1.11.10/debian/patches/10_nosuse.patch
URL:
http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.10/debian/patches/10_nosuse.patch?rev=792&op=diff
==============================================================================
--- branches/insserv-1.11.10/debian/patches/10_nosuse.patch (original)
+++ branches/insserv-1.11.10/debian/patches/10_nosuse.patch Tue Jul 22 15:48:11
2008
@@ -14,5 +14,5 @@
-ISSUSE = -DSUSE
+#ISSUSE = -DSUSE
DESTDIR =
- VERSION = 1.11.9
+ VERSION = 1.11.10
DATE = $(shell date +'%d%b%y' | tr '[:lower:]' '[:upper:]')
Modified:
branches/insserv-1.11.10/debian/patches/81_debian_default_start_stop_warnings.patch
URL:
http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.10/debian/patches/81_debian_default_start_stop_warnings.patch?rev=792&op=diff
==============================================================================
---
branches/insserv-1.11.10/debian/patches/81_debian_default_start_stop_warnings.patch
(original)
+++
branches/insserv-1.11.10/debian/patches/81_debian_default_start_stop_warnings.patch
Tue Jul 22 15:48:11 2008
@@ -1,40 +1,28 @@
-Improve warnings when overriding defaults with existing runlevel link scheme.
+Print a warning when new link scheme intends to add start or stop links
+when empty runlevel configuration exists for currently active script.
-In Debian, if Default-Start or Default-Stop fields are empty, warn and override
-defaults if runlevel links exist. Do not fallback to defaults when defaults are
-missing (broken LSB info), instead print a warning and create no links at all.
-
-This should not happen, as /usr/sbin/update-rc.d and lintian should be able to
-print enough warnings so that a Debian package maintainer notices the problems
-during his/her package quality control tests.
+This is a cleanup of previously submitted patch.
---
--- a/insserv.c
+++ b/insserv.c
-@@ -2779,8 +2779,9 @@
- */
- if (!defaults && (deflvls != service->start->lvl)) {
- if (!del && chkfor(d->d_name, argv, argc) &&
!(argr[curr_argc]))
-- warn("Warning, current start runlevel(s) %s
of script `%s' overwrites defaults %s.\n",
-- lvl2str(service->start->lvl),
d->d_name, lvl2str(deflvls));
-+ warn("Warning, current start runlevel(s)
(%s) of script `%s' overwrites defaults (%s).\n",
-+ service->start->lvl ?
lvl2str(service->start->lvl) : "empty", d->d_name,
-+ lvl2str(deflvls));
- }
- } else
- /*
-@@ -2788,7 +2789,7 @@
+@@ -2774,18 +2774,30 @@
* needed for enabling interactive services at
first time.
*/
service->start->lvl = deflvls;
-
+- } else if (!script_inf.default_start) {
+#ifdef SUSE
- } else {
++ } else {
/*
* Could be a none LSB script, use info from current
link scheme.
-@@ -2798,6 +2799,20 @@
+ * If not found use default.
+ */
+ if (service->attr.flags & SERV_ENABLED)
script_inf.default_start =
lvl2str(service->start->lvl);
+-#ifdef SUSE
else
script_inf.default_start =
xstrdup(DEFAULT_START_LVL);
+-#endif /* SUSE */
+#else
+ } else if (script_inf.default_start &&
script_inf.default_start == empty) {
+ if ((service->attr.flags & SERV_ENABLED) &&
service->start->lvl) {
@@ -52,31 +40,24 @@
}
#ifdef SUSE
/*
-@@ -2822,8 +2837,9 @@
- */
- if (!defaults && (deflvlk != service->stopp->lvl)) {
- if (!del && chkfor(d->d_name, argv, argc) &&
!(argr[curr_argc]))
-- warn("Warning, current stop runlevel(s) %s
of script `%s' overwrites defaults %s.\n",
-- lvl2str(service->stopp->lvl),
d->d_name, lvl2str(deflvlk));
-+ warn("Warning, current stop runlevel(s)
(%s) of script `%s' overwrites defaults (%s).\n",
-+ service->stopp->lvl ?
lvl2str(service->stopp->lvl) : "empty", d->d_name,
-+ lvl2str(deflvlk));
- }
- } else
- /*
-@@ -2831,7 +2847,7 @@
+@@ -2822,18 +2834,30 @@
* needed for enabling interactive services at
first time.
*/
service->stopp->lvl = deflvlk;
-
+- } else if (!script_inf.default_stop) {
+#ifdef SUSE
- } else {
++ } else {
/*
* Could be a none LSB script, use info from current
link scheme.
-@@ -2841,17 +2857,44 @@
+ * If not found use default.
+ */
+ if (service->attr.flags & SERV_ENABLED)
script_inf.default_stop =
lvl2str(service->stopp->lvl);
+-#ifdef SUSE
else
script_inf.default_stop = xstrdup(DEFAULT_STOP_LVL);
+-#endif /* SUSE */
+#else
+ } else if (script_inf.default_stop &&
script_inf.default_stop == empty) {
+ if ((service->attr.flags & SERV_ENABLED) &&
service->stopp->lvl) {
@@ -94,27 +75,3 @@
}
}
}
- free(provides);
- }
-
-+#ifdef SUSE
- /* Ahh ... set default multiuser with network */
- if (!script_inf.default_start || script_inf.default_start == empty)
- script_inf.default_start = xstrdup(DEFAULT_START_LVL);
- if (!script_inf.default_stop || script_inf.default_start == empty)
- script_inf.default_stop = xstrdup(DEFAULT_STOP_LVL);
-+#else
-+ if (!script_inf.default_start) {
-+ warn("Default-Start undefined, assuming empty start runlevel(s) for
script `%s'\n",
-+ d->d_name);
-+ script_inf.default_start = empty;
-+ }
-+ if (!script_inf.default_stop) {
-+ warn("Default-Stop undefined, assuming empty stop runlevel(s) for
script `%s'\n",
-+ d->d_name);
-+ script_inf.default_stop = empty;
-+ }
-+#endif
-
- if (chkfor(d->d_name, argv, argc) && !defaults && !del) {
- if (argr[curr_argc]) {
Modified: branches/insserv-1.11.10/debian/patches/series
URL:
http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.10/debian/patches/series?rev=792&op=diff
==============================================================================
--- branches/insserv-1.11.10/debian/patches/series (original)
+++ branches/insserv-1.11.10/debian/patches/series Tue Jul 22 15:48:11 2008
@@ -1,8 +1,3 @@
10_nosuse.patch
-11_more_warnings.patch
31_debian_conf.patch
-42_loopnochangemsg.patch
-62_warn_on_missing_required_fields.patch
-70_test_suite_failed_count.patch
-80_do_not_mangle_argv_pointer.patch
81_debian_default_start_stop_warnings.patch
_______________________________________________
Initscripts-ng-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/initscripts-ng-commits
