[arch-commits] Commit in sudo/trunk (2 files)

[Evangelos Foutras]

    Date: Wednesday, January 15, 2014 @ 22:16:44
  Author: foutrelis
Revision: 204260

upgpkg: sudo 1.8.9.p4-1

New upstream release.

Modified:
  sudo/trunk/PKGBUILD
Deleted:
  sudo/trunk/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch

-----------------------------------------------------------+
 PKGBUILD                                                  |   14 +---
 sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch |   35 ------------
 2 files changed, 3 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-15 20:56:02 UTC (rev 204259)
+++ PKGBUILD	2014-01-15 21:16:44 UTC (rev 204260)
@@ -4,9 +4,9 @@
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=sudo
-_sudover=1.8.9p3
+_sudover=1.8.9p4
 pkgver=${_sudover/p/.p}
-pkgrel=2
+pkgrel=1
 pkgdesc="Give certain users the ability to run some commands as root"
 arch=('i686' 'x86_64')
 url="http://www.sudo.ws/sudo/"
@@ -15,19 +15,11 @@
 depends=('glibc' 'pam')
 backup=('etc/sudoers' 'etc/pam.d/sudo')
 source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig}
-        sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch
         sudo.pam)
-sha256sums=('a2b1f0ec8aeb929c8430b1514cb53e2c2f882ea26cbb43426883d1cb6d22c5b7'
+sha256sums=('1943f9e9409c6542935d2e2d862c48d0d69dcf27288b294b8b537c02f52ac7a7'
             'SKIP'
-            '79d86c92723519fed1fa3db60ebc66b400435237d82e9bfdc899db4550c259b5'
             'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae')
 
-prepare() {
-  cd "$srcdir/$pkgname-$_sudover"
-
-  patch -Np1 -i "$srcdir/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch"
-}
-
 build() {
   cd "$srcdir/$pkgname-$_sudover"
 

Deleted: sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch
===================================================================
--- sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch	2014-01-15 20:56:02 UTC (rev 204259)
+++ sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch	2014-01-15 21:16:44 UTC (rev 204260)
@@ -1,35 +0,0 @@
-
-# HG changeset patch
-# User Todd C. Miller <Todd.Miller at courtesan.com>
-# 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
-
-diff -r 987087ce4658 -r a204b69d91f7 src/exec.c
---- a/src/exec.c	Tue Jan 14 09:26:14 2014 -0700
-+++ b/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;
-