commit util-linux for openSUSE:Factory
Hello community,
here is the log from the commit of package util-linux for openSUSE:Factory checked in at 2014-05-22 20:38:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/util-linux (Old)
and /work/SRC/openSUSE:Factory/.util-linux.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "util-linux"
Changes:
--------
--- /work/SRC/openSUSE:Factory/util-linux/util-linux.changes 2014-05-03 16:51:34.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.util-linux.new/util-linux.changes 2014-05-22 20:39:02.000000000 +0200
@@ -1,0 +2,21 @@
+Fri May 16 15:10:53 UTC 2014 - sweet_f_a@gmx.de
+
+- Prevent excessive clock drift calculations (bnc#871698,
+ util-linux-prevent-excessive-clock-drift-calculations.patch),
+ committed by sbrabec@suse.cz
+
+-------------------------------------------------------------------
+Thu May 8 08:15:04 UTC 2014 - werner@suse.de
+
+- Modify patch support-other-tty-lines-not-vconsole.patch to
+ make it work on virtual console
+- Modify patch agetty-on-s390-on-dev-3270-tty1-line.patch
+ to add the missed 3270 support upstream
+
+-------------------------------------------------------------------
+Wed May 7 14:12:32 UTC 2014 - werner@suse.de
+
+- Add patch support-other-tty-lines-not-vconsole.patch
+ to be able to support console lines like xvc and hvc
+
+-------------------------------------------------------------------
New:
----
support-other-tty-lines-not-vconsole.patch
util-linux-prevent-excessive-clock-drift-calculations.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ util-linux.spec ++++++
--- /var/tmp/diff_new_pack.Q2hCQU/_old 2014-05-22 20:39:06.000000000 +0200
+++ /var/tmp/diff_new_pack.Q2hCQU/_new 2014-05-22 20:39:06.000000000 +0200
@@ -104,6 +104,8 @@
Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
# disable encryption
Patch12: util-linux-2.23.1-noenc-suse.diff
+# PATCH-FIX-SUSE Be aware that there are e.g. xvc/hvc
+Patch14: support-other-tty-lines-not-vconsole.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
@@ -126,6 +128,8 @@
Patch31: blkid-convert-superblocks-to-new-calling-convention.patch
# PATH-FIX-UPSTREAM util-linux-libblkid-ext-probe.patch bnc864703 sbrabec@suse.cz -- libblkid: Drop the broken ext2/ext3/ext4 discrimination logic.
Patch32: util-linux-libblkid-ext-probe.patch
+# PATCH-FIX-UPSTREAM bnc871698 sbrabec@suse.cz
+Patch33: util-linux-prevent-excessive-clock-drift-calculations.patch
##
## klogconsole
@@ -247,6 +251,7 @@
%patch2 -p1
%patch4 -p1
%patch12 -p1
+%patch14 -p0
%patch15 -p0
%patch16 -p0
%patch17 -p0
@@ -260,6 +265,7 @@
%patch30 -p1
%patch31 -p1
%patch32 -p1
+%patch33 -p1
#
# setctsid
cp -p %{S:22} %{S:23} .
++++++ agetty-on-s390-on-dev-3270-tty1-line.patch ++++++
--- /var/tmp/diff_new_pack.Q2hCQU/_old 2014-05-22 20:39:06.000000000 +0200
+++ /var/tmp/diff_new_pack.Q2hCQU/_new 2014-05-22 20:39:06.000000000 +0200
@@ -1,14 +1,21 @@
-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(-)
+ login-utils/sulogin.c | 8 +++++++-
+ term-utils/agetty.c | 15 ++++++++++-----
+ 2 files changed, 17 insertions(+), 6 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 *
++++ term-utils/agetty.c 2014-05-08 08:08:26.384484940 +0000
+@@ -51,7 +51,8 @@
+ # define DEFAULT_VCTERM "linux"
+ # endif
+ # if defined (__s390__) || defined (__s390x__)
+-# define DEFAULT_TTYS0 "ibm327x"
++# define DEFAULT_TTYS0 "dumb"
++# define DEFAULT_TTY32 "ibm327x"
+ # define DEFAULT_TTYS1 "vt220"
+ # endif
+ # ifndef DEFAULT_STERM
+@@ -571,6 +572,8 @@ static void login_options_to_argv(char *
*argc = i;
}
@@ -17,7 +24,7 @@
/* 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 **
+@@ -749,7 +752,7 @@ static void parse_args(int argc, char **
}
/* Accept "tty", "baudrate tty", and "tty baudrate". */
@@ -26,7 +33,7 @@
/* Assume BSD style speed. */
parse_speeds(op, argv[optind++]);
if (argc < optind + 1) {
-@@ -758,7 +760,7 @@ static void parse_args(int argc, char **
+@@ -761,7 +764,7 @@ static void parse_args(int argc, char **
op->tty = argv[optind++];
if (argc > optind) {
char *v = argv[optind++];
@@ -35,3 +42,37 @@
parse_speeds(op, v);
else
op->speeds[op->numspeed++] = bcode("9600");
+@@ -1071,9 +1074,11 @@ static void open_tty(char *tty, struct t
+ * 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) /* linux/drivers/s390/char/con3215.c */
+ op->term = DEFAULT_TTYS0;
+- else if (strcmp(op->tty, "ttyS1") == 0)
++ else if (strncmp(op->tty, "3270/tty", 8) == 0) /* linux/drivers/s390/char/con3270.c */
++ op->term = DEFAULT_TTY32;
++ else if (strcmp(op->tty, "ttyS1") == 0) /* linux/drivers/s390/char/sclp_vt220.c */
+ op->term = DEFAULT_TTYS1;
+ }
+ #endif
+--- login-utils/sulogin.c
++++ login-utils/sulogin.c 2014-05-08 08:22:38.572781002 +0000
+@@ -189,10 +189,16 @@ static void tcfinal(struct console *con)
+ setenv("TERM", "linux", 1);
+ return;
+ }
+- if (con->flags & CON_NOTTY)
++ if (con->flags & CON_NOTTY) {
++ setenv("TERM", "dumb", 1);
+ return;
++ }
+
++#if defined (__s390__) || defined (__s390x__)
++ setenv("TERM", "dumb", 1);
++#else
+ setenv("TERM", "vt102", 1);
++#endif
+ tio = &con->tio;
+ fd = con->fd;
+
++++++ support-other-tty-lines-not-vconsole.patch ++++++
---
login-utils/sulogin.c | 17 ++++++++++++-----
term-utils/agetty.c | 23 +++++++++++------------
2 files changed, 23 insertions(+), 17 deletions(-)
--- login-utils/sulogin.c
+++ login-utils/sulogin.c 2014-05-08 08:01:13.102622002 +0000
@@ -49,6 +49,11 @@
# include
From 654e902731ea15a3494a3831b78d2b9f1cd1408d Mon Sep 17 00:00:00 2001 From: Ruediger Meier
Date: Fri, 16 May 2014 17:01:43 +0200 Subject: [PATCH] Prevent excessive clock drift calculations
Squashed commit of the following:
commit f55b4b45126b657fe02f5f0d3d7fde740e6a6247
Author: Karel Zak
participants (1)
-
root@hilbert.suse.de