[project @ 1999-12-01 18:04:00 by gecko]

Lots of the minor patchs from the list (3, 9,8,10,13-18,20) see the
archives for details

diff --git a/debian/changelog b/debian/changelog
index bfdfc7a4615cf9954ba0f9d5b482cabf706d6cfb..b208ceec0b2e2f70d819e18f4091700885672f60 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ debbugs (2.3-2) unstable; urgency=low
   * Tweeks to the [pkg|bug]report.cgi scripts
   * Merged README and README.Debian
   * Sundry of patchs from netgod.. see list archives for details :)
-    (#36147, #39540
+    (#36147, #39540, #39063, 
 
  -- Darren Benham <gecko@debian.org>  Tue, 24 Oct 1999 23:16:14 -0700
 

diff --git a/debian/control b/debian/control
index 5122d81afd1667f3085c0a5206459b79d88801cf..4a6349a74997dbb35727dee6148839d468ee6482 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,11 @@ Source: debbugs
 Section: misc
 Priority: optional
 Maintainer: Darren Benham <gecko@debian.org>
-Standards-Version: 2.5.0.0
+Standards-Version: 3.1.0.0
 
 Package: debbugs
 Architecture: all
-Depends: perl|perl5, lynx, mail-transport-agent, mailtools
+Depends: perl|perl5, lynx, mail-transport-agent, mailtools, ed
 Recommends: httpd
 Description: The bug tracking system based on the active Debian BTS
  This is an email based bug tracking system.  It is the same system used by

diff --git a/html/Developer.html.in b/html/Developer.html.in
index d19d3b048d8a2a2acaddf372c837badebeb04409..bb3f184c2d628fa9f9c234c159272497a2ee241a 100644 (file)
--- a/html/Developer.html.in
+++ b/html/Developer.html.in
@@ -76,9 +76,9 @@ mailing list separately.
 
 The $gBug system records a severity level with each $gBug report.  This is
 set to <code>$gDefaultSeverity</code> by default, but can be overridden either by
-supplying a <code>Severity</code> line in the psuedo-header when the
+supplying a <code>Severity</code> line in the pseudo-header when the
 $gBug is submitted (see the
-<A href="Reporting.html#psuedoheader">instructions for reporting
+<A href="Reporting.html#pseudoheader">instructions for reporting
 $gBugs</A>), or by using the <code>severity</code> command with the
 <A href="#requestserv">control request server</A>.
 

diff --git a/html/Reporting.html.in b/html/Reporting.html.in
index 5e394e35c060eb4cbabb7b8ee1980472cafa7e64..e3514815dc35dc5002ebc530831cc91aced634c4 100644 (file)
--- a/html/Reporting.html.in
+++ b/html/Reporting.html.in
@@ -42,7 +42,7 @@ A $gBug report, with mail header, looks something like this:
   To: submit\@$gEmailDomain
   From: diligent\@testing.linux.org
   Subject: Hello says `goodbye'
-<A name="psuedoheader">Package: hello</A>
+<A name="pseudoheader">Package: hello</A>
   Version: 1.3-2
 
   When I invoke `hello' without arguments from an ordinary shell
@@ -107,7 +107,7 @@ reports.
 
 The <em>right</em> way to do this is to use the
 <code>X-$gProject-CC</code> header.  Add a line like this to your
-message's mail header (not to the psuedo header with the
+message's mail header (not to the pseudo header with the
 <code>Package</code> field):
 <pre>
  X-$gProject-CC: other-list\@cosmic.edu
@@ -130,7 +130,7 @@ appropriate severity level to your report if you do not.
 <p>
 
 To assign a severity level put a
-<code>Severity: <var>severity</var></code> line in the psuedo-header,
+<code>Severity: <var>severity</var></code> line in the pseudo-header,
 together with <code>Package</code> and <code>Version</code>.  The
 severity levels available are described in the
 <A href="Developer.html#severities">developers' documentation</A>.
@@ -185,6 +185,6 @@ $gHTMLOtherPageList
 
 </ul>
 
-$gHTMLEnd
+$gHTMLTail
 
 HTML_END

diff --git a/scripts/config.in b/scripts/config.in
index ef4eaaa34ee7b693f716b21abff1a9830c3a95a3..f781d90fdc755d5491e0a81b821f297ad3728b4e 100644 (file)
--- a/scripts/config.in
+++ b/scripts/config.in
@@ -1,4 +1,4 @@
-# $Id: config.in,v 1.5 1999/11/22 01:35:10 gecko Exp $
+# $Id: config.in,v 1.6 1999/12/01 18:04:01 gecko Exp $
 #domains
 $gEmailDomain = "bugs.benham";         #bugs.debian.org
 $gListDomain = "lists.benham";         #lists.debian.org
@@ -67,4 +67,4 @@ and at all Debian mirror sites, in the files:
 
 
 #dont change
-$gBounceFroms = "^mailer|^da?emon|^post.*mast|^root|^wpuser|^mmdf|^smt.*|\\$emd|^mrgate|^vmmail|^mail.*system|^uucp|-maiser-|^mal\@|^mail.*agent|^tcpmail|^bitmail|^mailman";
+$gBounceFroms = "^mailer|^da?emon|^post.*mast|^root|^wpuser|^mmdf|^smt.*|^mrgate|^vmmail|^mail.*system|^uucp|-maiser-|^mal\@|^mail.*agent|^tcpmail|^bitmail|^mailman";

diff --git a/scripts/errorlib.in b/scripts/errorlib.in
index 9c5f55001a277debd33109468d2ebdceaa5195f0..fc775643d0f38e8ae58a881a2405dce0878dfed2 100755 (executable)
--- a/scripts/errorlib.in
+++ b/scripts/errorlib.in
@@ -1,5 +1,5 @@
 # -*- perl -*-
-# $Id: errorlib.in,v 1.2 1999/09/02 22:27:29 gecko Exp $
+# $Id: errorlib.in,v 1.3 1999/12/01 18:04:01 gecko Exp $
 
 sub F_SETLK { 6; } sub F_WRLCK{ 1; }
 $flockstruct= 'sslll'; # And there ought to be something for this too.
@@ -35,6 +35,7 @@ sub lockreadbug {
     chop($s_mergedwith= <S>);
     chop($s_severity= <S>);
     close(S);
+       $s_severity = 'normal' if $s_severity eq '';
     return 1;
 }
 

diff --git a/scripts/service.in b/scripts/service.in
index 9aae39be56c9629065048e65927d1447f83a0de2..8d0409e99b0ceed04ed3e686fe3253adc64e4359 100755 (executable)
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# $Id: service.in,v 1.8 1999/09/20 05:40:07 gecko Exp $
+# $Id: service.in,v 1.9 1999/12/01 18:04:01 gecko Exp $
 #
 # Usage: service <code>.nn
 # Temps:  incoming/P<code>.nn
@@ -90,29 +90,29 @@ for ($procline=$i; $procline<=$#msg; $procline++)
     next unless m/\S/; next if m/^\s*\#/;
     &transcript("> $_\n");
     $action= '';
-    if (m/^stop$/ || m/^quit$/ || m/^--/ || m/^thank/) 
+    if (m/^stop\s/i || m/^quit\s/i || m/^--/ || m/^thank\s/i) 
        {       &transcript("Stopping processing here.\n\n");
         last;
-    } elsif (m/^debug\s+(\d+)$/ && $1 >= 0 && $1 <= 1000) {
+    } elsif (m/^debug\s+(\d+)$/i && $1 >= 0 && $1 <= 1000) {
         $dl= $1+0;
         &transcript("Debug level $dl.\n\n");
-    } elsif (m/^(send|get)\s+\#?(\d{3,})$/) {
+    } elsif (m/^(send|get)\s+\#?(\d{2,})$/i) {
         $ref= $2+0; $reffile= $ref; $reffile =~ s,^..,$&/$&,;
         &sendlynxdoc("db/$reffile.html","logs for $gBug#$ref");
-    } elsif (m/^send-detail\s+\#?(\d+)$/) {
+    } elsif (m/^send-detail\s+\#?(\d+)$/i) {
         $ref= $1+0; $reffile= $ref; $reffile =~ s,^..,$&/$&,;
         &sendlynxdoc("db/$reffile-b.html","additional logs for $gBug#$ref");
-    } elsif (m/^index(\s+full)?$/) {
+    } elsif (m/^index(\s+full)?$/i) {
         &sendlynxdoc("db/ix/full.html",'full index');
-    } elsif (m/^index-summary\s+by-package$/) {
+    } elsif (m/^index-summary\s+by-package$/i) {
         &sendlynxdoc("db/ix/psummary.html",'summary index sorted by package/title');
-    } elsif (m/^index-summary(\s+by-number)?$/) {
+    } elsif (m/^index-summary(\s+by-number)?$/i) {
         &sendlynxdoc("db/ix/summary.html",'summary index sorted by number/date');
-    } elsif (m/^index(\s+|-)pack(age)?s?$/) {
+    } elsif (m/^index(\s+|-)pack(age)?s?$/i) {
         &sendlynxdoc("db/ix/packages.html",'index of packages');
-    } elsif (m/^index(\s+|-)maints?$/) {
+    } elsif (m/^index(\s+|-)maints?$/i) {
         &sendlynxdoc("db/ix/maintainers.html",'index of maintainers');
-    } elsif (m/^index(\s+|-)maint\s+(\S.*\S)$/) {
+    } elsif (m/^index(\s+|-)maint\s+(\S.*\S)$/i) {
         $substrg= $2; $matches=0;
         opendir(DBD,"$gWebDir/db/ma") || die $!;
         while (defined($_=readdir(DBD))) {
@@ -147,7 +147,7 @@ for ($procline=$i; $procline<=$#msg; $procline++)
                         "Use \`index-maint' to get list of maintainers.\n\n");
         }
         $ok++;
-    } elsif (m/^index(\s+|-)pack(age)?s?\s+(\S.*\S)$/) {
+    } elsif (m/^index(\s+|-)pack(age)?s?\s+(\S.*\S)$/i) {
         $substrg= $+; $matches=0;
         opendir(DBD,"$gWebDir/db/pa") || die $!;
         while (defined($_=readdir(DBD))) {
@@ -167,13 +167,13 @@ for ($procline=$i; $procline<=$#msg; $procline++)
                         "Use \`index-packages' to get list of packages.\n\n");
         }
         $ok++;
-    } elsif (m/^send-unmatched(\s+this|\s+-?0)?$/) {
+    } elsif (m/^send-unmatched(\s+this|\s+-?0)?$/i) {
         &sendlynxdoc("db/ju/unmatched-1.html","junk (this week)");
-    } elsif (m/^send-unmatched\s+(last|-1)$/) {
+    } elsif (m/^send-unmatched\s+(last|-1)$/i) {
         &sendlynxdoc("db/ju/unmatched-2.html","junk (last week)");
-    } elsif (m/^send-unmatched\s+(old|-2)$/) {
+    } elsif (m/^send-unmatched\s+(old|-2)$/i) {
         &sendlynxdoc("db/ju/unmatched-3.html","junk (two weeks ago)");
-    } elsif (m/^getinfo\s+(\S+)$/) {
+    } elsif (m/^getinfo\s+(\S+)$/i) {
         $file= $1;
         if ($file =~ m/^\./ || $file !~ m/^[-.0-9a-z]+$/ || $file =~ m/\.gz$/) {
             &transcript("Filename $file is badly formatted.\n\n");
@@ -186,20 +186,20 @@ for ($procline=$i; $procline<=$#msg; $procline++)
         } else {
             &transcript("Info file $file does not exist.\n\n");
          }
-    } elsif (m/^help$/) {
+    } elsif (m/^help$/i) {
         &sendhelp;
         &transcript("\n");
         $ok++;
-    } elsif (m/^refcard$/) {
+    } elsif (m/^refcard$/i) {
         &sendtxthelp("bug-mailserver-refcard.txt","mailservers' reference card");
-    } elsif (m/^subscribe/) {
+    } elsif (m/^subscribe/i) {
         &transcript(<<END);
 There is no $gProject $gBug mailing list.  If you wish to review bug reports
 please do so via http://$gWebUrl/ or ask this mailserver
 to send them to you.
 soon: MAILINGLISTS_TEXT
 END
-    } elsif (m/^unsubscribe/) {
+    } elsif (m/^unsubscribe/i) {
         &transcript(<<END);
 soon: UNSUBSCRIBE_TEXT
 soon: MAILINGLISTS_TEXT
@@ -214,7 +214,7 @@ END
             &transcript("Too many unknown commands, stopping here.\n\n");
             last;
         }
-    } elsif (m/^close\s+\#?(\d+)$/) {
+    } elsif (m/^close\s+\#?(\d+)$/i) {
        $ok++;
        $ref= $1;
        if (&setbug) {
@@ -253,7 +253,7 @@ END
                 } while (&getnextbug);
             }
         }
-    } elsif (m/^reassign\s+\#?(\d+)\s+(\S.*\S)$/) {
+    } elsif (m/^reassign\s+\#?(\d+)\s+(\S.*\S)$/i) {
         $ok++;
         $ref= $1; $newpackage= $2;
        $newpackage =~ y/A-Z/a-z/;
@@ -270,10 +270,10 @@ END
                 $s_package= $newpackage;
             } while (&getnextbug);
         }
