Add upstream patch for bug #524074.

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)

3 files changed, 59 insertions, 3 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/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
 }