Add upstream patch for bug #524074.

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

4 files changed, 70 insertions, 15 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 260c1f943876..9a6137f3d8e9 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/sudo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.365 2014/09/29 21:29:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.366 2014/10/06 19:35:59 flameeyes Exp $
+
+  06 Oct 2014; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/sudo-1.8.11-shadow.patch, sudo-1.8.11.ebuild:
+  Add upstream patch for bug #524074.
 
 *sudo-1.8.11 (29 Sep 2014)
 
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 027d1d7fa6ff..ccd7238270a9 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,26 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX sudo-1.8.11-shadow.patch 1622 SHA256 0049a0911107b758d7c07f5710b8d72db17213d952ccb1e7913b9499ca8d3e86 SHA512 6c5c175e891bbfec9164da851f18ddc9c51f302039b942c25df127a5713e2187c725594ddb8a01b17b750871ffba99e01a7f43bfce9781254ae4add8cfd12dd1 WHIRLPOOL 16ca01f7c627f23695a065e481addd3d00d232fab46877775555c593242d134db87854de320e35c1b4102642fa86f7d5401f09e3acb9129657525bcdaa29ec50
 DIST sudo-1.8.10p3.tar.gz 2262370 SHA256 6eda135fa68163108f1c24de6975de5ddb09d75730bb62d6390bda7b04345400 SHA512 714e20d7ea0e76b24acfa73818644fdf4094374b2000ef0cb879a92273230fdc2bda4cab041f224f19b57149f2ae289c377c693d3bca5a2d5e1bba79cf97c434 WHIRLPOOL 8677bf12f49f78af1ac4dcf4692194ac49116c5925258e2ad19e33e79bddfb6280ecbd11e98728bef57057c3461ca3b1fa29fc4533acf7b1bfb18e6836ea8c92
 DIST sudo-1.8.11.tar.gz 2399452 SHA256 a3177de7b5fbebfb43b32fc30aecaaf434762bf23e313de4c4a39e5ff715c845 SHA512 e35d42c8b15ded918b05a0522f8e167d6c672983bec593e0deee8ae2ccba6aed05170e88333f01b7c0b59f00cec690d8f3cf09404a7bde6fd10946a7622785fd WHIRLPOOL 236d23eb3c5db9a202a254e6cfaa50842e702aeddac584937eaf453156ec5c0b44a7dce1d84d1df29b8b2d59024f7d5b04407a33a0ffc9e2e43c47552542f415
 DIST sudo-1.8.5p2.tar.gz 1746344 SHA256 c32ae2bc3faf83444c82ca75ccb10ad3684d8222e3535f164c4a4db7cdddf8cf SHA512 616967eea79f91cda2b0cd1d13ed453d20142521ecfca289432bdf5708ac0549c7873fd80170cc0481390e82f1e60fb0bffcfc7c6b70d5d721aa98d23361c5cb WHIRLPOOL ac0d2c040935c54947571a0d4671be70aaaf7a6f69cb097acd321718656d4c569b0db4191eaf943c6b642a1d641263429287241a236a0f2a0c9edf973710bf8b
 DIST sudo-1.8.6p7.tar.gz 1858348 SHA256 301089edb22356f59d097f6abbe1303f03927a38691b02959d618546c2125036 SHA512 732bcbd53b77d329bbc77d3cd3644a595e938433053122fe3098385c0ad3a6a9cf4f4ab8709c7a79cad51dba77ffaa1be9ffde8e8834d3798822a1bd5b518d42 WHIRLPOOL 875984b44b571dc3765aab5ad8bd8859d0cd680e7da453109b5bee45aac336e3d0c05e1133ce0101a6dd2b9f19a26454d3e0b11c0edf32034f9fae04d3dfbb4d
 EBUILD sudo-1.8.10_p3.ebuild 5630 SHA256 7ffab9d8c9f6fcddb5cfc815f94b67c37929e3394ce336ea595caa2a77d93589 SHA512 186a6ba9ca67d904f857e507dce2002113f3fc5771ff90885ee88909c13be9a5fd436c25f73e204a4a89108a59d0638a870c446d7a26f62397069cf7aec47920 WHIRLPOOL 5134e735ab4e2d171c9bbf81e289731e5c6cfb2facece69a048402a132bc82dac14bb1b3dd55d2607902e11d995f8fe9ed78db4dd977094d84cbbc066f5dfdd0
