Update security/sudo pacakge to 1.7.2p2.

Major changes between sudo 1.7.2p1 and 1.7.2p2:

 * Fixed a a bug where the negation operator in a Cmnd_List
   was not being honored.

 * Sudo no longer produces a parse error when #includedir references
   a directory that contains no valid filenames.

 * The sudo.man.pl and sudoers.man.pl files are now included in
   the distribution for people who wish to regenerate the man pages.

 * Fixed the emulation of krb5_get_init_creds_opt_alloc() for MIT kerberos.

 * When authenticating via PAM, set PAM_RUSER and PAM_RHOST early so
   they can be used during authentication.

5 files changed, 35 insertions, 42 deletions

diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 90b48d88d06..3a8a8dd596a 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.116 2009/08/02 07:39:27 hasso Exp $
+# $NetBSD: Makefile,v 1.117 2009/12/20 07:46:32 taca Exp $
 #
 
-DISTNAME=		sudo-1.7.2p1
+DISTNAME=		sudo-1.7.2p2
 CATEGORIES=		security
 MASTER_SITES=		http://www.courtesan.com/sudo/dist/ \
 			ftp://ftp.courtesan.com/pub/sudo/ \
@@ -34,9 +34,9 @@ CONFIGURE_ENV+=		NROFFPROG=${CAT:Q}
 CONFIGURE_ENV+=		mansectsu=8
 CONFIGURE_ENV+=		mansectform=5
 CONFIGURE_ARGS+=	--disable-root-mailer --with-ignore-dot
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--with-timedir=${VARBASE:Q}/run/sudo
-CONFIGURE_ARGS+=	--with-logpath=${VARBASE:Q}/log/sudo.log
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-timedir=${VARBASE}/run/sudo
+CONFIGURE_ARGS+=	--with-logpath=${VARBASE}/log/sudo.log
 
 .include "options.mk"
 
diff --git a/security/sudo/distinfo b/security/sudo/distinfo
index 0bd9e8d8921..f15033895b0 100644
--- a/security/sudo/distinfo
+++ b/security/sudo/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.59 2009/08/02 07:39:27 hasso Exp $
+$NetBSD: distinfo,v 1.60 2009/12/20 07:46:32 taca Exp $
 
-SHA1 (sudo-1.7.2p1-200805130/sudo-1.7.2p1.tar.gz) = 2ef461d840110d2c9160db142336591775ede67a
-RMD160 (sudo-1.7.2p1-200805130/sudo-1.7.2p1.tar.gz) = 5f345d6062f178700fd78c93c04ee47c03bbcc50
-Size (sudo-1.7.2p1-200805130/sudo-1.7.2p1.tar.gz) = 771059 bytes
-SHA1 (patch-aa) = 80e25b6ddf5e071ba05c035d0c333c867814a436
-SHA1 (patch-af) = 0e1ffaa452f847405949875b47326bce6ff998d2
-SHA1 (patch-ag) = 0ae45801e8146bab8bb998fdc48b1fd05b56f96b
+SHA1 (sudo-1.7.2p2-200805130/sudo-1.7.2p2.tar.gz) = b729c158f81f5cff4ce6193f3db7bee00a2c2fbe
+RMD160 (sudo-1.7.2p2-200805130/sudo-1.7.2p2.tar.gz) = 4ab92524639b5d6822c48d0f74f80dc1c674ab0e
+Size (sudo-1.7.2p2-200805130/sudo-1.7.2p2.tar.gz) = 772399 bytes
+SHA1 (patch-aa) = f80a9c0f8a7f4a1072b19c6d02d05c5ffc5d825a
+SHA1 (patch-af) = 50e6ecf889c460669a4b632c0fd3b15fc45b1214
+SHA1 (patch-ag) = b6153d89cfe634c79f1c5b44d4f0df0089353528
diff --git a/security/sudo/patches/patch-aa b/security/sudo/patches/patch-aa
index 656b2f1a712..3fa4f82ac39 100644
--- a/security/sudo/patches/patch-aa
+++ b/security/sudo/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.21 2009/05/21 03:42:49 taca Exp $
+$NetBSD: patch-aa,v 1.22 2009/12/20 07:46:32 taca Exp $
 
---- Makefile.in.orig	2009-03-12 08:19:56.000000000 +0900
+--- Makefile.in.orig	2009-11-25 10:42:00.000000000 +0900
 +++ Makefile.in
 @@ -198,7 +198,7 @@ sudo_noexec.lo: $(srcdir)/sudo_noexec.c
  	$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/sudo_noexec.c
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.21 2009/05/21 03:42:49 taca Exp $
  
  # Uncomment the following if you want "make distclean" to clean the parser
  @DEV@GENERATED = gram.h gram.c toke.c def_data.c def_data.h
-@@ -406,36 +406,36 @@ sudoers.ldap.cat: sudoers.ldap.man
+@@ -408,36 +408,36 @@ sudoers.ldap.cat: sudoers.ldap.man
  ChangeLog:
  	cvs2cl --follow-only trunk
  
diff --git a/security/sudo/patches/patch-af b/security/sudo/patches/patch-af
index 0e5408ef696..ee24ca6b4c5 100644
--- a/security/sudo/patches/patch-af
+++ b/security/sudo/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.22 2009/08/02 07:39:27 hasso Exp $
+$NetBSD: patch-af,v 1.23 2009/12/20 07:46:32 taca Exp $
 
