moving more to quilt-style patches

diff --git a/debian/patches/series b/debian/patches/series
index 7dbc9475874697582c24e40594568aa80833d521..264a255e80e607ac1c45e77d20ca557722cb3576 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 makefile-strip.diff
 sudo-1.7.2p1-visudo-manpage-fix.diff
+typo-in-classic-insults.diff
+env.c-safety.diff

diff --git a/env.c b/env.c
index 75457b91310490654e22dcc8f7e7add1a2d2b782..3049dff93308329d357e87b80e8601289ec3d85b 100644 (file)
--- a/env.c
+++ b/env.c
@@ -120,8 +120,6 @@ static struct environment env;
 static const char *initial_badenv_table[] = {
     "IFS",
     "CDPATH",
-    "SHELLOPTS",
-    "PS4",
     "LOCALDOMAIN",
     "RES_OPTIONS",
     "HOSTALIASES",
@@ -604,17 +602,6 @@ rebuild_env(sudo_mode, noexec)
            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/ins_classic.h b/ins_classic.h
index 7c9939fd625139c304bb0aae2dd1f59d262d413a..4321f64d18f50437e14561089bb40e2d7f96562e 100644 (file)
--- a/ins_classic.h
+++ b/ins_classic.h
@@ -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?",