merge changes from dla source branch

[debbugs.git] / scripts / receive.in

diff --git a/scripts/receive.in b/scripts/receive.in
index 873b122f40376f2f1d995fe850911efa2e6e38a7..eb101a4029fe5cf681c1c5f2b6fe60ceb8c62c61 100755 (executable)
--- a/scripts/receive.in
+++ b/scripts/receive.in
@@ -5,11 +5,9 @@
 #set umask in order to have group-writable incoming/*
 #umask(002);
 
-#load configuration file
-$config_path = '/etc/debbugs';
-#$lib_path = '/usr/lib/debbugs';
+use Debbugs::Config qw(:globals :text);
+my $lib_path = $gLibPath;
 
-require "$config_path/config";
 $ENV{'PATH'} = '/usr/lib/debbugs:'.$ENV{'PATH'};
 
 #set source of mail delivery
@@ -28,7 +26,6 @@ if ( $gMailer eq 'exim' )
        s/\>//;
        s/\<//;
 }
-require("/etc/debbugs/text");
 
 #remove everything from @ to end of line
 s/\@.*$//;
@@ -67,7 +64,7 @@ y/A-Z/a-z/;
 if (s/^(\d{1,9})\b//) {
     $bugnumber= $1;
     if (not exists $withbugaddressmap{$_} and
-/-(?:(?:un)?subscribe|subhelp|ignore|(?:sub(?:yes|approve|reject)
+/-(?:(?:un)?subscribe|subhelp|help|ignore|(?:sub(?:yes|approve|reject)
  |unsubyes|bounce|probe|approve|reject|
  setlistyes|setlistsilentyes).*)/x
        ) {