From 39517f52257b6cb9575be033611c58ac8c06706c Mon Sep 17 00:00:00 2001
From: cube <cube>
Date: Mon, 9 Jan 2006 15:53:40 +0000
Subject: Sync with latest sudo release (1.6.8pl12).  The actual diff is one
 line long.  PR#32378 by Stefan Krüger.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changes:
     Added PS4 and SHELLOPTS to the list of variables to remove from
     the environment.     (Already in pkgsrc)
     Added JAVA_TOOL_OPTIONS to the list of variables to remove from
     the environment.
     Added PERLLIB, PERL5LIB and PERL5OPT to the list of variables to
     remove from the environment.     (Already in pkgsrc)
---
 security/sudo/Makefile         |  7 +++----
 security/sudo/distinfo         |  9 ++++-----
 security/sudo/patches/patch-ah | 23 -----------------------
 3 files changed, 7 insertions(+), 32 deletions(-)
 delete mode 100644 security/sudo/patches/patch-ah

(limited to 'security/sudo')

diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index a50f92ee212..499febef1e2 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.85 2005/12/29 06:22:12 jlam Exp $
+# $NetBSD: Makefile,v 1.86 2006/01/09 15:53:40 cube Exp $
 #
 
-DISTNAME=		sudo-1.6.8p9
-PKGNAME=		sudo-1.6.8pl9
-PKGREVISION=		2
+DISTNAME=		sudo-1.6.8p12
+PKGNAME=		sudo-1.6.8pl12
 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 42a544db467..cef937c8c68 100644
--- a/security/sudo/distinfo
+++ b/security/sudo/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.32 2005/11/12 14:17:45 adrianp Exp $
+$NetBSD: distinfo,v 1.33 2006/01/09 15:53:40 cube Exp $
 
-SHA1 (sudo-1.6.8p9.tar.gz) = f264d1ad9f197920f2e69614db7935b35ca51672
-RMD160 (sudo-1.6.8p9.tar.gz) = c1c719504476ab9ac11e0421716d149120463e33
-Size (sudo-1.6.8p9.tar.gz) = 585509 bytes
+SHA1 (sudo-1.6.8p12.tar.gz) = a79631e9e1c0d0d3f2aa88ae685628e5fde61982
+RMD160 (sudo-1.6.8p12.tar.gz) = d7ff9f18ca0973615258c2e975300b94567451d5
+Size (sudo-1.6.8p12.tar.gz) = 585643 bytes
 SHA1 (patch-aa) = a4f29f2c228eb3b4af0872cf04a00ffdf41c603c
 SHA1 (patch-af) = 245761812dc600b3d2752fa135ba367bb0223370
 SHA1 (patch-ag) = 87c3263674ec98ccc9cc33f2108a2456eddaecc5
-SHA1 (patch-ah) = 6210bca36fa7fc87ef179b7bf92109828390bea0
diff --git a/security/sudo/patches/patch-ah b/security/sudo/patches/patch-ah
deleted file mode 100644
index 5758493ed57..00000000000
--- a/security/sudo/patches/patch-ah
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2005/11/12 14:17:46 adrianp Exp $
-
---- env.c.orig	2005-02-06 15:37:01.000000000 +0000
-+++ env.c
-@@ -89,6 +89,8 @@ static char *format_env		__P((char *, ..
- static const char *initial_badenv_table[] = {
-     "IFS",
-     "CDPATH",
-+    "SHELLOPTS",
-+    "PS4",
-     "LOCALDOMAIN",
-     "RES_OPTIONS",
-     "HOSTALIASES",
-@@ -124,6 +126,9 @@ static const char *initial_badenv_table[
-     "TERMCAP",			/* XXX - only if it starts with '/' */
-     "ENV",
-     "BASH_ENV",
-+    "PERLLIB",
-+    "PERL5LIB",
-+    "PERL5OPT",
-     NULL
- };
- 
-- 
cgit v1.2.3