-    } elsif (m/^reopen\s+\#?(\d+)$/ ? ($noriginator='', 1) :
-             m/^reopen\s+\#?(\d+)\s+\=$/ ? ($noriginator='', 1) :
-             m/^reopen\s+\#?(\d+)\s+\!$/ ? ($noriginator=$replyto, 1) :
-             m/^reopen\s+\#?(\d+)\s+(\S.*\S)$/ ? ($noriginator=$2, 1) : 0) {
+    } elsif (m/^reopen\s+\#?(\d+)$/i ? ($noriginator='', 1) :
+             m/^reopen\s+\#?(\d+)\s+\=$/i ? ($noriginator='', 1) :
+             m/^reopen\s+\#?(\d+)\s+\!$/i ? ($noriginator=$replyto, 1) :
+             m/^reopen\s+\#?(\d+)\s+(\S.*\S)$/i ? ($noriginator=$2, 1) : 0) {
         $ok++;
         $ref= $1;
         if (&setbug) {
@@ -291,7 +291,7 @@ END
                 } while (&getnextbug);
             }
         }
-    } elsif (m/^forwarded\s+\#?(\d+)\s+(\S.*\S)$/) {
+    } elsif (m/^forwarded\s+\#?(\d+)\s+(\S.*\S)$/i) {
         $ok++;
         $ref= $1; $whereto= $2;
         if (&setbug) {
@@ -310,7 +310,7 @@ END
                 $s_forwarded= $whereto;
             } while (&getnextbug);
         }
