util-linux: update to 2.29.2

This commit is contained in:
Alessio Sergi 2017-02-26 16:16:26 +01:00 committed by Christian Neukirchen
parent 28d2203160
commit 49e6a022fa
2 changed files with 4 additions and 41 deletions

View file

@ -1,37 +0,0 @@
--- login-utils/su-common.c
+++ login-utils/su-common.c
@@ -368,6 +368,9 @@ create_watching_parent (void)
}
else
status = WEXITSTATUS (status);
+
+ /* child is gone, don't use the PID anymore */
+ child = (pid_t) -1;
}
else if (caught_signal)
status = caught_signal + 128;
@@ -377,7 +380,7 @@ create_watching_parent (void)
else
status = 1;
- if (caught_signal)
+ if (caught_signal && child != (pid_t)-1)
{
fprintf (stderr, _("\nSession terminated, killing shell..."));
kill (child, SIGTERM);
@@ -387,9 +390,12 @@ create_watching_parent (void)
if (caught_signal)
{
- sleep (2);
- kill (child, SIGKILL);
- fprintf (stderr, _(" ...killed.\n"));
+ if (child != (pid_t)-1)
+ {
+ sleep (2);
+ kill (child, SIGKILL);
+ fprintf (stderr, _(" ...killed.\n"));
+ }
/* Let's terminate itself with the received signal.
*

View file

@ -1,13 +1,13 @@
# Template file for 'util-linux'
pkgname=util-linux
version=2.28.2
revision=4
version=2.29.2
revision=1
short_desc="Miscellaneous linux utilities"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
license="GPL-2"
distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.*}/${pkgname}-${version}.tar.xz"
checksum=b89d37146f20bede93a42c847bce881a17e6dbd8066ff2db2bee733fa409f0cd
checksum=accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="zlib-devel readline-devel pam-devel libcap-ng-devel"
@ -41,7 +41,7 @@ do_configure() {
--enable-libblkid --enable-fsck --disable-rpath \
--enable-fs-paths-extra=/usr/sbin:/usr/bin \
--enable-vipw --enable-newgrp --enable-chfn-chsh \
--with-systemdsystemunitdir=/usr/lib/systemd/system \
--with-systemdsystemunitdir=no \
--without-udev --without-python \
--enable-write --localstatedir=/run
}