diff --git a/srcpkgs/sudo/patches/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch b/srcpkgs/sudo/patches/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch deleted file mode 100644 index 0a3c2a94d0c..00000000000 --- a/srcpkgs/sudo/patches/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch +++ /dev/null @@ -1,33 +0,0 @@ -# HG changeset patch -# User Todd C. Miller -# Date 1389722096 25200 -# Node ID a204b69d91f786444899ce3fc95ed535b6e32d33 -# Parent 987087ce465828da121b9d67412f42feaea06d56 -If not logging I/O we may get EOF when the command is executed and -the other end of the backchannel is closed. Just remove the -backchannel event in this case or we will continue to receive -the event. Bug #631 - ---- src/exec.c Tue Jan 14 09:26:14 2014 -0700 -+++ src/exec.c Tue Jan 14 10:54:56 2014 -0700 -@@ -230,11 +230,14 @@ - /* Short read or EOF. */ - sudo_debug_printf(SUDO_DEBUG_ERROR, - "failed to read child status: %s", n ? "short read" : "EOF"); -- /* -- * If not logging I/O we may get EOF when the command is -- * executed and sv is closed. It is safe to ignore this. -- */ -- if (ec->log_io || n != 0) { -+ if (!ec->log_io && n == 0) { -+ /* -+ * If not logging I/O we may get EOF when the command is -+ * executed and the other end of the backchannel is closed. -+ * Just remove the event in this case. -+ */ -+ (void)sudo_ev_del(ec->evbase, backchannel_event); -+ } else { - /* XXX - need new CMD_ type for monitor errors. */ - errno = n ? EIO : ECONNRESET; - ec->cstat->type = CMD_ERRNO; - diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template index 242439c7ae0..0415bc992ae 100644 --- a/srcpkgs/sudo/template +++ b/srcpkgs/sudo/template @@ -1,7 +1,7 @@ # Template build file for 'sudo'. pkgname=sudo -version=1.8.9p3 -revision=2 +version=1.8.9p4 +revision=1 build_style=gnu-configure configure_args="--with-ignore-dot -with-all-insults --with-env-editor --enable-shell-sets-home --enable-noargs-shell --without-sendmail @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://www.gratisoft.us/sudo/" license="ISC, BSD, zlib" distfiles="http://www.courtesan.com/sudo/dist/$pkgname-$version.tar.gz" -checksum=a2b1f0ec8aeb929c8430b1514cb53e2c2f882ea26cbb43426883d1cb6d22c5b7 +checksum=1943f9e9409c6542935d2e2d862c48d0d69dcf27288b294b8b537c02f52ac7a7 post_install() { vinstall ${FILESDIR}/sudo.pam 644 etc/pam.d sudo