[arch-commits] Commit in sudo/trunk (PKGBUILD fix-typo-in-sudo_sss_attrcpy.patch)

Evangelos Foutras foutrelis at archlinux.org
Fri Jul 17 20:28:58 UTC 2015


    Date: Friday, July 17, 2015 @ 22:28:58
  Author: foutrelis
Revision: 242333

upgpkg: sudo 1.8.14-2

Add upstream patch to fix SSSD support.

Added:
  sudo/trunk/fix-typo-in-sudo_sss_attrcpy.patch
Modified:
  sudo/trunk/PKGBUILD

------------------------------------+
 PKGBUILD                           |   11 ++++++++++-
 fix-typo-in-sudo_sss_attrcpy.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-07-17 19:40:20 UTC (rev 242332)
+++ PKGBUILD	2015-07-17 20:28:58 UTC (rev 242333)
@@ -6,7 +6,7 @@
 pkgname=sudo
 _sudover=1.8.14
 pkgver=${_sudover/p/.p}
-pkgrel=1
+pkgrel=2
 pkgdesc="Give certain users the ability to run some commands as root"
 arch=('i686' 'x86_64')
 url="http://www.sudo.ws/sudo/"
@@ -16,12 +16,21 @@
 backup=('etc/sudoers' 'etc/pam.d/sudo')
 install=$pkgname.install
 source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig}
+        fix-typo-in-sudo_sss_attrcpy.patch
         sudo.pam)
 sha256sums=('74308f7bf242f6f997d4c8145849581f06fb6fbe47032b6e87ac664c14b9f6d3'
             'SKIP'
+            '2ab1ad3174b852ad82601e670ba3b42efa06bc34d85d20918d69bb239e1f0c0e'
             'd1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2')
 validpgpkeys=('CCB24BE9E9481B15D34159535A89DFA27EE470C4')
 
+prepare() {
+  cd "$srcdir/$pkgname-$_sudover"
+
+  # http://bugzilla.sudo.ws/show_bug.cgi?id=703
+  patch -Np1 -i ../fix-typo-in-sudo_sss_attrcpy.patch
+}
+
 build() {
   cd "$srcdir/$pkgname-$_sudover"
 

Added: fix-typo-in-sudo_sss_attrcpy.patch
===================================================================
--- fix-typo-in-sudo_sss_attrcpy.patch	                        (rev 0)
+++ fix-typo-in-sudo_sss_attrcpy.patch	2015-07-17 20:28:58 UTC (rev 242333)
@@ -0,0 +1,29 @@
+
+# HG changeset patch
+# User Todd C. Miller <Todd.Miller at courtesan.com>
+# Date 1437163106 21600
+# Node ID 0fa324a7bb5665aec9d39cdf011eaed32db36685
+# Parent  e4c7cda464759b555e46ad0de229f302ac22b112
+Fix typo in sudo_sss_attrcpy() that caused a memory allocation error.
+
+diff -r e4c7cda46475 -r 0fa324a7bb56 plugins/sudoers/sssd.c
+--- a/plugins/sudoers/sssd.c	Wed Jul 15 12:36:02 2015 -0600
++++ b/plugins/sudoers/sssd.c	Fri Jul 17 13:58:26 2015 -0600
+@@ -142,7 +142,7 @@
+     sudo_debug_printf(SUDO_DEBUG_INFO, "malloc: cnt=%d", src->num_values);
+ 
+     dst->name = strdup(src->name);
+-    dst->values = reallocarray(NULL, dst->num_values, sizeof(char *));
++    dst->values = reallocarray(NULL, src->num_values, sizeof(char *));
+     if (dst->name == NULL || dst->values == NULL)
+ 	goto oom;
+     dst->num_values = src->num_values;
+@@ -195,7 +195,6 @@
+ 
+     for (i = 0; i < src->num_attrs; ++i) {
+ 	if (!sudo_sss_attrcpy(dst->attrs + i, src->attrs + i)) {
+-	    sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
+ 	    dst->num_attrs = i;
+ 	    sudo_sss_rulefree(dst);
+ 	    debug_return_bool(false);
+



More information about the arch-commits mailing list