[arch-commits] Commit in sudo/repos (10 files)
Evangelos Foutras
foutrelis at nymeria.archlinux.org
Wed Jan 15 01:53:10 UTC 2014
Date: Wednesday, January 15, 2014 @ 02:53:10
Author: foutrelis
Revision: 204057
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
sudo/repos/testing-i686/PKGBUILD
(from rev 204056, sudo/trunk/PKGBUILD)
sudo/repos/testing-i686/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch
(from rev 204056, sudo/trunk/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch)
sudo/repos/testing-i686/sudo.pam
(from rev 204056, sudo/trunk/sudo.pam)
sudo/repos/testing-x86_64/PKGBUILD
(from rev 204056, sudo/trunk/PKGBUILD)
sudo/repos/testing-x86_64/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch
(from rev 204056, sudo/trunk/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch)
sudo/repos/testing-x86_64/sudo.pam
(from rev 204056, sudo/trunk/sudo.pam)
Deleted:
sudo/repos/testing-i686/PKGBUILD
sudo/repos/testing-i686/sudo.pam
sudo/repos/testing-x86_64/PKGBUILD
sudo/repos/testing-x86_64/sudo.pam
--------------------------------------------------------------------------+
/PKGBUILD | 120 ++++++++++
/sudo.pam | 6
testing-i686/PKGBUILD | 52 ----
testing-i686/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch | 35 ++
testing-i686/sudo.pam | 3
testing-x86_64/PKGBUILD | 52 ----
testing-x86_64/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch | 35 ++
testing-x86_64/sudo.pam | 3
8 files changed, 196 insertions(+), 110 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2014-01-15 01:52:57 UTC (rev 204056)
+++ testing-i686/PKGBUILD 2014-01-15 01:53:10 UTC (rev 204057)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=sudo
-_sudover=1.8.9p3
-pkgver=${_sudover/p/.p}
-pkgrel=1
-pkgdesc="Give certain users the ability to run some commands as root"
-arch=('i686' 'x86_64')
-url="http://www.sudo.ws/sudo/"
-license=('custom')
-groups=('base-devel')
-depends=('glibc' 'pam')
-backup=('etc/sudoers' 'etc/pam.d/sudo')
-source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig}
- sudo.pam)
-sha256sums=('a2b1f0ec8aeb929c8430b1514cb53e2c2f882ea26cbb43426883d1cb6d22c5b7'
- 'SKIP'
- 'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae')
-
-build() {
- cd "$srcdir/$pkgname-$_sudover"
-
- ./configure \
- --prefix=/usr \
- --sbindir=/usr/bin \
- --libexecdir=/usr/lib \
- --with-logfac=auth \
- --with-pam \
- --with-env-editor \
- --with-passprompt="[sudo] password for %p: " \
- --with-all-insults
- make
-}
-
-check() {
- cd "$srcdir/$pkgname-$_sudover"
- make check
-}
-
-package() {
- cd "$srcdir/$pkgname-$_sudover"
- make DESTDIR="$pkgdir" install
-
- install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo"
-
- install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: sudo/repos/testing-i686/PKGBUILD (from rev 204056, sudo/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2014-01-15 01:53:10 UTC (rev 204057)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=sudo
+_sudover=1.8.9p3
+pkgver=${_sudover/p/.p}
+pkgrel=2
+pkgdesc="Give certain users the ability to run some commands as root"
+arch=('i686' 'x86_64')
+url="http://www.sudo.ws/sudo/"
+license=('custom')
+groups=('base-devel')
+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'
+ '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"
+
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --libexecdir=/usr/lib \
+ --with-logfac=auth \
+ --with-pam \
+ --with-env-editor \
+ --with-passprompt="[sudo] password for %p: " \
+ --with-all-insults
+ make
+}
+
+check() {
+ cd "$srcdir/$pkgname-$_sudover"
+ make check
+}
+
+package() {
+ cd "$srcdir/$pkgname-$_sudover"
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo"
+
+ install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: sudo/repos/testing-i686/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch (from rev 204056, sudo/trunk/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch)
===================================================================
--- testing-i686/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch (rev 0)
+++ testing-i686/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch 2014-01-15 01:53:10 UTC (rev 204057)
@@ -0,0 +1,35 @@
+
+# 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;
+
Deleted: testing-i686/sudo.pam
===================================================================
--- testing-i686/sudo.pam 2014-01-15 01:52:57 UTC (rev 204056)
+++ testing-i686/sudo.pam 2014-01-15 01:53:10 UTC (rev 204057)
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth required pam_unix.so
-auth required pam_nologin.so
Copied: sudo/repos/testing-i686/sudo.pam (from rev 204056, sudo/trunk/sudo.pam)
===================================================================
--- testing-i686/sudo.pam (rev 0)
+++ testing-i686/sudo.pam 2014-01-15 01:53:10 UTC (rev 204057)
@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth required pam_unix.so
+auth required pam_nologin.so
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2014-01-15 01:52:57 UTC (rev 204056)
+++ testing-x86_64/PKGBUILD 2014-01-15 01:53:10 UTC (rev 204057)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=sudo
-_sudover=1.8.9p3
-pkgver=${_sudover/p/.p}
-pkgrel=1
-pkgdesc="Give certain users the ability to run some commands as root"
-arch=('i686' 'x86_64')
-url="http://www.sudo.ws/sudo/"
-license=('custom')
-groups=('base-devel')
-depends=('glibc' 'pam')
-backup=('etc/sudoers' 'etc/pam.d/sudo')
-source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig}
- sudo.pam)
-sha256sums=('a2b1f0ec8aeb929c8430b1514cb53e2c2f882ea26cbb43426883d1cb6d22c5b7'
- 'SKIP'
- 'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae')
-
-build() {
- cd "$srcdir/$pkgname-$_sudover"
-
- ./configure \
- --prefix=/usr \
- --sbindir=/usr/bin \
- --libexecdir=/usr/lib \
- --with-logfac=auth \
- --with-pam \
- --with-env-editor \
- --with-passprompt="[sudo] password for %p: " \
- --with-all-insults
- make
-}
-
-check() {
- cd "$srcdir/$pkgname-$_sudover"
- make check
-}
-
-package() {
- cd "$srcdir/$pkgname-$_sudover"
- make DESTDIR="$pkgdir" install
-
- install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo"
-
- install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: sudo/repos/testing-x86_64/PKGBUILD (from rev 204056, sudo/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2014-01-15 01:53:10 UTC (rev 204057)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=sudo
+_sudover=1.8.9p3
+pkgver=${_sudover/p/.p}
+pkgrel=2
+pkgdesc="Give certain users the ability to run some commands as root"
+arch=('i686' 'x86_64')
+url="http://www.sudo.ws/sudo/"
+license=('custom')
+groups=('base-devel')
+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'
+ '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"
+
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --libexecdir=/usr/lib \
+ --with-logfac=auth \
+ --with-pam \
+ --with-env-editor \
+ --with-passprompt="[sudo] password for %p: " \
+ --with-all-insults
+ make
+}
+
+check() {
+ cd "$srcdir/$pkgname-$_sudover"
+ make check
+}
+
+package() {
+ cd "$srcdir/$pkgname-$_sudover"
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo"
+
+ install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: sudo/repos/testing-x86_64/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch (from rev 204056, sudo/trunk/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch)
===================================================================
--- testing-x86_64/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch (rev 0)
+++ testing-x86_64/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch 2014-01-15 01:53:10 UTC (rev 204057)
@@ -0,0 +1,35 @@
+
+# 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;
+
Deleted: testing-x86_64/sudo.pam
===================================================================
--- testing-x86_64/sudo.pam 2014-01-15 01:52:57 UTC (rev 204056)
+++ testing-x86_64/sudo.pam 2014-01-15 01:53:10 UTC (rev 204057)
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth required pam_unix.so
-auth required pam_nologin.so
Copied: sudo/repos/testing-x86_64/sudo.pam (from rev 204056, sudo/trunk/sudo.pam)
===================================================================
--- testing-x86_64/sudo.pam (rev 0)
+++ testing-x86_64/sudo.pam 2014-01-15 01:53:10 UTC (rev 204057)
@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth required pam_unix.so
+auth required pam_nologin.so
More information about the arch-commits
mailing list