[Pkg-sysvinit-commits] r1868 - in sysvinit/trunk/debian: . patches
Petter Reinholdtsen
pere at alioth.debian.org
Fri Apr 23 06:55:24 UTC 2010
Author: pere
Date: 2010-04-23 06:55:07 +0000 (Fri, 23 Apr 2010)
New Revision: 1868
Removed:
sysvinit/trunk/debian/patches/54_bootlogd_findptyfail.dpatch
sysvinit/trunk/debian/patches/55_bootlogd_flush.patch
Modified:
sysvinit/trunk/debian/changelog
sysvinit/trunk/debian/patches/series
Log:
- Drop 54_bootlogd_findptyfail.dpatch, now included upstream.
- Drop 55_bootlogd_flush.patch, now included upstream.
Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog 2010-04-23 06:02:23 UTC (rev 1867)
+++ sysvinit/trunk/debian/changelog 2010-04-23 06:55:07 UTC (rev 1868)
@@ -5,6 +5,8 @@
- Drop 14_doc_fsf_addr.dpatch, now included upstream.
- Drop 15_doc_upstream_email.dpatch, now included upstream.
- Drop 50_bootlogd_devsubdir.dpatch, now included upstream.
+ - Drop 54_bootlogd_findptyfail.dpatch, now included upstream.
+ - Drop 55_bootlogd_flush.patch, now included upstream.
- Drop 94_fstab-decode.dpatch, now included upstream.
- New upstream do not strip binaries, allowing the nostrip
build option to work (Closes: #438085).
Deleted: sysvinit/trunk/debian/patches/54_bootlogd_findptyfail.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/54_bootlogd_findptyfail.dpatch 2010-04-23 06:02:23 UTC (rev 1867)
+++ sysvinit/trunk/debian/patches/54_bootlogd_findptyfail.dpatch 2010-04-23 06:55:07 UTC (rev 1868)
@@ -1,17 +0,0 @@
-Purpose: Make sure bootlogd findpty() returns an error value when it fails to
- find a usable pty
-Authour: Rob Leslie
-Fixes: #492796
-Status: Applied upstream.
-
---- a/src/bootlogd.c
-+++ b/src/bootlogd.c
-@@ -189,7 +189,7 @@
- }
- if (found) break;
- }
-- if (found < 0) return -1;
-+ if (!found) return -1;
-
- if (name) strcpy(name, tty);
-
Deleted: sysvinit/trunk/debian/patches/55_bootlogd_flush.patch
===================================================================
--- sysvinit/trunk/debian/patches/55_bootlogd_flush.patch 2010-04-23 06:02:23 UTC (rev 1867)
+++ sysvinit/trunk/debian/patches/55_bootlogd_flush.patch 2010-04-23 06:55:07 UTC (rev 1868)
@@ -1,28 +0,0 @@
-Purpose: Make sure bootlogd fflush() every line, even if asked not to
- flush to disk using fdatasync().
-Authour: Scott Gifford
-Fixes: #542515
-Status: Applied upstream.
-
---- a/src/bootlogd.c.orig 2009-08-19 20:26:35.000000000 -0400
-+++ a/src/bootlogd.c 2009-08-19 20:26:56.000000000 -0400
-@@ -338,7 +338,7 @@
- break;
- case '\n':
- didnl = 1;
-- dosync = syncalot;
-+ dosync = 1;
- break;
- case '\t':
- line.pos += (line.pos / 8 + 1) * 8;
-@@ -370,7 +370,9 @@
-
- if (dosync) {
- fflush(fp);
-- fdatasync(fileno(fp));
-+ if (syncalot) {
-+ fdatasync(fileno(fp));
-+ }
- }
-
- outptr += olen;
Modified: sysvinit/trunk/debian/patches/series
===================================================================
--- sysvinit/trunk/debian/patches/series 2010-04-23 06:02:23 UTC (rev 1867)
+++ sysvinit/trunk/debian/patches/series 2010-04-23 06:55:07 UTC (rev 1868)
@@ -1,8 +1,6 @@
10_doc_manuals.dpatch
21_ifdown_kfreebsd.dpatch
46_pidof_symlinkman.dpatch
-54_bootlogd_findptyfail.dpatch
-55_bootlogd_flush.patch
60_init_selinux_ifdef.dpatch
62_init_freebsdterm.dpatch
63_init_keep_utf8_ttyflag.patch
More information about the Pkg-sysvinit-commits
mailing list