-EBUILD sudo-1.8.11.ebuild 5762 SHA256 a37d2f2e3e95a506fe88555c32a0cf6c1b4fc8b89a8c04b49202268ba0d20a8d SHA512 e02c54b352cca2a8de95b16f236e2a119b5ae8b082c2450400a81970c8e36efb6fb1888e0e93bb4a61332b33d37875cad730ba54a38f7d60c5cde457ea2cd38b WHIRLPOOL 05ce51b06dcaff1fa7030ef10aa3e3bb88828ed8e2790a3ab77ae5b76e09194e7798ff3bc6fd51627a7e6b8acc7701c8b56a37ac7f22803bff8ed9ef47441eb2
+EBUILD sudo-1.8.11.ebuild 5984 SHA256 0a10c4df4d31ef641a6ff4d3f9a82d0d0de64f444bbc9808962270e9ed10d628 SHA512 435aacc11a3067e9372e9647ce6578da297d0b45551d3ad74749e3479e8c4c636a6f3d5b05407b576ba3cd3d98baf1682823eb79887c23d77e60c8414b61ebaf WHIRLPOOL be66fee46f1ec6d85f93e3deeb8f6dae062a5ca0186ab91607d450d1b733d38e8c4e6f6cff3a80ea0c92335b25e533074ce7545e5f9a2e0aeb5d7a6f81a27e62
 EBUILD sudo-1.8.5_p2.ebuild 5464 SHA256 5a647b0c4a2949e476277ead580f6a42747f7778b282dd1e034a2c010c784a9e SHA512 34cc788ee019ccaf8e2f74dbae5e668d8fb94dab066bea49f3a37f31210a66c9327686e5c5f44a966321f26e3ccc5e2aa47fdb46b35285e96f266eafbddbc741 WHIRLPOOL 532a4151b0acbec600552cca4b18b54afba14a48e91640dd85642c4571e993e1a8eb20e03e83ef3f901a8f6eb6c63c2a5aec7650020e5e58f0d7911790d419f5
 EBUILD sudo-1.8.6_p7.ebuild 5464 SHA256 4f58dcb19ec413e99144a4806d5d7d68c5f9e3bbc4d8b0d77efb8df8dd147e57 SHA512 ed1575681e3e84d42d97f4465af3c3f33fa82d645d49a2219047728b22d0d7cbfb7c4e8a34ffce55da18ce67db84d6e40907c571231fa16acdef18bfa41cabc4 WHIRLPOOL a74177a5effbe3379a7da469f6cdaf5bd0263b777cbdecf8c02bf9956bc4cce3de35a2727f0e275f76ba94b1f0fff738d04d5102b83ac739bb99db624d919a1b
-MISC ChangeLog 53000 SHA256 69282874dc7e38c36f9445ef9b15689372d4aad72c8323f25a374b2c04d948a2 SHA512 3ccd9374aa81e1649b106a956d5081e67999b4c525cbedbd1a1b5031997bb35f67941cc9beaeabd5ae72d41a353d17a3284d2e8a9e4af09d9273468bf25715cc WHIRLPOOL 88958018ddb5b03624a26fb60f73fa666e4248b532c7b00834f8f7d59ccb3c9252535a7d818321eb596f7f1bb1dbb633ef2ed3d522d72426642d5d150db05cac
+MISC ChangeLog 53150 SHA256 b6bd543afa8fa8e68493cf1aeccd0759f8d9710ca7d992512136353efbf0ba64 SHA512 efeb42774cdfae2932b3232b4ea8d8c730e2da99a79551bf837f543de10608805e3f809bd09b2cf1aef5e96b26d6eeb5f2f7781497d8fff17e57bce64e37f40f WHIRLPOOL 390fcc8db84fe447cb756007134e568692373cab6c76077353dac3a78885a8c0ae18eabcd5d1926ae3dbae2ec32328218d08631feec2090d207e4049db67ee9e
 MISC metadata.xml 726 SHA256 242e8a573d76b2163a928259e5226fff2c237b3e9c244860a1430fa79c5b390e SHA512 d0a7e5f53ec823d84e3c38c2bd64ba566d7cbd08c12ebf3e9b9fed10b77ce2e3e951e262f1a307aa8f0819a662559ca6f9bcf86cf05088480413e4534ce299d3 WHIRLPOOL b919b1825e68eb3285523f057fc42b5fde9e59a738ecdb1de0835af827db6284fc66848a10517a215389c4466f21b70e376f3fffc993aa338e47fca971d0af83
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQF8BAEBCABmBQJUKc8tXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MUE3MTczOTAwRTQzNTc0RDJBOUJBMDIx
-Q0QxM0M4QUQ0MzAxMzQyAAoJEBzRPIrUMBNC/qQIAIEY4euOcALLK98zIfsZyqHw
-U5BrMPF2MBkCt+DZt2LNuc3/1W6v7+GRHmpeK6bABUKuTvDHvyMLYmE5j3LgPpyE
-5TRCKnFaQsKAqwa9iKFdYiJ6RJkq+rSp39JtvjQFpTthXnruLinjFIeQgf4+aYXp
-WnWEDB43IcyJtj6zzbrJCpz+n60ouLvbw80nWmTCYsiZIzydwAK+AuVIiq5JkFBx
-u5+7q4ehWv0HmmjN4IZpmrLjfSRAANECrirJUJMZjysSAePUptrVyCVFnJOaieWX
-vL6/VZKctoCAO59lkn8+bXyI2AIayySLh+NovhKr/ZmTlWX6BL+lAJ3XouqoSW4=
-=8rD5
+iQEcBAEBCAAGBQJUMu8sAAoJEBzRPIrUMBNCIoMH/iSeOzuj8cPLD6EpapPIyOa2
+uQN8GLw7FYvb8ktYCOQAswb0781hXOQcCSC+NiNOwknZflW6PGwntzhQG0AJW7XG
+uq6pRjUZmVy6PaRX5kJOYjDFvgzGJlKxezqyDHVi06dixzwc/ynE7wzPU/n41rJO
+8S8qMX3HPloCa4DSQ4ON9DkUn/lkAlFNHUz1Agc40Lz/X1WP9Q4tKJcG6w+rvN7N
+Y5uxgzLhWi8ecTyCajuaBe9aHyMMLvK3ZWeHMrg36Wa5qf2DE0k4kT/22BGjgDPz
+Jf6KjvJdV4tFY1Aq3RnVuNe7/dK4KQnqcB5BLlQLkPj6CI7HuWW12/8DaqJ2YxU=
+=65xN
 -----END PGP SIGNATURE-----
