[arch-commits] Commit in util-linux/trunk (3 files)

[Christian Hesse]

    Date: Monday, August 16, 2021 @ 14:14:20
  Author: eworm
Revision: 422277

upgpkg: util-linux 2.37.2-1: new upstream release

Modified:
  util-linux/trunk/PKGBUILD
Deleted:
  util-linux/trunk/0001-sulogin-fix-getpasswd.patch
  util-linux/trunk/0002-libmount-fix-setgroups-use.patch

---------------------------------------+
 0001-sulogin-fix-getpasswd.patch      |   23 -------------------
 0002-libmount-fix-setgroups-use.patch |   38 --------------------------------
 PKGBUILD                              |   17 ++------------
 3 files changed, 3 insertions(+), 75 deletions(-)

Deleted: 0001-sulogin-fix-getpasswd.patch
===================================================================
--- 0001-sulogin-fix-getpasswd.patch	2021-08-16 12:55:13 UTC (rev 422276)
+++ 0001-sulogin-fix-getpasswd.patch	2021-08-16 14:14:20 UTC (rev 422277)
@@ -1,23 +0,0 @@
-From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak at redhat.com>
-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 <kzak at redhat.com>
----
- 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);

Deleted: 0002-libmount-fix-setgroups-use.patch
===================================================================
--- 0002-libmount-fix-setgroups-use.patch	2021-08-16 12:55:13 UTC (rev 422276)
+++ 0002-libmount-fix-setgroups-use.patch	2021-08-16 14:14:20 UTC (rev 422277)
@@ -1,38 +0,0 @@
-From 420e914c4cc4c2ba34fd75790ea194d7f4a47d2c Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak at redhat.com>
-Date: Thu, 29 Jul 2021 11:50:48 +0200
-Subject: [PATCH] libmount: fix setgroups() use
-
-* keep process in single supplementary group, which is the real group ID for the process
-
-* make sure we have rights to call setgroups(), requires group permissions
-
-Fixes: https://github.com/karelzak/util-linux/issues/1398
-Signed-off-by: Karel Zak <kzak at redhat.com>
----
- include/c.h | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/include/c.h b/include/c.h
-index c1e4c5ffc..a4504e3ba 100644
---- a/include/c.h
-+++ b/include/c.h
-@@ -340,14 +340,16 @@ static inline size_t get_hostname_max(void)
- 
- static inline int drop_permissions(void)
- {
-+	gid_t newgid = getgid();
-+
- 	errno = 0;
- 
- 	/* drop supplementary groups */
--	if (setgroups(0, NULL) != 0)
-+	if (geteuid() == 0 && setgroups(1, &newgid) != 0)
- 		goto fail;
- 
- 	/* drop GID */
--	if (setgid(getgid()) < 0)
-+	if (setgid(newgid) < 0)
- 		goto fail;
- 
- 	/* drop UID */

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-08-16 12:55:13 UTC (rev 422276)
+++ PKGBUILD	2021-08-16 14:14:20 UTC (rev 422277)
@@ -5,9 +5,9 @@
 pkgbase=util-linux
 pkgname=(util-linux util-linux-libs)
 _pkgmajor=2.37
-_realver=${_pkgmajor}.1
+_realver=${_pkgmajor}.2
 pkgver=${_realver/-/}
-pkgrel=3
+pkgrel=1
 pkgdesc='Miscellaneous system utilities for Linux'
 url='https://github.com/karelzak/util-linux'
 arch=('x86_64')
@@ -16,17 +16,13 @@
 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'
-        '0002-libmount-fix-setgroups-use.patch'
         pam-{login,common,runuser,su}
         'util-linux.sysusers'
         '60-rfkill.rules'
         'rfkill-unblock_.service'
         'rfkill-block_.service')
-sha256sums=('8e4bd42053b726cf86eb4d13a73bc1d9225a2c2e1a2e0d2a891f1020f83e6b76'
+sha256sums=('6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9'
             'SKIP'
-            '00d526cfaca8979e433c7379c634cf14e700322f0ed0c5a7996af1c900147268'
-            '56fbc491b999aa18113237f28d399045a6d66678353b3619ab8da2f8518d2a4d'
             '99cd77f21ee44a0c5e57b0f3670f711a00496f198fc5704d7e44f5d817c81a0f'
             '57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af'
             '48d6fba767631e3dd3620cf02a71a74c5d65a525d4c4ce4b5a0b7d9f41ebfea1'
@@ -36,13 +32,6 @@
             '8ccec10a22523f6b9d55e0d6cbf91905a39881446710aa083e935e8073323376'
             'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36')
 
-prepare() {
-  cd "${pkgbase}-${_realver}"
-
-  patch -Np1 < ../0001-sulogin-fix-getpasswd.patch
-  patch -Np1 < ../0002-libmount-fix-setgroups-use.patch
-}
-
 build() {
   cd "${pkgbase}-${_realver}"