Import of pkgsrc-2016Q3

security/sudo/patches/patch-ag

@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.22 2014/03/08 11:51:56 kim Exp $
+$NetBSD: patch-ag,v 1.24 2016/09/12 17:12:24 taca Exp $
 
 * Add "--with-nbsdops" option, NetBSD standard options.
 * Link with util(3) in the case of DragonFly, too.
@@ -7,9 +7,9 @@ $NetBSD: patch-ag,v 1.22 2014/03/08 11:51:56 kim Exp $
   functions (HAVE_KRB5_*).
 * Remove setting sysconfdir to "/etc".
 
---- configure.orig	2014-03-05 08:09:14.000000000 -0500
-+++ configure	2014-03-08 06:35:19.000000000 -0500
-@@ -1484,7 +1484,7 @@
+--- configure.orig	2016-06-22 16:36:22.000000000 +0000
++++ configure
+@@ -1562,7 +1562,7 @@ Fine tuning of the installation director
    --bindir=DIR            user executables [EPREFIX/bin]
    --sbindir=DIR           system admin executables [EPREFIX/sbin]
    --libexecdir=DIR        program executables [EPREFIX/libexec]
@@ -18,15 +18,15 @@ $NetBSD: patch-ag,v 1.22 2014/03/08 11:51:56 kim Exp $
    --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
    --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
    --libdir=DIR            object code libraries [EPREFIX/lib]
-@@ -1569,6 +1569,7 @@
+@@ -1661,6 +1661,7 @@ Optional Packages:
    --with-libraries        additional libraries to link with
    --with-efence           link with -lefence for malloc() debugging
    --with-csops            add CSOps standard options
 +  --with-nbsdops          add NetBSD standard options
    --without-passwd        don't use passwd/shadow file for authentication
-   --with-skey=DIR         enable S/Key support
-   --with-opie=DIR         enable OPIE support
-@@ -3959,6 +3960,22 @@
+   --with-skey[=DIR]       enable S/Key support
+   --with-opie[=DIR]       enable OPIE support
+@@ -4499,6 +4500,22 @@ $as_echo "$as_me: WARNING: Ignoring unkn
  esac
  fi
  
@@ -49,38 +49,39 @@ $NetBSD: patch-ag,v 1.22 2014/03/08 11:51:56 kim Exp $
  
  
  # Check whether --with-passwd was given.
-@@ -14244,7 +14261,7 @@
+@@ -15209,7 +15226,7 @@ fi
  		: ${mansectsu='1m'}
  		: ${mansectform='4'}
  		;;
 -    *-*-linux*|*-*-k*bsd*-gnu)
 +    *-*-linux*|*-*-k*bsd*-gnu|*-*-gnukfreebsd)
- 		OSDEFS="${OSDEFS} -D_GNU_SOURCE"
- 		# Some Linux versions need to link with -lshadow
  		shadow_funcs="getspnam"
-@@ -15643,7 +15660,7 @@
+ 		test -z "$with_pam" && AUTH_EXCL_DEF="PAM"
+ 		;;
+@@ -17228,7 +17245,7 @@ if test "x$ac_cv_header_login_cap_h" = x
  _ACEOF
-  LOGINCAP_USAGE='[-c class|-] '; LCMAN=1
+  LOGINCAP_USAGE='[-c class] '; LCMAN=1
  	case "$OS" in
--	    freebsd|netbsd)	SUDO_LIBS="${SUDO_LIBS} -lutil"
-+	    dragonfly*|freebsd*|netbsd*)	SUDO_LIBS="${SUDO_LIBS} -lutil"
- 	    ;;
- 	esac
- 
-@@ -18580,6 +18597,8 @@
+-	    freebsd|netbsd)
++	    dragonfly*|freebsd|netbsd)
+ 		SUDO_LIBS="${SUDO_LIBS} -lutil"
+ 		SUDOERS_LIBS="${SUDOERS_LIBS} -lutil"
+ 		;;
+@@ -21839,6 +21856,8 @@ fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 	AUTH_OBJS="$AUTH_OBJS kerb5.o"
+ 	AUTH_OBJS="$AUTH_OBJS kerb5.lo"
      fi
 +fi
 +if test ${with_kerb5-'no'} != "no"; then
      _LIBS="$LIBS"
-     LIBS="${LIBS} ${SUDO_LIBS}"
+     LIBS="${LIBS} ${SUDOERS_LIBS}"
      for ac_func in krb5_verify_user krb5_init_secure_context
-@@ -20324,7 +20343,6 @@
+@@ -24341,7 +24360,7 @@ test "$datarootdir" = '${prefix}/share' 
  test "$docdir" = '${datarootdir}/doc/${PACKAGE_TARNAME}' && docdir='$(datarootdir)/doc/$(PACKAGE_TARNAME)'
  test "$localedir" = '${datarootdir}/locale' && localedir='$(datarootdir)/locale'
  test "$localstatedir" = '${prefix}/var' && localstatedir='$(prefix)/var'
--test "$sysconfdir" = '${prefix}/etc' -a X"$with_stow" != X"yes" && sysconfdir='/etc'
- 
- ac_config_files="$ac_config_files Makefile sudo_usage.h sudoers"
+-test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
++# test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
  
+ if test X"$INIT_SCRIPT" != X""; then
+     ac_config_files="$ac_config_files init.d/$INIT_SCRIPT"