Update sudo package to 1.7.6.2 (1.7.6p2).

What's new in Sudo 1.7.6p2

 * Two-character CIDR-style IPv4 netmasks are now matched correctly
   in the sudoers file.

 * A build error with MIT Kerberos V has been resolved.

What's new in Sudo 1.7.6p1

 * A non-existent includedir is now treated the same as an empty
   directory and not reported as an error.

 * Removed extraneous parens in LDAP filter when sudoers_search_filter
   is enabled that can cause an LDAP search error.

6 files changed, 37 insertions, 36 deletions

diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index cfeb5b8e0e6..251e2df4a1b 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.129 2011/03/22 14:52:08 taca Exp $
+# $NetBSD: Makefile,v 1.130 2011/06/19 15:54:55 taca Exp $
 #
 
-DISTNAME=		sudo-1.7.5
+DISTNAME=		sudo-1.7.6p2
+PKGNAME=		sudo-1.7.6.2
 CATEGORIES=		security
 MASTER_SITES=		http://www.courtesan.com/sudo/dist/ \
 			ftp://ftp.courtesan.com/pub/sudo/ \
diff --git a/security/sudo/distinfo b/security/sudo/distinfo
index 90d1f225d8c..2fee84a000b 100644
--- a/security/sudo/distinfo
+++ b/security/sudo/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.71 2011/04/23 17:48:33 hauke Exp $
+$NetBSD: distinfo,v 1.72 2011/06/19 15:54:55 taca Exp $
 
-SHA1 (sudo-1.7.5.tar.gz) = 5d12121aaf65b9fcd1012582c6d3a89f403c25d1
-RMD160 (sudo-1.7.5.tar.gz) = b325d664b6597662568949e50bb781bbfc8c6abb
-Size (sudo-1.7.5.tar.gz) = 1117718 bytes
-SHA1 (patch-aa) = 795486c6b62f1e20017e3c5bd1f05d8cc5991332
-SHA1 (patch-af) = 389af9aca76d7286c2e981573c56358846f8d0ca
-SHA1 (patch-ag) = 853232cc5fde6808562cc7dd6f5770069bdeae3f
-SHA1 (patch-logging.c) = 0881a7e1903eeef764037a9a3334c2db62479761
+SHA1 (sudo-1.7.6p2.tar.gz) = 771627e3d5a69906a35c5b2f891a049636c611af
+RMD160 (sudo-1.7.6p2.tar.gz) = 82ddf8f9896e23d2ba0f72f467f00d6bd260798e
+Size (sudo-1.7.6p2.tar.gz) = 1124547 bytes
+SHA1 (patch-aa) = df93a99bdcecdcee7f836d1123bcf740b054ed4e
+SHA1 (patch-af) = c9e09c77f520874ea165750380c3b985b31f559c
+SHA1 (patch-ag) = 4c4771911b93c8760c3a8195311cf2b3456aeafd
+SHA1 (patch-logging.c) = b4f10e64564e0cece07d4211d3a3ae6723057393
diff --git a/security/sudo/patches/patch-aa b/security/sudo/patches/patch-aa
index 6dd3d519257..cf645cea60c 100644
--- a/security/sudo/patches/patch-aa
+++ b/security/sudo/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.26 2011/03/22 14:52:08 taca Exp $
+$NetBSD: patch-aa,v 1.27 2011/06/19 15:54:55 taca Exp $
 
 * Fix libtools's link option.
 * Prevent to install sudoers files and directory.
 * Use standard instal(8) option instead of shell wrapper.
 * Don't setuid here.
 
---- Makefile.in.orig	2011-02-19 13:25:51.000000000 +0000
+--- Makefile.in.orig	2011-03-29 19:25:56.000000000 +0000
 +++ Makefile.in
 @@ -222,7 +222,7 @@ sudo_noexec.lo: $(srcdir)/sudo_noexec.c
  	$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/sudo_noexec.c
@@ -16,11 +16,11 @@ $NetBSD: patch-aa,v 1.26 2011/03/22 14:52:08 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 getdate
-@@ -535,43 +535,43 @@ ChangeLog:
- 	    fi; \
+@@ -541,43 +541,43 @@ pre-install:
+ 	    ./visudo -c -f $(DESTDIR)$(sudoersdir)/sudoers; \
  	fi
  
--install: install-dirs install-binaries @INSTALL_NOEXEC@ install-sudoers install-doc
+-install: pre-install install-dirs install-binaries @INSTALL_NOEXEC@ install-sudoers install-doc
 +install: install-binaries @INSTALL_NOEXEC@ install-doc
  
  install-dirs:
diff --git a/security/sudo/patches/patch-af b/security/sudo/patches/patch-af
index 32978e8321a..756b6609583 100644
--- a/security/sudo/patches/patch-af
+++ b/security/sudo/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.26 2010/09/21 03:05:27 taca Exp $
+$NetBSD: patch-af,v 1.27 2011/06/19 15:54:55 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-af,v 1.26 2010/09/21 03:05:27 taca Exp $
   functions (HAVE_KRB5_*).
 * Remove setting sysconfdir to "/etc".
 
---- configure.in.orig	2010-09-06 12:03:33.000000000 +0000
+--- configure.in.orig	2011-05-16 17:38:07.000000000 +0000
 +++ configure.in
