[Pkg-sysvinit-commits] r1883 - in sysvinit/trunk/debian: . patches

[Petter Reinholdtsen]

Author: pere
Date: 2010-04-26 20:18:03 +0000 (Mon, 26 Apr 2010)
New Revision: 1883

Added:
   sysvinit/trunk/debian/patches/20_init_freebsd_vswtc.patch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/series
Log:
New 20_init_freebsd_vswtc.patch to add workaround for missing VSWTC
on kfreebsd (Closes: 579293).

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2010-04-26 20:03:02 UTC (rev 1882)
+++ sysvinit/trunk/debian/changelog	2010-04-26 20:18:03 UTC (rev 1883)
@@ -8,6 +8,8 @@
   * Report script name requested if invoke-rc.d is used during
     shutdown.
   * Update 63_init_keep_utf8_ttyflag.patch to actually work on kfreebsd.
+  * New 20_init_freebsd_vswtc.patch to add workaround for missing VSWTC
+    on kfreebsd (Closes: 579293).
 
  -- Petter Reinholdtsen <pere at debian.org>  Mon, 26 Apr 2010 11:20:00 +0200
 

Added: sysvinit/trunk/debian/patches/20_init_freebsd_vswtc.patch
===================================================================
--- sysvinit/trunk/debian/patches/20_init_freebsd_vswtc.patch	                        (rev 0)
+++ sysvinit/trunk/debian/patches/20_init_freebsd_vswtc.patch	2010-04-26 20:18:03 UTC (rev 1883)
@@ -0,0 +1,19 @@
+Purpose: kFreeBSD is missing VSWTC, provide workaround.
+Authour: Petter Reinholdtsen
+Fixes:   #579293
+Status:  Not sent upstream.
+
+--- sysvinit.old/src/init.c	(revision 1869)
++++ sysvinit/src/init.c	(working copy)
+@@ -770,7 +770,11 @@
+ 	tty.c_cc[VEOF]	    = CEOF;
+ 	tty.c_cc[VTIME]	    = 0;
+ 	tty.c_cc[VMIN]	    = 1;
++#ifdef __linux__
+ 	tty.c_cc[VSWTC]	    = _POSIX_VDISABLE;
++#else /* not __linux__ */
++	tty.c_cc[VSWTCH]    = _POSIX_VDISABLE;
++#endif /* not __linux__ */
+ 	tty.c_cc[VSTART]    = CSTART;
+ 	tty.c_cc[VSTOP]	    = CSTOP;
+ 	tty.c_cc[VSUSP]	    = CSUSP;

Modified: sysvinit/trunk/debian/patches/series
===================================================================
--- sysvinit/trunk/debian/patches/series	2010-04-26 20:03:02 UTC (rev 1882)
+++ sysvinit/trunk/debian/patches/series	2010-04-26 20:18:03 UTC (rev 1883)
@@ -1,3 +1,4 @@
 10_doc_manuals.dpatch
+20_init_freebsd_vswtc.patch
 63_init_keep_utf8_ttyflag.patch
 91_sulogin_lockedpw.dpatch