Imported Upstream version 1.6.8p12

diff --git a/CHANGES b/CHANGES
index 221d7bd13fd1a0e98d110b2da2c20239eb54e938..2ab4d684cc4db7b248797bc201ef80102d02f2ab 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1793,3 +1793,18 @@ Sudo 1.6.8p8 released.
      safe_cmnd.
 
 Sudo 1.6.8p9 released.
+
+567) Added PS4 and SHELLOPTS to the list of variables to remove from
+     the environment.
+
+Sudo 1.6.8p10 released.
+
+567) Added JAVA_TOOL_OPTIONS to the list of variables to remove from
+     the environment.
+
+Sudo 1.6.8p11 released.
+
+567) Added PERLLIB, PERL5LIB and PERL5OPT to the list of variables to
+     remove from the environment.
+
+Sudo 1.6.8p12 released.

diff --git a/Makefile.in b/Makefile.in
index 58f78d4525ef5787b342064c367cd5004cde510e..893ac812396d1bc7c852dedd4048fda0ddba153e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -130,7 +130,7 @@ TESTOBJS = interfaces.o testsudoers.o $(PARSEOBJS)
 
 LIBOBJS = @LIBOBJS@ @ALLOCA@
 
-VERSION = 1.6.8p9
+VERSION = 1.6.8p12
 
 DISTFILES = $(SRCS) $(HDRS) BUGS CHANGES HISTORY INSTALL INSTALL.configure \
            LICENSE Makefile.in PORTING README README.LDAP RUNSON TODO \

diff --git a/env.c b/env.c
index 9d3a765654650bae103bd55d4471c82995744353..6f55503a1412c3a51837b0411e229fe5a4651112 100644 (file)
--- a/env.c
+++ b/env.c
@@ -124,6 +124,12 @@ static const char *initial_badenv_table[] = {
     "TERMCAP",                 /* XXX - only if it starts with '/' */
     "ENV",
     "BASH_ENV",
+    "PS4",
+    "SHELLOPTS",
+    "JAVA_TOOL_OPTIONS",
+    "PERLLIB",
+    "PERL5LIB",
+    "PERL5OPT",
     NULL
 };
 

diff --git a/sudo.cat b/sudo.cat
index fdca4d8aaa074c69969a06cca77fbc17384ab007..c5d7434afff0fe4220dd426154ba227c0a91d2b6 100644 (file)
--- a/sudo.cat
+++ b/sudo.cat
@@ -61,7 +61,7 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
 
 
 
-1.6.8p9                  June, 20 2005                          1
+1.6.8p12                 June, 20 2005                          1
 
 
 
@@ -127,7 +127,7 @@ O\bOP\bPT\bTI\bIO\bON\bNS\bS
 
 
 
-1.6.8p9                  June, 20 2005                          2
+1.6.8p12                 June, 20 2005                          2
 
 
 
@@ -193,7 +193,7 @@ SUDO(1m)               MAINTENANCE COMMANDS              SUDO(1m)
 
 
 
-1.6.8p9                  June, 20 2005                          3
+1.6.8p12                 June, 20 2005                          3
 
 
 
@@ -259,7 +259,7 @@ SUDO(1m)               MAINTENANCE COMMANDS              SUDO(1m)
 
 
 
-1.6.8p9                  June, 20 2005                          4
+1.6.8p12                 June, 20 2005                          4
 
 
 
@@ -325,7 +325,7 @@ S\bSE\bEC\bCU\bUR\bRI\bIT\bTY\bY N\bNO\bOT\bTE\bES\bS
 
 
 
-1.6.8p9                  June, 20 2005                          5
+1.6.8p12                 June, 20 2005                          5
 
 
 
@@ -391,7 +391,7 @@ E\bEN\bNV\bVI\bIR\bRO\bON\bNM\bME\bEN\bNT\bT
 
 
 
-1.6.8p9                  June, 20 2005                          6
+1.6.8p12                 June, 20 2005                          6
 
 
 
@@ -457,7 +457,7 @@ A\bAU\bUT\bTH\bHO\bOR\bRS\bS
 
 
 
-1.6.8p9                  June, 20 2005                          7
+1.6.8p12                 June, 20 2005                          7
 
 
 
