Re: Cherry-pick debbug commits from my branch(?)

Mike Gabriel <[email protected]>
Newsgroups gmane.linux.debian.devel.debbugs
Message-ID <[email protected]> 
Hi Don,

On Mo 10 Sep 2012 19:09:23 CEST Don Armstrong wrote:

> On Mon, 10 Sep 2012, Mike Gabriel wrote:
>> What will be best practice here? One Debian BTS issue per Git
>> commit? Or you check my commits and cherry pick?
>
> Please just send patches to this mailing list using git format-patch.

Attached you find a series of patches. I use dch+debcommit for  
/debian/changelog maintenance, so all patches have an entry in  
/debian/changelog of the debbugs package. The last patch does some  
cleaning up of entries I made in /debian/changelog. Hope, this is ok.

I also realized further issues (e.g. debbugs user needed for postfix,  
a special transport map file needed when postfix is used as MTA,  
etc.). So there will be more patches coming, I guess.

Greets,
Mike

-- 

DAS-NETZWERKTEAM
mike gabriel, rothenstein 5, 24214 neudorf-bornstein
fon: +49 (1520) 1976 148

GnuPG Key ID 0x25771B31
mail: [email protected], http://das-netzwerkteam.de

freeBusy:
https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb
0001-Load-bugs.css-file-in-documentation-html-pages.patch (text/x-patch, 4.2 KB) 
>From 8c43133209896a77254086bfceaf19ff701e65ed Mon Sep 17 00:00:00 2001
From: Mike Gabriel <[email protected]>
Date: Sat, 8 Sep 2012 22:24:04 +0200
Subject: [PATCH 01/11] Load bugs.css file in documentation html pages.

---
 debian/changelog            |    6 +++++-
 html/Access.html.in         |    1 +
 html/Developer.html.in      |    1 +
 html/Reporting.html.in      |    1 +
 html/index.html.in          |    1 +
 html/server-control.html.in |    1 +
 html/server-refcard.html.in |    1 +
 html/server-request.html.in |    1 +
 8 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ebab4fd..c1c291e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 debbugs (2.4.2~exp2) UNRELEASED; urgency=low
 
