From f52005993ea85a502cf7223558cd3d500e7d24b0 Mon Sep 17 00:00:00 2001 From: cjwatson <> Date: Thu, 5 Jun 2003 07:26:59 -0800 Subject: [PATCH] [project @ 2003-06-05 08:26:59 by cjwatson] Clean up the definition and use of $gCGIDomain (#139697). --- UPGRADE | 5 +++++ debian/changelog | 1 + html/index.html.in | 20 ++++++++++---------- scripts/config.debian | 6 ++---- scripts/service.in | 4 ++-- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/UPGRADE b/UPGRADE index 0df0d951..bbe1390f 100644 --- a/UPGRADE +++ b/UPGRADE @@ -9,6 +9,11 @@ Add the following variables to the /etc/debbugs/config file: $gHTMLSuffix = ".html"; +The use of $gCGIDomain has been cleaned up; formerly, it needed to begin +with "http://", which was confusingly inconsistent with all the other domain +variables. If you worked around this in your configuration, you will need to +recheck it. + From 2.3 to 2.4 --------------- diff --git a/debian/changelog b/debian/changelog index 00129bb1..60295410 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ debbugs (2.4.1) UNRELEASED; urgency=low - Add facility to search by tag. - Fix rebuild script and add it to the example crontab, closes: #139696. - Silence postinst warning if spool/db doesn't exist, closes: #194892. + - Clean up the definition and use of $gCGIDomain, closes: #139697. * Adam Heath: - Convert all code to use global read/write functions, instead of having it duplicated everywhere. diff --git a/html/index.html.in b/html/index.html.in index d432d7b8..e09d8cf6 100644 --- a/html/index.html.in +++ b/html/index.html.in @@ -34,13 +34,13 @@ $gHTMLCopies

Find a bug by number:
-

+ as mbox
-
+

Find bugs by: package source package @@ -55,24 +55,24 @@ What to search for:

The following bug report indices are available:

diff --git a/scripts/config.debian b/scripts/config.debian index aa91e90b..6153839a 100644 --- a/scripts/config.debian +++ b/scripts/config.debian @@ -1,5 +1,5 @@ # This is the bugs.debian.org debbugs configuration file. -# $Id: config.debian,v 1.19 2003/05/31 15:59:12 cjwatson Exp $ +# $Id: config.debian,v 1.20 2003/06/05 08:26:59 cjwatson Exp $ # Domains $gEmailDomain = "bugs.debian.org"; @@ -7,9 +7,7 @@ $gListDomain = "lists.debian.org"; $gWebDomain = "www.debian.org/Bugs"; $gHTMLSuffix = ""; $gPackagePages = "packages.debian.org"; -$gCGIHost = "bugs.debian.org"; -$gCGIPath = "/cgi-bin"; -$gCGIDomain = "http://$gCGIHost$gCGIPath"; +$gCGIDomain = "bugs.debian.org/cgi-bin"; $gMirrors = ""; # comma separated list $gSubscriptionDomain = "packages.qa.debian.org"; diff --git a/scripts/service.in b/scripts/service.in index 78d7d8e0..c31399c1 100755 --- a/scripts/service.in +++ b/scripts/service.in @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id: service.in,v 1.76 2003/05/31 11:17:16 cjwatson Exp $ +# $Id: service.in,v 1.77 2003/06/05 08:26:59 cjwatson Exp $ # ^ more or less ^ # # Usage: service .nn @@ -958,7 +958,7 @@ END sub sendlynxdocraw { local ($relpath,$description) = @_; $doc=''; - open(L,"lynx -nolist -dump $gCGIDomain/\Q$relpath\E 2>&1 |") || &quit("fork for lynx: $!"); + open(L,"lynx -nolist -dump http://$gCGIDomain/\Q$relpath\E 2>&1 |") || &quit("fork for lynx: $!"); while() { $doc.=$_; } $!=0; close(L); if ($? == 255 && $doc =~ m/^\n*lynx: Can\'t access start file/) { -- 2.39.5