From 90715b03ecd21d542a72a23870024d1fb28ca6c0 Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Fri, 19 Oct 2012 09:42:03 -0700
Subject: [PATCH] Fix lack of archive support in pkgindex.cgi.

---
 cgi/pkgindex.cgi | 20 +++++++++++++++-----
 debian/changelog |  1 +
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/cgi/pkgindex.cgi b/cgi/pkgindex.cgi
index 855e3fb..a0e91ae 100755
--- a/cgi/pkgindex.cgi
+++ b/cgi/pkgindex.cgi
@@ -67,7 +67,9 @@ my %htmldescrip = ();
 my %sortkey = ();
 if ($indexon eq "pkg") {
   $tag = "package";
-  %count = count_bugs(function => sub {my %d=@_; return splitpackages($d{"pkg"})});
+  %count = count_bugs(function => sub {my %d=@_; return splitpackages($d{"pkg"})},
+		     archive => $archive,
+		     );
   if (defined $param{first}) {
        %count = map {
 	    if (/^\Q$param{first}\E/) {
@@ -106,7 +108,9 @@ if ($indexon eq "pkg") {
                           return map {
                             $pkgsrc->{$_} || $_
                           } splitpackages($d{"pkg"});
-                         });
+                         },
+		     archive => $archive,
+		     );
   $note = "";
   foreach my $src (keys %count) {
     $sortkey{$src} = lc $src;
@@ -129,7 +133,9 @@ if ($indexon eq "pkg") {
                             }
                             map { $_->address } @me;
                           } splitpackages($d{"pkg"});
-                         });
+                         },
+		     archive => $archive,
+		     );
   if (defined $param{first}) {
        %count = map {
 	    if (/^\Q$param{first}\E/) {
@@ -157,7 +163,9 @@ if ($indexon eq "pkg") {
                               unless exists $fullname{$addr->address};
                           }
                           map { $_->address } @se;
-                         });
+                         },
+		     archive => $archive,
+		     );
   if (defined $param{first}) {
        %count = map {
 	    if (/^\Q$param{first}\E/) {
@@ -179,7 +187,9 @@ if ($indexon eq "pkg") {
   $note .= "different addresses.</p>\n";
 } elsif ($indexon eq "tag") {
   $tag = "tag";
-  %count = count_bugs(function => sub {my %d=@_; return split ' ', $d{tags}; });
+  %count = count_bugs(function => sub {my %d=@_; return split ' ', $d{tags}; },
+		      archive => $archive,
+		     );
   if (defined $param{first}) {
        %count = map {
 	    if (/^\Q$param{first}\E/) {
diff --git a/debian/changelog b/debian/changelog
index 33fe18a..9288124 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ debbugs (2.4.2~exp2) UNRELEASED; urgency=low
     Gabriel.
   * Only remove list headers if the message appears to have traversed a
     mailing list to get to us. (closes: #690408)
+  * Fix lack of archive support in pkgindex.cgi.
 
   [Thanks to Arnout Engelen: ]
   * Add Homepage (closes: #670555).
-- 
2.39.2