From: Bdale Garbee <bdale@gag.com>
Date: Fri, 20 Nov 2009 22:51:06 +0000 (-0700)
Subject: more quilting
X-Git-Tag: debian/1.7.2p5-1~14
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=b020cc3eb50bb3c9347f252b3eebe1c5e5ccd813;p=debian%2Fsudo

more quilting
---

diff --git a/debian/patches/env.c-safety.diff b/debian/patches/env.c-safety.diff
new file mode 100644
index 0000000..6a6467d
--- /dev/null
+++ b/debian/patches/env.c-safety.diff
@@ -0,0 +1,29 @@
+--- /home/bdale/Desktop/sudo-1.7.2p1/env.c	2009-06-23 12:24:42.000000000 -0600
++++ sudo/env.c	2009-11-20 07:31:58.000000000 -0700
+@@ -120,6 +120,8 @@
+ static const char *initial_badenv_table[] = {
+     "IFS",
+     "CDPATH",
++    "SHELLOPTS",
++    "PS4",
+     "LOCALDOMAIN",
+     "RES_OPTIONS",
+     "HOSTALIASES",
+@@ -602,6 +604,17 @@
+ 	    if (keepit == -1)
+ 		keepit = matches_env_keep(*ep);
+ 
++	    if (!strncmp (*ep, "DISPLAY=",8)
++		|| !strncmp (*ep, "XAUTHORITY=", 11)
++		|| !strncmp (*ep, "XAUTHORIZATION=", 15)
++		|| !strncmp (*ep, "XAPPLRESDIR=", 12)
++		|| !strncmp (*ep, "XFILESEARCHPATH=", 16)
++		|| !strncmp (*ep, "XUSERFILESEARCHPATH=", 20)
++		|| !strncmp (*ep, "LANG=", 5)
++		|| !strncmp (*ep, "LANGUAGE=", 9)
++		|| !strncmp (*ep, "LC_", 3))
++	      keepit = 1;
++
+ 	    /* For SUDO_PS1 -> PS1 conversion. */
+ 	    if (strncmp(*ep, "SUDO_PS1=", 8) == 0)
+ 		ps1 = *ep + 5;
diff --git a/debian/patches/typo-in-classic-insults.diff b/debian/patches/typo-in-classic-insults.diff
new file mode 100644
index 0000000..7a7f219
--- /dev/null
+++ b/debian/patches/typo-in-classic-insults.diff
@@ -0,0 +1,11 @@
+--- /home/bdale/Desktop/sudo-1.7.2p1/ins_classic.h	2004-02-13 14:36:43.000000000 -0700
++++ sudo/ins_classic.h	2009-11-20 07:31:58.000000000 -0700
+@@ -32,7 +32,7 @@
+     "Where did you learn to type?",
+     "Are you on drugs?",
+     "My pet ferret can type better than you!",
+-    "You type like i drive.",
++    "You type like I drive.",
+     "Do you think like you type?",
+     "Your mind just hasn't been the same since the electro-shock, has it?",
+