[Pkg-sysvinit-commits] r1870 - in sysvinit/trunk/debian: . patches
Petter Reinholdtsen
pere at alioth.debian.org
Fri Apr 23 20:25:31 UTC 2010
Author: pere
Date: 2010-04-23 20:25:31 +0000 (Fri, 23 Apr 2010)
New Revision: 1870
Removed:
sysvinit/trunk/debian/patches/60_init_selinux_ifdef.dpatch
sysvinit/trunk/debian/patches/62_init_freebsdterm.dpatch
Modified:
sysvinit/trunk/debian/changelog
sysvinit/trunk/debian/patches/series
Log:
- Drop 60_init_selinux_ifdef.dpatch, now included upstream.
- Drop 62_init_freebsdterm.dpatch, now included upstream.
Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog 2010-04-23 07:01:22 UTC (rev 1869)
+++ sysvinit/trunk/debian/changelog 2010-04-23 20:25:31 UTC (rev 1870)
@@ -7,6 +7,8 @@
- 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 60_init_selinux_ifdef.dpatch, now included upstream.
+ - Drop 62_init_freebsdterm.dpatch, now included upstream.
- Drop 70_compiler_warnings.dpatch, now included upstream.
- Drop 94_fstab-decode.dpatch, now included upstream.
- New upstream do not strip binaries, allowing the nostrip
Deleted: sysvinit/trunk/debian/patches/60_init_selinux_ifdef.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/60_init_selinux_ifdef.dpatch 2010-04-23 07:01:22 UTC (rev 1869)
+++ sysvinit/trunk/debian/patches/60_init_selinux_ifdef.dpatch 2010-04-23 20:25:31 UTC (rev 1870)
@@ -1,18 +0,0 @@
-Purpose: Avoid compiler warning about unused variable when SE Linux is not
- enabled.
-Authour: Petter Reinholdtsen
-Fixes: -
-Status: Applied upstream.
-
---- a/src/init.c
-+++ b/src/init.c
-@@ -2615,7 +2615,9 @@
- char *p;
- int f;
- int isinit;
-+#ifdef WITH_SELINUX
- int enforce = 0;
-+#endif
-
- /* Get my own name */
- if ((p = strrchr(argv[0], '/')) != NULL)
Deleted: sysvinit/trunk/debian/patches/62_init_freebsdterm.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/62_init_freebsdterm.dpatch 2010-04-23 07:01:22 UTC (rev 1869)
+++ sysvinit/trunk/debian/patches/62_init_freebsdterm.dpatch 2010-04-23 20:25:31 UTC (rev 1870)
@@ -1,22 +0,0 @@
-Purpose: Make sure TERM is set on FreeBSD. Closes debian bug #335023.
-Authour: Robert Millan
-Fixes: #335023
-Status: Applied upstream
-
---- a/src/init.c
-+++ b/src/init.c
-@@ -694,6 +694,14 @@
- return;
- }
-
-+#ifdef __FreeBSD_kernel__
-+ /* The kernel of FreeBSD expects userland to set TERM. Usually, we want
-+ "cons25". Later, gettys might disagree on this (i.e. we're not using
-+ syscons) but some boot scripts, like /etc/init.d/xserver-xorg, still
-+ need a non-dumb terminal. */
-+ putenv ("TERM=cons25");
-+#endif
-+
- (void) tcgetattr(fd, &tty);
-
- tty.c_cflag &= CBAUD|CBAUDEX|CSIZE|CSTOPB|PARENB|PARODD;
Modified: sysvinit/trunk/debian/patches/series
===================================================================
--- sysvinit/trunk/debian/patches/series 2010-04-23 07:01:22 UTC (rev 1869)
+++ sysvinit/trunk/debian/patches/series 2010-04-23 20:25:31 UTC (rev 1870)
@@ -1,8 +1,6 @@
10_doc_manuals.dpatch
21_ifdown_kfreebsd.dpatch
46_pidof_symlinkman.dpatch
-60_init_selinux_ifdef.dpatch
-62_init_freebsdterm.dpatch
63_init_keep_utf8_ttyflag.patch
91_sulogin_lockedpw.dpatch
96_shutdown_acctoff.dpatch
More information about the Pkg-sysvinit-commits
mailing list