forked from pool/util-linux
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
This commit is contained in:
parent
bb4a013d42
commit
a7ab3a33bc
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
16
util-linux-2.33.1.tar.sign
Normal file
16
util-linux-2.33.1.tar.sign
Normal file
@ -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-----
|
BIN
util-linux-2.33.1.tar.xz
(Stored with Git LFS)
Normal file
BIN
util-linux-2.33.1.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -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-----
|
BIN
util-linux-2.33.tar.xz
(Stored with Git LFS)
BIN
util-linux-2.33.tar.xz
(Stored with Git LFS)
Binary file not shown.
@ -1,59 +0,0 @@
|
||||
From d7a412fe0ae5fa08b891769be2961e5d80769484 Mon Sep 17 00:00:00 2001
|
||||
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
|
||||
Date: Mon, 12 Nov 2018 11:31:17 +0100
|
||||
Subject: [PATCH] agetty: fix portability issues
|
||||
|
||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||
---
|
||||
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
|
||||
|
@ -1,26 +0,0 @@
|
||||
From f8ee3af9fabc4369c36fdbd706a17deb246a751c Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hesse <mail@eworm.de>
|
||||
Date: Wed, 7 Nov 2018 13:55:06 +0100
|
||||
Subject: [PATCH] agetty: fix output of escaped characters
|
||||
|
||||
Signed-off-by: Christian Hesse <mail@eworm.de>
|
||||
---
|
||||
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
|
||||
|
@ -1,30 +0,0 @@
|
||||
From d16afd8d157d41bd128da9f792ee49a716b76fd1 Mon Sep 17 00:00:00 2001
|
||||
From: Stanislav Brabec <sbrabec@suse.cz>
|
||||
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 <sbrabec@suse.cz>
|
||||
---
|
||||
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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user