[project @ 2004-02-27 02:05:17 by cjwatson]

Sanitize $data->{package} before using it as a local-part
@$gSubscriptionDomain; exim barfs messily otherwise and we end up with
half-written .log records (#191306 and perhaps others).

diff --git a/scripts/process.in b/scripts/process.in
index 7ce07e3c3756e39c8a0d00896d89fafd03d7a399..8bc235017f122dde5fec42580ebf61496bc557cf 100755 (executable)
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: process.in,v 1.84 2003/09/18 17:31:48 cjwatson Exp $
+# $Id: process.in,v 1.85 2004/02/27 02:05:17 cjwatson Exp $
 #
 # Usage: process nn
 # Temps:  incoming/Pnn
@@ -1088,6 +1088,9 @@ sub checkmaintainers {
     $anymaintfound=0; $anymaintnotfound=0;
     for $p (split(m/[ \t?,():]+/,$data->{package})) {
         $p =~ y/A-Z/a-z/;
+       $p =~ /([a-z0-9.+-]+)/;
+       $p = $1;
+       next unless defined $p;
        if (defined $gSubscriptionDomain) {
            if (defined($pkgsrc{$p})) {
                push @addsrcaddrs, "$pkgsrc{$p}\@$gSubscriptionDomain";

diff --git a/scripts/service.in b/scripts/service.in
index 9f2e39c880a658f520d64c967a475de957556fbe..2a4f28b928e8f28c809542b9975ad6c45c1f7f8f 100755 (executable)
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: service.in,v 1.95 2004/02/03 21:37:45 cjwatson Exp $
+# $Id: service.in,v 1.96 2004/02/27 02:05:17 cjwatson Exp $
 #
 # Usage: service <code>.nn
 # Temps:  incoming/P<code>.nn
@@ -1054,12 +1054,14 @@ sub addmaintainers {
     # Data structure is:
     #   maintainer email address &c -> assoc of packages -> assoc of bug#'s
     my $data = shift;
-    my ($p, $addmaint, $pshow);
+    my ($p, $addmaint);
     &ensuremaintainersloaded;
     $anymaintfound=0; $anymaintnotfound=0;
     for $p (split(m/[ \t?,():]+/, $data->{package})) {
        $p =~ y/A-Z/a-z/;
-        $pshow= ($p =~ m/[-+.a-z0-9]+/ ? $& : '');
+       $p =~ /([a-z0-9.+-]+)/;
+       $p = $1;
+       next unless defined $p;
        if (defined $gSubscriptionDomain) {
            if (defined($pkgsrc{$p})) {
                addbcc("$pkgsrc{$p}\@$gSubscriptionDomain");