flameeyes    14/10/06 19:35:59

  Added:                sudo-1.8.11-shadow.patch
  Log:
  Add upstream patch for bug #524074.
  
  (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with 
key 1CD13C8AD4301342)

Revision  Changes    Path
1.1                  app-admin/sudo/files/sudo-1.8.11-shadow.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/sudo/files/sudo-1.8.11-shadow.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/sudo/files/sudo-1.8.11-shadow.patch?rev=1.1&content-type=text/plain

Index: sudo-1.8.11-shadow.patch
===================================================================
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"])




Reply via email to