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

[Petter Reinholdtsen]

Author: pere
Date: 2009-10-25 14:31:47 +0000 (Sun, 25 Oct 2009)
New Revision: 1801

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/63_init_keep_utf8_ttyflag.patch
Log:
Update patch 63_init_keep_utf8_ttyflag.patch to try to get it
working on freebsd too.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-10-25 10:43:28 UTC (rev 1800)
+++ sysvinit/trunk/debian/changelog	2009-10-25 14:31:47 UTC (rev 1801)
@@ -1,3 +1,11 @@
+sysvinit (2.87dsf-8) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Update patch 63_init_keep_utf8_ttyflag.patch to try to get it
+    working on freebsd too.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Sun, 25 Oct 2009 15:31:04 +0100
+
 sysvinit (2.87dsf-7) unstable; urgency=low
 
   [ Petter Reinholdtsen ]

Modified: sysvinit/trunk/debian/patches/63_init_keep_utf8_ttyflag.patch
===================================================================
--- sysvinit/trunk/debian/patches/63_init_keep_utf8_ttyflag.patch	2009-10-25 10:43:28 UTC (rev 1800)
+++ sysvinit/trunk/debian/patches/63_init_keep_utf8_ttyflag.patch	2009-10-25 14:31:47 UTC (rev 1801)
@@ -3,14 +3,20 @@
 Fixes:   #547073
 Status:  not submitted upstream yet
 
---- a/src/init.c.orig	2009-09-17 01:31:17.000000000 +0200
-+++ b/src/init.c	2009-09-17 01:31:38.000000000 +0200
-@@ -704,7 +704,7 @@
+Index: trunk/src/init.c
+===================================================================
+--- trunk.orig/src/init.c	2009-10-25 15:29:44.000000000 +0100
++++ trunk/src/init.c	2009-10-25 15:30:30.000000000 +0100
+@@ -721,7 +721,11 @@
  	/*
  	 *	Set pre and post processing
  	 */
 -	tty.c_iflag = IGNPAR|ICRNL|IXON|IXANY;
-+	tty.c_iflag = IGNPAR|ICRNL|IXON|IXANY | (tty.c_iflag & IUTF8);
++	tty.c_iflag = IGNPAR|ICRNL|IXON|IXANY
++#ifdef IUTF8 /* Not defined on FreeBSD */
++                      | (tty.c_iflag & IUTF8)
++#endif /* IUTF8 */
++            ;
  	tty.c_oflag = OPOST|ONLCR;
  	tty.c_lflag = ISIG|ICANON|ECHO|ECHOCTL|ECHOPRT|ECHOKE;