@@ -523,7 +523,7 @@ D\bDI\bIS\bSC\bCL\bLA\bAI\bIM\bME\bER\bR
 
 
 
-1.6.8p9                  June, 20 2005                          8
+1.6.8p12                 June, 20 2005                          8
 
 
 
@@ -589,6 +589,6 @@ SUDO(1m)               MAINTENANCE COMMANDS              SUDO(1m)
 
 
 
-1.6.8p9                  June, 20 2005                          9
+1.6.8p12                 June, 20 2005                          9
 
 

diff --git a/sudo.man.in b/sudo.man.in
index 773886ac7ccf1f6bdf217cacf64f19f56957f38b..a733db5d05d711eaadc3ee2000af0549dd6dea78 100644 (file)
--- a/sudo.man.in
+++ b/sudo.man.in
@@ -149,7 +149,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SUDO @mansectsu@"
-.TH SUDO @mansectsu@ "June 20, 2005" "1.6.8p9" "MAINTENANCE COMMANDS"
+.TH SUDO @mansectsu@ "June 20, 2005" "1.6.8p12" "MAINTENANCE COMMANDS"
 .SH "NAME"
 sudo, sudoedit \- execute a command as another user
 .SH "SYNOPSIS"

diff --git a/sudoers.cat b/sudoers.cat
index 8be0790528835646deeddb9d81b74e90b52c13e7..41d3489bd35fec4d1dee1087334fcd20eb9f7187 100644 (file)
--- a/sudoers.cat
+++ b/sudoers.cat
@@ -61,7 +61,7 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
 
 
 
-1.6.8p9                  June, 20 2005                          1
+1.6.8p12                 June, 20 2005                          1
 
 
 
@@ -127,7 +127,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.8p9                  June, 20 2005                          2
+1.6.8p12                 June, 20 2005                          2
 
 
 
@@ -193,7 +193,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.8p9                  June, 20 2005                          3
+1.6.8p12                 June, 20 2005                          3
 
 
 
@@ -259,7 +259,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.8p9                  June, 20 2005                          4
+1.6.8p12                 June, 20 2005                          4
 
 
 
@@ -325,7 +325,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.8p9                  June, 20 2005                          5
+1.6.8p12                 June, 20 2005                          5
 
 
 
@@ -391,7 +391,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.8p9                  June, 20 2005                          6
+1.6.8p12                 June, 20 2005                          6
 
 
 
@@ -457,7 +457,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.8p9                  June, 20 2005                          7
+1.6.8p12                 June, 20 2005                          7
 
 
 
@@ -523,7 +523,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.8p9                  June, 20 2005                          8
+1.6.8p12                 June, 20 2005                          8
 
 
 
@@ -589,7 +589,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.8p9                  June, 20 2005                          9
+1.6.8p12                 June, 20 2005                          9
 
 
 
@@ -655,7 +655,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.8p9                  June, 20 2005                         10
+1.6.8p12                 June, 20 2005                         10
 
 
 
@@ -721,7 +721,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.8p9                  June, 20 2005                         11
+1.6.8p12                 June, 20 2005                         11
 
 
 
@@ -787,7 +787,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.8p9                  June, 20 2005                         12
+1.6.8p12                 June, 20 2005                         12
 
 
 
@@ -853,7 +853,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.8p9                  June, 20 2005                         13
+1.6.8p12                 June, 20 2005                         13
 
 
 
@@ -919,7 +919,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.8p9                  June, 20 2005                         14
+1.6.8p12                 June, 20 2005                         14
 
 
 
@@ -985,7 +985,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.8p9                  June, 20 2005                         15
+1.6.8p12                 June, 20 2005                         15
 
 
 
@@ -1051,7 +1051,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.8p9                  June, 20 2005                         16
+1.6.8p12                 June, 20 2005                         16
 
 
 
@@ -1117,7 +1117,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.8p9                  June, 20 2005                         17
+1.6.8p12                 June, 20 2005                         17
 
 
 
@@ -1183,7 +1183,7 @@ E\bEX\bXA\bAM\bMP\bPL\bLE\bES\bS
 
 
 
-1.6.8p9                  June, 20 2005                         18
+1.6.8p12                 June, 20 2005                         18
 
 
 
@@ -1249,7 +1249,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.8p9                  June, 20 2005                         19
+1.6.8p12                 June, 20 2005                         19
 
 
 
