From: Bill Allombert <Bill.Allombert@math.u-bordeaux.fr>
Date: Mon, 11 Nov 2024 10:25:46 +0000 (+0100)
Subject: cgi/{search,version}.cgi: do not special-case merkel.debian.org
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d6ceb79943866e3389de8e52d81c5681cf614509;p=debbugs.git

cgi/{search,version}.cgi: do not special-case merkel.debian.org
---

diff --git a/cgi/search.cgi b/cgi/search.cgi
index d728542e..1fda98aa 100755
--- a/cgi/search.cgi
+++ b/cgi/search.cgi
@@ -3,15 +3,6 @@
 use warnings;
 use strict;
 
-# Hack to work on merkel where suexec is in place
-BEGIN{
-     if ($ENV{HTTP_HOST} eq 'merkel.debian.org') {
-	  unshift @INC, qw(/home/don/perl/usr/share/perl5 /home/don/perl/usr/lib/perl5 /home/don/source);
-	  $ENV{DEBBUGS_CONFIG_FILE}="/home/don/config_internal";
-     }
-}
-
-
 use CGI::Simple;
 
 # use CGI::Alert 'nobody@example.com';
diff --git a/cgi/version.cgi b/cgi/version.cgi
index ab8f3c17..f5e5a3df 100755
--- a/cgi/version.cgi
+++ b/cgi/version.cgi
@@ -3,15 +3,6 @@
 use warnings;
 use strict;
 
-# Hack to work on merkel where suexec is in place
-BEGIN{
-     if (defined $ENV{HTTP_HOST} and $ENV{HTTP_HOST} eq 'merkel.debian.org') {
-	  unshift @INC, qw(/home/don/perl/usr/share/perl5 /home/don/perl/usr/lib/perl5 /home/don/source);
-	  $ENV{DEBBUGS_CONFIG_FILE}="/home/don/config_internal";
-     }
-}
-
-
 use CGI::Simple;
 
 # by default send this message nowhere
diff --git a/debian/changelog b/debian/changelog
index 7e3e4b67..e25a449a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,8 @@ debbugs (2.6.1) unstable; urgency=medium
     - Update Standards-Version to 4.7.0
   * debian/compat: removed
   * Actually upload the package (closes: #477182, #1079842)
+  * cgi/search.cgi, cgi/version.cgi:
+    - Do not special-case merkel.debian.org
 
  -- Bill Allombert <ballombe@debian.org>  Fri, 08 Nov 2024 10:03:05 +0100