Import of pkgsrc-2016Q3

security/sudo/patches/patch-af

@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.31 2014/03/08 11:51:56 kim Exp $
+$NetBSD: patch-af,v 1.33 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,59 +7,62 @@ $NetBSD: patch-af,v 1.31 2014/03/08 11:51:56 kim Exp $
   functions (HAVE_KRB5_*).
 * Remove setting sysconfdir to "/etc".
 
---- configure.in.orig	2014-03-05 08:08:53.000000000 -0500
-+++ configure.in	2014-03-08 06:35:19.000000000 -0500
-@@ -330,6 +330,18 @@
+--- configure.ac.orig	2016-06-22 16:36:23.000000000 +0000
++++ configure.ac
+@@ -439,6 +439,20 @@ AC_ARG_WITH(csops, [AS_HELP_STRING([--wi
  		;;
  esac])
  
-+AC_ARG_WITH(nbsdops, [AS_HELP_STRING([--with-nbsdops], [add NetBSD standard options])],
+++AC_ARG_WITH(nbsdops, [AS_HELP_STRING([--with-nbsdops], [add NetBSD standard opt
++ions])],
 +[case $with_nbsdops in
-+    yes)	echo 'Adding NetBSD standard options'
-+		CHECKSIA=false
-+		with_ignore_dot=yes
-+		with_env_editor=yes
-+		with_tty_tickets=yes
-+		;;
-+    no)		;;
-+    *)		echo "Ignoring unknown argument to --with-nbsdops: $with_nbsdops"
-+		;;
++    yes)       echo 'Adding NetBSD standard options'
++               CHECKSIA=false
++               with_ignore_dot=yes
++               with_env_editor=yes
++               with_tty_tickets=yes
++               ;;
++    no)                ;;
++    *)         echo "Ignoring unknown argument to --with-nbsdops: $with_nbsdops"
++               ;;
 +esac])
++
  AC_ARG_WITH(passwd, [AS_HELP_STRING([--without-passwd], [don't use passwd/shadow file for authentication])],
  [case $with_passwd in
      yes|no)	AC_MSG_CHECKING(whether to use shadow/passwd file authentication)
-@@ -1726,7 +1738,7 @@
+@@ -1951,7 +1965,7 @@ case "$host" in
  		: ${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"
-@@ -2016,7 +2028,7 @@
+ 		test -z "$with_pam" && AUTH_EXCL_DEF="PAM"
+ 		;;
+@@ -2299,7 +2313,7 @@ SUDO_MAILDIR
  if test ${with_logincap-'no'} != "no"; then
-     AC_CHECK_HEADERS(login_cap.h, [LOGINCAP_USAGE='[[-c class|-]] '; LCMAN=1
+     AC_CHECK_HEADERS([login_cap.h], [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
-     ])
-@@ -2635,6 +2647,8 @@
+-	    freebsd|netbsd)
++	    dragonfly*|freebsd|netbsd)
+ 		SUDO_LIBS="${SUDO_LIBS} -lutil"
+ 		SUDOERS_LIBS="${SUDOERS_LIBS} -lutil"
+ 		;;
+@@ -3381,6 +3395,8 @@ if test ${with_kerb5-'no'} != "no"; then
  	])
- 	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}"
-     AC_CHECK_FUNCS(krb5_verify_user krb5_init_secure_context)
-@@ -3168,7 +3182,6 @@
+     LIBS="${LIBS} ${SUDOERS_LIBS}"
+     AC_CHECK_FUNCS([krb5_verify_user krb5_init_secure_context])
+@@ -4220,7 +4236,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'
+-test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
++dnl test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
  
  dnl
- dnl Substitute into the Makefile, sudo_usage.h and example sudoers
+ dnl Substitute into the Makefile and man pages