@@ -1315,7 +1315,7 @@ SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 
 
 
-1.6.8p9                  June, 20 2005                         20
+1.6.8p12                 June, 20 2005                         20
 
 
 
@@ -1381,7 +1381,7 @@ P\bPR\bRE\bEV\bVE\bEN\bNT\bTI\bIN\bNG\bG S\bSH\bHE\bEL\bLL\bL E\bES\bSC\bCA\bAP\bPE\bES\bS
 
 
 
-1.6.8p9                  June, 20 2005                         21
+1.6.8p12                 June, 20 2005                         21
 
 
 
@@ -1447,7 +1447,7 @@ C\bCA\bAV\bVE\bEA\bAT\bTS\bS
 
 
 
-1.6.8p9                  June, 20 2005                         22
+1.6.8p12                 June, 20 2005                         22
 
 
 
@@ -1513,6 +1513,6 @@ D\bDI\bIS\bSC\bCL\bLA\bAI\bIM\bME\bER\bR
 
 
 
-1.6.8p9                  June, 20 2005                         23
+1.6.8p12                 June, 20 2005                         23
 
 

diff --git a/sudoers.man.in b/sudoers.man.in
index 3acbd3acf17b62df5656e9d03b0b398dac5a58fc..101a3d0cb59aeebcd77453f9585e69dffcd3a353 100644 (file)
--- a/sudoers.man.in
+++ b/sudoers.man.in
@@ -149,7 +149,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SUDOERS @mansectform@"
-.TH SUDOERS @mansectform@ "June 20, 2005" "1.6.8p9" "MAINTENANCE COMMANDS"
+.TH SUDOERS @mansectform@ "June 20, 2005" "1.6.8p12" "MAINTENANCE COMMANDS"
 .SH "NAME"
 sudoers \- list of which users may execute what
 .SH "DESCRIPTION"

diff --git a/version.h b/version.h
index 12c46a2311a6743f1191642f589fd179f26445ae..3c2bc4ce979489bf1236ecc77a51d492532fa49d 100644 (file)
--- a/version.h
+++ b/version.h
@@ -23,6 +23,6 @@
 #ifndef _SUDO_VERSION_H
 #define _SUDO_VERSION_H
 
-static const char version[] = "1.6.8p9";
+static const char version[] = "1.6.8p12";
 
 #endif /* _SUDO_VERSION_H */

diff --git a/visudo.cat b/visudo.cat
index 6eb2a7fd47b67245270757997d9d1ec09c34348a..c1be3524fbb01def41cbca40d3f3e7b0ddb54022 100644 (file)
--- a/visudo.cat
+++ b/visudo.cat
@@ -61,7 +61,7 @@ O\bOP\bPT\bTI\bIO\bON\bNS\bS
 
 
 
-1.6.8p9                  June, 20 2005                          1
+1.6.8p12                 June, 20 2005                          1
 
 
 
@@ -127,7 +127,7 @@ D\bDI\bIA\bAG\bGN\bNO\bOS\bST\bTI\bIC\bCS\bS
 
 
 
-1.6.8p9                  June, 20 2005                          2
+1.6.8p12                 June, 20 2005                          2
 
 
 
@@ -193,6 +193,6 @@ D\bDI\bIS\bSC\bCL\bLA\bAI\bIM\bME\bER\bR
 
 
 
-1.6.8p9                  June, 20 2005                          3
+1.6.8p12                 June, 20 2005                          3
 
 

diff --git a/visudo.man.in b/visudo.man.in
index 26f6e32abe5f424d05bd98199646af9cf9439025..ad8e8c403c13a6618acd328f9a510e98c4b6042f 100644 (file)
--- a/visudo.man.in
+++ b/visudo.man.in
@@ -149,7 +149,7 @@
 .\" ========================================================================
 .\"
 .IX Title "VISUDO @mansectsu@"
-.TH VISUDO @mansectsu@ "June 20, 2005" "1.6.8p9" "MAINTENANCE COMMANDS"
+.TH VISUDO @mansectsu@ "June 20, 2005" "1.6.8p12" "MAINTENANCE COMMANDS"
 .SH "NAME"
 visudo \- edit the sudoers file
 .SH "SYNOPSIS"