[Pkg-sysvinit-commits] r1865 - in sysvinit/trunk/debian: . patches
Petter Reinholdtsen
pere at alioth.debian.org
Fri Apr 23 05:46:27 UTC 2010
Author: pere
Date: 2010-04-23 05:46:26 +0000 (Fri, 23 Apr 2010)
New Revision: 1865
Removed:
sysvinit/trunk/debian/patches/11_doc_shutdown-c.dpatch
sysvinit/trunk/debian/patches/94_fstab-decode.dpatch
Modified:
sysvinit/trunk/debian/changelog
sysvinit/trunk/debian/patches/series
Log:
- Drop 11_doc_shutdown-c.dpatch, now included upstream.
- Drop 94_fstab-decode.dpatch, now included upstream.
Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog 2010-04-23 05:42:27 UTC (rev 1864)
+++ sysvinit/trunk/debian/changelog 2010-04-23 05:46:26 UTC (rev 1865)
@@ -1,6 +1,8 @@
sysvinit (2.88dsf-1) UNRELEASED; urgency=low
* New upstream release.
+ - Drop 11_doc_shutdown-c.dpatch, now included upstream.
+ - Drop 94_fstab-decode.dpatch, now included upstream.
* New patch 99_nostrip.patch to remove stripping from src/Makefile to
get nostrip build option working (Closes: #438085).
* Update Standards-Version from 3.8.3 to 3.8.4. No change needed.
Deleted: sysvinit/trunk/debian/patches/11_doc_shutdown-c.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/11_doc_shutdown-c.dpatch 2010-04-23 05:42:27 UTC (rev 1864)
+++ sysvinit/trunk/debian/patches/11_doc_shutdown-c.dpatch 2010-04-23 05:46:26 UTC (rev 1865)
@@ -1,22 +0,0 @@
-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: Applied upstream.
-
---- a/man/shutdown.8
-+++ b/man/shutdown.8
-@@ -81,9 +81,10 @@
- .\"}}}
- .\"{{{ -c
- .IP \fB\-c\fP
--Cancel an already running shutdown. With this option it is of course
--not possible to give the \fBtime\fP argument, but you can enter a
--explanatory message on the command line that will be sent to all users.
-+Cancel a waiting shutdown. ("shutdown now" is no longer waiting.) With
-+this option it is of course not possible to give the time argument, but
-+you can enter explanatory message arguments on the command line that
-+will be sent to all users.
- .\"}}}
- .\"{{{ time
- .IP \fItime\fP
Deleted: sysvinit/trunk/debian/patches/94_fstab-decode.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/94_fstab-decode.dpatch 2010-04-23 05:42:27 UTC (rev 1864)
+++ sysvinit/trunk/debian/patches/94_fstab-decode.dpatch 2010-04-23 05:46:26 UTC (rev 1865)
@@ -1,161 +0,0 @@
-Purpose: Helper program lifted from Fedora to make it easier to handle
- /etc/mtab content.
-Authour: Fedora
-Fixes: -
-Status: Applied upstream
-
---- /dev/null
-+++ b/src/fstab-decode.c
-@@ -0,0 +1,86 @@
-+/* fstab-decode(8).
-+
-+Copyright (c) 2006 Red Hat, Inc. All rights reserved.
-+
-+This copyrighted material is made available to anyone wishing to use, modify,
-+copy, or redistribute it subject to the terms and conditions of the 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 more details.
-+
-+You should have received a copy of the GNU General Public License along with
-+this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
-+Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+
-+Author: Miloslav Trmac <mitr at redhat.com> */
-+
-+#include <errno.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+/* Decode the fstab-encoded string in place. */
-+static void
-+decode(char *s)
-+{
-+ const char *src;
-+ char *dest;
-+
-+ src = s;
-+ dest = s;
-+ while (*src != '\0') {
-+ if (*src != '\\')
-+ *dest = *src++;
-+ else {
-+ static const struct repl {
-+ char orig[4];
-+ size_t len;
-+ char new;
-+ } repls[] = {
-+#define R(X, Y) { X, sizeof(X) - 1, Y }
-+ R("\\", '\\'),
-+ R("011", '\t'),
-+ R("012", '\n'),
-+ R("040", ' '),
-+ R("134", '\\')
-+#undef R
-+ };
-+
-+ size_t i;
-+
-+ for (i = 0; i < sizeof (repls) / sizeof (repls[0]);
-+ i++) {
-+ if (memcmp(src + 1, repls[i].orig,
-+ repls[i].len) == 0) {
-+ *dest = repls[i].new;
-+ src += 1 + repls[i].len;
-+ goto found;
-+ }
-+ }
-+ *dest = *src++;
-+ found:
-+ ;
-+ }
-+ dest++;
-+ }
-+ *dest = '\0';
-+}
-+
-+int
-+main (int argc, char *argv[])
-+{
-+ size_t i;
-+
-+ if (argc < 2) {
-+ fprintf(stderr, "Usage: fstab-decode command [arguments]\n");
-+ return EXIT_FAILURE;
-+ }
-+ for (i = 2; i < (size_t)argc; i++)
-+ decode(argv[i]);
-+ execvp(argv[1], argv + 1);
-+ fprintf(stderr, "fstab-decode: %s: %s\n", argv[1], strerror(errno));
-+ return 127;
-+}
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -15,13 +15,13 @@
-
- # For some known distributions we do not build all programs, otherwise we do.
- BIN =
--SBIN = init halt shutdown runlevel killall5
-+SBIN = init halt shutdown runlevel killall5 fstab-decode
- USRBIN = last mesg
-
- MAN1 = last.1 lastb.1 mesg.1
- MAN5 = initscript.5 inittab.5
- MAN8 = halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8
--MAN8 += shutdown.8 telinit.8
-+MAN8 += shutdown.8 telinit.8 fstab-decode.8
-
- ifeq ($(DISTRO),)
- BIN += mountpoint
---- /dev/null
-+++ b/man/fstab-decode.8
-@@ -0,0 +1,45 @@
-+.\" A man page for fstab-decode(8).
-+.\"
-+.\" Copyright (C) 2006 Red Hat, Inc. All rights reserved.
-+.\"
-+.\" This copyrighted material is made available to anyone wishing to use,
-+.\" modify, copy, or redistribute it subject to the terms and conditions of the
-+.\" 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
-+.\" more details.
-+.\"
-+.\" You should have received a copy of the GNU General Public License along
-+.\" with this program; if not, write to the Free Software Foundation, Inc.,
-+.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+.\"
-+.\" Author: Miloslav Trmac <mitr at redhat.com>
-+.TH fstab-decode 8 "May 2006"
-+
-+.SH NAME
-+fstab-decode \- run a command with fstab-encoded arguments
-+
-+.SH SYNOPSIS
-+\fB fstab-decode\fR \fICOMMAND\fR [\fIARGUMENT\fR]...
-+
-+.SH DESCRIPTION
-+.B fstab-decode
-+decodes escapes in the specified \FIARGUMENT\fRs
-+and uses them to run \fICOMMAND\fR.
-+The argument escaping uses the same rules as path escaping in
-+\fB/etc/fstab\fR,
-+.B /etc/mtab
-+and \fB/proc/mtab\fR.
-+
-+.SH EXIT STATUS
-+.B fstab-decode
-+exits with status 127 if
-+.I COMMAND
-+can't be run.
-+Otherwise it exits with the status returned by \fICOMMAND\fR.
-+
-+.SH EXAMPLES
-+
-+.B fstab-decode umount $(awk '$3 == "vfat" { print $2 }' /etc/fstab)
Modified: sysvinit/trunk/debian/patches/series
===================================================================
--- sysvinit/trunk/debian/patches/series 2010-04-23 05:42:27 UTC (rev 1864)
+++ sysvinit/trunk/debian/patches/series 2010-04-23 05:46:26 UTC (rev 1865)
@@ -1,5 +1,4 @@
10_doc_manuals.dpatch
-11_doc_shutdown-c.dpatch
14_doc_fsf_addr.dpatch
15_doc_upstream_email.dpatch
21_ifdown_kfreebsd.dpatch
@@ -12,7 +11,6 @@
63_init_keep_utf8_ttyflag.patch
70_compiler_warnings.dpatch
91_sulogin_lockedpw.dpatch
-94_fstab-decode.dpatch
96_shutdown_acctoff.dpatch
97_init_starttest.dpatch
98_installtarget.patch
More information about the Pkg-sysvinit-commits
mailing list