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

[Petter Reinholdtsen]

Author: pere
Date: 2010-04-23 20:28:01 +0000 (Fri, 23 Apr 2010)
New Revision: 1871

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/63_init_keep_utf8_ttyflag.patch
Log:
Update 63_init_keep_utf8_ttyflag.patch.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2010-04-23 20:25:31 UTC (rev 1870)
+++ sysvinit/trunk/debian/changelog	2010-04-23 20:28:01 UTC (rev 1871)
@@ -11,6 +11,7 @@
     - Drop 62_init_freebsdterm.dpatch, now included upstream.
     - Drop 70_compiler_warnings.dpatch, now included upstream.
     - Drop 94_fstab-decode.dpatch, now included upstream.
+    - Update 63_init_keep_utf8_ttyflag.patch.
     - New upstream do not strip binaries, allowing the nostrip
       build option to work (Closes: #438085).
   * Update Standards-Version from 3.8.3 to 3.8.4.  No change needed.

Modified: sysvinit/trunk/debian/patches/63_init_keep_utf8_ttyflag.patch
===================================================================
--- sysvinit/trunk/debian/patches/63_init_keep_utf8_ttyflag.patch	2010-04-23 20:25:31 UTC (rev 1870)
+++ sysvinit/trunk/debian/patches/63_init_keep_utf8_ttyflag.patch	2010-04-23 20:28:01 UTC (rev 1871)
@@ -1,20 +1,21 @@
 Purpose: Make sure the utf-8 flag is not cleared from the tty.
 Authour: Samuel Thibault
 Fixes:   #547073
-Status:  Applied upstream.
+Status:  Not applied upstream.
 
---- 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 @@
+Index: src/init.c
+===================================================================
+--- trunk.orig/src/init.c	(revision 1869)
++++ trunk/src/init.c	(working copy)
+@@ -784,9 +784,9 @@
  	/*
  	 *	Set pre and post processing
  	 */
 -	tty.c_iflag = IGNPAR|ICRNL|IXON|IXANY;
 +	tty.c_iflag = IGNPAR|ICRNL|IXON|IXANY
-+#ifdef IUTF8 /* Not defined on FreeBSD */
-+                      | (tty.c_iflag & IUTF8)
-+#endif /* IUTF8 */
-+            ;
+ #ifdef IUTF8 /* Not defined on FreeBSD */
+-	tty.c_iflag |= IUTF8;
++		      | (tty.c_iflag & IUTF8)
+ #endif /* IUTF8 */
  	tty.c_oflag = OPOST|ONLCR;
  	tty.c_lflag = ISIG|ICANON|ECHO|ECHOCTL|ECHOPRT|ECHOKE;
-