From 366ed3d5cba0b69d8cb5478f0cdfba09544a43aa Mon Sep 17 00:00:00 2001
From: taca <taca>
Date: Sun, 28 Oct 2007 02:05:44 +0000
Subject: Update sudo package to 1.6.9p7.

pkgsrc change: added DESTDIR support.


Major changes since Sudo 1.6.9p6:

 o Reverted back to to using TCSAFLUSH instead of TCSADRAIN when
   turning off echo during password reading.

 o Fixed a configure bug that was preventing the addition of -lutil for
   login.conf support on FreeBSD and NetBSD.

 o Added a configure check for struct in6_addr since some systems
   define AF_INET6 but have no real IPv6 support.
---
 security/sudo/Makefile         | 19 ++++++++++---------
 security/sudo/distinfo         | 14 +++++++-------
 security/sudo/patches/patch-aa | 12 ++++++------
 security/sudo/patches/patch-af | 30 ++----------------------------
 security/sudo/patches/patch-ag | 23 +++++++----------------
 5 files changed, 32 insertions(+), 66 deletions(-)

(limited to 'security/sudo')

diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 923b892fd5f..58b0e6d0683 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.98 2007/10/10 00:08:24 taca Exp $
+# $NetBSD: Makefile,v 1.99 2007/10/28 02:05:44 taca Exp $
 #
 
-DISTNAME=		sudo-1.6.9p6
+DISTNAME=		sudo-1.6.9p7
 CATEGORIES=		security
 MASTER_SITES=		http://www.courtesan.com/sudo/dist/ \
 			ftp://ftp.courtesan.com/pub/sudo/ \
@@ -21,6 +21,7 @@ USE_LIBTOOL=		yes
 OWN_DIRS+=		${VARBASE}/run
 GNU_CONFIGURE=		yes
 BUILD_DEFS+=		VARBASE
+PKG_DESTDIR_SUPPORT=	destdir
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -37,16 +38,16 @@ CONFIGURE_ARGS+=	--with-logpath=${VARBASE:Q}/log/sudo.log
 
 CONFIGURE_ARGS+=	--with-nbsdops --disable-path-info
 
-DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
-EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+DOCDIR=			share/doc/${PKGBASE}
+EGDIR=			share/examples/${PKGBASE}
 CONF_FILES_PERMS=	${EGDIR}/sudoers ${PKG_SYSCONFDIR}/sudoers 0 0 0440
 SPECIAL_PERMS+=		bin/sudo ${SETUID_ROOT_PERMS}
 