-    } elsif (m/^notforwarded\s+\#?(\d+)$/) {
+    } elsif (m/^notforwarded\s+\#?(\d+)$/i) {
         $ok++;
         $ref= $1;
         if (&setbug) {
@@ -325,7 +325,7 @@ END
                 } while (&getnextbug);
             }
         }
-    } elsif (m/^severity\s+\#?(\d+)\s+([-0-9a-z]+)$/) {
+    } elsif (m/^severity\s+\#?(\d+)\s+([-0-9a-z]+)$/i) {
         $ok++;
         $ref= $1;
         $newseverity= $2;
@@ -341,7 +341,7 @@ END
                 $s_severity= $newseverity;
             } while (&getnextbug);
         }
-    } elsif (m/^retitle\s+\#?(\d+)\s+(\S.*\S)\s*$/) {
+    } elsif (m/^retitle\s+\#?(\d+)\s+(\S.*\S)\s*$/i) {
         $ok++;
         $ref= $1; $newtitle= $2;
         if (&getbug) {
@@ -358,7 +358,7 @@ END
         } else {
             &notfoundbug;
         }
-    } elsif (m/^unmerge\s+\#?(\d+)$/) {
+    } elsif (m/^unmerge\s+\#?(\d+)$/i) {
        $ok++;
        $ref= $1;
        if (&setbug) {
@@ -377,7 +377,7 @@ END
                 } while (&getnextbug);
            }
        }
