Date: Monday, August 2, 2021 @ 12:31:11 Author: eworm Revision: 421036
upgpkg: util-linux 2.37.1-2: sulogin: fix getpasswd() Added: util-linux/trunk/0001-sulogin-fix-getpasswd.patch Modified: util-linux/trunk/PKGBUILD ----------------------------------+ 0001-sulogin-fix-getpasswd.patch | 23 +++++++++++++++++++++++ PKGBUILD | 10 +++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) Added: 0001-sulogin-fix-getpasswd.patch =================================================================== --- 0001-sulogin-fix-getpasswd.patch (rev 0) +++ 0001-sulogin-fix-getpasswd.patch 2021-08-02 12:31:11 UTC (rev 421036) @@ -0,0 +1,23 @@ +From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001 +From: Karel Zak <[email protected]> +Date: Thu, 29 Jul 2021 21:28:00 +0200 +Subject: [PATCH] sulogin: fix getpasswd() + +Fixes: https://github.com/karelzak/util-linux/issues/1400 +Signed-off-by: Karel Zak <[email protected]> +--- + login-utils/sulogin.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c +index 3016ef483..4d48943ad 100644 +--- a/login-utils/sulogin.c ++++ b/login-utils/sulogin.c +@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con) + cp = &con->cp; + tty = con->tio; + ++ ret = pass; + tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY); + tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG); + tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0); Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-08-02 12:19:19 UTC (rev 421035) +++ PKGBUILD 2021-08-02 12:31:11 UTC (rev 421036) @@ -7,7 +7,7 @@ _pkgmajor=2.37 _realver=${_pkgmajor}.1 pkgver=${_realver/-/} -pkgrel=1 +pkgrel=2 pkgdesc='Miscellaneous system utilities for Linux' url='https://github.com/karelzak/util-linux' arch=('x86_64') @@ -16,6 +16,7 @@ options=('strip') validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak source=("https://www.kernel.org/pub/linux/utils/util-linux/v${_pkgmajor}/${pkgbase}-${_realver}.tar."{xz,sign} + '0001-sulogin-fix-getpasswd.patch' pam-{login,common,runuser,su} 'util-linux.sysusers' '60-rfkill.rules' @@ -23,6 +24,7 @@ 'rfkill-block_.service') sha256sums=('8e4bd42053b726cf86eb4d13a73bc1d9225a2c2e1a2e0d2a891f1020f83e6b76' 'SKIP' + '00d526cfaca8979e433c7379c634cf14e700322f0ed0c5a7996af1c900147268' '99cd77f21ee44a0c5e57b0f3670f711a00496f198fc5704d7e44f5d817c81a0f' '57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af' '48d6fba767631e3dd3620cf02a71a74c5d65a525d4c4ce4b5a0b7d9f41ebfea1' @@ -32,6 +34,12 @@ '8ccec10a22523f6b9d55e0d6cbf91905a39881446710aa083e935e8073323376' 'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36') +prepare() { + cd "${pkgbase}-${_realver}" + + patch -Np1 < ../0001-sulogin-fix-getpasswd.patch +} + build() { cd "${pkgbase}-${_realver}"
