update from 1.6.6 to 1.6.7p4

PR:             51084
Submitted by:   Sergey A. Osokin  <osa@freebsd.org.ru>

4 files changed, 16 insertions, 58 deletions

diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index d75a873c36ef..a905ce29186d 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	sudo
-PORTVERSION=	1.6.6
-PORTREVISION=	1
+PORTVERSION=	1.6.7.4
+PORTREVISION?=	0
 CATEGORIES=	security
 MASTER_SITES=	http://www.sudo.ws/sudo/dist/ \
 		ftp://ftp.cs.colorado.edu/pub/sysadmin/sudo/ \
 		ftp://ftp.stikman.com/pub/sudo/ \
 		ftp://ftp.uu.net/pub/security/sudo/
-DISTNAME=	${PORTNAME}-1.6.6
+DISTNAME=	${PORTNAME}-1.6.7p4
 
 MAINTAINER=	mharo@FreeBSD.org
 COMMENT=	Allow others to run commands as root
diff --git a/security/sudo/distinfo b/security/sudo/distinfo
index a5e01b77a51e..e8f8074697a1 100644
--- a/security/sudo/distinfo
+++ b/security/sudo/distinfo
@@ -1 +1 @@
-MD5 (sudo-1.6.6.tar.gz) = 4da4bf6cf31634cc7a17ec3b69fdc333
+MD5 (sudo-1.6.7p4.tar.gz) = 3365f58ab07d3c3ecc4b770399430ddf
diff --git a/security/sudo/files/patch-aa b/security/sudo/files/patch-aa
deleted file mode 100644
index 974662610d33..000000000000
--- a/security/sudo/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Thu Apr 25 10:16:31 2002
-+++ configure	Thu Apr 25 10:18:04 2002
-@@ -10564,7 +10564,7 @@
- fi
- 
- if test "$with_skey" = "yes"; then
--    SUDO_LIBS="${SUDO_LIBS} -lskey"
-+    SUDO_LIBS="${SUDO_LIBS} -lskey -lmd"
-     if test -f /usr/include/skey.h -a -f /usr/lib/libskey.a; then
- 	:
-     elif test -f /usr/local/include/skey.h; then
diff --git a/security/sudo/files/patch-auth::pam.c b/security/sudo/files/patch-auth::pam.c
index 7dfcb89497a9..bed7753f8257 100644
--- a/security/sudo/files/patch-auth::pam.c
+++ b/security/sudo/files/patch-auth::pam.c
@@ -1,47 +1,16 @@
-Index: auth/pam.c
-===================================================================
-RCS file: /home/cvs/sudo/sudo/auth/pam.c,v
-retrieving revision 1.30
-retrieving revision 1.31
-diff -u -r1.30 -r1.31
---- auth/pam.c	22 Nov 2002 19:41:13 -0000	1.30
-+++ auth/pam.c	13 Dec 2002 16:33:26 -0000	1.31
-@@ -66,7 +66,7 @@
- #include "sudo_auth.h"
- 
- #ifndef lint
--static const char rcsid[] = "$Sudo: pam.c,v 1.29 2002/01/22 16:43:23 millert Exp $";
-+static const char rcsid[] = "$Sudo: pam.c,v 1.30 2002/11/22 19:41:13 millert Exp $";
- #endif /* lint */
- 
- static int sudo_conv __P((int, PAM_CONST struct pam_message **,
-@@ -205,7 +205,7 @@
-     PAM_CONST struct pam_message *pm;
-     const char *p = def_prompt;
-     char *pass;
--    int n;
-+    int n, flags;
-     extern int nil_pw;
- 
-     if ((*response = malloc(num_msg * sizeof(struct pam_response))) == NULL)
-@@ -213,17 +213,17 @@
-     (void) memset(*response, 0, num_msg * sizeof(struct pam_response));
- 
-     for (pr = *response, pm = *msg, n = num_msg; n--; pr++, pm++) {
-+	flags = tgetpass_flags;
- 	switch (pm->msg_style) {
- 	    case PAM_PROMPT_ECHO_ON:
--		tgetpass_flags |= TGP_ECHO;
-+		flags |= TGP_ECHO;
- 	    case PAM_PROMPT_ECHO_OFF:
- 		/* Only override PAM prompt if it matches /^Password: ?/ */
- 		if (strncmp(pm->msg, "Password:", 9) || (pm->msg[9] != '\0'
- 		    && (pm->msg[9] != ' ' || pm->msg[10] != '\0')))
+--- auth/pam.c.orig	Wed Apr  2 11:55:50 2003
++++ auth/pam.c	Wed Apr  2 11:57:32 2003
+@@ -224,11 +224,11 @@
  		    p = pm->msg;
  		/* Read the password. */
--		pass = tgetpass(p, def_ival(I_PASSWD_TIMEOUT) * 60,
--		    tgetpass_flags);
-+		pass = tgetpass(p, def_ival(I_PASSWD_TIMEOUT) * 60, flags);
- 		pr->resp = estrdup(pass ? pass : "");
+ 		pass = tgetpass(p, def_ival(I_PASSWD_TIMEOUT) * 60, flags);
+-		pr->resp = estrdup(pass ? pass : "");
++		pr->resp = estrdup((const char *)pass ? (const char *)pass : "");
  		if (*pr->resp == '\0')
  		    nil_pw = 1;		/* empty password */
+ 		else
+-		    memset(pass, 0, strlen(pass));
++		    memset((void *)pass, 0, strlen((const char *)pass));
+ 		break;
+ 	    case PAM_TEXT_INFO:
+ 		if (pm->msg)