merge changes from dla mainline

diff --combined scripts/process.in
index 90de6634706cbb3cbf8daa37fad5a787c9e87f88,efdfe470e7a41651ef65bf4e1ff64ed8de55794a..cb02aefb57ce2ca6dd521f43e1fa6cdc64995d8b
--- 1/scripts/process.in
--- 2/scripts/process.in
+++ b/scripts/process.in
@@@ -4,9 -4,7 +4,7 @@@
  # Usage: process nn
  # Temps:  incoming/Pnn
  
- use POSIX qw(strftime tzset);
- $ENV{"TZ"} = 'UTC';
- tzset();
+ use POSIX qw(strftime);
  
  use MIME::Parser;
  use Debbugs::MIME qw(decode_rfc1522 create_mime_message);
@@@ -14,14 -12,16 +12,16 @@@ use Debbugs::Mail qw(send_mail_message 
  use Debbugs::Packages qw(getpkgsrc);
  use Debbugs::User qw(read_usertags write_usertags);
  
- my $config_path = '/etc/debbugs';
- my $lib_path = '/usr/lib/debbugs';
+ use HTML::Entities qw(encode_entities);
  
  # TODO DLA; needs config reworking and errorlib reworking
  # use warnings;
  # use strict;
  
- require "$config_path/config";
+ use Debbugs::Status qw(:versions);
+ use Debbugs::Config qw(:globals);
+ my $lib_path = $gLibPath;
+ 
  require "$lib_path/errorlib";
  $ENV{'PATH'} = $lib_path.':'.$ENV{'PATH'};
  
@@@ -152,7 -152,7 +152,7 @@@ for my $phline (@bodylines
      print DEBUG ">$fn|$fv|\n";
      $fn = lc $fn;
      # Don't lc owner or forwarded
-     $fv = lc $fv unless $fh =~ /^(?:owner|forwarded|usertags)$/;
+     $fv = lc $fv unless $fh =~ /^(?:owner|forwarded|usertags|version|source-version)$/;
      $pheader{$fn} = $fv;
      print DEBUG ">$fn~$fv<\n";
  }
@@@ -672,7 -672,7 +672,7 @@@ EN
                        $user_tags{$tag} = [keys %bugs_with_tag];
                   }
              }
 -            write_usertags(\%usertags,$user);
 +            write_usertags(\%user_tags,$user);
         }
         else {
              $brokenness .=<<END;
@@@ -775,7 -775,7 +775,7 @@@ EN
      &htmllog($newref ? "Report" : "Information", "forwarded",
               join(', ',"$gSubmitList\@$gListDomain",@resentccs),
               "<code>$gBug#$ref</code>".
-              (length($data->{package})? "; Package <code>".&sani($data->{package})."</code>" : '').
+              (length($data->{package})? "; Package <code>".encode_entities($data->{package})."</code>" : '').
               ".");
      &sendmessage(<<END,["$gSubmitList\@$gListDomain",@resentccs],[@bccs]);
  Subject: $gBug#$ref: $newsubject
@@@ -798,13 -798,13 +798,13 @@@ EN
          &htmllog($newref ? "Report" : "Information", "forwarded",
                   $resentccval,
                   "<code>$gBug#$ref</code>".
-                  (length($data->{package}) ? "; Package <code>".&sani($data->{package})."</code>" : '').
+                  (length($data->{package}) ? "; Package <code>".encode_entities($data->{package})."</code>" : '').
                   ".");
      } else {
          &htmllog($newref ? "Report" : "Information", "stored",
                   "",
                   "<code>$gBug#$ref</code>".
-                  (length($data->{package}) ? "; Package <code>".&sani($data->{package})."</code>" : '').
+                  (length($data->{package}) ? "; Package <code>".encode_entities($data->{package})."</code>" : '').
                   ".");
      }
      &sendmessage(<<END,[@resentccs],[@bccs]);
@@@ -822,10 -822,10 +822,10 @@@ ${source_pr_header}$fw
  END
  }
  
- $htmlbreak= length($brokenness) ? "<p>\n".&sani($brokenness)."\n<p>\n" : '';
+ $htmlbreak= length($brokenness) ? "<p>\n".encode_entities($brokenness)."\n<p>\n" : '';
  $htmlbreak =~ s/\n\n/\n<P>\n\n/g;
  if (length($resentccval)) {
-     $htmlbreak = "  Copy sent to <code>".&sani($resentccval)."</code>.".
+     $htmlbreak = "  Copy sent to <code>".encode_entities($resentccval)."</code>.".
          $htmlbreak;
  }
  unless (exists $header{'x-debbugs-no-ack'}) {
@@@ -1090,7 -1090,7 +1090,7 @@@ sub htmllog 
      print(AP
            "\6\n".
            "<strong>$whatobj $whatverb</strong>".
-           ($where eq '' ? "" : " to <code>".&sani($where)."</code>").
+           ($where eq '' ? "" : " to <code>".encode_entities($where)."</code>").
            ":<br>\n". $desc.
            "\n\3\n") || &quit("writing db-h/$hash/$ref.log (lh): $!");
      close(AP) || &quit("closing db-h/$hash/$ref.log (lh): $!");