[arch-commits] Commit in sudo/trunk (PKGBUILD sudo_validate_exitval.patch)

[Allan McRae]

    Date: Sunday, March 6, 2011 @ 20:35:02
  Author: allan
Revision: 112829

upgpkg: sudo 1.8.0-3
add upstream sudo -v return value patch

Added:
  sudo/trunk/sudo_validate_exitval.patch
Modified:
  sudo/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |    8 +++++++-
 sudo_validate_exitval.patch |   15 +++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-07 01:01:17 UTC (rev 112828)
+++ PKGBUILD	2011-03-07 01:35:02 UTC (rev 112829)
@@ -5,7 +5,7 @@
 pkgname=sudo
 _ver=1.8.0
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=2
+pkgrel=3
 pkgdesc="Give certain users the ability to run some commands as root"
 arch=('i686' 'x86_64')
 url="http://www.sudo.ws/sudo/"
@@ -14,16 +14,22 @@
 backup=('etc/sudoers' 'etc/pam.d/sudo')
 source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz
 	sudo_l.patch
+	sudo_validate_exitval.patch
         sudo.pam)
 options=('!libtool' '!makeflags')
 md5sums=('fa0a35330691af14cb1869f64a65aebc'
          '29656b2f2365e14fa0f8eb94e61f3690'
+         '4751aa5557fe43fd8e03e0c7b5affcfc'
          '4e7ad4ec8f2fe6a40e12bcb2c0b256e3')
 
 build() {
   cd $srcdir/$pkgname-$_ver
 
+  # http://www.sudo.ws/bugs/show_bug.cgi?id=474
   patch -Np1 -i $srcdir/sudo_l.patch
+  
+  # http://www.sudo.ws/bugs/show_bug.cgi?id=479
+  patch -Np1 -i $srcdir/sudo_validate_exitval.patch
 
   ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \
     --with-env-editor --with-all-insults --with-logfac=auth

Added: sudo_validate_exitval.patch
===================================================================
--- sudo_validate_exitval.patch	                        (rev 0)
+++ sudo_validate_exitval.patch	2011-03-07 01:35:02 UTC (rev 112829)
@@ -0,0 +1,15 @@
+diff -r 172f29597bd2 plugins/sudoers/sudoers.c
+--- a/plugins/sudoers/sudoers.c	Sun Mar 06 15:38:02 2011 -0500
++++ b/plugins/sudoers/sudoers.c	Sun Mar 06 15:52:06 2011 -0500
+@@ -546,8 +546,10 @@
+     if (def_group_plugin)
+ 	group_plugin_unload();
+ 
+-    if (ISSET(sudo_mode, (MODE_VALIDATE|MODE_CHECK|MODE_LIST)))
++    if (ISSET(sudo_mode, (MODE_VALIDATE|MODE_CHECK|MODE_LIST))) {
++	rval = TRUE;
+ 	goto done;
++    }
+ 
+     /*
+      * Set umask based on sudoers.