checked in (request 38937)

OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=43

sysvinit-2.88dsf-utf8.dif

@@ -1,45 +0,0 @@
-Index: doc/Changelog
-===================================================================
---- doc/Changelog	(revision 68)
-+++ doc/Changelog	(working copy)
-@@ -1,3 +1,7 @@
-+  [ Werner Fink ]
-+  * Correct fix for Debian bug #547073: use IUTF8 flag if defined
-+    and if already set.
-+
- sysvinit (2.88dsf) UNRELEASED; urgency=low
- 
-   [ Petter Reinholdtsen ]
-Index: src/init.c
-===================================================================
---- src/init.c	(revision 68)
-+++ src/init.c	(working copy)
-@@ -784,10 +784,11 @@ void console_stty(void)
- 	/*
- 	 *	Set pre and post processing
- 	 */
--	tty.c_iflag = IGNPAR|ICRNL|IXON|IXANY;
--#ifdef IUTF8 /* Not defined on FreeBSD */
--	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;
- 
-Index: src/sulogin.c
-===================================================================
---- src/sulogin.c	(revision 68)
-+++ src/sulogin.c	(working copy)
-@@ -101,9 +101,6 @@ void fixtty(void)
- 	 * the same result as `stty sane cr0 pass8'
- 	 */
- 	tty.c_iflag |=  (BRKINT | ICRNL | IMAXBEL);
--#ifdef IUTF8 /* Not defined on FreeBSD */
--	tty.c_iflag |= IUTF8;
--#endif /* IUTF8 */
- 	tty.c_iflag &= ~(IGNBRK | INLCR | IGNCR | IXOFF | IUCLC | IXANY | ISTRIP);
- 	tty.c_oflag |=  (OPOST | ONLCR | NL0 | CR0 | TAB0 | BS0 | VT0 | FF0);
- 	tty.c_oflag &= ~(OLCUC | OCRNL | ONOCR | ONLRET | OFILL | OFDEL |\

sysvinit.changes

@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Tue Apr 27 14:36:43 CEST 2010 - werner@suse.de
-
-- Do not overwrite UTF8 input terminal setting as this may cause
-  trouble on system consoles forwarded to a foreign serial console
-
 -------------------------------------------------------------------
 Tue Apr 13 18:27:02 CEST 2010 - werner@suse.de
 

sysvinit.spec

@@ -49,7 +49,6 @@ Patch2:         sysvinit-2.88dsf-suse.patch
 Patch3:         sysvinit-2.88dsf-no-kill.patch
 Patch4:         notify-pam-dead.patch
 Patch5:         sysvinit-last-ipv6-heuristic.patch
-Patch6:         sysvinit-2.88dsf-utf8.dif
 Patch20:        powerd-2.0.2.dif
 Patch30:        killproc-2.16.dif
 Patch40:        showconsole-1.10.dif
@@ -90,7 +89,6 @@ sysvinit package.
 %patch3  -p0 -b .no-kill
 %patch4  -p0 -b .pam
 %patch5  -p2 -b .ipv6
-%patch6  -p2 -b .utf8
 %patch
 pushd ../powerd-%{PDVER}
 %patch20