-    } elsif (m/^merge\s(\d+(\s+\d+)+)\s*$/) {
+    } elsif (m/^merge\s+(\d+(\s+\d+)+)\s*$/i) {
        $ok++;
         @tomerge= sort { $a <=> $b } split(/\s+/,$1);
         @newmergelist= ();

diff --git a/scripts/text.in b/scripts/text.in
index 12edecf0c249219bd9877ab21b56e96491ffa152..891bd12c56ecd4347b9424c224976f8f8088717f 100644 (file)
--- a/scripts/text.in
+++ b/scripts/text.in
@@ -1,4 +1,4 @@
-# $Id: text.in,v 1.7 1999/11/22 01:35:10 gecko Exp $
+# $Id: text.in,v 1.8 1999/12/01 18:04:01 gecko Exp $
 
 ############################################################################
 #  Here is a blurb to point people to ftp archive of directions.  It is
@@ -122,14 +122,19 @@ $gHTMLSeverityDesc = "<DT><CODE>critical</CODE>
        not been fixed by the person responsible.";
 
 ############################################################################
-# shows up at the end of (most) html pages.  You shouldn't have
+# shows up at the start of (most) html pages.
+############################################################################
+$gHTMLStart = "<BODY>";
+
+############################################################################
+# shows up at the end of (most) html pages.
 ############################################################################
 $gHTMLTail = "<HR><ADDRESS>$gMaintainer /
  <A HREF=\"mailto:$gMaintainerEmail\">$gMaintainerEmail</A>.  Last modifed:
  <!--timestamp-->
  SUBSTITUTE_DTIME
  <!--timestamp-->
- (<A HREF=\"$gWebDomain/ix/zstamp.html\">timestamp page</A> available).
+ (<A HREF=\"http://$gWebDomain/ix/zstamp.html\">timestamp page</A> available).
          
  <P>
  Debian $gBug tracking system<BR>
@@ -153,7 +158,7 @@ $gHTMLExpireNote = "(Closed $gBugs are cleaned out 28 days after the last relate
 ############################################################################
 $gHTMLStamp = "<HTML><HEAD><TITLE>$gProject $gBugs - timestamp page</TITLE>
        <LINK REV=\"made\" HREF=\"mailto:$gMaintainerEmail\">
-       </HEAD><BODY><H1>Is this $gBug log or mirror up to date?</H1>
+       </HEAD>$gHTMLStart<H1>Is this $gBug log or mirror up to date?</H1>
 
        Unlike all the other $gBug pages, this small timestamp page is updated every
        time the update check job runs.  If the timestamp here is recent it\'s
@@ -178,7 +183,6 @@ $gHTMLStamp = "<HTML><HEAD><TITLE>$gProject $gBugs - timestamp page</TITLE>
 ############################################################################
 # Makeup of the indices pages
 ############################################################################
-$gHTMLStart = "<BODY>";
 $gFullIndex = "<HTML><HEAD><TITLE>$gProject $gBugs - full index</TITLE>
        <LINK REV=\"make\" HREF=\"mailto:$gMaintainerEmail\">
        </HEAD>$gHTMLStart<H1>$gProject $gBug report logs - index</H1>