-@@ -322,6 +322,18 @@ AC_ARG_WITH(csops, [AS_HELP_STRING([--wi
+@@ -326,6 +326,18 @@ AC_ARG_WITH(csops, [AS_HELP_STRING([--wi
  		;;
  esac])
  
@@ -28,7 +28,7 @@ $NetBSD: patch-af,v 1.26 2010/09/21 03:05:27 taca 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)
-@@ -1865,7 +1877,7 @@ SUDO_MAILDIR
+@@ -1925,7 +1937,7 @@ SUDO_MAILDIR
  if test ${with_logincap-'no'} != "no"; then
      AC_CHECK_HEADERS(login_cap.h, [LOGINCAP_USAGE='[[-c class|-]] '; LCMAN=1
  	case "$OS" in
@@ -37,16 +37,16 @@ $NetBSD: patch-af,v 1.26 2010/09/21 03:05:27 taca Exp $
  	    ;;
  	esac
      ])
-@@ -2370,6 +2382,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"
+@@ -2429,6 +2441,8 @@ if test ${with_kerb5-'no'} != "no"; then
+ 	])
+ 	AUTH_OBJS="$AUTH_OBJS kerb5.o"
+     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)
-@@ -2798,7 +2812,6 @@ test "$libexecdir" = '${exec_prefix}/lib
+@@ -2869,7 +2883,6 @@ test "$libexecdir" = '${exec_prefix}/lib
  test "$includedir" = '${prefix}/include' && includedir='$(prefix)/include'
  test "$datarootdir" = '${prefix}/share' && datarootdir='$(prefix)/share'
  test "$docdir" = '${datarootdir}/doc/${PACKAGE_TARNAME}' && docdir='$(datarootdir)/doc/$(PACKAGE_TARNAME)'
diff --git a/security/sudo/patches/patch-ag b/security/sudo/patches/patch-ag
index eb5f53d6c13..069b24dc366 100644
--- a/security/sudo/patches/patch-ag
+++ b/security/sudo/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.17 2010/09/21 03:05:27 taca Exp $
+$NetBSD: patch-ag,v 1.18 2011/06/19 15:54:55 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.17 2010/09/21 03:05:27 taca Exp $
   functions (HAVE_KRB5_*).
 * Remove setting sysconfdir to "/etc".
 
---- configure.orig	2010-09-06 12:03:39.000000000 +0000
+--- configure.orig	2011-05-16 17:38:16.000000000 +0000
 +++ configure
-@@ -1589,7 +1589,7 @@ Fine tuning of the installation director
+@@ -1596,7 +1596,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,7 +18,7 @@ $NetBSD: patch-ag,v 1.17 2010/09/21 03:05:27 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]
-@@ -1667,6 +1667,7 @@ Optional Packages:
+@@ -1676,6 +1676,7 @@ Optional Packages:
    --with-libraries        additional libraries to link with
    --with-efence           link with -lefence for malloc() debugging
    --with-csops            add CSOps standard options
@@ -26,7 +26,7 @@ $NetBSD: patch-ag,v 1.17 2010/09/21 03:05:27 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
-@@ -4038,6 +4039,22 @@ $as_echo "$as_me: WARNING: Ignoring unkn
+@@ -4052,6 +4053,22 @@ $as_echo "$as_me: WARNING: Ignoring unkn
  esac
  fi
  
@@ -49,7 +49,7 @@ $NetBSD: patch-ag,v 1.17 2010/09/21 03:05:27 taca Exp $
  
  
  # Check whether --with-passwd was given.
-@@ -14153,7 +14170,7 @@ if test "x$ac_cv_header_login_cap_h" = x
+@@ -14469,7 +14486,7 @@ if test "x$ac_cv_header_login_cap_h" = x
  _ACEOF
   LOGINCAP_USAGE='[-c class|-] '; LCMAN=1
  	case "$OS" in
@@ -58,16 +58,16 @@ $NetBSD: patch-ag,v 1.17 2010/09/21 03:05:27 taca Exp $
  	    ;;
  	esac
  
-@@ -17124,6 +17141,8 @@ fi
- fi
+@@ -17439,6 +17456,8 @@ fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-     AUTH_OBJS="$AUTH_OBJS kerb5.o"
+ 	AUTH_OBJS="$AUTH_OBJS kerb5.o"
+     fi
 +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
-@@ -18468,7 +18487,6 @@ test "$libexecdir" = '${exec_prefix}/lib
+@@ -18811,7 +18830,6 @@ test "$libexecdir" = '${exec_prefix}/lib
  test "$includedir" = '${prefix}/include' && includedir='$(prefix)/include'
  test "$datarootdir" = '${prefix}/share' && datarootdir='$(prefix)/share'
  test "$docdir" = '${datarootdir}/doc/${PACKAGE_TARNAME}' && docdir='$(datarootdir)/doc/$(PACKAGE_TARNAME)'
diff --git a/security/sudo/patches/patch-logging.c b/security/sudo/patches/patch-logging.c
index 44644cf425a..8ec5a7a4e26 100644
--- a/security/sudo/patches/patch-logging.c
+++ b/security/sudo/patches/patch-logging.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-logging.c,v 1.1 2011/04/23 17:48:33 hauke Exp $
+$NetBSD: patch-logging.c,v 1.2 2011/06/19 15:54:55 taca Exp $
 
 Make sure CODESET is actually defined, for the sake of
 old NetBSD versions
 
---- logging.c.orig	Fri Feb  4 22:59:42 2011
+--- logging.c.orig	2011-02-04 22:59:42.000000000 +0000
 +++ logging.c
 @@ -619,7 +619,7 @@ send_mail(fmt, va_alist)
  	    (void) fputc(*p, mail);