Fix bug #266361, thanks to Todd (sudo's maintainer) for the patch.

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

4 files changed, 34 insertions, 7 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 20724995ea69..3e92b19cee2d 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/sudo
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.172 2009/04/19 16:12:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.173 2009/04/24 15:22:12 flameeyes Exp $
+
+*sudo-1.7.1-r1 (24 Apr 2009)
+
+  24 Apr 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/sudo-1.7.1-bug348.patch, -sudo-1.7.1.ebuild, +sudo-1.7.1-r1.ebuild:
+  Fix bug #266361, thanks to Todd (sudo's maintainer) for the patch.
 
 *sudo-1.7.1 (19 Apr 2009)
 
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 63752550653b..82c7ff5be326 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -2,17 +2,18 @@
 Hash: SHA1
 
 AUX sudo-1.7.0-parallelinstall.patch 1482 RMD160 92834eaf19bd2ef254a7349d4cb3d4005943da5f SHA1 cc256aef1f710accc2c31138aae9e7f92478904d SHA256 c69fb9cfff5e3c2ff97e45d9050a52d112222783421eec9d0137e7f3315f9e99
+AUX sudo-1.7.1-bug348.patch 449 RMD160 68d3066d595d3e8f7b15da4a52129d332f4da65a SHA1 50439aa618dc3b941111364275d06752ff8b42fd SHA256 c3f361764b41755331ae711b1647d09dec5324381176b9633f762f1c9381b563
 AUX sudo-skeychallengeargs.diff 567 RMD160 906ee43a7c2f21d1cf5130eac5c98ef0833154fd SHA1 b0efbedc72a1ed85c74ba10e343a68368e76c3e9 SHA256 dd2f4fdba26be6c3b4af15f3b6e18efa19375e1f9c579cdc2c76ee1adcce5e1d
 DIST sudo-1.7.0.tar.gz 744311 RMD160 62c1dbe97a4b46ea2352023ecb8b30dc4afedf58 SHA1 77bb230148b305e8608a3e552f1747507a84a55c SHA256 5f7de94287f39c8b3b8d86aed147967e9286f45740412004233858b637391978
 DIST sudo-1.7.1.tar.gz 755823 RMD160 e9c2e165ead15e5cab6a8d32facc0d38135d0ff9 SHA1 f76ad5ff5dac253c14dfedfdbddd99b4cf7f54a2 SHA256 e51c39eb4fca981b28b02c1cc58eef0b079258dce90cc87d5d91fcecedabe1db
 EBUILD sudo-1.7.0.ebuild 6520 RMD160 5fb6a9917779e4ac740f9a3f907075c715177b91 SHA1 aed5faecab483b235a8284956827dee79c477b54 SHA256 ff82283063f73885adf9119bf98a9340bba48f593f6d57f5dc5cf96dd5ca0e0d
-EBUILD sudo-1.7.1.ebuild 6481 RMD160 2f9880613ebf6b66e4b2894ba8ddb45f12c796a4 SHA1 c0367914996b86a91dd30520fef1b76d2cf00be4 SHA256 ed052ee056cbea00fa4ce097b8ed5ec89709ee2ccfb59ecb52038dd47e80af32
-MISC ChangeLog 24151 RMD160 14f3a9b530a1e51878fe316cbfa89ef97463a335 SHA1 1c2f11574247787083c8482a5275676ebd6faa16 SHA256 93a7db0bfa9f86edab837d2d423d357c93255ba859d1ee492cef6d508af58659
+EBUILD sudo-1.7.1-r1.ebuild 6560 RMD160 0a8f20691e811e5d01c44b278490d3f8795f76db SHA1 8f20e41eb04194929727f4905991dd685461ce42 SHA256 f8248a722b118009785711488edf5a82fbcdac47578bc43f495f2117eeb44152
+MISC ChangeLog 24384 RMD160 7c3b2df5c3dc97108ea86dfb491263867e23661f SHA1 e00a06b43ba1ab5e8589c277d7914510a4cde5f1 SHA256 3138b19dbee67fb072375e9d0f8cb2fad9920384a108117d1522b276df1bdef6
 MISC metadata.xml 501 RMD160 74dd36daa51d7ad5ce1659f0279e1245cd1ef4bc SHA1 e447d21dc61ee4a6de8cc0f66aa28aa422d9990a SHA256 5f399b83a90977486ff92847caa884d16f8b71705fd0d2203acb35f56c9a6db6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknrTVgACgkQAiZjviIA2XhL9QCgjJ8xe++t3sXa+T6pPE4g8HHt
-FKcAoIXegfjygMObh3svQscn4f/Vye2u
-=9X5L
+iEYEARECAAYFAknx2TgACgkQAiZjviIA2XgZ3wCfe5tbIW1xQgh53DIn4Y0I8veK
+71EAnjNoHUqwWQx2INqOxrepopwW0cqi
+=l918
 -----END PGP SIGNATURE-----
diff --git a/app-admin/sudo/files/sudo-1.7.1-bug348.patch b/app-admin/sudo/files/sudo-1.7.1-bug348.patch
new file mode 100644
index 000000000000..c63497728bda
--- /dev/null
+++ b/app-admin/sudo/files/sudo-1.7.1-bug348.patch
@@ -0,0 +1,17 @@
+Index: env.c
+===================================================================
+RCS file: /home/cvs/courtesan/sudo/env.c,v
+retrieving revision 1.101
+diff -u -r1.101 env.c
+--- env.c	11 Mar 2009 23:01:10 -0000	1.101
++++ env.c	24 Apr 2009 15:07:33 -0000
+@@ -257,6 +257,9 @@
+ 	return(-1);
+     }
+ 
++    if (val == NULL)
++	val = "";		/* glibc treats a NULL val as "" */
++
+     esize = strlen(var) + 1 + strlen(val) + 1;
+     estring = emalloc(esize);
+ 
diff --git a/app-admin/sudo/sudo-1.7.1.ebuild b/app-admin/sudo/sudo-1.7.1-r1.ebuild
index 71fbc8d440c3..63edc7180f50 100644
--- a/app-admin/sudo/sudo-1.7.1.ebuild
+++ b/app-admin/sudo/sudo-1.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.1.ebuild,v 1.1 2009/04/19 16:12:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.1-r1.ebuild,v 1.1 2009/04/24 15:22:12 flameeyes Exp $
 
 inherit eutils pam confutils
 
@@ -52,6 +52,9 @@ src_unpack() {
 	# compatability fix.
 	epatch "${FILESDIR}"/${PN}-skeychallengeargs.diff
 
+	# Bug #266361 (upstream bug #348)
+	epatch "${FILESDIR}"/${P}-bug348.patch
+
 	# additional variables to disallow, should user disable env_reset.
 
 	# NOTE: this is not a supported mode of operation, these variables