+INSTALLATION_DIRS+=	${DOCDIR} ${EGDIR}
+
 post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/UPGRADE ${DOCDIR}
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/sudoers ${EGDIR}/sudoers
-	${INSTALL_DATA} ${WRKSRC}/README* ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/UPGRADE ${DESTDIR}${PREFIX}/${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/sudoers ${DESTDIR}${PREFIX}/${EGDIR}/sudoers
+	${INSTALL_DATA} ${WRKSRC}/README* ${DESTDIR}${PREFIX}/${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/sudo/distinfo b/security/sudo/distinfo
index 6e62e0a4fc0..139a33619a4 100644
--- a/security/sudo/distinfo
+++ b/security/sudo/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.42 2007/10/10 00:08:24 taca Exp $
+$NetBSD: distinfo,v 1.43 2007/10/28 02:05:44 taca Exp $
 
-SHA1 (sudo-1.6.9p6.tar.gz) = c243b51dccfca5972eda68f23ee31b78a3c0c121
-RMD160 (sudo-1.6.9p6.tar.gz) = 917ceee30d3706533e755c6ebc6971251f7077a6
-Size (sudo-1.6.9p6.tar.gz) = 574983 bytes
-SHA1 (patch-aa) = 98ca6552bc305aeeb726d48f1d722480f792a0ba
-SHA1 (patch-af) = 1863dc637d1d2720d832bf9c7ec60e11365473ba
-SHA1 (patch-ag) = 9cdd8836addc9d2317bccff7ea7fe407d1e8256e
+SHA1 (sudo-1.6.9p7.tar.gz) = f070cca0a99daa08480fb99e60108fc330f0207f
+RMD160 (sudo-1.6.9p7.tar.gz) = c42a0c3bebf25c685459957084962bf1662db1bc
+Size (sudo-1.6.9p7.tar.gz) = 575363 bytes
+SHA1 (patch-aa) = 5741d965cec49d7bb84bcdd7fd461edb2cc18465
+SHA1 (patch-af) = ca47e872e3faf63f2b359eb587600332240689a9
+SHA1 (patch-ag) = 6eb83833bcd6b05cfbd548a631fb7b7b0aa1a74b
diff --git a/security/sudo/patches/patch-aa b/security/sudo/patches/patch-aa
index cb48a8b24a0..2017444d958 100644
--- a/security/sudo/patches/patch-aa
+++ b/security/sudo/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.15 2007/08/18 15:09:13 taca Exp $
+$NetBSD: patch-aa,v 1.16 2007/10/28 02:05:44 taca Exp $
 
---- Makefile.in.orig	2007-07-16 22:53:18.000000000 -0400
-+++ Makefile.in	2007-07-23 05:50:01.000000000 -0400
-@@ -185,7 +185,7 @@
+--- Makefile.in.orig	2007-10-26 00:52:02.000000000 +0900
++++ Makefile.in
+@@ -186,7 +186,7 @@ sudo_noexec.lo: $(srcdir)/sudo_noexec.c
  	$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/sudo_noexec.c
  
  sudo_noexec.la: sudo_noexec.lo
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.15 2007/08/18 15:09:13 taca Exp $
  
  # Uncomment the following if you want "make distclean" to clean the parser
  @DEV@PARSESRCS = sudo.tab.h sudo.tab.c lex.yy.c def_data.c def_data.h
-@@ -300,20 +300,20 @@
+@@ -301,20 +301,20 @@ sudoers.man:: sudoers.man.in
  
  sudoers.cat: sudoers.man
  
@@ -36,7 +36,7 @@ $NetBSD: patch-aa,v 1.15 2007/08/18 15:09:13 taca Exp $
  
  install-noexec: sudo_noexec.la
  	$(LIBTOOL) --mode=install $(INSTALL) sudo_noexec.la $(DESTDIR)$(noexecdir)
-@@ -323,15 +323,15 @@
+@@ -324,15 +324,15 @@ bininst-noexec: sudo_noexec.la
  
  install-sudoers:
  	test -f $(DESTDIR)$(sudoersdir)/sudoers || \
diff --git a/security/sudo/patches/patch-af b/security/sudo/patches/patch-af
index 398030998fc..7ebc7764a1a 100644
--- a/security/sudo/patches/patch-af
+++ b/security/sudo/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.17 2007/09/09 12:54:37 taca Exp $
+$NetBSD: patch-af,v 1.18 2007/10/28 02:05:45 taca Exp $
 
---- configure.in.orig	2007-09-07 01:19:57.000000000 +0900
+--- configure.in.orig	2007-10-25 01:43:25.000000000 +0900
 +++ configure.in
 @@ -129,7 +129,6 @@ dnl
  test "$mandir" = '${prefix}/man' && mandir='$(prefix)/man'
@@ -30,15 +30,6 @@ $NetBSD: patch-af,v 1.17 2007/09/09 12:54:37 taca Exp $
  AC_ARG_WITH(passwd, [  --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)
-@@ -1470,7 +1482,7 @@ case "$host" in
- 		    AC_CHECK_FUNCS(auth_challenge, [AUTH_EXCL_DEF="BSD_AUTH"])
- 		fi
- 		;;
--    *-*-freebsd*)
-+    *-*-freebsd*|*-*-dragonfly*)
- 		# FreeBSD has a real setreuid(2) starting with 2.1 and
- 		# backported to 2.0.5.  We just take 2.1 and above...
- 		case "$OSREV" in
 @@ -1484,6 +1496,8 @@ case "$host" in
  		CHECKSHADOW="false"
  		test -z "$with_pam" && AUTH_EXCL_DEF="PAM"
@@ -62,20 +53,3 @@ $NetBSD: patch-af,v 1.17 2007/09/09 12:54:37 taca Exp $
  		fi
  		CHECKSHADOW="false"
  		test -z "$with_pam" && AUTH_EXCL_DEF="PAM"
-@@ -2047,16 +2063,6 @@ if test ${with_kerb5-'no'} != "no" -a -z
- fi
- 
- dnl
--dnl Some systems put login_cap(3) in libutil
--dnl
--if test ${with_logincap-'no'} = "yes"; then
--    case "$OS" in
--	freebsd|netbsd)	SUDO_LIBS="${SUDO_LIBS} -lutil"
--	;;
--    esac
--fi
--
--dnl
- dnl extra AFS libs and includes
- dnl
- if test ${with_AFS-'no'} = "yes"; then
diff --git a/security/sudo/patches/patch-ag b/security/sudo/patches/patch-ag
index fc851aad029..e60a12237a6 100644
--- a/security/sudo/patches/patch-ag
+++ b/security/sudo/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.9 2007/09/09 12:54:38 taca Exp $
+$NetBSD: patch-ag,v 1.10 2007/10/28 02:05:45 taca Exp $
 
