Index: Makefile.PL
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/Makefile.PL,v
retrieving revision 1.112
diff -u -p -d -b -r1.112 Makefile.PL
--- Makefile.PL	10 Sep 2003 03:30:37 -0000	1.112
+++ Makefile.PL	10 Sep 2003 21:34:52 -0000
@@ -717,7 +717,7 @@ sub _set_macro_PERL_yesno {
   $macro = 'PERL_' . $macro;
   $val   = "";
   if (get_macro($macro)) {
-    $val = yesno(get_macro($macro));
+    $val = ::yesno(get_macro($macro));
   }
 
   set_macro($macro, $val);
@@ -926,7 +926,8 @@ FIXBYTES	= -Mbytes \
 
 FIXBANG		= -Msharpbang \
 		  -DPERL_BIN="$(PERL_BIN)" \
-		  -DPERL_WARN="$(PERL_WARN)"
+		  -DPERL_WARN="$(PERL_WARN)" \
+		  -DPERL_TAINT="$(PERL_TAINT)"
 
 SPAMC_SOURCES	= spamd/spamc.c spamd/libspamc.c spamd/utils.c qmail/qmail-spamc.c
 
Index: build/preprocessor
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/build/preprocessor,v
retrieving revision 1.10
diff -u -p -d -b -r1.10 preprocessor
--- build/preprocessor	26 Aug 2003 04:14:49 -0000	1.10
+++ build/preprocessor	10 Sep 2003 21:34:52 -0000
@@ -131,19 +131,18 @@ sub do_stdin {
     }
   }
 
-  # If we're using a CVS build, add the -w switch to turn on warnings
-  my $perl_warn = -f 'CVS/Repository' ? ' -w' : '';
-  # The warnings can be overwritten via -DPERL_WARN=<1|0>
-  if ($defines{'PERL_WARN'} && ($defines{'PERL_WARN'} ne 'auto')) {
-    if ($defines{'PERL_WARN'} eq 'yes') {
-      $perl_warn = ' -w';
-    }
-    elsif ($defines{'PERL_WARN'} eq 'no') {
+  # Warnings are enabled per default
+  my $perl_warn = ' -w';
+  # The warnings can be overwritten via -DPERL_WARN=<yes|no>
+  if ($defines{'PERL_WARN'} and $defines{'PERL_WARN'} eq 'no') {
       $perl_warn = '';
     }
-    else {
-      warn("Unknown value '$defines{'PERL_WARN'}' for PERL_WARN; assuming 'auto'");
-    }
+
+  # Taint mode is enabled per default
+  my $perl_taint = ' -T';
+  # The taint mode can be disabled with -DPERL_TAINT=<yes|no>
+  if ($defines{'PERL_TAINT'} and $defines{'PERL_TAINT'} eq 'no') {
+    $perl_taint = '';
   }
 
   # Save the Perl Version
@@ -180,7 +179,7 @@ sub do_stdin {
 
     # Sharpbang (#!) replacement (see also ExtUtils::MY->fixin)
     if ($modules{'sharpbang'} && ($l == 1)) {
-      s/^#!.*perl.*$/#!${perl}${perl_warn}/;
+      s/^#!.*perl.*$/#!${perl}${perl_taint}${perl_warn}/;
     }
 
     print;