merge changes from dla source tree

diff --git a/Debbugs/Config.pm b/Debbugs/Config.pm
index 9b2792a2972c8aa44889c38b71f6145de63c8941..68dd507abdfe81916d8c0587e777bcc3c3d146fe 100644 (file)
--- a/Debbugs/Config.pm
+++ b/Debbugs/Config.pm
@@ -348,6 +348,34 @@ set_default(\%config,'removal_default_distribution_tags',
            [qw(unstable testing)]
           );
 
+=item package_name_re
+
+The regex which will match a package name
+
+Default: '[a-z0-9][a-z0-9\.+-]+'
+
+=cut
+
+set_default(\%config,'package_name_re',
+           '[a-z0-9][a-z0-9\.+-]+');
+
+=item package_version_re
+
+The regex which will match a package version
+
+Default: '[A-Za-z0-9:+\.-]+'
+
+=cut
+
+set_default(\%config,'package_version_re',
+           '[A-Za-z0-9:+\.-]+');
+
+
+
+
+
+
+
 set_default(\%config,'default_severity','normal');
 set_default(\%config,'show_severities','critical, grave, normal, minor, wishlist');
 set_default(\%config,'strong_severities',[qw(critical grave)]);

diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm
index c78e58559c7eca270504225ac6702d9b99a061ec..22d818345e5ad35432537739fba6e4fff32d91e8 100644 (file)
--- a/Debbugs/Status.pm
+++ b/Debbugs/Status.pm
@@ -48,7 +48,7 @@ BEGIN{
                     read   => [qw(readbug read_bug lockreadbug)],
                     write  => [qw(writebug makestatus unlockwritebug)],
                     versions => [qw(addfoundversions addfixedversions),
-                                 qw(removefoundversions)
+                                 qw(removefoundversions removefixedversions)
                                 ],
                     hook     => [qw(bughook bughook_archive)],
                    );

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 26d5f80ad47a9007e86f3ab0b311b18afabbf961..1d0e41374d2feb83a6c5f9c0d7e1eb9d6ff7647f 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -277,7 +277,7 @@ if (defined $pkg) {
                              return 0;
                         })};
   } else {
-       @bugs = get_bugs(maint=>[split /,/,$maint]);
+       @bugs = get_bugs(maint=>[map {lc ($_)} split /,/,$maint]);
   }
 } elsif (defined $maintenc) {
   my %maintainers = %{getmaintainers()};
@@ -296,7 +296,7 @@ if (defined $pkg) {
   add_user($submitter);
   $title = "submitter $submitter";
   $title .= " in $dist" if defined $dist;
-  my @submitters = split /,/, $submitter;
+  my @submitters = map {lc ($_)} split /,/, $submitter;
   @bugs = get_bugs(submitter => \@submitters);
 } elsif (defined($severity) && defined($status)) {
   $title = "$status $severity bugs";
@@ -333,7 +333,7 @@ if (defined $pkg) {
 elsif (defined $owner) {
      $title = "bugs owned by $owner";
      $title .= " in $dist" if defined $dist;
-     my @owners = split /,/, $owner;
+     my @owners = map {lc ($_)} split /,/, $owner;
      my %bugs = ();
      @bugs = get_bugs(owner=>\@owners);
 

diff --git a/debian/changelog b/debian/changelog
index 601b0fea6f13b56bba22df8a91b500a9bc4da905..829afd299344de4e15250fbf13e239089c3a7b9b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -164,6 +164,8 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Make e-mail addresses case insensitive for searching
       (closes: #89569)
     - pkgindex.cgi limits its output with pagination (closes: #23018)
+    - lc submitter address for comparsion in pkgreport.cgi
+      (closes: #415628)
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100

diff --git a/scripts/service.in b/scripts/service.in
index e5074d329ad053ae5b2e99f6abdd54bf891f1059..d4e8e98ed6d066bab95db98f659567d0f40a6c1b 100755 (executable)
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -11,7 +11,7 @@ use Debbugs::Mail qw(send_mail_message);
 use Debbugs::User;
 use HTML::Entities qw(encode_entities);
 
-use Debbugs::Config qw(:globals);
+use Debbugs::Config qw(:globals :config);
 use Debbugs::CGI qw(html_escape);
 $lib_path = $gLibPath;
 require "$lib_path/errorlib";
@@ -507,7 +507,9 @@ END
                 } while (&getnextbug);
             }
         }
-    } elsif (m/^found\s+\#?(-?\d+)(?:\s+(\d.*))?$/i) {
+    } elsif (m{^found\s+\#?(-?\d+)
+              (?:\s+(?:$config{package_name_re}\/)?
+                   ($config{package_version_re}))?$}ix) {
         $ok++;
         $ref= $1;
         $version= $2;
@@ -560,8 +562,43 @@ END
                 &addmaintainers($data);
                 removefoundversions($data, $data->{package}, $version, 'binary');
             } while (&getnextbug);
-        }
-    } elsif (m/^submitter\s+\#?(-?\d+)\s+\!$/i ? ($newsubmitter=$replyto, 1) :
+       }
+   }
+    elsif (m[^fixed\s+\#?(-?\d+)\s+
+            ((?:$config{package_name_re}\/)?
+                 $config{package_version_re})\s*$]ix) {
+        $ok++;
+        $ref= $1;
+        $version= $2;
+        if (&setbug) {
+            $action=
+                 defined($version) ?
+                      "$gBug marked as fixed in version $version." :
+                           "$gBug reopened.";
+                do {
+                    &addmaintainers($data);
+                    addfixedversions($data, $data->{package}, $version, 'binary');
+              } while (&getnextbug);
+       }
+   }
+    elsif (m[^notfixed\s+\#?(-?\d+)\s+
+            ((?:$config{package_name_re}\/)?
+                 $config{package_version_re})\s*$]ix) {
+        $ok++;
+        $ref= $1;
+        $version= $2;
+        if (&setbug) {
+            $action=
+                 defined($version) ?
+                      "$gBug marked as not fixed in version $version." :
+                           "$gBug reopened.";
+                do {
+                    &addmaintainers($data);
+                    removefixedversions($data, $data->{package}, $version, 'binary');
+              } while (&getnextbug);
+       }
+   }
+    elsif (m/^submitter\s+\#?(-?\d+)\s+\!$/i ? ($newsubmitter=$replyto, 1) :
              m/^submitter\s+\#?(-?\d+)\s+(\S.*\S)$/i ? ($newsubmitter=$2, 1) : 0) {
         $ok++;
         $ref= $1;

diff --git a/t/06_mail_handling.t b/t/06_mail_handling.t
index c5be8477c87af4633bc13308c7531dde2b4aec90..01d4bc0d34ad65f1ed258d3897c023148f9220ea 100644 (file)
--- a/t/06_mail_handling.t
+++ b/t/06_mail_handling.t
@@ -1,7 +1,7 @@
 # -*- mode: cperl;-*-
 # $Id: 05_mail.t,v 1.1 2005/08/17 21:46:17 don Exp $
 
-use Test::More tests => 31;
+use Test::More tests => 37;
 
 use warnings;
 use strict;
@@ -135,6 +135,16 @@ my @control_commands =
                             status_key => 'found_versions',
                             status_value => [],
                            },
+      'fixed_1.1'        => {command => 'fixed',
+                            value   => '1.1',
+                            status_key => 'fixed_versions',
+                            status_value => ['1.1'],
+                           },
+      'notfixed_1.1'     => {command => 'notfixed',
+                            value   => '1.1',
+                            status_key => 'fixed_versions',
+                            status_value => [],
+                           },
       submitter_foo      => {command => 'submitter',
                             value   => 'foo@bar.com',
                             status_key => 'originator',