---- configure.in.orig	2009-07-20 16:34:37 +0300
-+++ configure.in	2009-08-01 22:19:54 +0300
-@@ -156,7 +156,6 @@ else
+--- configure.in.orig	2009-11-25 01:55:34.000000000 +0000
++++ configure.in
+@@ -158,7 +158,6 @@ else
  fi
  test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin'
  test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/sbin'
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.22 2009/08/02 07:39:27 hasso Exp $
  
  dnl
  dnl Deprecated --with options (these all warn or generate an error)
-@@ -294,6 +293,19 @@ AC_ARG_WITH(csops, [AS_HELP_STRING([--wi
+@@ -296,6 +295,19 @@ AC_ARG_WITH(csops, [AS_HELP_STRING([--wi
  		;;
  esac])
  
@@ -30,7 +30,7 @@ $NetBSD: patch-af,v 1.22 2009/08/02 07:39:27 hasso Exp $
  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)
-@@ -1790,7 +1802,7 @@ fi
+@@ -1795,7 +1807,7 @@ fi
  if test ${with_logincap-'no'} != "no"; then
      AC_CHECK_HEADERS(login_cap.h, [LOGINCAP_USAGE='[[-c class|-]] '; LCMAN=""
  	case "$OS" in
@@ -39,12 +39,12 @@ $NetBSD: patch-af,v 1.22 2009/08/02 07:39:27 hasso Exp $
  	    ;;
  	esac
      ])
-@@ -2237,6 +2249,8 @@ if test ${with_kerb5-'no'} != "no" -a -z
- 	    AC_CHECK_LIB(krb5support, main, [SUDO_LIBS="${SUDO_LIBS} -lkrb5support,"])
+@@ -2242,6 +2254,8 @@ if test ${with_kerb5-'no'} != "no" -a -z
+ 	    AC_CHECK_LIB(krb5support, main, [SUDO_LIBS="${SUDO_LIBS} -lkrb5support"])
      ])
      AUTH_OBJS="$AUTH_OBJS kerb5.o"
 +fi
 +if test ${with_kerb5-'no'} != "no"; then
      _LIBS="$LIBS"
      LIBS="${LIBS} ${SUDO_LIBS}"
-     AC_CHECK_FUNCS(krb5_verify_user krb5_init_secure_context krb5_get_init_creds_opt_alloc)
+     AC_CHECK_FUNCS(krb5_verify_user krb5_init_secure_context)
diff --git a/security/sudo/patches/patch-ag b/security/sudo/patches/patch-ag
index e5895e8f988..d0d5c62cfbd 100644
--- a/security/sudo/patches/patch-ag
+++ b/security/sudo/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.13 2009/02/05 13:48:12 taca Exp $
+$NetBSD: patch-ag,v 1.14 2009/12/20 07:46:32 taca Exp $
 
---- configure.orig	2008-12-10 06:04:36.000000000 +0900
+--- configure.orig	2009-11-25 01:57:27.000000000 +0000
 +++ configure
-@@ -1451,7 +1451,7 @@ Fine tuning of the installation director
+@@ -1454,7 +1454,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]
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.13 2009/02/05 13:48:12 taca Exp $
    --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
    --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
    --libdir=DIR           object code libraries [EPREFIX/lib]
-@@ -1523,6 +1523,7 @@ Optional Packages:
+@@ -1527,6 +1527,7 @@ Optional Packages:
    --with-devel            add development options
    --with-efence           link with -lefence for malloc() debugging
    --with-csops            add CSOps standard options
@@ -19,7 +19,7 @@ $NetBSD: patch-ag,v 1.13 2009/02/05 13:48:12 taca Exp $
    --without-passwd        don't use passwd/shadow file for authentication
    --with-skey=DIR         enable S/Key support
    --with-opie=DIR         enable OPIE support
-@@ -2163,7 +2164,6 @@ else
+@@ -2183,7 +2184,6 @@ else
  fi
  test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin'
  test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/sbin'
@@ -27,7 +27,7 @@ $NetBSD: patch-ag,v 1.13 2009/02/05 13:48:12 taca Exp $
  
  
  
-@@ -2356,6 +2356,23 @@ fi
+@@ -2396,6 +2396,23 @@ fi
  
  
  
@@ -51,7 +51,7 @@ $NetBSD: patch-ag,v 1.13 2009/02/05 13:48:12 taca Exp $
  # Check whether --with-passwd was given.
  if test "${with_passwd+set}" = set; then
    withval=$with_passwd; case $with_passwd in
-@@ -14091,7 +14108,7 @@ if test `eval echo '${'$as_ac_Header'}'`
+@@ -14287,7 +14304,7 @@ if test `eval echo '${'$as_ac_Header'}'`
  _ACEOF
   LOGINCAP_USAGE='[-c class|-] '; LCMAN=""
  	case "$OS" in
@@ -60,19 +60,12 @@ $NetBSD: patch-ag,v 1.13 2009/02/05 13:48:12 taca Exp $
  	    ;;
  	esac
  
-@@ -21080,11 +21098,12 @@ fi
+@@ -21537,6 +21554,8 @@ fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
      AUTH_OBJS="$AUTH_OBJS kerb5.o"
--    _LIBS="$LIBS"
--    LIBS="${LIBS} ${SUDO_LIBS}"
--
- 
 +fi
- 
 +if test ${with_kerb5-'no'} != "no"; then
-+_LIBS="$LIBS"
-+LIBS="${LIBS} ${SUDO_LIBS}"
- for ac_func in krb5_verify_user krb5_init_secure_context krb5_get_init_creds_opt_alloc
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+     _LIBS="$LIBS"
+     LIBS="${LIBS} ${SUDO_LIBS}"
+