This patch will upgrade Sudo version 1.7.2 to Sudo version 1.7.2
patchlevel 1. To apply:
$ cd sudo-1.7.2
$ patch -p1 < sudo-1.7.2p1.patch
diff -ur sudo-1.7.2/ChangeLog sudo-1.7.2p1/ChangeLog
--- sudo-1.7.2/ChangeLog Sat Jul 11 21:12:29 2009
+++ sudo-1.7.2p1/ChangeLog Tue Jul 28 14:59:05 2009
@@ -1,3 +1,20 @@
+2009-07-18 09:55 millert
+
+ * toke.c, toke.l: Fix expansion of %h in #include names. Fixes
+ bugzilla 363
+
+2009-07-12 17:17 millert
+
+ * mkdefaults: If no arg assume def_data.in
+
+2009-07-11 21:27 millert
+
+ * README, WHATSNEW: Update for 1.7.2
+
+2009-07-11 21:12 millert
+
+ * ChangeLog: sync
+
2009-06-30 08:41 millert
* sudoers.cat, sudoers.man.in, sudoers.pod: Add missing single
@@ -5089,7 +5106,7 @@
2004-10-01 10:58 millert
* sample.pam, sample.sudoers, sample.syslog.conf, sudoers: Add
- $Sudo: ChangeLog,v 1.22 2009/07/12 01:12:29 millert Exp $ tags.
+ $Sudo$ tags.
2004-10-01 10:47 millert
diff -ur sudo-1.7.2/configure sudo-1.7.2p1/configure
--- sudo-1.7.2/configure Sat Jun 13 16:21:50 2009
+++ sudo-1.7.2p1/configure Mon Jul 20 09:34:39 2009
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for sudo 1.7.2.
+# Generated by GNU Autoconf 2.61 for sudo 1.7.2p1.
#
# Report bugs to .
#
@@ -724,8 +724,8 @@
# Identity of this package.
PACKAGE_NAME='sudo'
PACKAGE_TARNAME='sudo'
-PACKAGE_VERSION='1.7.2'
-PACKAGE_STRING='sudo 1.7.2'
+PACKAGE_VERSION='1.7.2p1'
+PACKAGE_STRING='sudo 1.7.2p1'
PACKAGE_BUGREPORT='http://www.sudo.ws/bugs/'
# Factoring default headers for most tests.
@@ -1416,7 +1416,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures sudo 1.7.2 to adapt to many kinds of systems.
+\`configure' configures sudo 1.7.2p1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1481,7 +1481,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sudo 1.7.2:";;
+ short | recursive ) echo "Configuration of sudo 1.7.2p1:";;
esac
cat <<\_ACEOF
@@ -1683,7 +1683,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-sudo configure 1.7.2
+sudo configure 1.7.2p1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1697,7 +1697,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by sudo $as_me 1.7.2, which was
+It was created by sudo $as_me 1.7.2p1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -24462,7 +24462,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by sudo $as_me 1.7.2, which was
+This file was extended by sudo $as_me 1.7.2p1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24511,7 +24511,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-sudo config.status 1.7.2
+sudo config.status 1.7.2p1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -ur sudo-1.7.2/configure.in sudo-1.7.2p1/configure.in
--- sudo-1.7.2/configure.in Sat Jun 13 16:52:50 2009
+++ sudo-1.7.2p1/configure.in Mon Jul 20 09:34:37 2009
@@ -4,7 +4,7 @@
dnl
dnl Copyright (c) 1994-1996,1998-2009 Todd C. Miller
dnl
-AC_INIT([sudo], [1.7.2], [http://www.sudo.ws/bugs/], [sudo])
+AC_INIT([sudo], [1.7.2p1], [http://www.sudo.ws/bugs/], [sudo])
AC_CONFIG_HEADER(config.h pathnames.h)
dnl
dnl This won't work before AC_INIT
diff -ur sudo-1.7.2/mkdefaults sudo-1.7.2p1/mkdefaults
--- sudo-1.7.2/mkdefaults Mon Nov 29 12:32:05 2004
+++ sudo-1.7.2p1/mkdefaults Tue Jul 28 14:58:35 2009
@@ -16,9 +16,9 @@
$header .= '.h';
$cfile .= '.c';
}
-die "usage: $0 input_file\n" unless $#ARGV == 0;
+die "usage: $0 [input_file]\n" unless $#ARGV == -1 || $#ARGV == 0;
-$infile = $ARGV[0];
+$infile = $ARGV[0] || "def_data.in";
if (!defined($header)) {
$header = $infile;
$header =~ s/(\.in)?$/.h/;
Binary files sudo-1.7.2/sudo.cat and sudo-1.7.2p1/sudo.cat differ
diff -ur sudo-1.7.2/sudo.man.in sudo-1.7.2p1/sudo.man.in
--- sudo-1.7.2/sudo.man.in Mon Jun 29 09:36:42 2009
+++ sudo-1.7.2p1/sudo.man.in Mon Jul 20 09:35:00 2009
@@ -153,7 +153,7 @@
.\" ========================================================================
.\"
.IX Title "SUDO @mansectsu@"
-.TH SUDO @mansectsu@ "June 15, 2009" "1.7.2" "MAINTENANCE COMMANDS"
+.TH SUDO @mansectsu@ "June 15, 2009" "1.7.2p1" "MAINTENANCE COMMANDS"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
Binary files sudo-1.7.2/sudoers.cat and sudo-1.7.2p1/sudoers.cat differ
Binary files sudo-1.7.2/sudoers.ldap.cat and sudo-1.7.2p1/sudoers.ldap.cat differ
diff -ur sudo-1.7.2/sudoers.ldap.man.in sudo-1.7.2p1/sudoers.ldap.man.in
--- sudo-1.7.2/sudoers.ldap.man.in Thu Jun 11 16:29:12 2009
+++ sudo-1.7.2p1/sudoers.ldap.man.in Mon Jul 20 09:35:04 2009
@@ -149,7 +149,7 @@
.\" ========================================================================
.\"
.IX Title "SUDOERS.LDAP @mansectform@"
-.TH SUDOERS.LDAP @mansectform@ "June 11, 2009" "1.7.2" "MAINTENANCE COMMANDS"
+.TH SUDOERS.LDAP @mansectform@ "June 11, 2009" "1.7.2p1" "MAINTENANCE COMMANDS"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -ur sudo-1.7.2/sudoers.man.in sudo-1.7.2p1/sudoers.man.in
--- sudo-1.7.2/sudoers.man.in Tue Jun 30 08:41:09 2009
+++ sudo-1.7.2p1/sudoers.man.in Mon Jul 20 09:35:06 2009
@@ -153,7 +153,7 @@
.\" ========================================================================
.\"
.IX Title "SUDOERS @mansectform@"
-.TH SUDOERS @mansectform@ "June 30, 2009" "1.7.2" "MAINTENANCE COMMANDS"
+.TH SUDOERS @mansectform@ "June 30, 2009" "1.7.2p1" "MAINTENANCE COMMANDS"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -ur sudo-1.7.2/toke.c sudo-1.7.2p1/toke.c
--- sudo-1.7.2/toke.c Tue May 26 20:47:17 2009
+++ sudo-1.7.2p1/toke.c Mon Jul 20 09:33:58 2009
@@ -3,7 +3,7 @@
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Header: /home/cvs/courtesan/sudo/toke.c,v 1.36 2009/05/27 00:47:17 millert Exp $
+ * $Header: /home/cvs/courtesan/sudo/toke.c,v 1.37 2009/07/18 13:55:37 millert Exp $
*/
#define FLEX_SCANNER
@@ -1417,7 +1417,7 @@
#include
#ifndef lint
-__unused static const char rcsid[] = "$Sudo: toke.c,v 1.36 2009/05/27 00:47:17 millert Exp $";
+__unused static const char rcsid[] = "$Sudo: toke.c,v 1.37 2009/07/18 13:55:37 millert Exp $";
#endif /* lint */
extern YYSTYPE yylval;
@@ -3592,6 +3592,7 @@
memcpy(pp, user_shost, shost_len);
pp += shost_len;
cp += 2;
+ continue;
}
*pp++ = *cp++;
}
diff -ur sudo-1.7.2/toke.l sudo-1.7.2p1/toke.l
--- sudo-1.7.2/toke.l Tue May 26 20:46:51 2009
+++ sudo-1.7.2p1/toke.l Mon Jul 20 09:33:58 2009
@@ -72,7 +72,7 @@
#include
#ifndef lint
-__unused static const char rcsid[] = "$Sudo: toke.l,v 1.37 2009/05/27 00:46:51 millert Exp $";
+__unused static const char rcsid[] = "$Sudo: toke.l,v 1.38 2009/07/18 13:55:37 millert Exp $";
#endif /* lint */
extern YYSTYPE yylval;
@@ -971,6 +971,7 @@
memcpy(pp, user_shost, shost_len);
pp += shost_len;
cp += 2;
+ continue;
}
*pp++ = *cp++;
}
Binary files sudo-1.7.2/visudo.cat and sudo-1.7.2p1/visudo.cat differ
diff -ur sudo-1.7.2/visudo.man.in sudo-1.7.2p1/visudo.man.in
--- sudo-1.7.2/visudo.man.in Thu Jun 11 16:29:12 2009
+++ sudo-1.7.2p1/visudo.man.in Mon Jul 20 09:35:09 2009
@@ -153,7 +153,7 @@
.\" ========================================================================
.\"
.IX Title "VISUDO @mansectsu@"
-.TH VISUDO @mansectsu@ "June 11, 2009" "1.7.2" "MAINTENANCE COMMANDS"
+.TH VISUDO @mansectsu@ "June 11, 2009" "1.7.2p1" "MAINTENANCE COMMANDS"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l