Module Name:	pkgsrc
Committed By:	taca
Date:		Wed Dec  5 10:07:14 UTC 2007

Modified Files:
	pkgsrc/security/sudo: Makefile distinfo

Log Message:
sudo-1.6.9p9.tar.gz was updated now.  So, introduce DIST_SUBDIR and
bump PKGREVISION.

A little bug fix seems to applied.

-rw-r--r--  1 taca  taca  578259 Dec  3 19:38 sudo-1.6.9p9.tar.gz-prev
-rw-r--r--  1 taca  taca  578262 Dec  5 00:27 sudo-1.6.9p9.tar.gz

diff -dupNr sudo-1.6.9p9-20071203/parse.c sudo-1.6.9p9/parse.c
--- sudo-1.6.9p9-20071203/parse.c	2007-11-28 08:29:59.000000000 +0900
+++ sudo-1.6.9p9/parse.c	2007-12-05 00:26:40.000000000 +0900
@@ -90,7 +90,7 @@
 #endif /* HAVE_EXTENDED_GLOB */

 #ifndef lint
-__unused static const char rcsid[] = "$Sudo: parse.c,v 1.160.2.14 2007/10/24 16:43:27 millert Exp $";
+__unused static const char rcsid[] = "$Sudo: parse.c,v 1.160.2.15 2007/12/04 15:26:40 millert Exp $";
 #endif /* lint */

 /*
@@ -202,7 +202,7 @@ sudoers_lookup(pwflag)
 		    return(VALIDATE_OK |
 			(no_passwd == TRUE ? FLAG_NOPASS : 0) |
 			(no_execve == TRUE ? FLAG_NOEXEC : 0) |
-			(setenv_ok == TRUE ? FLAG_SETENV : 0));
+			(setenv_ok >= TRUE ? FLAG_SETENV : 0));
 		} else if ((runas_matches == TRUE && cmnd_matches == FALSE) ||
 		    (runas_matches == FALSE && cmnd_matches == TRUE)) {
 		    /*
@@ -212,7 +212,7 @@ sudoers_lookup(pwflag)
 		    return(VALIDATE_NOT_OK |
 			(no_passwd == TRUE ? FLAG_NOPASS : 0) |
 			(no_execve == TRUE ? FLAG_NOEXEC : 0) |
-			(setenv_ok == TRUE ? FLAG_SETENV : 0));
+			(setenv_ok >= TRUE ? FLAG_SETENV : 0));
 		}
 	    }
 	    top--;
diff -dupNr sudo-1.6.9p9-20071203/sudo.c sudo-1.6.9p9/sudo.c
--- sudo-1.6.9p9-20071203/sudo.c	2007-12-03 02:13:52.000000000 +0900
+++ sudo-1.6.9p9/sudo.c	2007-12-04 01:12:03.000000000 +0900
@@ -730,8 +730,10 @@ parse_args(argc, argv)

     while (NewArgc > 0) {
 	if (NewArgv[0][0] == '-') {
-	    if (NewArgv[0][1] != '\0' && NewArgv[0][2] != '\0')
+	    if (NewArgv[0][1] != '\0' && NewArgv[0][2] != '\0') {
 		warnx("please use single character options");
+		usage(1);
+	    }

 	    switch (NewArgv[0][1]) {
 		case 'p':


To generate a diff of this commit:
cvs rdiff -r1.101 -r1.102 pkgsrc/security/sudo/Makefile
cvs rdiff -r1.46 -r1.47 pkgsrc/security/sudo/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.