[Pkg-sysvinit-commits] r1574 - in sysvinit/trunk/debian: . patches startpar/patches
Kel Modderman
kelmo-guest at alioth.debian.org
Sat Aug 1 13:18:05 UTC 2009
Author: kelmo-guest
Date: 2009-08-01 13:18:05 +0000 (Sat, 01 Aug 2009)
New Revision: 1574
Added:
sysvinit/trunk/debian/patches/series
Removed:
sysvinit/trunk/debian/patches/00list
sysvinit/trunk/debian/patches/12_doc_lastb.dpatch
sysvinit/trunk/debian/patches/68_init_quiet.dpatch
Modified:
sysvinit/trunk/debian/changelog
sysvinit/trunk/debian/control
sysvinit/trunk/debian/patches/10_doc_manuals.dpatch
sysvinit/trunk/debian/patches/11_doc_shutdown-c.dpatch
sysvinit/trunk/debian/patches/14_doc_fsf_addr.dpatch
sysvinit/trunk/debian/patches/21_ifdown_kfreebsd.dpatch
sysvinit/trunk/debian/patches/46_pidof_symlinkman.dpatch
sysvinit/trunk/debian/patches/50_bootlogd_devsubdir.dpatch
sysvinit/trunk/debian/patches/54_bootlogd_findptyfail.dpatch
sysvinit/trunk/debian/patches/60_init_selinux_ifdef.dpatch
sysvinit/trunk/debian/patches/62_init_freebsdterm.dpatch
sysvinit/trunk/debian/patches/70_compiler_warnings.dpatch
sysvinit/trunk/debian/patches/91_sulogin_lockedpw.dpatch
sysvinit/trunk/debian/patches/94_fstab-decode.dpatch
sysvinit/trunk/debian/patches/96_shutdown_acctoff.dpatch
sysvinit/trunk/debian/patches/97_init_starttest.dpatch
sysvinit/trunk/debian/rules
sysvinit/trunk/debian/startpar/patches/00_not_suse.patch
sysvinit/trunk/debian/startpar/patches/01_dev_pts_workaround.patch
sysvinit/trunk/debian/startpar/patches/02_posix_fadvise_kfreebsd.patch
sysvinit/trunk/debian/startpar/patches/03_o_direct_undef.patch
sysvinit/trunk/debian/startpar/patches/04_makeboot_loop_upper_bound.patch
Log:
* Migrate from dpatch to quilt for patch management:
- build-depend on quilt (>= 0.40)
- provide patch and unpatch targets in debian/rules. use custom patch
targets to allow for separate debian/patches, debian/startpar/patches
and debian/insserv/patches patch series
- keep .dpatch file extenstion to make checking changes easier
* Purge debian/patches/12_doc_lastb.dpatch and
debian/patches/68_init_quiet.dpatch, they were never applied and wrong.
* Update patch header for all remaining patches.
Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/changelog 2009-08-01 13:18:05 UTC (rev 1574)
@@ -1,5 +1,6 @@
sysvinit (2.87dsf-3) UNRELEASED; urgency=low
+ [ Petter Reinholdtsen ]
* Drop execution of files in /etc/rc.boot from sysv-rc. This feature
have been obsolete since before 1999. Remove the rc.boot(5) manual
page from the source as well.
@@ -21,8 +22,19 @@
both sysv-rc and insserv (Closes: #538959) if other packages want
to take over the boot sequencing.
- -- Petter Reinholdtsen <pere at debian.org> Tue, 28 Jul 2009 16:03:06 +0200
+ [ Kel Modderman ]
+ * Migrate from dpatch to quilt for patch management:
+ - build-depend on quilt (>= 0.40)
+ - provide patch and unpatch targets in debian/rules. use custom patch
+ targets to allow for separate debian/patches, debian/startpar/patches
+ and debian/insserv/patches patch series
+ - keep .dpatch file extenstion to make checking changes easier
+ * Purge debian/patches/12_doc_lastb.dpatch and
+ debian/patches/68_init_quiet.dpatch, they were never applied and wrong.
+ * Update patch header for all remaining patches.
+ -- Kel Modderman <kel at otaku42.de> Sat, 01 Aug 2009 23:16:50 +1000
+
sysvinit (2.87dsf-2) unstable; urgency=low
[ Petter Reinholdtsen ]
Modified: sysvinit/trunk/debian/control
===================================================================
--- sysvinit/trunk/debian/control 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/control 2009-08-01 13:18:05 UTC (rev 1574)
@@ -3,7 +3,7 @@
Priority: required
Maintainer: Debian sysvinit maintainers <pkg-sysvinit-devel at lists.alioth.debian.org>
Uploaders: Petter Reinholdtsen <pere at debian.org>, Henrique de Moraes Holschuh <hmh at debian.org>, Kel Modderman <kel at otaku42.de>
-Build-Depends: debhelper (>= 1), dpatch, libselinux1-dev (>= 1.14) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libsepol1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
+Build-Depends: debhelper (>= 1), quilt (>= 0.40), libselinux1-dev (>= 1.14) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libsepol1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
Standards-Version: 3.8.2
Homepage: http://freshmeat.net/projects/sysvinit/
Vcs-Svn: svn://svn.debian.org/pkg-sysvinit/sysvinit/trunk
Deleted: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/patches/00list 2009-08-01 13:18:05 UTC (rev 1574)
@@ -1,17 +0,0 @@
-10_doc_manuals
-11_doc_shutdown-c
-# 12_doc_lastb patch is reported to be incorrect.
-#12_doc_lastb
-14_doc_fsf_addr
-21_ifdown_kfreebsd
-46_pidof_symlinkman
-50_bootlogd_devsubdir
-54_bootlogd_findptyfail
-60_init_selinux_ifdef
-62_init_freebsdterm
-#68_init_quiet
-70_compiler_warnings
-91_sulogin_lockedpw
-94_fstab-decode
-96_shutdown_acctoff
-97_init_starttest
Modified: sysvinit/trunk/debian/patches/10_doc_manuals.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/10_doc_manuals.dpatch 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/patches/10_doc_manuals.dpatch 2009-08-01 13:18:05 UTC (rev 1574)
@@ -1,13 +1,10 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_doc_manuals.dpatch by the Debian ALSA psychos
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Misc patches to manual pages
+Purpose: Misc patches to manual pages
+Authour: the Debian ALSA psychos
+Fixes: -
+Status: unknown
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./man/init.8 /tmp/dpep-work.VkakEo/trunk/man/init.8
---- ./man/init.8 2005-12-02 17:22:58.000000000 +0100
-+++ /tmp/dpep-work.VkakEo/trunk/man/init.8 2006-02-15 17:10:18.000000000 +0100
+--- a/man/init.8
++++ b/man/init.8
@@ -39,21 +39,34 @@
only a selected group of processes to exist. The processes spawned by
\fBinit\fP for each of these runlevels are defined in the
@@ -50,7 +47,7 @@
Internally they are aliases for the same runlevel.
.\"}}}
.PP
-@@ -65,10 +78,11 @@
+@@ -65,9 +78,10 @@
entry (or no \fB/etc/inittab\fP at all), a runlevel must be
entered at the system console.
.PP
@@ -59,12 +56,11 @@
-\fB/sbin/sulogin\fP is invoked on \fB/dev/console\fP.
+Runlevel \fBS\fP or \fBs\fP initialize the system
+and do not require an \fB/etc/inittab\fP file.
- .PP
-+In single user mode, \fB/sbin/sulogin\fP is invoked on \fB/dev/console\fP.
+.PP
++In single user mode, \fB/sbin/sulogin\fP is invoked on \fB/dev/console\fP.
+ .PP
When entering single user mode, \fBinit\fP initializes the consoles
\fBstty\fP settings to sane values. Clocal mode is set. Hardware
- speed and handshaking are not changed.
@@ -266,6 +280,14 @@
for them. If the processes change their group, \fBinit\fP can't
kill them and you may end up with two processes reading from one
Property changes on: sysvinit/trunk/debian/patches/10_doc_manuals.dpatch
___________________________________________________________________
Deleted: svn:executable
- *
Modified: sysvinit/trunk/debian/patches/11_doc_shutdown-c.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/11_doc_shutdown-c.dpatch 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/patches/11_doc_shutdown-c.dpatch 2009-08-01 13:18:05 UTC (rev 1574)
@@ -1,18 +1,11 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_doc_shutdown-c.dpatch by Petter Reinholdtsen, based on text
-## proposal from Dan Jacobson
+Purpose: Make it clear that shutdown -c can only cancel a waiting shutdown,
+ not an active one.
+Authour: Petter Reinholdtsen, based on text proposal from Dan Jacobson
+Fixes: #374038
+Status: not sent upstream
-Make it clear that shutdown -c can only cancel a waiting shutdown, not
-an active one.
-
-BTS: #374038
-Status: not sent upstream
-
- at DPATCH@
-Index: a/man/shutdown.8
-===================================================================
---- a/man/shutdown.8 (revision 1485)
-+++ b/man/shutdown.8 (working copy)
+--- a/man/shutdown.8
++++ b/man/shutdown.8
@@ -81,9 +81,10 @@
.\"}}}
.\"{{{ -c
Property changes on: sysvinit/trunk/debian/patches/11_doc_shutdown-c.dpatch
___________________________________________________________________
Deleted: svn:executable
- *
Deleted: sysvinit/trunk/debian/patches/12_doc_lastb.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/12_doc_lastb.dpatch 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/patches/12_doc_lastb.dpatch 2009-08-01 13:18:05 UTC (rev 1574)
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_doc_lastb.dpatch by Javier Fernández-Sanguino Peńa
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP:
-## DP: This patch is reported to be incorrect. See bug report for
-## DP: more info.
-## DP:
-## DP: Document the fact that file mode for btmp is important. (bug
-## DP: #295335)
-
- at DPATCH@
-diff -Nru sysvinit-2.86.ds1/man/last.1 sysvinit-2.86.ds1.new/man/last.1
---- sysvinit-2.86.ds1/man/last.1 2004-07-30 13:39:18.000000000 +0200
-+++ sysvinit-2.86.ds1.new/man/last.1 2005-02-15 08:58:19.000000000 +0100
-@@ -83,6 +83,11 @@
- configuration issue. If you want the files to be used, they can be
- created with a simple \fBtouch\fP(1) command (for example,
- \fItouch /var/log/wtmp\fP).
-+.PP
-+Moreover, since the \fIbtmp\fP file might contain sensitive information
-+that might be useful for a local attacker, this file is only logged
-+to if it is not world readable. In order to get login programs to
-+write there you need to \fIchmod 640 /var/log/btmp\fP).
- .\"{{{ Files
- .SH FILES
- /var/log/wtmp
Modified: sysvinit/trunk/debian/patches/14_doc_fsf_addr.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/14_doc_fsf_addr.dpatch 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/patches/14_doc_fsf_addr.dpatch 2009-08-01 13:18:05 UTC (rev 1574)
@@ -1,14 +1,11 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 14_doc_fsf_addr.dpatch by Kel Modderman
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Refer to /usr/share/common-licenses/GPL-2 and not the
-## DP: versionless symlink /usr/share/common-licenses/GPL.
+Purpose: Refer to /usr/share/common-licenses/GPL-2 and not the versionless
+ symlink /usr/share/common-licenses/GPL.
+Authour: Kel Modderman <kel at otaku42.de>
+Fixes: -
+Status: Debian specific
- at DPATCH@
-diff -urNad sysvinit~/COPYRIGHT sysvinit/COPYRIGHT
---- sysvinit~/COPYRIGHT 2009-02-02 17:11:24.000000000 +1000
-+++ sysvinit/COPYRIGHT 2009-07-19 23:49:37.000000000 +1000
+--- a/COPYRIGHT
++++ b/COPYRIGHT
@@ -15,5 +15,5 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Property changes on: sysvinit/trunk/debian/patches/14_doc_fsf_addr.dpatch
___________________________________________________________________
Deleted: svn:executable
- *
Modified: sysvinit/trunk/debian/patches/21_ifdown_kfreebsd.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/21_ifdown_kfreebsd.dpatch 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/patches/21_ifdown_kfreebsd.dpatch 2009-08-01 13:18:05 UTC (rev 1574)
@@ -1,13 +1,10 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 22_ifdown_kfreebsd.dpatch mostly by Robert Millan
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Get ifdown working on kFreeBSD. (Closes: #327031)
+Purpose: Get ifdown working on kFreeBSD.
+Authour: Robert Millan <rmh at aybabtu.com>
+Fixes: #327031
+Status: unknown
- at DPATCH@
-diff -urNad sysvinit-2.86.ds1~/src/ifdown.c sysvinit-2.86.ds1/src/ifdown.c
---- sysvinit-2.86.ds1~/src/ifdown.c 2008-04-17 15:49:43.000000000 +0200
-+++ sysvinit-2.86.ds1/src/ifdown.c 2008-04-17 15:57:16.000000000 +0200
+--- a/src/ifdown.c
++++ b/src/ifdown.c
@@ -61,10 +61,25 @@
continue;
if (strchr(ifr[i].ifr_name, ':') != NULL)
Property changes on: sysvinit/trunk/debian/patches/21_ifdown_kfreebsd.dpatch
___________________________________________________________________
Deleted: svn:executable
- *
Modified: sysvinit/trunk/debian/patches/46_pidof_symlinkman.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/46_pidof_symlinkman.dpatch 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/patches/46_pidof_symlinkman.dpatch 2009-08-01 13:18:05 UTC (rev 1574)
@@ -1,13 +1,11 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 46_pidof_symlinkman.dpatch by Bill Nottingham and Fedora.
+Purpose: Add note to pidof manual page about the use of readlink(2)
+Authour: Bill Nottingham and Fedora.
+Fixes: -
+Status: unknown
-Document how pidof handle symlinks.
-
- at DPATCH@
-diff -up sysvinit-2.86/man/pidof.8.foo sysvinit-2.86/man/pidof.8
---- sysvinit-2.86/man/pidof.8.foo 2008-12-08 15:09:31.000000000 -0500
-+++ sysvinit-2.86/man/pidof.8 2008-12-08 15:11:48.000000000 -0500
-@@ -43,7 +43,11 @@ which should also be located in \fP/sbin
+--- a/man/pidof.8
++++ b/man/pidof.8
+@@ -50,7 +50,11 @@
When \fIpidof\fP is invoked with a full pathname to the program it
should find the pid of, it is reasonably safe. Otherwise it is possible
that it returns pids of running programs that happen to have the same name
Property changes on: sysvinit/trunk/debian/patches/46_pidof_symlinkman.dpatch
___________________________________________________________________
Deleted: svn:executable
- *
Modified: sysvinit/trunk/debian/patches/50_bootlogd_devsubdir.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/50_bootlogd_devsubdir.dpatch 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/patches/50_bootlogd_devsubdir.dpatch 2009-08-01 13:18:05 UTC (rev 1574)
@@ -1,17 +1,11 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_bootlogd_devsubdir.dpatch by Petter Reinholdtsen
+Purpose: Rewrite findtty() in bootlogd to recursively search /dev/ for the
+ correct device, to handle terminal devices for example in /dev/pty/.
+Authour: Petter Reinholdtsen
+Fixes: #376406
+Status: not sent upstream yet
-Rewrite findtty() in bootlogd to recursively search /dev/ for the
-correct device, to handle terminal devices for example in /dev/pty/.
-
-BTS: #376406
-Status: not sent upstream yet
-
- at DPATCH@
-Index: a/src/bootlogd.c
-===================================================================
---- a/src/bootlogd.c (revision 1485)
-+++ b/src/bootlogd.c (working copy)
+--- a/src/bootlogd.c
++++ b/src/bootlogd.c
@@ -98,41 +98,60 @@
/*
Property changes on: sysvinit/trunk/debian/patches/50_bootlogd_devsubdir.dpatch
___________________________________________________________________
Deleted: svn:executable
- *
Modified: sysvinit/trunk/debian/patches/54_bootlogd_findptyfail.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/54_bootlogd_findptyfail.dpatch 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/patches/54_bootlogd_findptyfail.dpatch 2009-08-01 13:18:05 UTC (rev 1574)
@@ -1,16 +1,12 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 54_bootlogd_findptyfail.dpatch by Rob Leslie.
+Purpose: Make sure bootlogd findpty() returns an error value when it fails to
+ find a usable pty
+Authour: Rob Leslie
+Fixes: #492796
+Status: unknown
-Making sure bootlogd findpty() returns an error value when it
-fails to find a usable pty
-
-BTS: #492796
-
- at DPATCH@
-diff -urNad trunk~/src/bootlogd.c trunk/src/bootlogd.c
---- trunk~/src/bootlogd.c 2009-07-14 22:07:15.000000000 +0200
-+++ trunk/src/bootlogd.c 2009-07-14 22:08:24.000000000 +0200
-@@ -167,7 +167,7 @@
+--- a/src/bootlogd.c
++++ b/src/bootlogd.c
+@@ -189,7 +189,7 @@
}
if (found) break;
}
Property changes on: sysvinit/trunk/debian/patches/54_bootlogd_findptyfail.dpatch
___________________________________________________________________
Deleted: svn:executable
- *
Modified: sysvinit/trunk/debian/patches/60_init_selinux_ifdef.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/60_init_selinux_ifdef.dpatch 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/patches/60_init_selinux_ifdef.dpatch 2009-08-01 13:18:05 UTC (rev 1574)
@@ -1,16 +1,11 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 60_init_selinux_ifdef.dpatch by Petter Reinholdtsen
+Purpose: Avoid compiler warning about unused variable when SE Linux is not
+ enabled.
+Authour: Petter Reinholdtsen
+Fixes: -
+Status: Not yet submitted upstream.
-Avoid compiler warning about unused variable when SE Linux is not
-enabled.
-
-Status: Should be sent upstream.
-
- at DPATCH@
-Index: a/src/init.c
-===================================================================
---- a/src/init.c (revision 1485)
-+++ b/src/init.c (working copy)
+--- a/src/init.c
++++ b/src/init.c
@@ -2615,7 +2615,9 @@
char *p;
int f;
Modified: sysvinit/trunk/debian/patches/62_init_freebsdterm.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/62_init_freebsdterm.dpatch 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/patches/62_init_freebsdterm.dpatch 2009-08-01 13:18:05 UTC (rev 1574)
@@ -1,14 +1,11 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 62_init_freebsdterm.dpatch by Robert Millan
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make sure TERM is set on FreeBSD. Closes debian bug #335023.
+Purpose: Make sure TERM is set on FreeBSD. Closes debian bug #335023.
+Authour: Robert Millan
+Fixes: #335023
+Status: unknown
- at DPATCH@
-diff -urNad trunk~/src/init.c trunk/src/init.c
---- trunk~/src/init.c 2008-03-26 09:34:01.000000000 +0100
-+++ trunk/src/init.c 2008-03-26 09:34:01.000000000 +0100
-@@ -690,6 +690,14 @@
+--- a/src/init.c
++++ b/src/init.c
+@@ -694,6 +694,14 @@
return;
}
Property changes on: sysvinit/trunk/debian/patches/62_init_freebsdterm.dpatch
___________________________________________________________________
Deleted: svn:executable
- *
Deleted: sysvinit/trunk/debian/patches/68_init_quiet.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/68_init_quiet.dpatch 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/patches/68_init_quiet.dpatch 2009-08-01 13:18:05 UTC (rev 1574)
@@ -1,54 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-# 68_init_quiet.dpatch by Petter Reinholdtsen
-
-If the kernel was told to be quiet, let init be quiet too. Based on
-patch from ubuntu, but using different activating variable.
-
-The patch to quiet down the 'switching to runlevel' message is based
-on the sysvinit-2.86-quiet.patch file from Fedora.
-
-WARNING: This patch do not work because the 'quiet' kernel argument is
- removed by the kernel before init is called. To use the
- 'quiet' kernel argument, /proc/cmdline will need to be
- checked.
-
- at DPATCH@
---- sysvinit_2.86.ds1-20/src/init.c.orig 2006-09-11 10:51:50.000000000 +0200
-+++ sysvinit_2.86.ds1-20/src/init.c 2006-09-11 10:53:40.000000000 +0200
-@@ -115,6 +115,7 @@
- char *console_dev; /* Console device. */
- int pipe_fd = -1; /* /dev/initctl */
- int did_boot = 0; /* Did we already do BOOT* stuff? */
-+int quietinit = 0; /* Should init be quiet on load? */
- int main(int, char **);
-
- /* Used by re-exec part */
-@@ -1673,7 +1674,7 @@
- initlog(L_SY, "Trying to re-exec init");
- return 'U';
- default:
-- initlog(L_VB, "Switching to runlevel: %c", foo);
-+ if (!quietinit)
-+ initlog(L_VB, "Switching to runlevel: %c", foo);
- }
-
- if (foo == 'Q') return runlevel;
-@@ -2423,7 +2424,8 @@
- /*
- * Say hello to the world
- */
-- initlog(L_CO, bootmsg, "booting");
-+ if (!quietinit)
-+ initlog(L_CO, bootmsg, "booting");
-
- /*
- * See if we have to start an emergency shell.
-@@ -2651,6 +2653,8 @@
- putenv("AUTOBOOT=YES");
- else if (!strcmp(argv[f], "-b") || !strcmp(argv[f],"emergency"))
- emerg_shell = 1;
-+ else if (!strcmp(argv[f],"quiet"))
-+ quietinit = 1;
- else if (!strcmp(argv[f], "-z")) {
- /* Ignore -z xxx */
- if (argv[f + 1]) f++;
Modified: sysvinit/trunk/debian/patches/70_compiler_warnings.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/70_compiler_warnings.dpatch 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/patches/70_compiler_warnings.dpatch 2009-08-01 13:18:05 UTC (rev 1574)
@@ -1,14 +1,10 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 70_compiler_warnings.dpatch by Petter Reinholdtsen
+Purpose: Get rid of some signed/unsigned warnings.
+Authour: Petter Reinholdtsen
+Fixes: -
+Status: Should be sent upstream.
-Get rid of some signed/unsigned warnings.
-
-Status: Should be sent upstream.
-
- at DPATCH@
-diff -urNad trunk~/src/bootlogd.c trunk/src/bootlogd.c
---- trunk~/src/bootlogd.c 2009-07-25 16:38:56.000000000 +0200
-+++ trunk/src/bootlogd.c 2009-07-25 16:39:58.000000000 +0200
+--- a/src/bootlogd.c
++++ b/src/bootlogd.c
@@ -370,7 +370,7 @@
break;
case '\t':
@@ -36,9 +32,8 @@
}
if (fp) {
-diff -urNad trunk~/src/bootlogd.c.rej trunk/src/bootlogd.c.rej
---- trunk~/src/bootlogd.c.rej 1970-01-01 01:00:00.000000000 +0100
-+++ trunk/src/bootlogd.c.rej 2009-07-25 16:38:57.000000000 +0200
+--- /dev/null
++++ b/src/bootlogd.c.rej
@@ -0,0 +1,17 @@
+***************
+*** 126,132 ****
@@ -57,9 +52,8 @@
+ fprintf(stderr, "bootlogd: console device name too long\n");
+ r = -1;
+ } else
-diff -urNad trunk~/src/init.c trunk/src/init.c
---- trunk~/src/init.c 2009-07-25 16:38:56.000000000 +0200
-+++ trunk/src/init.c 2009-07-25 16:38:57.000000000 +0200
+--- a/src/init.c
++++ b/src/init.c
@@ -1256,7 +1256,7 @@
strncpy(ch->id, id, sizeof(utproto.ut_id) + 1); /* Hack for different libs. */
strncpy(ch->process, process, sizeof(ch->process) - 1);
@@ -69,9 +63,8 @@
ch->rlevel[f] = rlevel[f];
if (ch->rlevel[f] == 's') ch->rlevel[f] = 'S';
}
-diff -urNad trunk~/src/last.c trunk/src/last.c
---- trunk~/src/last.c 2009-07-25 16:38:26.000000000 +0200
-+++ trunk/src/last.c 2009-07-25 16:38:57.000000000 +0200
+--- a/src/last.c
++++ b/src/last.c
@@ -322,7 +322,7 @@
*
* Ugly.
@@ -90,9 +83,8 @@
domain[0] = 0;
strncat(domain, p->ut_host, len);
}
-diff -urNad trunk~/src/shutdown.c trunk/src/shutdown.c
---- trunk~/src/shutdown.c 2009-07-25 16:38:26.000000000 +0200
-+++ trunk/src/shutdown.c 2009-07-25 16:38:57.000000000 +0200
+--- a/src/shutdown.c
++++ b/src/shutdown.c
@@ -141,7 +141,7 @@
nl = strlen(name);
vl = value ? strlen(value) : 0;
@@ -102,9 +94,8 @@
return -1;
memcpy(request.i.data, name, nl);
-diff -urNad trunk~/src/sulogin.c trunk/src/sulogin.c
---- trunk~/src/sulogin.c 2009-07-25 16:38:26.000000000 +0200
-+++ trunk/src/sulogin.c 2009-07-25 16:38:57.000000000 +0200
+--- a/src/sulogin.c
++++ b/src/sulogin.c
@@ -282,7 +282,7 @@
if (read(0, pass, sizeof(pass) - 1) <= 0)
ret = NULL;
Modified: sysvinit/trunk/debian/patches/91_sulogin_lockedpw.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/91_sulogin_lockedpw.dpatch 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/patches/91_sulogin_lockedpw.dpatch 2009-08-01 13:18:05 UTC (rev 1574)
@@ -1,16 +1,13 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 91_sulogin_lockedpw.dpatch by Thom May
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make sure file systems can be fixed on machines with locked
-## DP: root accounts too, by presenting a shell in these cases.
-## DP: Patch from Ubuntu and Thom May. Fixes debian bug #326678.
+debian/patches/91_sulogin_lockedpw.dpatch (Thom May):
+Purpose: Make sure file systems can be fixed on machines with locked
+ root accounts too, by presenting a shell in these cases.
+Authour: Thom May and Ubuntu.
+Fixes: #326678
+Status: unknown
- at DPATCH@
-diff -urNad trunk~/src/sulogin.c trunk/src/sulogin.c
---- trunk~/src/sulogin.c 2008-03-26 09:34:22.000000000 +0100
-+++ trunk/src/sulogin.c 2008-03-26 09:34:22.000000000 +0100
-@@ -240,7 +240,11 @@
+--- a/src/sulogin.c
++++ b/src/sulogin.c
+@@ -241,7 +241,11 @@
fprintf(stderr, "%s: no entry for root\n", F_SHADOW);
strcpy(pwd.pw_passwd, "");
}
@@ -23,7 +20,7 @@
fprintf(stderr, "%s: root password garbled\n", F_SHADOW);
strcpy(pwd.pw_passwd, ""); }
return &pwd;
-@@ -462,6 +466,14 @@
+@@ -469,6 +473,14 @@
fprintf(stderr, "sulogin: cannot open password database!\n");
sleep(2);
}
Property changes on: sysvinit/trunk/debian/patches/91_sulogin_lockedpw.dpatch
___________________________________________________________________
Deleted: svn:executable
- *
Modified: sysvinit/trunk/debian/patches/94_fstab-decode.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/94_fstab-decode.dpatch 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/patches/94_fstab-decode.dpatch 2009-08-01 13:18:05 UTC (rev 1574)
@@ -1,14 +1,11 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 94_fstab-decode.dpatch by Fedora
+Purpose: Helper program lifted from Fedora to make it easier to handle
+ /etc/mtab content.
+Authour: Fedora
+Fixes: -
+Status: unknown
-Helper program lifted from Fedora to make it easier to handle
-/etc/mtab content.
-
- at DPATCH@
-Index: sysvinit/src/fstab-decode.c
-===================================================================
---- sysvinit/src/fstab-decode.c (revision 0)
-+++ sysvinit/src/fstab-decode.c (revision 0)
+--- /dev/null
++++ b/src/fstab-decode.c
@@ -0,0 +1,86 @@
+/* fstab-decode(8).
+
@@ -96,10 +93,8 @@
+ fprintf(stderr, "fstab-decode: %s: %s\n", argv[1], strerror(errno));
+ return 127;
+}
-Index: sysvinit/src/Makefile
-===================================================================
---- sysvinit/src/Makefile (revision 1370)
-+++ sysvinit/src/Makefile (working copy)
+--- a/src/Makefile
++++ b/src/Makefile
@@ -15,13 +15,13 @@
# For some known distributions we do not build all programs, otherwise we do.
@@ -116,10 +111,8 @@
ifeq ($(DISTRO),)
BIN += mountpoint
-Index: sysvinit/man/fstab-decode.8
-===================================================================
---- sysvinit/man/fstab-decode.8 (revision 0)
-+++ sysvinit/man/fstab-decode.8 (revision 0)
+--- /dev/null
++++ b/man/fstab-decode.8
@@ -0,0 +1,45 @@
+.\" A man page for fstab-decode(8).
+.\"
@@ -130,8 +123,8 @@
+.\" GNU General Public License v.2.
+.\"
+.\" This program is distributed in the hope that it will be useful, but WITHOUT
-+.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
++.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+.\" more details.
+.\"
+.\" You should have received a copy of the GNU General Public License along
Property changes on: sysvinit/trunk/debian/patches/94_fstab-decode.dpatch
___________________________________________________________________
Deleted: svn:executable
- *
Modified: sysvinit/trunk/debian/patches/96_shutdown_acctoff.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/96_shutdown_acctoff.dpatch 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/patches/96_shutdown_acctoff.dpatch 2009-08-01 13:18:05 UTC (rev 1574)
@@ -1,14 +1,10 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 96_shutdown_acctoff.dpatch by Petter Reinholdtsen
+Purpose: Debian accton require an argument since at least 2009-07-11.
+Authour: Petter Reinholdtsen
+Fixes: #536574
+Status: unknown
-Debian accton require an argument since at least 2009-07-11.
-
-BTS: #536574
-
- at DPATCH@
-diff -urNad trunk~/src/shutdown.c trunk/src/shutdown.c
---- trunk~/src/shutdown.c 2009-07-14 21:47:18.000000000 +0200
-+++ trunk/src/shutdown.c 2009-07-14 21:48:51.000000000 +0200
+--- a/src/shutdown.c
++++ b/src/shutdown.c
@@ -331,7 +331,12 @@
write_wtmp("shutdown", "~~", 0, RUN_LVL, "~~");
Modified: sysvinit/trunk/debian/patches/97_init_starttest.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/97_init_starttest.dpatch 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/patches/97_init_starttest.dpatch 2009-08-01 13:18:05 UTC (rev 1574)
@@ -1,14 +1,12 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 97_init_starttest.dpatch by Petter Reinholdtsen.
+Purpose: Patch problem reported at 2003-03-10 on
+ <URL:http://freshmeat.net/projects/sysvinit/>.
+Authour: Petter Reinholdtsen
+Fixes: -
+Status: Should be applied upstream
-Patch problem reported on <URL:http://freshmeat.net/projects/sysvinit/>
-2003-03-10.
-
- at DPATCH@
-diff -urNad trunk~/src/init.c trunk/src/init.c
---- trunk~/src/init.c 2009-07-15 09:22:38.000000000 +0200
-+++ trunk/src/init.c 2009-07-15 09:23:01.000000000 +0200
-@@ -2618,9 +2618,10 @@
+--- a/src/init.c
++++ b/src/init.c
+@@ -2645,9 +2645,10 @@
*/
isinit = (getpid() == 1);
for (f = 1; f < argc; f++) {
Property changes on: sysvinit/trunk/debian/patches/97_init_starttest.dpatch
___________________________________________________________________
Deleted: svn:executable
- *
Added: sysvinit/trunk/debian/patches/series
===================================================================
--- sysvinit/trunk/debian/patches/series (rev 0)
+++ sysvinit/trunk/debian/patches/series 2009-08-01 13:18:05 UTC (rev 1574)
@@ -0,0 +1,14 @@
+10_doc_manuals.dpatch
+11_doc_shutdown-c.dpatch
+14_doc_fsf_addr.dpatch
+21_ifdown_kfreebsd.dpatch
+46_pidof_symlinkman.dpatch
+50_bootlogd_devsubdir.dpatch
+54_bootlogd_findptyfail.dpatch
+60_init_selinux_ifdef.dpatch
+62_init_freebsdterm.dpatch
+70_compiler_warnings.dpatch
+91_sulogin_lockedpw.dpatch
+94_fstab-decode.dpatch
+96_shutdown_acctoff.dpatch
+97_init_starttest.dpatch
Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/rules 2009-08-01 13:18:05 UTC (rev 1574)
@@ -34,7 +34,22 @@
test -f src/init.c
endef
-build: patch-stamp
+PATCH_STAMP=debian/stamp-patched
+patch: $(PATCH_STAMP)
+$(PATCH_STAMP):
+ dh_testdir debian/patches/series debian/startpar/patches/series
+ QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null push -a || test $$? = 2
+ cd debian/startpar && \
+ QUILT_PATCHES=patches quilt --quiltrc /dev/null push -a || test $$? = 2
+ touch $(PATCH_STAMP)
+
+unpatch:
+ QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null pop -a -R || test $$? = 2
+ cd debian/startpar && \
+ QUILT_PATCHES=patches quilt --quiltrc /dev/null pop -a -R || test $$? = 2
+ rm -rf .pc debian/startpar/.pc $(PATCH_STAMP)
+
+build: patch
# Builds the binary package.
$(checkdir)
ifeq ($(DEB_HOST_ARCH_OS),linux)
@@ -343,5 +358,3 @@
(cd ../sysvinit-$$version && debuild $(DEBUILDFLAGS))
.PHONY: binary binary-arch binary-indep clean checkroot
-
-include /usr/share/dpatch/dpatch.make
Modified: sysvinit/trunk/debian/startpar/patches/00_not_suse.patch
===================================================================
--- sysvinit/trunk/debian/startpar/patches/00_not_suse.patch 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/startpar/patches/00_not_suse.patch 2009-08-01 13:18:05 UTC (rev 1574)
@@ -1,5 +1,6 @@
Purpose: Disable the SUSE flag.
Fixes: None, made as part of Debian porting.
+Authour: Kel Modderman
Status: Debian specific, showed to upstream.
---
--- a/Makefile
Modified: sysvinit/trunk/debian/startpar/patches/01_dev_pts_workaround.patch
===================================================================
--- sysvinit/trunk/debian/startpar/patches/01_dev_pts_workaround.patch 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/startpar/patches/01_dev_pts_workaround.patch 2009-08-01 13:18:05 UTC (rev 1574)
@@ -10,6 +10,7 @@
On SuSe /dev/pts is always mounted in very early boot and this
hack is never needed.
+Authour: Petter Reinholdtsen, modified by Kel Modderman
Fixes: #457896
Status: Submitted to upstream.
---
Modified: sysvinit/trunk/debian/startpar/patches/02_posix_fadvise_kfreebsd.patch
===================================================================
--- sysvinit/trunk/debian/startpar/patches/02_posix_fadvise_kfreebsd.patch 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/startpar/patches/02_posix_fadvise_kfreebsd.patch 2009-08-01 13:18:05 UTC (rev 1574)
@@ -2,6 +2,7 @@
compatibility define for platforms which do not support it
and make it a no-op.
Fixes: #534337
+Authour: Petr Salinger <Petr.Salinger at seznam.cz>
Status: Submitted upstream.
---
--- a/makeboot.c
Modified: sysvinit/trunk/debian/startpar/patches/03_o_direct_undef.patch
===================================================================
--- sysvinit/trunk/debian/startpar/patches/03_o_direct_undef.patch 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/startpar/patches/03_o_direct_undef.patch 2009-08-01 13:18:05 UTC (rev 1574)
@@ -1,5 +1,6 @@
Purpose: O_DIRECT is undefined on Debian/hurd.
Fixes: #534471
+Authour: Samuel Thibault <sthibault at debian.org>
Status: Submitted upstream.
---
--- a/makeboot.c
Modified: sysvinit/trunk/debian/startpar/patches/04_makeboot_loop_upper_bound.patch
===================================================================
--- sysvinit/trunk/debian/startpar/patches/04_makeboot_loop_upper_bound.patch 2009-08-01 12:23:52 UTC (rev 1573)
+++ sysvinit/trunk/debian/startpar/patches/04_makeboot_loop_upper_bound.patch 2009-08-01 13:18:05 UTC (rev 1574)
@@ -2,8 +2,8 @@
999 seems to be too low, which causes make like boot to use an
incorrect sequence.
Fixes: None.
-Status: Not submitted upstream. Work in progress.
- Needs further discussion/investigation.
+Authour: Kel Modderman
+Status: Applied upstream.
---
--- a/makeboot.c
+++ b/makeboot.c
More information about the Pkg-sysvinit-commits
mailing list