Accepting request 220785 from Base:System

- Modify patch agetty-on-s390-on-dev--3270-tty1-line.patch and
  patch tty3270-on-serial-line-of-s390.patch to handle 3270
  terminals 
- Really do not verify /usr/bin/eject

- Add patch agetty-on-s390-on-dev--3270-tty1-line.patch
  to let agetty detect /dev/3270/tty1 as device not as baud rate

OBS-URL: https://build.opensuse.org/request/show/220785
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=178

agetty-on-s390-on-dev-3270-tty1-line.patch

@@ -0,0 +1,37 @@
+Be aware that on s390 the 3270 terminal line is found at
+/dev/3270/tty<X>.  That is that the baud speed rate numbers
+have to be identified in a unique way. 
+
+---
+ agetty.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- term-utils/agetty.c
++++ term-utils/agetty.c	2014-02-04 09:33:13.162735763 +0000
+@@ -568,6 +568,8 @@ static void login_options_to_argv(char *
+ 	*argc = i;
+ }
+ 
++#define is_speed(str) (strlen((str)) == strspn((str), "0123456789,"))
++
+ /* Parse command-line arguments. */
+ static void parse_args(int argc, char **argv, struct options *op)
+ {
+@@ -746,7 +748,7 @@ static void parse_args(int argc, char **
+ 	}
+ 
+ 	/* Accept "tty", "baudrate tty", and "tty baudrate". */
+-	if ('0' <= argv[optind][0] && argv[optind][0] <= '9') {
++	if (is_speed(argv[optind])) {
+ 		/* Assume BSD style speed. */
+ 		parse_speeds(op, argv[optind++]);
+ 		if (argc < optind + 1) {
+@@ -758,7 +760,7 @@ static void parse_args(int argc, char **
+ 		op->tty = argv[optind++];
+ 		if (argc > optind) {
+ 			char *v = argv[optind++];
+-			if ('0' <= *v && *v <= '9')
++			if (is_speed(v))
+ 				parse_speeds(op, v);
+ 			else
+ 				op->speeds[op->numspeed++] = bcode("9600");

tty3270-on-serial-line-of-s390.patch

@@ -32,7 +32,7 @@ is compatible with VT220.
 +		 * higher.  Whereas the second serial line on a S/390(x) is
 +		 * a real character terminal which is compatible with VT220.
 +		 */
-+		if (strcmp(op->tty, "ttyS0") == 0)
++		if (strcmp(op->tty, "ttyS0") == 0 || strncmp(op->tty, "3270/tty", 8) == 0)
 +			op->term = DEFAULT_TTYS0;
 +		else if (strcmp(op->tty, "ttyS1") == 0)
 +			op->term = DEFAULT_TTYS1;

util-linux.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Feb  4 10:24:02 UTC 2014 - werner@suse.de
+
+- Modify patch agetty-on-s390-on-dev--3270-tty1-line.patch and
+  patch tty3270-on-serial-line-of-s390.patch to handle 3270
+  terminals 
+- Really do not verify /usr/bin/eject
+
+-------------------------------------------------------------------
+Mon Feb  3 16:16:36 UTC 2014 - werner@suse.de
+
+- Add patch agetty-on-s390-on-dev--3270-tty1-line.patch
+  to let agetty detect /dev/3270/tty1 as device not as baud rate 
+
 -------------------------------------------------------------------
 Tue Jan 28 09:37:57 UTC 2014 - speilicke@suse.com
 

util-linux.spec

@@ -110,6 +110,8 @@ Patch13:        blkdiscard-BLKSSZGET-fills-in-an-int.patch
 Patch14:        tty3270-on-serial-line-of-s390.patch
 # PATCH-FIX-SUSE -- Let agetty not be fooled by locked termios srtucture
 Patch15:        agetty-fooled-on-serial-line-due-plymouth.patch
+# PATCH-FIX-SUSE -- Let agetty detect /dev/3270/tty1 as device not as baud rate
+Patch16:        agetty-on-s390-on-dev-3270-tty1-line.patch
 
 # hack for boot.localfs
 Patch20:        util-linux-HACK-boot.localfs.diff
@@ -229,6 +231,7 @@ xzcat %{S:0} | %gpg_verify %{S:12} -
 %patch13 -p1
 %patch14 -p0
 %patch15 -p0
+%patch16 -p0
 #
 %patch20 -p1
 #
@@ -509,9 +512,6 @@ for PAM_FILE in default/su pam.d/su pam.d/su-l ; do
 	fi
 done
 %endif
-%if %{with enable_eject}
-%set_permissions %{_bindir}/eject
-%endif
 
 # mount option 'code=' is now called 'codepage=' so change fstab
 if [ -f etc/fstab ]; then