+  [ Don Armstrong ]
   * Hack around elinks css bug (closes: #593804)
   * affects now appends packages by default (closes: #656371). Thanks to
     Andreas Beckmann and Julien Cristau.
@@ -13,7 +14,10 @@ debbugs (2.4.2~exp2) UNRELEASED; urgency=low
   * Add Homepage (closes: #670555).
   * Fix VCS in control (closes: #670556).
   * Link to blocked bugs (closes: #670568).
-  
+
+  [ Mike Gabriel ]
+  * Load bugs.css file in documentation html pages.
+
  -- Don Armstrong <[email protected]>  Wed, 25 Aug 2010 01:57:38 -0700
 
 debbugs (2.4.2~exp1) experimental; urgency=low
diff --git a/html/Access.html.in b/html/Access.html.in
index ec1b747..4465fdd 100644
--- a/html/Access.html.in
+++ b/html/Access.html.in
@@ -4,6 +4,7 @@ $gAccessHtml = <<HTML_END
 <head>
   <title>$gProject $gBugs - Accessing the logs</title>
   <link rev="made" href="mailto:$gMaintainerEmail">
+  <link rel="stylesheet" href="$gWebHostBugDir/css/bugs.css" type="text/css">
 </head>
 <body>
 
diff --git a/html/Developer.html.in b/html/Developer.html.in
index d876d91..4e14355 100644
--- a/html/Developer.html.in
+++ b/html/Developer.html.in
@@ -4,6 +4,7 @@ $gDeveloperHtml = <<HTML_END
 <head>
   <title>$gProject - Developers' information</title>
   <link rev="made" href="mailto:$gMaintainerEmail">
+  <link rel="stylesheet" href="$gWebHostBugDir/css/bugs.css" type="text/css">
 </head>
 <body>
 
diff --git a/html/Reporting.html.in b/html/Reporting.html.in
index 29fa156..caf81ef 100644
--- a/html/Reporting.html.in
+++ b/html/Reporting.html.in
@@ -4,6 +4,7 @@ $gReportingHtml = <<HTML_END
 <head>
   <title>$gProject $gBugs - how to report a $gBug</title>
   <link rev="made" href="mailto:$gMaintainerEmail">
+  <link rel="stylesheet" href="$gWebHostBugDir/css/bugs.css" type="text/css">
 </head>
 <body>
 
diff --git a/html/index.html.in b/html/index.html.in
index 5c87451..d690d1f 100644
--- a/html/index.html.in
+++ b/html/index.html.in
@@ -4,6 +4,7 @@ $gIndexHtml = <<HTML_END
 <head>
   <title>$gProject $gBug tracking system</title>
   <link rev="made" href="mailto:$gMaintainerEmail">
+  <link rel="stylesheet" href="$gWebHostBugDir/css/bugs.css" type="text/css">
 </head>
 <body>
 
diff --git a/html/server-control.html.in b/html/server-control.html.in
index 3c61089..5ded484 100644
--- a/html/server-control.html.in
+++ b/html/server-control.html.in
@@ -4,6 +4,7 @@ $gControlHtml = <<HTML_END
 <head>
   <title>$gProject $gBug system - control mail server commands</title>
   <link rev="made" href="mailto:$gMaintainerEmail">
+  <link rel="stylesheet" href="$gWebHostBugDir/css/bugs.css" type="text/css">
 </head>
 <body>
 
diff --git a/html/server-refcard.html.in b/html/server-refcard.html.in
index c1f09b8..7738a19 100644
--- a/html/server-refcard.html.in
+++ b/html/server-refcard.html.in
@@ -4,6 +4,7 @@ $gRefcardHtml = <<HTML_END
 <head>
   <title>$gProject $gBug system - mail servers' reference card</title>
   <link rev="made" href="mailto:$gMaintainerEmail">
+  <link rel="stylesheet" href="$gWebHostBugDir/css/bugs.css" type="text/css">
 </head>
 <body>
 
diff --git a/html/server-request.html.in b/html/server-request.html.in
index f7f7836..2de3500 100644
--- a/html/server-request.html.in
+++ b/html/server-request.html.in
@@ -4,6 +4,7 @@ $gRequestHtml = <<HTML_END
 <head>
   <title>$gProject $gBug system - $gBug logs by mail server</title>
   <link rev="made" href="mailto:$gMaintainerEmail">
+  <link rel="stylesheet" href="$gWebHostBugDir/css/bugs.css" type="text/css">
 </head>
 <body>
 
-- 
1.7.10
0002-Assure-in-apache.conf-example-that-documentation-htm.patch (text/x-patch, 1.4 KB) 
>From a9ec06380c5f1285cddd6de7003161eca32db701 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <[email protected]>
Date: Sat, 8 Sep 2012 22:27:51 +0200
Subject: [PATCH 02/11] Assure in apache.conf example that documentation html
 pages get loaded.

---
 debian/changelog     |    1 +
 examples/apache.conf |    2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c1c291e..afe3ac0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ debbugs (2.4.2~exp2) UNRELEASED; urgency=low
 
   [ Mike Gabriel ]
   * Load bugs.css file in documentation html pages.
+  * Assure in apache.conf example that documentation html pages get loaded.
 
  -- Don Armstrong <[email protected]>  Wed, 25 Aug 2010 01:57:38 -0700
 
diff --git a/examples/apache.conf b/examples/apache.conf
index e322c0f..7db0dc5 100644
--- a/examples/apache.conf
+++ b/examples/apache.conf
@@ -27,6 +27,8 @@
     RewriteRule ^/severity:([^/]+)$ /cgi-bin/pkgreport.cgi?severity=$1 [L,R,NE]
     RewriteRule ^/tag:([^/]+)$ /cgi-bin/pkgreport.cgi?tag=$1 [L,R,NE]
     # RewriteMap fix-chars	int:noescape
+    RewriteCond %{REQUEST_URI} ^/(Access\.html|Developer\.html|Reporting\.html|server-request\.html|server-control\.html|server-refcard\.html).* [NC]
+    RewriteRule .* - [L]
     RewriteRule ^/([^/]+)$ /cgi-bin/pkgreport.cgi?pkg=$1 [L,R,NE]
     <IfModule mod_perl.c>
 	<Directory /org/bugs.debian.org/cgi-bin/sql>
-- 
1.7.10
0003-Rewrite-rule-example-http-webhost-nnn-show-bug-repor.patch (text/x-patch, 1.4 KB) 
>From 0ec3707781c29961101b94be8540bb3f4ed549c3 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <[email protected]>
Date: Sat, 8 Sep 2012 22:31:15 +0200
Subject: [PATCH 03/11] Rewrite rule example: http://<webhost>/<nnn> -> show
 bug report for bug <nnn>.

---
 debian/changelog     |    2 ++
 examples/apache.conf |    1 +
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index afe3ac0..3f84594 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ debbugs (2.4.2~exp2) UNRELEASED; urgency=low
   [ Mike Gabriel ]
   * Load bugs.css file in documentation html pages.
   * Assure in apache.conf example that documentation html pages get loaded.
+  * Rewrite rule example: http://<webhost>/<nnn> -> show bug report for
+    bug <nnn>.
 
  -- Don Armstrong <[email protected]>  Wed, 25 Aug 2010 01:57:38 -0700
 
diff --git a/examples/apache.conf b/examples/apache.conf
index 7db0dc5..a09086b 100644
--- a/examples/apache.conf
+++ b/examples/apache.conf
@@ -29,6 +29,7 @@
     # RewriteMap fix-chars	int:noescape
     RewriteCond %{REQUEST_URI} ^/(Access\.html|Developer\.html|Reporting\.html|server-request\.html|server-control\.html|server-refcard\.html).* [NC]
     RewriteRule .* - [L]
+    RewriteRule ^/([0-9]+)$ /cgi-bin/bugreport.cgi?bug=$1 [L,R,NE]
     RewriteRule ^/([^/]+)$ /cgi-bin/pkgreport.cgi?pkg=$1 [L,R,NE]
     <IfModule mod_perl.c>
 	<Directory /org/bugs.debian.org/cgi-bin/sql>
-- 
1.7.10
0004-Fix-sani-function-in-scripts-errorlib.-Generate-html.patch (text/x-patch, 1.3 KB) 
>From 48efcc9948f368768e363870f00f28938f5670e9 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <[email protected]>
Date: Sat, 8 Sep 2012 22:34:11 +0200
Subject: [PATCH 04/11] Fix sani function in scripts/errorlib. Generate html
 entities correctly (prepend ampersand, append
 semicolon).

---
 debian/changelog |    2 ++
 scripts/errorlib |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3f84594..a9a6339 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ debbugs (2.4.2~exp2) UNRELEASED; urgency=low
   * Assure in apache.conf example that documentation html pages get loaded.
   * Rewrite rule example: http://<webhost>/<nnn> -> show bug report for
     bug <nnn>.
+  * Fix sani function in scripts/errorlib. Generate html entities correctly
+    (prepend ampersand, append semicolon).
 
  -- Don Armstrong <[email protected]>  Wed, 25 Aug 2010 01:57:38 -0700
 
diff --git a/scripts/errorlib b/scripts/errorlib
index a2e9016..0b88d6a 100755
--- a/scripts/errorlib
+++ b/scripts/errorlib
@@ -18,7 +18,7 @@ sub unlockreadbugmerge {
 sub sani {
     my ($in) = @_;
     carp "You should be using HTML::Entities instead.";
-    $in =~ s/([<>&"])/$saniarray{$1}/g;
+    $in =~ s/([<>&"])/\&$saniarray{$1};/g;
     return $in;
 }
 
-- 
1.7.10
0005-Be-more-generic-comment-out-rewrite-rule-that-direct.patch (text/x-patch, 1.5 KB) 
>From 1f8c57e325076a9b1d36006e26ef582036975a73 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <[email protected]>
Date: Sat, 8 Sep 2012 22:41:23 +0200
Subject: [PATCH 05/11] Be more generic, comment out rewrite rule that
 directly redirects http://<debbugs-webhost>/ to
 http://www.debian.org/Bugs.

---
 debian/changelog     |    2 ++
 examples/apache.conf |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a9a6339..5478321 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ debbugs (2.4.2~exp2) UNRELEASED; urgency=low
     bug <nnn>.
   * Fix sani function in scripts/errorlib. Generate html entities correctly
     (prepend ampersand, append semicolon).
+  * Be more generic, comment out rewrite rule that directly redirects
+    http://<debbugs-webhost>/ to http://www.debian.org/Bugs.
 
  -- Don Armstrong <[email protected]>  Wed, 25 Aug 2010 01:57:38 -0700
 
diff --git a/examples/apache.conf b/examples/apache.conf
index a09086b..298472b 100644
--- a/examples/apache.conf
+++ b/examples/apache.conf
@@ -13,7 +13,7 @@
     #  RewriteLog /org/bugs.debian.org/apache-rewrite.log
     #  RewriteLogLevel 0
      
-    RewriteRule ^/$ http://www.debian.org/Bugs/
+    #RewriteRule ^/$ http://www.debian.org/Bugs/
     RewriteRule ^/(robots\.txt|release-critical|apt-listbugs\.html)$ - [L]
     # The following two redirect to up-to-date pages
     RewriteRule ^/[[:space:]]*#?([[:digit:]][[:digit:]][[:digit:]]+)([;&].+)?$ /cgi-bin/bugreport.cgi?bug=$1$2 [L,R,NE]
-- 
1.7.10
0006-Fix-pkgindex.cgi-concerning-several-issues-load-prop.patch (text/x-patch, 4.3 KB) 
>From 319f072013093bfbd36877b4d36c06a078de01c6 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <[email protected]>
Date: Wed, 12 Sep 2012 09:04:49 +0200
Subject: [PATCH 06/11] Fix pkgindex.cgi concerning several issues: load
 proper Perl modules, replace usage of src_url and
 pkg_url by package_links, use html_tail from
 templates, use count_bugs everywhere, load bugs.css,
 fix global variable usage in html header.

---
 cgi/pkgindex.cgi |   25 ++++++++++++++-----------
 debian/changelog |    4 ++++
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/cgi/pkgindex.cgi b/cgi/pkgindex.cgi
index 8adbfb8..8aa133e 100755
--- a/cgi/pkgindex.cgi
+++ b/cgi/pkgindex.cgi
@@ -4,12 +4,14 @@ use warnings;
 use strict;
 use POSIX qw(strftime nice);
 
-use Debbugs::Config;
+use Debbugs::Config qw(:globals :text :config);
 use CGI::Simple;
 use Debbugs::CGI qw(:util :url :html);
-use Debbugs::Common qw(getmaintainers);
+use Debbugs::Common qw(getmaintainers getparsedaddrs);
 use Debbugs::Bugs qw(count_bugs);
 use Debbugs::Status qw(:status);
+use Debbugs::Packages qw(getpkgsrc);
+use Debbugs::Text qw(:templates);
 
 nice(5);
 
@@ -57,9 +59,6 @@ my %maintainers = %{&getmaintainers()};
 my %strings = ();
 
 my $dtime = strftime "%a, %e %b %Y %T UTC", gmtime;
-my $tail_html = '';#$gHTMLTail;
-$tail_html = '';#$gHTMLTail;
-$tail_html =~ s/SUBSTITUTE_DTIME/$dtime/;
 
 my %count;
 my $tag;
@@ -84,6 +83,7 @@ if ($indexon eq "pkg") {
   foreach my $pkg (keys %count) {
     $sortkey{$pkg} = lc $pkg;
     $htmldescrip{$pkg} = sprintf('<a href="%s">%s</a> (%s)',
+                           package_links(package => $pkg, links_only=>1),
                            pkg_url(pkg => $pkg),
                            html_escape($pkg),
                            htmlize_maintlinks(sub { $_[0] == 1 ? 'maintainer: '
@@ -103,7 +103,7 @@ if ($indexon eq "pkg") {
 	    } 
        } keys %count;
   }
-  %count = countbugs(function => sub {my %d=@_;
+  %count = count_bugs(function => sub {my %d=@_;
                           return map {
                             $pkgsrc->{$_} || $_
                           } splitpackages($d{"pkg"});
@@ -112,7 +112,7 @@ if ($indexon eq "pkg") {
   foreach my $src (keys %count) {
     $sortkey{$src} = lc $src;
     $htmldescrip{$src} = sprintf('<a href="%s">%s</a> (%s)',
-                           srcurl($src),
+                           package_links(src => $src, links_only=>1),
                            html_escape($src),
                            htmlize_maintlinks(sub { $_[0] == 1 ? 'maintainer: '
                                                            : 'maintainers: ' },
@@ -223,11 +223,12 @@ print "Content-Type: text/html\n\n";
 
 print "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n";
 print "<HTML><HEAD>\n" . 
-    "<TITLE>$debbugs::gProject$Archived $debbugs::gBug reports by $tag</TITLE>\n" .
+    "<TITLE>$gProject$Archived $gBug reports by $tag</TITLE>\n" .
+    qq(<LINK REL="stylesheet" HREF="$gWebHostBugDir/css/bugs.css" TYPE="text/css">) .
     "</HEAD>\n" .
     '<BODY TEXT="#000000" BGCOLOR="#FFFFFF" LINK="#0000FF" VLINK="#800080">' .
     "\n";
-print "<H1>" . "$debbugs::gProject$Archived $debbugs::gBug report logs by $tag" .
+print "<H1>" . "$gProject$Archived $gBug report logs by $tag" .
       "</H1>\n";
 
 print $note;
@@ -256,6 +257,8 @@ else {
 print $result;
 
 print "<hr>\n";
-print "<p>$tail_html";
-
+print fill_in_template(template=>'html/html_tail',
+                       hole_var => {'&strftime' => \&POSIX::strftime,
+                                   },
+                      );
 print "</body></html>\n";
diff --git a/debian/changelog b/debian/changelog
index 5478321..d8a3941 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,10 @@ debbugs (2.4.2~exp2) UNRELEASED; urgency=low
     (prepend ampersand, append semicolon).
   * Be more generic, comment out rewrite rule that directly redirects
     http://<debbugs-webhost>/ to http://www.debian.org/Bugs.
+  * Fix pkgindex.cgi concerning several issues: load proper Perl modules,
+    replace usage of src_url and pkg_url by package_links, use
+    html_tail from templates, use count_bugs everywhere, load bugs.css,
+    fix global variable usage in html header.
 
  -- Don Armstrong <[email protected]>  Wed, 25 Aug 2010 01:57:38 -0700
 
-- 
1.7.10
0007-debian-control-Add-misc-Depends-to-Depends.patch (text/x-patch, 2.7 KB) 
>From c87743e9bafcda449d49c7a5ca1d443fe8a41958 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <[email protected]>
Date: Mon, 10 Sep 2012 12:16:44 +0200
Subject: [PATCH 07/11] /debian/control: Add ${misc:Depends} to Depends.

---
 debian/changelog |    2 ++
 debian/control   |   19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d8a3941..896a267 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ debbugs (2.4.2~exp2) UNRELEASED; urgency=low
   * Link to blocked bugs (closes: #670568).
 
   [ Mike Gabriel ]
+  * /debian/control:
+    + Add ${misc:Depends} to Depends.
   * Load bugs.css file in documentation html pages.
   * Assure in apache.conf example that documentation html pages get loaded.
   * Rewrite rule example: http://<webhost>/<nnn> -> show bug report for
diff --git a/debian/control b/debian/control
index bafce98..764ad90 100644
--- a/debian/control
+++ b/debian/control
@@ -18,8 +18,11 @@ Homepage: http://wiki.debian.org/Teams/Debbugs
 
 Package: debbugs
 Architecture: all
-Depends: ${perl:Depends}, exim4 | mail-transport-agent,
- libdebbugs-perl
+Depends:
+ ${perl:Depends},
+ ${misc:Depends},
+ exim4 | mail-transport-agent,
+ libdebbugs-perl,
 Recommends: debbugs-web
 Suggests: spamassassin (>= 3.0), libcgi-alert-perl
 Description: The bug tracking system based on the active Debian BTS
@@ -35,7 +38,9 @@ Description: The bug tracking system based on the active Debian BTS
 
 Package: libdebbugs-perl
 Architecture: all
-Depends: ${perl:Depends}, libmailtools-perl, ed, libmime-tools-perl,
+Depends:
+ ${misc:Depends},
+ ${perl:Depends}, libmailtools-perl, ed, libmime-tools-perl,
  libio-stringy-perl, libmldbm-perl, liburi-perl, libsoap-lite-perl,
  libcgi-simple-perl, libparams-validate-perl, libtext-template-perl,
  libsafe-hole-perl, libmail-rfc822-address-perl, liblist-moreutils-perl,
@@ -53,7 +58,9 @@ Description: modules used by the active Debian BTS
 
 Package: debbugs-web
 Architecture: all
-Depends: libdebbugs-perl, apache | httpd
+Depends:
+ ${misc:Depends},
+ libdebbugs-perl, apache | httpd
 Suggests: libcgi-alert-perl
 Description: web scripts for the active Debian BTS
  Debian has a bug tracking system which files details of bugs reported by
@@ -66,7 +73,9 @@ Description: web scripts for the active Debian BTS
 
 Package: debbugs-local
 Architecture: all
-Depends: libdebbugs-perl, debbugs-web, libconfig-simple-perl,
+Depends:
+ ${misc:Depends},
+ libdebbugs-perl, debbugs-web, libconfig-simple-perl,
  libuser-perl, rsync, libhttp-server-simple-perl, libnet-server-perl
 Description: run and maintains a local mirror of the Debian BTS
  Debian has a bug tracking system which files details of bugs reported
-- 
1.7.10
0008-Extend-examples-apache.conf-add-directory-rules.-Esp.patch (text/x-patch, 2.4 KB) 
>From 2c7b0fb5a048a753dfce9c4d20154e18815bcc35 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <[email protected]>
Date: Mon, 10 Sep 2012 13:05:18 +0200
Subject: [PATCH 08/11] Extend examples/apache.conf, add directory rules. Esp.
 allow Indexes to be overridden in
 /var/lib/debbugs/www/db to allow mod_expires apache
 configuration options in .htaccess.

---
 debian/changelog     |    3 +++
 examples/apache.conf |   32 ++++++++++++++++++++++++++++----
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 896a267..a7db9e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,9 @@ debbugs (2.4.2~exp2) UNRELEASED; urgency=low
     replace usage of src_url and pkg_url by package_links, use
     html_tail from templates, use count_bugs everywhere, load bugs.css,
     fix global variable usage in html header.
+  * Extend examples/apache.conf, add directory rules. Esp. allow Indexes to be
+    overridden in /var/lib/debbugs/www/db to allow mod_expires apache
+    configuration options in .htaccess.
 
  -- Don Armstrong <[email protected]>  Wed, 25 Aug 2010 01:57:38 -0700
 
diff --git a/examples/apache.conf b/examples/apache.conf
index 298472b..62a24b9 100644
--- a/examples/apache.conf
+++ b/examples/apache.conf
@@ -1,10 +1,34 @@
 <VirtualHost *>
     ServerName bugs.debian.org
     ServerAdmin [email protected]
-    DocumentRoot /org/bugs.debian.org/www/
-    ScriptAlias /cgi-bin /org/bugs.debian.org/cgi-bin
-    ErrorLog /var/log/apache/bugs.debian.org-error.log
-    CustomLog /var/log/apache/bugs.debian.org-access.log combined
+    DocumentRoot /var/lib/debbugs/www/
+
+    ErrorLog /var/log/apache/debbugs-error.log
+    CustomLog /var/log/apache/debbugs-access.log combined
+
+    <Directory />
+        Options FollowSymLinks
+        AllowOverride None
+    </Directory>
+
+    <Directory /var/lib/debbugs/www>
+        Options -Indexes FollowSymLinks MultiViews
+        AllowOverride Options
+        Order allow,deny
+        allow from all
+    </Directory>
+
+    <Directory /var/lib/debbugs/www/db>
+        AllowOverride Indexes
+    </Directory>
+
+    ScriptAlias /cgi-bin/ /var/lib/debbugs/www/cgi/
+    <Directory "/var/lib/debbugs/www/cgi/">
+        AllowOverride None
+        Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+        Order allow,deny
+        Allow from all
+    </Directory>
 
     RewriteEngine on
     RewriteCond %{HTTP_USER_AGENT}	.*apt-listbugs.*
-- 
1.7.10
0009-Let-generated-index-pages-load-css-file.patch (text/x-patch, 4.6 KB) 
>From bdfb1a5c198bc247257619e3d245ca8df09599aa Mon Sep 17 00:00:00 2001
From: Mike Gabriel <[email protected]>
Date: Mon, 10 Sep 2012 13:09:29 +0200
Subject: [PATCH 09/11] Let generated index pages load css file.

---
 scripts/text |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/text b/scripts/text
index 415aba0..a1a6a00 100644
--- a/scripts/text
+++ b/scripts/text
@@ -199,6 +199,7 @@ $gHTMLExpireNote = "(Closed $gBugs are archived $gRemoveAge days after the last
 $gHTMLStamp = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
 	<HTML><HEAD><TITLE>$gProject $gBugs - timestamp page</TITLE>
 	<LINK REV=\"made\" HREF=\"mailto:$gMaintainerEmail\">
+	<LINK REL=\"stylesheet\" HREF=\"$gWebHostBugDir/css/bugs.css\" TYPE=\"text/css\">
 	</HEAD>$gHTMLStart<H1>Is this $gBug log or mirror up to date?</H1>
 
 	Unlike all the other $gBug pages, this small timestamp page is updated every
@@ -227,6 +228,7 @@ $gHTMLStamp = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
 $gFullIndex = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
 	<HTML><HEAD><TITLE>$gProject $gBugs - full index</TITLE>
 	<LINK REV=\"make\" HREF=\"mailto:$gMaintainerEmail\">
+	<LINK REL=\"stylesheet\" HREF=\"$gWebHostBugDir/css/bugs.css\" TYPE=\"text/css\">
 	</HEAD>$gHTMLStart<H1>$gProject $gBug report logs - index</H1>
 
 	This index gives access to $gBugs sent to <CODE>submit\@$gEmailDomain</CODE>
@@ -244,6 +246,7 @@ $gFullIndex = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
 $gJunkIndex = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
 	<HTML><HEAD><TITLE>$gProject $gBug reports - Junk</TITLE>
 	<LINK REV=\"made\" HREF=\"$gMaintainerEmail\">
+	<LINK REL=\"stylesheet\" HREF=\"$gWebHostBugDir/css/bugs.css\" TYPE=\"text/css\">
 	</HEAD>$gHTMLStart<H1>$gProject $gBug reports - Junk</H1>
 
 	This is the index page for logs of messages not associated with a specific
@@ -259,6 +262,7 @@ $gJunkIndex = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
 $gMaintIndex = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
 	<HTML><HEAD><TITLE>$gProject $gBug reports by maintainer</TITLE>
 	<LINK REF=\"made\" HREF=\"mailto:$gMaintainerEmail\">
+	<LINK REL=\"stylesheet\" HREF=\"$gWebHostBugDir/css/bugs.css\" TYPE=\"text/css\">
 	</HEAD>$gHTMLStart<H1>$gProject $gBug reports by maintainer</H1>
 
 	This page lists the package maintainers against whose packages there are
@@ -278,6 +282,7 @@ $gMaintIndex = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"
 $gPackageIndex = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
 	<HTML><HEAD><TITLE>$gProject $gBug reports by package</TITLE>
 	<LINK REF=\"made\" HREF=\"mailto:$gMaintainerEmail\">
+	<LINK REL=\"stylesheet\" HREF=\"$gWebHostBugDir/css/bugs.css\" TYPE=\"text/css\">
 	</HEAD>$gHTMLStart<H1>$gProject $gBug reports by package</H1>
 
 	This page lists the package against which there are outstanding, forwarded or
@@ -294,6 +299,7 @@ $gPackageIndex = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN
 $gSummaryIndex = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
 	<HTML><HEAD><TITLE>$gProject $gBug report logs - summary index</TITLE>
 	<LINK REF=\"made\" HREF=\"mailto:$gMaintainerEmail\">
+	<LINK REL=\"stylesheet\" HREF=\"$gWebHostBugDir/css/bugs.css\" TYPE=\"text/css\">
 	</HEAD>$gHTMLStart<H1>$gProject $gBug report logs - summary index</H1>
 
 	This summary index briefly lists $gBugs sent to <CODE>submit\@$gEmailDomain
@@ -312,6 +318,7 @@ $gSummaryIndex = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN
 $gPackageLog = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
 	<HTML><HEAD><TITLE>$gProject $gBug report logs - index by package</TITLE>
 	<LINK REF=\"made\" HREF=\"mailto:$gMaintainerEmail\">
+	<LINK REL=\"stylesheet\" HREF=\"$gWebHostBugDir/css/bugs.css\" TYPE=\"text/css\">
 	</HEAD>$gHTMLStart<H1>$gProject $gBug report logs - index by package</H1>
 
 	This summary index briefly lists $gBugs sent to <CODE>submit\@$gEmailDomain
@@ -327,6 +334,7 @@ $gPackageLog = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"
 $gPseudoIndex = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">
 	<HTML><HEAD><TITLE>$gProject $gBug report pseudo-packages</TITLE>
 	<LINK REF=\"made\" HREF=\"mailto:$gMaintainerEmail\">
+	<LINK REL=\"stylesheet\" HREF=\"$gWebHostBugDir/css/bugs.css\" TYPE=\"text/css\">
 	</HEAD>$gHTMLStart<H1>$gProject $gBug report pseudo-packages</H1>
 
 	This page lists the pseudo-packages available for use in the
-- 
1.7.10
0010-Allow-directory-index-for-var-lib-debbugs-www-to-be-.patch (text/x-patch, 787 B) 
>From 9220ef7e2ec88c02882c40be1059708d5b80c8f7 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <[email protected]>
Date: Wed, 12 Sep 2012 08:31:13 +0200
Subject: [PATCH 10/11] Allow directory index for /var/lib/debbugs/www to be
 shown TTW (in apache.conf example).

---
 examples/apache.conf |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/examples/apache.conf b/examples/apache.conf
index 62a24b9..246149f 100644
--- a/examples/apache.conf
+++ b/examples/apache.conf
@@ -22,6 +22,10 @@
         AllowOverride Indexes
     </Directory>
 
+    <Directory /var/lib/debbugs/www/txt>
+        Options +Indexes
+    </Directory>
+
     ScriptAlias /cgi-bin/ /var/lib/debbugs/www/cgi/
     <Directory "/var/lib/debbugs/www/cgi/">
         AllowOverride None
-- 
1.7.10
0011-changelog-cleanup-for-last-commits.patch (text/x-patch, 2.1 KB) 
>From 5e3a5c06e97ddfddb62421eec6f4a80bcc2d2bed Mon Sep 17 00:00:00 2001
From: Mike Gabriel <[email protected]>
Date: Wed, 12 Sep 2012 09:10:46 +0200
Subject: [PATCH 11/11] changelog cleanup for last commits

---
 debian/changelog |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a7db9e0..37e2aa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,21 +18,22 @@ debbugs (2.4.2~exp2) UNRELEASED; urgency=low
   [ Mike Gabriel ]
   * /debian/control:
     + Add ${misc:Depends} to Depends.
+  * /examples/apache.conf:
+    - Assure in apache.conf example that documentation html pages get loaded.
+    - Rewrite rule example: http://<webhost>/<nnn> -> show bug report for
+      bug <nnn>.
+    - Be more generic, comment out rewrite rule that directly redirects
+      http://<debbugs-webhost>/ to http://www.debian.org/Bugs.
+    - Extend examples/apache.conf, add directory rules. Esp. allow Indexes to be
+      overridden in /var/lib/debbugs/www/db to allow mod_expires apache
+      configuration options in .htaccess.
   * Load bugs.css file in documentation html pages.
-  * Assure in apache.conf example that documentation html pages get loaded.
-  * Rewrite rule example: http://<webhost>/<nnn> -> show bug report for
-    bug <nnn>.
   * Fix sani function in scripts/errorlib. Generate html entities correctly
     (prepend ampersand, append semicolon).
-  * Be more generic, comment out rewrite rule that directly redirects
-    http://<debbugs-webhost>/ to http://www.debian.org/Bugs.
   * Fix pkgindex.cgi concerning several issues: load proper Perl modules,
     replace usage of src_url and pkg_url by package_links, use
     html_tail from templates, use count_bugs everywhere, load bugs.css,
     fix global variable usage in html header.
-  * Extend examples/apache.conf, add directory rules. Esp. allow Indexes to be
-    overridden in /var/lib/debbugs/www/db to allow mod_expires apache
-    configuration options in .htaccess.
 
  -- Don Armstrong <[email protected]>  Wed, 25 Aug 2010 01:57:38 -0700
 
-- 
1.7.10
signature.asc (application/pgp-signature, 836 B) 
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iQIcBAABAgAGBQJQUDfoAAoJEJr0azAldxsxqd0QAIe+93wHEsIoV9c9vc91C9+1
Bbkj3w2NDZ4OBKI20daI04NMZMucO51acpPCgg7o6ZfjI5MUihRXfL1i74SE8P7G
yUz6JYhA7uO8cNIS0C/gYG0LMFkM0+c1vJ3uYQO9tgESI41xQbh1bcy/XI+qweDI
1tHFIeIt5Ep1UpIJYlNQ/h3yS0DVy7ZeJj6QBgoTAviHku8G0cKOrM2n8Mq3WyKD
MWd1xUg/OoOayul7XONAjoMSRQ/cV3CY2gxrCgB4wR5EnERoPqP10ZGz3tXZrmi9
zCrb7QXagUKYpVO0RiAYW8H8Ey06E9wyM1DxpyC3Ksos+UcsF6Xy7AtfNTT954J9
hiuWrmcD4V6EmnnxWn1+xqiQXD6fF91wr17IiHcO6RVIoG/c6wXZpG0GpE03z7cm
/bq4wuLaj2lUYCHByQ45LFfcRdYLfH4w/cLo3tJDWCmQ22uSam4GMDYb5XAXLkaV
ppJ+exjQ+GzMArvJ3CtMEhyIgrvdbE6ME3Y6zLSIijqqBox/ch6wYyKFF+eKCpPN
aTwNSIcX6I2gh7+eTAFot2oCJ+PgyY1fahvdUq+yv9HW/2Z6a3GjuedmPY3KpU12
Nxl5x/6jyj56tjJdv9DBcE5MUSg6MBO+xOkpU8NVp+D+EZKM8SysrfQ/sWjbK79/
w7CssbC6VjvTIoqTD7eM
=fG2/
-----END PGP SIGNATURE-----
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.