merge changes from mainline

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 51ea552af0a0aa414b4917be01c2910ed754a15b..ef397b4bcd2a142392df5d3eecb5bb39c8eaf7a1 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -428,6 +428,7 @@ sub handle_record{
          # Incomming Mail Message
          my ($received,$hostname) = $record->{text} =~ m/Received: \(at (\S+)\) by (\S+)\;/;
          $output .= qq|<hr><p class="msgreceived"><a name="$msg_number"></a><a name="msg$msg_number">Message received</a> at |.
+         $output .= qq|<hr><p class="msgreceived"><a name="$msg_number"><a name="msg$msg_number">Message received</a> at |.
               htmlsanit("$received\@$hostname") . q| (<a href="| . bugurl($ref, "msg=$msg_number") . '">full text</a>'.q|, <a href="| . bugurl($ref, "msg=$msg_number") . ';mbox=yes">mbox</a>)'.":</p>\n";
          $output .= handle_email_message($record->{text},
                                    ref        => $bug_number,

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 30284baa66ac2d0d8cd5406230ce98399c342486..c89ded45271e49acf893be0486d1d8169abdf21d 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -942,12 +942,13 @@ sub pkg_htmlselectarch {
 }
 
 sub myurl {
-    return pkg_etc_url($pkg, "pkg", 0) if defined($pkg);
-    return pkg_etc_url($src, "src", 0) if defined($src);
-    return pkg_etc_url($maint, "maint", 0) if defined($maint);
-    return pkg_etc_url($submitter, "submitter", 0) if defined($submitter);
-    return pkg_etc_url($severity, "severity", 0) if defined($severity);
-    return pkg_etc_url($tag, "tag", 0) if defined($tag);
+     return urlsanit('pkgreport.cgi?'.
+                    join(';',
+                         (map {("$_=$param{$_}")
+                                           } keys %param
+                         )
+                        )
+                   );
 }
 
 sub make_order_list {

diff --git a/debian/changelog b/debian/changelog
index b7536a57febb04b21cb14200de75b7eed863ad0f..5708cbd09ddf936707f87a3c25aa91465a779963 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -138,6 +138,10 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Fix javascript error in pkgreport.cgi (closes: #346043)
     - When a bug can't be found in control@; indicate to user that it may
       be archived. (closes: #153536)
+    - my_url in pkgreport.cgi now returns the complete url (closes: #378566)
+    - Document precisely how forwarded works (closes: #228049)
+    - Dissallow forwarded being set to a $gEmailDomain address
+      (closes: #397486)
     - Fix broken sorting by usertags by forcing numeric (closes: #395027)
 
   

diff --git a/html/Developer.html.in b/html/Developer.html.in
index 8f8e7881fdc85e5208ea0ef40bc17566fdd0c50f..d876d91dbaa9ceec1cd07922b6b1ff0d01cb7b10 100644 (file)
--- a/html/Developer.html.in
+++ b/html/Developer.html.in
@@ -123,8 +123,9 @@ they should note this in the $gBug tracking system as follows:
 
 <p>Make sure that the <code>To</code> field of your message to the author
 has only the author(s) address(es) in it; put both the person who
-reported the $gBug and
-<var>nnn</var><code>-forwarded\@$gEmailDomain</code> in the
+reported the $gBug, 
+<var>nnn</var><code>-forwarded\@$gEmailDomain</code> and
+<var>nnn</var><code>\@$gEmailDomain</code> in the
 <code>CC</code> field.
 
 <p>Ask the author to preserve the <code>CC</code> to

diff --git a/scripts/process.in b/scripts/process.in
index 6569260f0514b5fa920433f71b75285c3411f582..bdeec7f72609d990e10b20ebc5023ee95eb99819 100755 (executable)
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -283,6 +283,10 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
         $receivedat= "forwarded\@$gEmailDomain";
         $markaswhat= 'forwarded';
         $set_forwarded= $header{'to'};
+       # Dissallow forwarded being set to this bug tracking system
+       if (defined $set_forwarded and $set_forwarded =~ /\Q$gEmailDomain\E/) {
+            undef $set_forwarded;
+       }
        if ( length( $gListDomain ) > 0 && length( $gForwardList ) > 0 ) {
            push @generalcc, "$gForwardList\@$gListDomain";
            $generalcc= "$gForwardList\@$gListDomain";

diff --git a/t/03_versions.t b/t/03_versions.t
new file mode 100644 (file)
index 0000000..ace98ce
--- /dev/null
+++ b/t/03_versions.t
@@ -0,0 +1,30 @@
+# -*- mode: cperl;-*-
+
+use Test::More tests => 3;
+
+use warnings;
+use strict;
+
+use Storable qw(dclone);
+
+# First, lets create a dataset for the illustrious foo package
+
+my %data = (package => q(foo),
+           found_versions   => ['bar/1.00',
+                                '1.00',
+                                '1.34',
+                               ],
+           fixed_versions   => ['bar/1.02',
+                                '1.45',
+                               ],
+          );
+
+
+require_ok('scripts/errorlib.in');
+# check removefoundversions
+my $data = dclone(\%data);
+removefoundversions($data,$data->{package},'1.00');
+is_deeply($data->{found_versions},['1.34'],'removefoundversions removes all 1.00 versions');
+$data = dclone(\%data);
+removefoundversions($data,$data->{package},'bar/1.00');
+is_deeply($data->{found_versions},['1.00','1.34'],'removefoundversions removes only bar/1.00 versions');