[Initscripts-ng-commits] r772 - in /branches/insserv-1.11.9/debian: ./ patches/
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Mon Jul 14 03:36:26 UTC 2008
Author: kelmo-guest
Date: Mon Jul 14 03:36:25 2008
New Revision: 772
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=772
Log:
* Convert patches to a quilt series, adjust debian/{rules,control}
accordingly. Build-Depend on quilt.
* Add 70_test_suite_failed_count.patch to close delta between SUSE and
Debian common test suite shlib.
Added:
branches/insserv-1.11.9/debian/patches/10_nosuse.patch
branches/insserv-1.11.9/debian/patches/11_more_warnings.patch
branches/insserv-1.11.9/debian/patches/31_debian_conf.patch
branches/insserv-1.11.9/debian/patches/42_loopnochangemsg.patch
branches/insserv-1.11.9/debian/patches/62_warn_on_missing_required_fields.patch
branches/insserv-1.11.9/debian/patches/63_warn_on_missing_default_fields.patch
branches/insserv-1.11.9/debian/patches/64_missing_default_fields_fallback.patch
branches/insserv-1.11.9/debian/patches/70_test_suite_failed_count.patch
branches/insserv-1.11.9/debian/patches/series
Removed:
branches/insserv-1.11.9/debian/patches/00list
branches/insserv-1.11.9/debian/patches/10_nosuse.dpatch
branches/insserv-1.11.9/debian/patches/11_more_warnings.dpatch
branches/insserv-1.11.9/debian/patches/31_debian_conf.dpatch
branches/insserv-1.11.9/debian/patches/42_loopnochangemsg.dpatch
branches/insserv-1.11.9/debian/patches/62_warn_on_missing_required_fields.dpatch
branches/insserv-1.11.9/debian/patches/63_warn_on_missing_default_fields.dpatch
branches/insserv-1.11.9/debian/patches/64_missing_default_fields_fallback.dpatch
Modified:
branches/insserv-1.11.9/debian/changelog
branches/insserv-1.11.9/debian/control
branches/insserv-1.11.9/debian/rules
Modified: branches/insserv-1.11.9/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/changelog?rev=772&op=diff
==============================================================================
--- branches/insserv-1.11.9/debian/changelog (original)
+++ branches/insserv-1.11.9/debian/changelog Mon Jul 14 03:36:25 2008
@@ -27,8 +27,12 @@
- 62_warn_on_missing_required_fields.dpatch
- 63_warn_on_missing_default_fields.dpatch
- 64_missing_default_fields_fallback.dpatch
-
- -- Kel Modderman <kel at otaku42.de> Mon, 14 Jul 2008 10:31:59 +1000
+ * Convert patches to a quilt series, adjust debian/{rules,control}
+ accordingly. Build-Depend on quilt.
+ * Add 70_test_suite_failed_count.patch to close delta between SUSE and
+ Debian common test suite shlib.
+
+ -- Kel Modderman <kel at otaku42.de> Mon, 14 Jul 2008 13:35:00 +1000
insserv (1.11.0-9) unstable; urgency=low
Modified: branches/insserv-1.11.9/debian/control
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/control?rev=772&op=diff
==============================================================================
--- branches/insserv-1.11.9/debian/control (original)
+++ branches/insserv-1.11.9/debian/control Mon Jul 14 03:36:25 2008
@@ -2,7 +2,7 @@
Section: misc
Priority: optional
Maintainer: Petter Reinholdtsen <pere at debian.org>
-Build-Depends: debhelper (>= 4.0.0), po-debconf, dpatch
+Build-Depends: debhelper (>= 4.0.0), po-debconf, quilt
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/initscripts-ng/trunk/src/insserv
Vcs-Browser: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv
Added: branches/insserv-1.11.9/debian/patches/10_nosuse.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/10_nosuse.patch?rev=772&op=file
==============================================================================
--- branches/insserv-1.11.9/debian/patches/10_nosuse.patch (added)
+++ branches/insserv-1.11.9/debian/patches/10_nosuse.patch Mon Jul 14 03:36:25 2008
@@ -1,0 +1,18 @@
+Goal: Disable the SUSE specific parts and make sure to build
+ with debugging.
+Fixes: none, made as part of Debian porting.
+Status wrt upstream: Debian specific, showed to upstream.
+Notes: The debug symbol change might make sense to get included
+ upstream.
+---
+--- a/Makefile
++++ b/Makefile
+@@ -9,7 +9,7 @@
+ #DESTDIR = /tmp/root
+ #DEBUG = -DDEBUG=1 -Wpacked
+ DEBUG =
+-ISSUSE = -DSUSE
++#ISSUSE = -DSUSE
+ DESTDIR =
+ VERSION = 1.11.9
+ DATE = $(shell date +'%d%b%y' | tr '[:lower:]' '[:upper:]')
Added: branches/insserv-1.11.9/debian/patches/11_more_warnings.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/11_more_warnings.patch?rev=772&op=file
==============================================================================
--- branches/insserv-1.11.9/debian/patches/11_more_warnings.patch (added)
+++ branches/insserv-1.11.9/debian/patches/11_more_warnings.patch Mon Jul 14 03:36:25 2008
@@ -1,0 +1,16 @@
+Goal: Make more issues visible by using -W in addition to -Wall
+Fixes: none
+Status wrt upstream: Need to submit upstream
+Notes: none
+---
+--- a/Makefile
++++ b/Makefile
+@@ -27,7 +27,7 @@
+ COPTS = -g -O2
+ endif
+ endif
+- CFLAGS = -Wall $(COPTS) $(DEBUG) $(LOOPS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
++ CFLAGS = -W -Wall $(COPTS) $(DEBUG) $(LOOPS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
+ $(ISSUSE) -DINITDIR=\"$(INITDIR)\" -DINSCONF=\"$(INSCONF)\" -pipe
+ CLOOP = -falign-loops=0
+ LDFLAGS = -Wl,-O,3,--relax
Added: branches/insserv-1.11.9/debian/patches/31_debian_conf.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/31_debian_conf.patch?rev=772&op=file
==============================================================================
--- branches/insserv-1.11.9/debian/patches/31_debian_conf.patch (added)
+++ branches/insserv-1.11.9/debian/patches/31_debian_conf.patch Mon Jul 14 03:36:25 2008
@@ -1,0 +1,50 @@
+diff -urNad insserv~/insserv.conf insserv/insserv.conf
+--- insserv~/insserv.conf 2008-01-04 11:19:42.000000000 +0100
++++ insserv/insserv.conf 2008-01-04 11:21:59.000000000 +0100
+@@ -1,29 +1,29 @@
+ #
+ # All local filesystems are mounted (done during boot phase)
+ #
+-$local_fs boot.localfs
++$local_fs +mountall +mountoverflowtmp +umountfs
+
+ #
+ # Low level networking (ethernet card)
+ #
+-$network network +pcmcia +hotplug
++$network +networking +ifupdown
+
+ #
+ # Named is operational
+ #
+-$named +named +dnsmasq +lwresd $network
++$named +named +dnsmasq +lwresd +bind9 $network
+
+ #
+ # All remote filesystems are mounted (note in some cases /usr may
+ # be remote. Most applications that care will probably require
+ # both $local_fs and $remote_fs)
+ #
+-$remote_fs $local_fs +nfs
++$remote_fs $local_fs +mountnfs +mountnfs-bootclean +umountnfs +sendsigs
+
+ #
+ # System logger is operational
+ #
+-$syslog syslog
++$syslog +syslog +sysklogd +rsyslog +syslog-ng
+
+ #
+ # SunRPC portmapper available
+@@ -33,9 +33,9 @@
+ #
+ # The system time has been set correctly
+ #
+-$time boot.clock +xntpd
++$time hwclock
+
+ #
+ # Services which need to be interactive
+ #
+-<interactive> boot.crypto boot.localfs boot.rootfsck apache apache2 kdump
++<interactive> glibc hostname mountkernfs udev mountdevsubfs checkroot checkfs console-screen keymap
Added: branches/insserv-1.11.9/debian/patches/42_loopnochangemsg.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/42_loopnochangemsg.patch?rev=772&op=file
==============================================================================
--- branches/insserv-1.11.9/debian/patches/42_loopnochangemsg.patch (added)
+++ branches/insserv-1.11.9/debian/patches/42_loopnochangemsg.patch Mon Jul 14 03:36:25 2008
@@ -1,0 +1,11 @@
+--- a/insserv.c
++++ b/insserv.c
+@@ -2960,7 +2960,7 @@
+ */
+ follow_all();
+ if (is_loop_detected() && !ignore)
+- error("exiting now!\n");
++ error("exiting without changing boot order!\n");
+
+ /*
+ * Be sure that interactive scripts are the only member of
Added: branches/insserv-1.11.9/debian/patches/62_warn_on_missing_required_fields.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/62_warn_on_missing_required_fields.patch?rev=772&op=file
==============================================================================
--- branches/insserv-1.11.9/debian/patches/62_warn_on_missing_required_fields.patch (added)
+++ branches/insserv-1.11.9/debian/patches/62_warn_on_missing_required_fields.patch Mon Jul 14 03:36:25 2008
@@ -1,0 +1,11 @@
+--- a/insserv.c
++++ b/insserv.c
+@@ -1292,7 +1292,7 @@
+ error("exiting now!\n");
+ }
+
+- if (verbose && (begin && end && (!provides || (provides == empty) || !required_start || !required_stop)))
++ if (begin && end && (!provides || (provides == empty) || !required_start || !required_stop))
+ {
+ char *name = basename(path);
+ if (*name == 'S' || *name == 'K')
Added: branches/insserv-1.11.9/debian/patches/63_warn_on_missing_default_fields.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/63_warn_on_missing_default_fields.patch?rev=772&op=file
==============================================================================
--- branches/insserv-1.11.9/debian/patches/63_warn_on_missing_default_fields.patch (added)
+++ branches/insserv-1.11.9/debian/patches/63_warn_on_missing_default_fields.patch Mon Jul 14 03:36:25 2008
@@ -1,0 +1,29 @@
+--- a/insserv.c
++++ b/insserv.c
+@@ -1292,7 +1292,12 @@
+ error("exiting now!\n");
+ }
+
+- if (begin && end && (!provides || (provides == empty) || !required_start || !required_stop))
++ if (begin && end && (!provides || (provides == empty) ||
++#ifdef SUSE
++ !required_start || !required_stop || !default_start))
++#else
++ !required_start || !required_stop || !default_start || !default_stop))
++#endif
+ {
+ char *name = basename(path);
+ if (*name == 'S' || *name == 'K')
+@@ -1306,6 +1311,12 @@
+ warn("missing `Required-Start:' entry: please add even if empty.\n");
+ if (!required_stop)
+ warn("missing `Required-Stop:' entry: please add even if empty.\n");
++ if (!default_start)
++ warn("missing `Default-Start:' entry: please add even if empty.\n");
++#ifndef SUSE
++ if (!default_stop)
++ warn("missing `Default-Stop:' entry: please add even if empty.\n");
++#endif
+ }
+
+ #undef provides
Added: branches/insserv-1.11.9/debian/patches/64_missing_default_fields_fallback.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/64_missing_default_fields_fallback.patch?rev=772&op=file
==============================================================================
--- branches/insserv-1.11.9/debian/patches/64_missing_default_fields_fallback.patch (added)
+++ branches/insserv-1.11.9/debian/patches/64_missing_default_fields_fallback.patch Mon Jul 14 03:36:25 2008
@@ -1,0 +1,48 @@
+--- a/insserv.c
++++ b/insserv.c
+@@ -2796,8 +2796,10 @@
+ */
+ 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
+ }
+ #ifdef SUSE
+ /*
+@@ -2839,19 +2841,34 @@
+ */
+ 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
+ }
+ }
+ }
+ 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]) {
Added: branches/insserv-1.11.9/debian/patches/70_test_suite_failed_count.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/70_test_suite_failed_count.patch?rev=772&op=file
==============================================================================
--- branches/insserv-1.11.9/debian/patches/70_test_suite_failed_count.patch (added)
+++ branches/insserv-1.11.9/debian/patches/70_test_suite_failed_count.patch Mon Jul 14 03:36:25 2008
@@ -1,0 +1,59 @@
+--- a/tests/suite
++++ b/tests/suite
+@@ -15,12 +15,15 @@
+ : ${debug:=""}
+
+ declare -i retval=0
++declare -i checkfailed=0
++declare -i testcount=0
++declare -i testfailed=0
+ finish_test ()
+ {
+ if test 0 -ne $retval ; then
+- echo "error: one or more test failed."
++ echo "error: $testcount test executed, $checkfailed fatal tests failed, $testfailed nonfatal test failed."
+ else
+- echo "success: no test failed."
++ echo "success: $testcount test executed, $testfailed nonfatal tests failed."
+ fi
+ rm -rf ${tmpdir}
+ return $retval
+@@ -172,15 +175,22 @@
+ echo "$path"
+ }
+
++counttest ()
++{
++ testcount=$(expr $testcount + 1)
++}
++
+ error ()
+ {
+ echo error: $@
++ checkfailed=$(expr $checkfailed + 1)
+ retval=1
+ }
+
+ warning ()
+ {
+ echo warning: $@
++ testfailed=$(expr $testfailed + 1)
+ }
+
+ addscript ()
+@@ -204,6 +214,7 @@
+ local script=$1; shift
+ local ret=0
+ test -L ${rcdpath}/[KS][0-9][0-9]$script || ret=1
++ counttest
+ return $ret
+ }
+
+@@ -271,6 +282,7 @@
+ fi
+ popd &> /dev/null
+ test "$order" = "$script1 $script2" || ret=1
++ counttest
+ return $ret
+ }
+
Added: branches/insserv-1.11.9/debian/patches/series
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/series?rev=772&op=file
==============================================================================
--- branches/insserv-1.11.9/debian/patches/series (added)
+++ branches/insserv-1.11.9/debian/patches/series Mon Jul 14 03:36:25 2008
@@ -1,0 +1,8 @@
+10_nosuse.patch
+11_more_warnings.patch
+31_debian_conf.patch
+42_loopnochangemsg.patch
+62_warn_on_missing_required_fields.patch
+63_warn_on_missing_default_fields.patch
+64_missing_default_fields_fallback.patch
+70_test_suite_failed_count.patch
Modified: branches/insserv-1.11.9/debian/rules
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/rules?rev=772&op=diff
==============================================================================
--- branches/insserv-1.11.9/debian/rules (original)
+++ branches/insserv-1.11.9/debian/rules Mon Jul 14 03:36:25 2008
@@ -21,11 +21,11 @@
pkgdatadir = /usr/share/$(PACKAGE)
sbindir = /usr/sbin
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
build: build-stamp
-build-stamp: patch-stamp
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
# Add here commands to compile the package.
More information about the Initscripts-ng-commits
mailing list