---- configure.orig	2007-09-07 01:21:13.000000000 +0900
+--- configure.orig	2007-10-24 02:19:18.000000000 +0900
 +++ configure
 @@ -1436,7 +1436,7 @@ Fine tuning of the installation director
    --bindir=DIR           user executables [EPREFIX/bin]
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.9 2007/09/09 12:54:38 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]
-@@ -1505,6 +1505,7 @@ Optional Packages:
+@@ -1506,6 +1506,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.9 2007/09/09 12:54:38 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
-@@ -2118,7 +2119,6 @@ shadow_libs_optional=
+@@ -2119,7 +2120,6 @@ shadow_libs_optional=
  test "$mandir" = '${prefix}/man' && mandir='$(prefix)/man'
  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.9 2007/09/09 12:54:38 taca Exp $
  
  
  
-@@ -2310,6 +2310,23 @@ fi
+@@ -2311,6 +2311,23 @@ fi
  
  
  
@@ -51,16 +51,7 @@ $NetBSD: patch-ag,v 1.9 2007/09/09 12:54:38 taca Exp $
  # Check whether --with-passwd was given.
  if test "${with_passwd+set}" = set; then
    withval=$with_passwd; case $with_passwd in
-@@ -11981,7 +11998,7 @@ done
- 
- 		fi
- 		;;
--    *-*-freebsd*)
-+    *-*-freebsd*|*-*-dragonfly*)
- 		# FreeBSD has a real setreuid(2) starting with 2.1 and
- 		# backported to 2.0.5.  We just take 2.1 and above...
- 		case "$OSREV" in
-@@ -11995,6 +12012,8 @@ done
+@@ -11996,6 +12013,8 @@ done
  		CHECKSHADOW="false"
  		test -z "$with_pam" && AUTH_EXCL_DEF="PAM"
  		: ${with_logincap='maybe'}
@@ -69,7 +60,7 @@ $NetBSD: patch-ag,v 1.9 2007/09/09 12:54:38 taca Exp $
  		;;
      *-*-*openbsd*)
  		# OpenBSD has a real setreuid(2) starting with 3.3 but
-@@ -12023,10 +12042,12 @@ done
+@@ -12024,10 +12043,12 @@ done
  		CHECKSHADOW="false"
  		test -z "$with_pam" && AUTH_EXCL_DEF="PAM"
  		: ${with_logincap='maybe'}
-- 
cgit v1.2.3