From bb4a013d42d6c68cfcd4e4fc5dc9685d71e4b0aeaf3879f6e4f00f5ca7f9c7bd Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 8 Jan 2019 16:41:49 +0000 Subject: [PATCH 1/2] Accepting request 662937 from home:sbrabec:branches:util-linux-b1120298 - agetty: Fixes for reload issue only if it is really needed (bsc#1085196, boo#1120298, util-linux-agetty-smart-reload-10.patch, util-linux-agetty-smart-reload-11.patch, util-linux-agetty-smart-reload-12.patch). OBS-URL: https://build.opensuse.org/request/show/662937 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=391 --- python3-libmount.changes | 9 ++++ python3-libmount.spec | 16 ++++--- util-linux-agetty-smart-reload-10.patch | 59 +++++++++++++++++++++++++ util-linux-agetty-smart-reload-11.patch | 26 +++++++++++ util-linux-agetty-smart-reload-12.patch | 30 +++++++++++++ util-linux-systemd.changes | 9 ++++ util-linux-systemd.spec | 16 ++++--- util-linux.changes | 9 ++++ util-linux.spec | 16 ++++--- 9 files changed, 172 insertions(+), 18 deletions(-) create mode 100644 util-linux-agetty-smart-reload-10.patch create mode 100644 util-linux-agetty-smart-reload-11.patch create mode 100644 util-linux-agetty-smart-reload-12.patch diff --git a/python3-libmount.changes b/python3-libmount.changes index 20e1bf7..36d611c 100644 --- a/python3-libmount.changes +++ b/python3-libmount.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jan 4 22:56:19 CET 2019 - sbrabec@suse.com + +- agetty: Fixes for reload issue only if it is really needed + (bsc#1085196, boo#1120298, + util-linux-agetty-smart-reload-10.patch, + util-linux-agetty-smart-reload-11.patch, + util-linux-agetty-smart-reload-12.patch). + ------------------------------------------------------------------- Mon Dec 10 19:08:35 CET 2018 - sbrabec@suse.com diff --git a/python3-libmount.spec b/python3-libmount.spec index 8a77397..c9b3456 100644 --- a/python3-libmount.spec +++ b/python3-libmount.spec @@ -1,7 +1,7 @@ # # spec file for package python3-libmount # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -140,13 +140,15 @@ Source13: %{_name}.keyring Source14: runuser.pamd Source15: runuser-l.pamd Source16: su-l.pamd -# Source51: blkid.conf -## -## util-linux patches -## # PATCH-EXTEND-UPSTREAM: Let `su' handle /sbin and /usr/sbin in path Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff +# PATCH-FEATURE-UPSTREAM util-linux-agetty-smart-reload-10.patch bsc1085196 sbrabec@suse.com -- agetty: Reload issue only if it is really needed. +Patch22: util-linux-agetty-smart-reload-10.patch +# PATCH-FEATURE-UPSTREAM util-linux-agetty-smart-reload-11.patch bsc1085196 sbrabec@suse.com -- agetty: Reload issue only if it is really needed. +Patch23: util-linux-agetty-smart-reload-11.patch +# PATCH-FEATURE-UPSTREAM util-linux-agetty-smart-reload-12.patch bsc1085196 sbrabec@suse.com -- agetty: Reload issue only if it is really needed. +Patch24: util-linux-agetty-smart-reload-12.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -383,7 +385,9 @@ library. %prep %setup -q -n %{_name}-%{version} %patch0 -p1 -# +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 %build %if %build_util_linux diff --git a/util-linux-agetty-smart-reload-10.patch b/util-linux-agetty-smart-reload-10.patch new file mode 100644 index 0000000..5f7b367 --- /dev/null +++ b/util-linux-agetty-smart-reload-10.patch @@ -0,0 +1,59 @@ +From d7a412fe0ae5fa08b891769be2961e5d80769484 Mon Sep 17 00:00:00 2001 +From: Samuel Thibault +Date: Mon, 12 Nov 2018 11:31:17 +0100 +Subject: [PATCH] agetty: fix portability issues + +Signed-off-by: Karel Zak +--- + term-utils/agetty.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/term-utils/agetty.c b/term-utils/agetty.c +index 05a269abb..759cea5b8 100644 +--- a/term-utils/agetty.c ++++ b/term-utils/agetty.c +@@ -1768,6 +1768,7 @@ static void eval_issue_file(struct issue *ie __attribute__((__unused__)), + } + #else /* ISSUE_SUPPORT */ + ++#ifdef AGETTY_RELOAD + static int issue_is_changed(struct issue *ie) + { + if (ie->mem_old && ie->mem +@@ -1780,6 +1781,7 @@ static int issue_is_changed(struct issue *ie) + + return 1; + } ++#endif + + static void print_issue_file(struct issue *ie, + struct options *op, +@@ -2066,8 +2068,8 @@ static char *get_logname(struct issue *ie, struct options *op, struct termios *t + /* Write issue file and prompt */ + do_prompt(ie, op, tp); + +-#ifdef AGETTY_RELOAD + no_reload: ++#ifdef AGETTY_RELOAD + if (!wait_for_term_input(STDIN_FILENO)) { + /* refresh prompt -- discard input data, clear terminal + * and call do_prompt() again +@@ -2731,6 +2733,7 @@ static void output_special_char(struct issue *ie, + fprintf (ie->output, "%d ", users); + break; + } ++#if defined(RTMGRP_IPV4_IFADDR) && defined(RTMGRP_IPV6_IFADDR) + case '4': + case '6': + { +@@ -2754,6 +2757,7 @@ static void output_special_char(struct issue *ie, + netlink_groups |= RTMGRP_IPV6_IFADDR; + break; + } ++#endif + default: + putchar(c); + break; +-- +2.19.1 + diff --git a/util-linux-agetty-smart-reload-11.patch b/util-linux-agetty-smart-reload-11.patch new file mode 100644 index 0000000..c1b9ee7 --- /dev/null +++ b/util-linux-agetty-smart-reload-11.patch @@ -0,0 +1,26 @@ +From f8ee3af9fabc4369c36fdbd706a17deb246a751c Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Wed, 7 Nov 2018 13:55:06 +0100 +Subject: [PATCH] agetty: fix output of escaped characters + +Signed-off-by: Christian Hesse +--- + term-utils/agetty.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/term-utils/agetty.c b/term-utils/agetty.c +index 759cea5b8..615db2c78 100644 +--- a/term-utils/agetty.c ++++ b/term-utils/agetty.c +@@ -2759,7 +2759,7 @@ static void output_special_char(struct issue *ie, + } + #endif + default: +- putchar(c); ++ putc(c, ie->output); + break; + } + } +-- +2.19.1 + diff --git a/util-linux-agetty-smart-reload-12.patch b/util-linux-agetty-smart-reload-12.patch new file mode 100644 index 0000000..7c0ea44 --- /dev/null +++ b/util-linux-agetty-smart-reload-12.patch @@ -0,0 +1,30 @@ +From d16afd8d157d41bd128da9f792ee49a716b76fd1 Mon Sep 17 00:00:00 2001 +From: Stanislav Brabec +Date: Tue, 20 Nov 2018 00:38:14 +0100 +Subject: [PATCH] agetty: Return old behavior with empty logname + +c094fcd37 introduced a behavior change: When Return is entered with empty +logname, nothing happens. As it confuses users, return back the old +behavior: re-prompt. + +Signed-off-by: Stanislav Brabec +--- + term-utils/agetty.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/term-utils/agetty.c b/term-utils/agetty.c +index 615db2c78..fc373847e 100644 +--- a/term-utils/agetty.c ++++ b/term-utils/agetty.c +@@ -2185,7 +2185,7 @@ static char *get_logname(struct issue *ie, struct options *op, struct termios *t + break; + } + /* Everything was erased. */ +- if (bp == logname) ++ if (bp == logname && cp->eol == '\0') + goto no_reload; + } + } +-- +2.19.1 + diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index 20e1bf7..36d611c 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jan 4 22:56:19 CET 2019 - sbrabec@suse.com + +- agetty: Fixes for reload issue only if it is really needed + (bsc#1085196, boo#1120298, + util-linux-agetty-smart-reload-10.patch, + util-linux-agetty-smart-reload-11.patch, + util-linux-agetty-smart-reload-12.patch). + ------------------------------------------------------------------- Mon Dec 10 19:08:35 CET 2018 - sbrabec@suse.com diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 5f124a4..5552984 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -1,7 +1,7 @@ # # spec file for package util-linux-systemd # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -140,13 +140,15 @@ Source13: %{_name}.keyring Source14: runuser.pamd Source15: runuser-l.pamd Source16: su-l.pamd -# Source51: blkid.conf -## -## util-linux patches -## # PATCH-EXTEND-UPSTREAM: Let `su' handle /sbin and /usr/sbin in path Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff +# PATCH-FEATURE-UPSTREAM util-linux-agetty-smart-reload-10.patch bsc1085196 sbrabec@suse.com -- agetty: Reload issue only if it is really needed. +Patch22: util-linux-agetty-smart-reload-10.patch +# PATCH-FEATURE-UPSTREAM util-linux-agetty-smart-reload-11.patch bsc1085196 sbrabec@suse.com -- agetty: Reload issue only if it is really needed. +Patch23: util-linux-agetty-smart-reload-11.patch +# PATCH-FEATURE-UPSTREAM util-linux-agetty-smart-reload-12.patch bsc1085196 sbrabec@suse.com -- agetty: Reload issue only if it is really needed. +Patch24: util-linux-agetty-smart-reload-12.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -383,7 +385,9 @@ library. %prep %setup -q -n %{_name}-%{version} %patch0 -p1 -# +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 %build %if %build_util_linux diff --git a/util-linux.changes b/util-linux.changes index 20e1bf7..36d611c 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jan 4 22:56:19 CET 2019 - sbrabec@suse.com + +- agetty: Fixes for reload issue only if it is really needed + (bsc#1085196, boo#1120298, + util-linux-agetty-smart-reload-10.patch, + util-linux-agetty-smart-reload-11.patch, + util-linux-agetty-smart-reload-12.patch). + ------------------------------------------------------------------- Mon Dec 10 19:08:35 CET 2018 - sbrabec@suse.com diff --git a/util-linux.spec b/util-linux.spec index 1f005ea..a361048 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -1,7 +1,7 @@ # # spec file for package util-linux # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -140,13 +140,15 @@ Source13: %{_name}.keyring Source14: runuser.pamd Source15: runuser-l.pamd Source16: su-l.pamd -# Source51: blkid.conf -## -## util-linux patches -## # PATCH-EXTEND-UPSTREAM: Let `su' handle /sbin and /usr/sbin in path Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff +# PATCH-FEATURE-UPSTREAM util-linux-agetty-smart-reload-10.patch bsc1085196 sbrabec@suse.com -- agetty: Reload issue only if it is really needed. +Patch22: util-linux-agetty-smart-reload-10.patch +# PATCH-FEATURE-UPSTREAM util-linux-agetty-smart-reload-11.patch bsc1085196 sbrabec@suse.com -- agetty: Reload issue only if it is really needed. +Patch23: util-linux-agetty-smart-reload-11.patch +# PATCH-FEATURE-UPSTREAM util-linux-agetty-smart-reload-12.patch bsc1085196 sbrabec@suse.com -- agetty: Reload issue only if it is really needed. +Patch24: util-linux-agetty-smart-reload-12.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -383,7 +385,9 @@ library. %prep %setup -q -n %{_name}-%{version} %patch0 -p1 -# +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 %build %if %build_util_linux From a7ab3a33bca8b763abf4679cef31b78fd6094489710da2bcef35a121e83692d5 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 24 Jan 2019 15:28:59 +0000 Subject: [PATCH 2/2] Accepting request 667887 from home:sbrabec:branches:util-linux-2.33.1 - Update to version 2.33.1: * agetty fixes (drop util-linux-agetty-smart-reload-10.patch, util-linux-agetty-smart-reload-11.patch, util-linux-agetty-smart-reload-12.patch). * Other minor fixes and documentation updates. OBS-URL: https://build.opensuse.org/request/show/667887 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=392 --- python3-libmount.changes | 9 ++++ python3-libmount.spec | 11 +---- util-linux-2.33.1.tar.sign | 16 +++++++ util-linux-2.33.1.tar.xz | 3 ++ util-linux-2.33.tar.sign | 16 ------- util-linux-2.33.tar.xz | 3 -- util-linux-agetty-smart-reload-10.patch | 59 ------------------------- util-linux-agetty-smart-reload-11.patch | 26 ----------- util-linux-agetty-smart-reload-12.patch | 30 ------------- util-linux-systemd.changes | 9 ++++ util-linux-systemd.spec | 11 +---- util-linux.changes | 9 ++++ util-linux.spec | 11 +---- 13 files changed, 49 insertions(+), 164 deletions(-) create mode 100644 util-linux-2.33.1.tar.sign create mode 100644 util-linux-2.33.1.tar.xz delete mode 100644 util-linux-2.33.tar.sign delete mode 100644 util-linux-2.33.tar.xz delete mode 100644 util-linux-agetty-smart-reload-10.patch delete mode 100644 util-linux-agetty-smart-reload-11.patch delete mode 100644 util-linux-agetty-smart-reload-12.patch diff --git a/python3-libmount.changes b/python3-libmount.changes index 36d611c..0cfeca5 100644 --- a/python3-libmount.changes +++ b/python3-libmount.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jan 22 22:29:00 CET 2019 - sbrabec@suse.com + +- Update to version 2.33.1: + * agetty fixes (drop util-linux-agetty-smart-reload-10.patch, + util-linux-agetty-smart-reload-11.patch, + util-linux-agetty-smart-reload-12.patch). + * Other minor fixes and documentation updates. + ------------------------------------------------------------------- Fri Jan 4 22:56:19 CET 2019 - sbrabec@suse.com diff --git a/python3-libmount.spec b/python3-libmount.spec index c9b3456..f5c3b78 100644 --- a/python3-libmount.spec +++ b/python3-libmount.spec @@ -116,7 +116,7 @@ BuildRequires: libmount-devel %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.33 +Version: 2.33.1 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -143,12 +143,6 @@ Source16: su-l.pamd Source51: blkid.conf # PATCH-EXTEND-UPSTREAM: Let `su' handle /sbin and /usr/sbin in path Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff -# PATCH-FEATURE-UPSTREAM util-linux-agetty-smart-reload-10.patch bsc1085196 sbrabec@suse.com -- agetty: Reload issue only if it is really needed. -Patch22: util-linux-agetty-smart-reload-10.patch -# PATCH-FEATURE-UPSTREAM util-linux-agetty-smart-reload-11.patch bsc1085196 sbrabec@suse.com -- agetty: Reload issue only if it is really needed. -Patch23: util-linux-agetty-smart-reload-11.patch -# PATCH-FEATURE-UPSTREAM util-linux-agetty-smart-reload-12.patch bsc1085196 sbrabec@suse.com -- agetty: Reload issue only if it is really needed. -Patch24: util-linux-agetty-smart-reload-12.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -385,9 +379,6 @@ library. %prep %setup -q -n %{_name}-%{version} %patch0 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 %build %if %build_util_linux diff --git a/util-linux-2.33.1.tar.sign b/util-linux-2.33.1.tar.sign new file mode 100644 index 0000000..6b0b9f8 --- /dev/null +++ b/util-linux-2.33.1.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEsMZNFDAcxu+u32Dk5LcdXuw5woQFAlw1y9AACgkQ5LcdXuw5 +woSq5w/9EaCuQM9mbJw+mOQvTnit3OsfTTw3Gs2OIM2apSDpUp8pHXBkFR/k/7qe +Hzm4Epj71tpkYjp2yqfNDh6q1okBDTtsCNZzX8aMuCjsDltVw6oKqf/cFxhyQJFt +6nalTrnPBnBKwuqAQvyuhduE2c/T7GYmCsp72iapxcLBNcrcdRLVJxQ30zHvpKpF +6Ww0W0r9/xF+xER+fQBDh4In0GUwXbhg318P9cmm8GKHUXeSxDDAx/xOtlTGGGAG +lPJE5WhJK8J6cnGyoYrRXWuC4XmbC40K/G5mxb+yAaOM0phR7JXvwnCqBwSvfGgK +RRA3InkQV/ufAYt2C2c4pSug2wLh0jUIDBznm5xp0K7G7ZjODdZ+XmLtkd3sjv+z +VQbO1w7n1HBBKXrcJBUGZzgZKzn9Ya9/iBlyiQ289cf1leYAcpyaDnp3VUBGiTfX +idUqPPj8bOvZXw1YhSdRad4Mxypuyxef5g9ri7IsmdVnUODgc69WVuXImQZ+k6Gl +Q4/M4h+HNwsxKWrtmXKDCKaPonExoY8hg84dTojp3nYNFwV+ZkIYb0Us0aQuN0kj +9AP5m2z1+XDzywortQd1r9EJmuClZFPXoq1T9XFmVHICRg2IfgN0x1Pcg3q+A60f +fX7/1gQUmY1vVA+hjNs06LXi/keRJNyllF+n/lm/QB2XOJta+Ow= +=TCHD +-----END PGP SIGNATURE----- diff --git a/util-linux-2.33.1.tar.xz b/util-linux-2.33.1.tar.xz new file mode 100644 index 0000000..259c1fc --- /dev/null +++ b/util-linux-2.33.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c14bd9f3b6e1792b90db87696e87ec643f9d63efa0a424f092a5a6b2f2dbef21 +size 4650936 diff --git a/util-linux-2.33.tar.sign b/util-linux-2.33.tar.sign deleted file mode 100644 index 4b67e62..0000000 --- a/util-linux-2.33.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEsMZNFDAcxu+u32Dk5LcdXuw5woQFAlvheV4ACgkQ5LcdXuw5 -woRfdw/9GgfVJaBZZZlH7WHdZLPqU7U1cxJBTY+c5Yp+rPiOM+S3XFYTgTR7i89o -Bc1truq3Kg/wFPFrRuRqxNcv3eJzubNczC+acUIU/uN0BI4Nxpd9e1/AuLq6tHHo -U5HzNRmWQpXTPEeffRX1AXBLIVC0/dwP4JtRZ8DIbBxU8G5KFYqfAX1sfk8+PxJI -3WU/4oZkhgnbzA8CEN7ULYwmNfeReZjFYfX81kaUPbxuC/NdNRgYgq/7zY+icyxR -tqKMvWMlv/E5JPiaAW97dwdHw6YpaDkPALqN2x/CdmbI0XCKfU8wijR37zezYntr -J1JKXkFCYdCr54fcvJE5/6eO0/fCyhP34MXfe8nA9XpWwrVmRzQVZJNA9basjsfa -X0ZZtI/HLRHAziRwK0SB+vOvQIa53/VpddXLKJ/nLMWK1QPP8+iDKqYlZFV0PzjK -diZzXJS5NhxyJ/O1iSfZm2L3nEEGCQbFNA6OKKW8qSfXHRwdheVEaSBJzrp/3HEN -6ROcDK8tz1IZym/2bjkpp7QikuwwD9Svw5PmJ5vyoxXoduAKv7MR1VPQ4kX6CQ0r -lvjMW+k76Sb0VH+dfkzwgbAP2NqUP9uBjQWR6DbxkXMStWCmlPEwv+ADyjqQifp9 -FWAYJKGcfZXTsj/9kH5BtroHmbSirIuBzpNMAmgMC5hEHxsD/OU= -=yq3T ------END PGP SIGNATURE----- diff --git a/util-linux-2.33.tar.xz b/util-linux-2.33.tar.xz deleted file mode 100644 index 32efe85..0000000 --- a/util-linux-2.33.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f261b9d73c35bfeeea04d26941ac47ee1df937bd3b0583e748217c1ea423658a -size 4663072 diff --git a/util-linux-agetty-smart-reload-10.patch b/util-linux-agetty-smart-reload-10.patch deleted file mode 100644 index 5f7b367..0000000 --- a/util-linux-agetty-smart-reload-10.patch +++ /dev/null @@ -1,59 +0,0 @@ -From d7a412fe0ae5fa08b891769be2961e5d80769484 Mon Sep 17 00:00:00 2001 -From: Samuel Thibault -Date: Mon, 12 Nov 2018 11:31:17 +0100 -Subject: [PATCH] agetty: fix portability issues - -Signed-off-by: Karel Zak ---- - term-utils/agetty.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/term-utils/agetty.c b/term-utils/agetty.c -index 05a269abb..759cea5b8 100644 ---- a/term-utils/agetty.c -+++ b/term-utils/agetty.c -@@ -1768,6 +1768,7 @@ static void eval_issue_file(struct issue *ie __attribute__((__unused__)), - } - #else /* ISSUE_SUPPORT */ - -+#ifdef AGETTY_RELOAD - static int issue_is_changed(struct issue *ie) - { - if (ie->mem_old && ie->mem -@@ -1780,6 +1781,7 @@ static int issue_is_changed(struct issue *ie) - - return 1; - } -+#endif - - static void print_issue_file(struct issue *ie, - struct options *op, -@@ -2066,8 +2068,8 @@ static char *get_logname(struct issue *ie, struct options *op, struct termios *t - /* Write issue file and prompt */ - do_prompt(ie, op, tp); - --#ifdef AGETTY_RELOAD - no_reload: -+#ifdef AGETTY_RELOAD - if (!wait_for_term_input(STDIN_FILENO)) { - /* refresh prompt -- discard input data, clear terminal - * and call do_prompt() again -@@ -2731,6 +2733,7 @@ static void output_special_char(struct issue *ie, - fprintf (ie->output, "%d ", users); - break; - } -+#if defined(RTMGRP_IPV4_IFADDR) && defined(RTMGRP_IPV6_IFADDR) - case '4': - case '6': - { -@@ -2754,6 +2757,7 @@ static void output_special_char(struct issue *ie, - netlink_groups |= RTMGRP_IPV6_IFADDR; - break; - } -+#endif - default: - putchar(c); - break; --- -2.19.1 - diff --git a/util-linux-agetty-smart-reload-11.patch b/util-linux-agetty-smart-reload-11.patch deleted file mode 100644 index c1b9ee7..0000000 --- a/util-linux-agetty-smart-reload-11.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f8ee3af9fabc4369c36fdbd706a17deb246a751c Mon Sep 17 00:00:00 2001 -From: Christian Hesse -Date: Wed, 7 Nov 2018 13:55:06 +0100 -Subject: [PATCH] agetty: fix output of escaped characters - -Signed-off-by: Christian Hesse ---- - term-utils/agetty.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/term-utils/agetty.c b/term-utils/agetty.c -index 759cea5b8..615db2c78 100644 ---- a/term-utils/agetty.c -+++ b/term-utils/agetty.c -@@ -2759,7 +2759,7 @@ static void output_special_char(struct issue *ie, - } - #endif - default: -- putchar(c); -+ putc(c, ie->output); - break; - } - } --- -2.19.1 - diff --git a/util-linux-agetty-smart-reload-12.patch b/util-linux-agetty-smart-reload-12.patch deleted file mode 100644 index 7c0ea44..0000000 --- a/util-linux-agetty-smart-reload-12.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d16afd8d157d41bd128da9f792ee49a716b76fd1 Mon Sep 17 00:00:00 2001 -From: Stanislav Brabec -Date: Tue, 20 Nov 2018 00:38:14 +0100 -Subject: [PATCH] agetty: Return old behavior with empty logname - -c094fcd37 introduced a behavior change: When Return is entered with empty -logname, nothing happens. As it confuses users, return back the old -behavior: re-prompt. - -Signed-off-by: Stanislav Brabec ---- - term-utils/agetty.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/term-utils/agetty.c b/term-utils/agetty.c -index 615db2c78..fc373847e 100644 ---- a/term-utils/agetty.c -+++ b/term-utils/agetty.c -@@ -2185,7 +2185,7 @@ static char *get_logname(struct issue *ie, struct options *op, struct termios *t - break; - } - /* Everything was erased. */ -- if (bp == logname) -+ if (bp == logname && cp->eol == '\0') - goto no_reload; - } - } --- -2.19.1 - diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index 36d611c..0cfeca5 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jan 22 22:29:00 CET 2019 - sbrabec@suse.com + +- Update to version 2.33.1: + * agetty fixes (drop util-linux-agetty-smart-reload-10.patch, + util-linux-agetty-smart-reload-11.patch, + util-linux-agetty-smart-reload-12.patch). + * Other minor fixes and documentation updates. + ------------------------------------------------------------------- Fri Jan 4 22:56:19 CET 2019 - sbrabec@suse.com diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 5552984..6034a1b 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -116,7 +116,7 @@ BuildRequires: libmount-devel %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.33 +Version: 2.33.1 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -143,12 +143,6 @@ Source16: su-l.pamd Source51: blkid.conf # PATCH-EXTEND-UPSTREAM: Let `su' handle /sbin and /usr/sbin in path Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff -# PATCH-FEATURE-UPSTREAM util-linux-agetty-smart-reload-10.patch bsc1085196 sbrabec@suse.com -- agetty: Reload issue only if it is really needed. -Patch22: util-linux-agetty-smart-reload-10.patch -# PATCH-FEATURE-UPSTREAM util-linux-agetty-smart-reload-11.patch bsc1085196 sbrabec@suse.com -- agetty: Reload issue only if it is really needed. -Patch23: util-linux-agetty-smart-reload-11.patch -# PATCH-FEATURE-UPSTREAM util-linux-agetty-smart-reload-12.patch bsc1085196 sbrabec@suse.com -- agetty: Reload issue only if it is really needed. -Patch24: util-linux-agetty-smart-reload-12.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -385,9 +379,6 @@ library. %prep %setup -q -n %{_name}-%{version} %patch0 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 %build %if %build_util_linux diff --git a/util-linux.changes b/util-linux.changes index 36d611c..0cfeca5 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jan 22 22:29:00 CET 2019 - sbrabec@suse.com + +- Update to version 2.33.1: + * agetty fixes (drop util-linux-agetty-smart-reload-10.patch, + util-linux-agetty-smart-reload-11.patch, + util-linux-agetty-smart-reload-12.patch). + * Other minor fixes and documentation updates. + ------------------------------------------------------------------- Fri Jan 4 22:56:19 CET 2019 - sbrabec@suse.com diff --git a/util-linux.spec b/util-linux.spec index a361048..d6133d4 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -116,7 +116,7 @@ BuildRequires: libmount-devel %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.33 +Version: 2.33.1 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -143,12 +143,6 @@ Source16: su-l.pamd Source51: blkid.conf # PATCH-EXTEND-UPSTREAM: Let `su' handle /sbin and /usr/sbin in path Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff -# PATCH-FEATURE-UPSTREAM util-linux-agetty-smart-reload-10.patch bsc1085196 sbrabec@suse.com -- agetty: Reload issue only if it is really needed. -Patch22: util-linux-agetty-smart-reload-10.patch -# PATCH-FEATURE-UPSTREAM util-linux-agetty-smart-reload-11.patch bsc1085196 sbrabec@suse.com -- agetty: Reload issue only if it is really needed. -Patch23: util-linux-agetty-smart-reload-11.patch -# PATCH-FEATURE-UPSTREAM util-linux-agetty-smart-reload-12.patch bsc1085196 sbrabec@suse.com -- agetty: Reload issue only if it is really needed. -Patch24: util-linux-agetty-smart-reload-12.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -385,9 +379,6 @@ library. %prep %setup -q -n %{_name}-%{version} %patch0 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 %build %if %build_util_linux