[project @ 1999-09-16 19:42:50 by gecko]

Better Mime handling and Y2K changes

diff --git a/scripts/process.in b/scripts/process.in
index c83eb5159e550dd9a76fe7ea608b1397908b289a..9cd3e7c7cf1c42abf6eb126019876c6615d5802a 100755 (executable)
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: process.in,v 1.3 1999/09/16 07:16:47 gecko Exp $
+# $Id: process.in,v 1.4 1999/09/16 19:42:50 gecko Exp $
 #
 # Usage: process nn
 # Temps:  incoming/Pnn
@@ -75,9 +75,18 @@ for ($i=0; $i<=$#msg; $i++) {
 
 #remove blank lines
 while ($i <= $#msg && !length($msg[$i])) { $fwd .= "\n"; $i++; }
+
+#skips the "this is mime" message and any blank space after it
+if ( $msg[$i] =~ /^This is a multi-part message in MIME format./ )
+{
+       while ( $i <= $#msg && length( $msg[$i] ) ) { $fwd .= $msg[$i] . "\n"; $i++; }
+       while ( $i <= $#msg && !length( $msg[$i] ) ) { $fwd .= "\n"; $i++; }
+}
+#if the lines starts with -- or is nothing but blank space...
+#skip to the next blank line(s) then skip past the blank line(s)
 if ( $msg[$i] =~ /^--/ || $msg[$i] =~ /^\s*$/ )
 {
-       while ( $i <= $#msg && length( $msg[$i] ) ) { $fwd .= $msg[$i]; $i++; }
+       while ( $i <= $#msg && length( $msg[$i] ) ) { $fwd .= $msg[$i] . "\n"; $i++; }
        while ( $i <= $#msg && !length( $msg[$i] ) ) { $fwd .= "\n"; $i++; }
 }              
 

diff --git a/scripts/service.in b/scripts/service.in
index 28a4f785a87e49b28b6daad47b0c2903f8e4798f..4a43da82a242a93cd08b4a728545dc74ee08b0d6 100755 (executable)
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# $Id: service.in,v 1.4 1999/09/16 07:16:47 gecko Exp $
+# $Id: service.in,v 1.5 1999/09/16 19:42:50 gecko Exp $
 #
 # Usage: service <code>.nn
 # Temps:  incoming/P<code>.nn
@@ -34,7 +34,7 @@ grep((s/\n$//,s/\s+$//),@msg);
 
 print DEBUG "###\n",join("##\n",@msg),"\n###\n";
 
-chop($tdate= `date -u '+%a, %d %h 19%y %T GMT'`);
+chop($tdate= `date -u '+%a, %d %h %Y %T GMT'`);
 $fwd= <<END;
 Received: via spool for service; $tdate
 END

diff --git a/scripts/text.in b/scripts/text.in
index fbb9bcc095cd86b8e5eed9d99f05b086d222eb3e..5e1d5aee20ec21b7d3a08ae1dfa48bf8bd35d28d 100644 (file)
--- a/scripts/text.in
+++ b/scripts/text.in
@@ -1,4 +1,4 @@
-# $Id: text.in,v 1.5 1999/09/14 22:33:48 gecko Exp $
+# $Id: text.in,v 1.6 1999/09/16 19:42:50 gecko Exp $
 
 ############################################################################
 #  Here is a blurb to point people to ftp archive of directions.  It is
@@ -124,7 +124,7 @@ $gHTMLSeverityDesc = "<DT><CODE>critical</CODE>
 ############################################################################
 # shows up at the end of (most) html pages.  You shouldn't have
 ############################################################################
-$gHTMLTail = "<HR><ADDRESS><A HREF=\"$gMaintainerWebpage\">$gMaintainer</A> /
+$gHTMLTail = "<HR><ADDRESS>$gMaintainer /
  <A HREF=\"mailto:$gMaintainerEmail\">$gMaintainerEmail</A>.  Last modifed:
  <!--timestamp-->
  SUBSTITUTE_DTIME
@@ -133,9 +133,10 @@ $gHTMLTail = "<HR><ADDRESS><A HREF=\"$gMaintainerWebpage\">$gMaintainer</A> /
          
  <P>
  Debian $gBug tracking system<BR>
- copyright 1997 nCipher Corporation Ltd,<BR>
- copyright 1994-1997 Ian Jackson,<BR>
- copyright 1995 Steven Brenner.<BR>
+ copyright 1999 Darren O. Benham,
+ 1997 nCipher Corporation Ltd,
+ 1994-7 Ian Jackson,
+ 1995 Steven Brenner.<BR>
  <A HREF=\"http://www.chiark.greenend.org.uk/~ian/debbugs/\">
  Available under the GPL.</A>
  </ADDRESS>