diff --git a/app-admin/sudo/files/sudo-1.8.11-shadow.patch b/app-admin/sudo/files/sudo-1.8.11-shadow.patch
new file mode 100644
index 000000000000..66caaf3c990e
--- /dev/null
+++ b/app-admin/sudo/files/sudo-1.8.11-shadow.patch
@@ -0,0 +1,45 @@
+diff -r fe06a2448c53 configure
+diff -r fe06a2448c53 configure.ac
+--- a/configure.ac	Fri Sep 26 21:03:22 2014 -0600
++++ b/configure.ac	Sat Sep 27 10:09:38 2014 -0600
+@@ -226,7 +226,6 @@
+ shadow_defs=
+ shadow_funcs=
+ shadow_libs=
+-shadow_libs_optional=
+ CONFIGURE_ARGS="$@"
+ 
+ dnl
+@@ -1908,9 +1907,7 @@
+ 		;;
+     *-*-linux*|*-*-k*bsd*-gnu)
+ 		OSDEFS="${OSDEFS} -D_GNU_SOURCE"
+-		# Some Linux versions need to link with -lshadow
+ 		shadow_funcs="getspnam"
+-		shadow_libs_optional="-lshadow"
+ 		test -z "$with_pam" && AUTH_EXCL_DEF="PAM"
+ 		;;
+     *-*-gnu*)
+@@ -3430,13 +3427,6 @@
+ 	LIBS="$LIBS $shadow_libs"
+ 	found=no
+ 	AC_CHECK_FUNCS($shadow_funcs, [found=yes])
+-	if test "$found" = "yes" -a -n "$shadow_libs_optional"; then
+-	    LIBS="$LIBS $shadow_libs_optional"
+-	    AC_CHECK_FUNCS($shadow_funcs, [found=yes])
+-	    if test "$found" = "yes"; then
+-		shadow_libs="$shadow_libs $shadow_libs_optional"
+-	    fi
+-	fi
+ 	if test "$found" = "yes"; then
+ 	    case "$shadow_funcs" in
+ 		*getprpwnam*) SECUREWARE=1;;
+@@ -3449,7 +3439,7 @@
+ 	LIBS="$_LIBS"
+     fi
+     if test "$CHECKSHADOW" = "true"; then
+-	AC_SEARCH_LIBS([getspnam], [gen], [AC_DEFINE(HAVE_GETSPNAM)] [CHECKSHADOW=false; test -n "$ac_lib" && shadow_libs="${shadow_libs} $ac_res"])
++	AC_SEARCH_LIBS([getspnam], [gen shadow], [AC_DEFINE(HAVE_GETSPNAM)] [CHECKSHADOW=false; test -n "$ac_lib" && shadow_libs="${shadow_libs} $ac_res"])
+     fi
+     if test "$CHECKSHADOW" = "true"; then
+ 	AC_SEARCH_LIBS([getprpwnam], [sec security prot], [AC_DEFINE(HAVE_GETPRPWNAM)] [CHECKSHADOW=false; SECUREWARE=1; test -n "$ac_lib" && shadow_libs="${shadow_libs} $ac_res"])
diff --git a/app-admin/sudo/sudo-1.8.11.ebuild b/app-admin/sudo/sudo-1.8.11.ebuild
index bdf3d5f1bc38..5a990bcbe26f 100644
--- a/app-admin/sudo/sudo-1.8.11.ebuild
+++ b/app-admin/sudo/sudo-1.8.11.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.11.ebuild,v 1.1 2014/09/29 21:29:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.11.ebuild,v 1.2 2014/10/06 19:35:59 flameeyes Exp $
 
 EAPI=5
 
-inherit eutils pam multilib libtool
+inherit eutils pam multilib libtool autotools
 
 MY_P=${P/_/}
 MY_P=${MY_P/beta/b}
@@ -54,6 +54,13 @@ RESTRICT=test
 MAKEOPTS+=" SAMPLES="
 
 src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.8.11-shadow.patch"
+
+	# Fix the Makefile.in to use automake-style install-sh parameters.
+	sed -i -e '/INSTALL/ { s: -O : -o :; s: -G : -g :; }' \
+		**/Makefile.in || die
+
+	eautoreconf
 	elibtoolize
 }