From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Thu, 18 Oct 2007 21:19:27 +0000 (+0000)
Subject: Merge commit 'origin/master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=2ad60a1122641f5c264f36a690847b76d38120b3;hp=0400a01d5bbcf0ca210f15b1423d4e90071fa4fd;p=deb%2Fpackages.git

Merge commit 'origin/master' into debian-master

Conflicts:

	config.sh.sed.in
	templates/config.tmpl
---

diff --git a/cgi-bin/index.php b/cgi-bin/index.php
deleted file mode 100644
index 006db80..0000000
--- a/cgi-bin/index.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?
-
-function go($script)
-{
-	$pipes = null;
-	$proc = proc_open("./$script php", array(
-		0 => array('pipe', 'r'),
-		1 => array('pipe', 'w'),
-		2 => array('pipe', 'w')
-		), $pipes);
-	foreach ($_GET as $k => $v) {
-		fwrite($pipes[0], urlencode($k)."=".urlencode($v)."\n");
-	}
-	fclose($pipes[0]);
-	fpassthru($pipes[1]);
-	$stderr = fread($pipes[2], 4096);
-	$exit = proc_close($proc);
-	if ($exit) {
-		echo "<h1>Error happened, code $exit</h1>\n";
-	}
-	echo "<pre>".htmlspecialchars($stderr);
-	echo "</pre>";
-}
-
-$SUITES = array('oldstable', 'stable', 'testing', 'unstable', 'experimental');
-$pi = substr($_SERVER["PATH_INFO"], 1);
-$elems = explode('/', $pi);
-if ($pi == "") {
-	readfile("index.html");
-	exit;
-} elseif ($pi == 'search') {
-	go("search_packages.pl");
-} elseif ($elems[0] == 'package' && count($elems) == 2) {
-	$_GET['searchon'] = 'names';
-	$_GET['keywords'] = $elems[1];
-	$_GET['suite'] = 'all';
-	$_GET['exact'] = 1;
-	go("search_packages.pl");
-} elseif ($elems[0] == 'source' && count($elems) == 2) {
-	$_GET['searchon'] = 'sourcenames';
-	$_GET['keywords'] = $elems[1];
-	$_GET['suite'] = 'all';
-	$_GET['exact'] = 1;
-	go("search_packages.pl");
-} elseif (in_array($elems[0], $SUITES) && count($elems) == 2) {
-	$_GET['package'] = $elems[1];
-	$_GET['suite'] = $elems[0];
-	go("show_package.pl");
-} elseif (in_array($elems[0], $SUITES) && count($elems) == 3) {
-	header("Location: http://merkel.debian.org/~jeroen/pdo/$elems[0]/".urlencode($elems[2]));
-	exit;
-} elseif (substr($pi, 0, 4) == 'src:') {
-	header("Location: http://merkel.debian.org/~jeroen/pdo/source/".urlencode(substr($pi,4)));
-	exit;
-} elseif (!eregi('[^a-z0-9+.-]', $pi)) {
-	header("Location: http://merkel.debian.org/~jeroen/pdo/package/".urlencode($pi));
-	exit;
-} else {
-	echo "404 not found";
-}
diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 5ed7453..5f316e2 100644
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -110,8 +110,8 @@
    RewriteRule ^/[^/]+\.css - [L]
    RewriteRule ^/[^/]+\.js - [L]
 
-#   RewriteRule ^/$ http://www.debian.org/distrib/packages
-   RewriteRule ^/$ /index.html [L]
+   RewriteRule ^/$ http://www.debian.org/distrib/packages
+#   RewriteRule ^/$ /index.html [L]
    RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
    RewriteRule ^/changelog:(.+)$  http://%SITE%/changelogs/${changelog-url:$1} [R,L,NE]
    RewriteRule ^/src:([^/]+)$ /source/$1 [R,L,NE]
diff --git a/config.sh.sed.in b/config.sh.sed.in
index c4f06a8..f0ee0c7 100644
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -20,7 +20,7 @@ cachedir=${topdir}/cache
 # unset this if %SITE% moves somewhere where the packages files
 # cannot be obtained locally
 #
-localdir=/org/ftp.debian.org/debian
+localdir=/org/ftp.root/debian
 
 # path to private ftp directory
 #ftproot=/org/ftp.root
@@ -38,7 +38,8 @@ root=""
 # Architectures
 #
 polangs="de fi fr hu nl uk"
-ddtplangs="ca cs da de eo es fi fr go hu it ja km_KH ko nl pl pt pt_BR ru sk sv uk zh zh_CN zh_TW"
+ddtplangs="ca cs da de eo es fi fr go hu it ja km_KH ko nl pl pt pt_BR ru sk sv uk"
+#ddtplangs="ca cs da de eo es fi fr go hu it ja km_KH ko nl pl pt pt_BR ru sk sv uk zh zh_CN zh_TW"
 archives="us security amd64 gnuab backports volatile"
 sections="main contrib non-free"
 parts="$sections"
diff --git a/cron.d/050checkinst b/cron.d/050checkinst
index 9dc6689..68afe23 100755
--- a/cron.d/050checkinst
+++ b/cron.d/050checkinst
@@ -5,7 +5,7 @@
 # Test whether all required packages are installed and generate a mail
 # if they aren't, so that the admin is informed.
 
-required="git-core gettext locales rsync dpkg-dev procmail"
+required="gettext locales rsync dpkg-dev procmail"
 required="$required libcompress-zlib-perl"
 required="$required libhtml-parser-perl libio-stringy-perl"
 required="$required liblocale-gettext-perl libmldbm-perl"
diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index ff68426..4062122 100755
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -139,7 +139,7 @@ sub do_dispatch {
 
     my $what_to_do = 'show';
     my $source = 0;
-    if (my $path = $input->path_info() || $input->param('PATH_INFO')) {
+    if (my $path = $ENV{'PATH_INFO'} || $input->param('PATH_INFO')) {
 	my @components = grep { $_ } map { lc $_ } split /\/+/, $path;
 
 	debug( "PATH_INFO=$path components=@components", 3) if DEBUG;
diff --git a/templates/config.tmpl b/templates/config.tmpl
index bb124e7..7f95493 100644
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -4,7 +4,7 @@
 
    organisation = 'Debian'
    homepage = 'http://www.debian.org/'
-   packages_homepage = 'http://packages.debian.net/'
+   packages_homepage = 'http://packages.debian.org/'
    searchformurl = packages_homepage
    search_url = '/'
    tags_url = 'http://debtags.alioth.debian.org/'
@@ -46,6 +46,7 @@
 -%]
 [%-
    # possible values for importance: high, normal, low
-   sitewidemsg = { importance => "high",
-		   txt => g('Please note that this is an experimental version of <a href="http://packages.debian.org/">packages.debian.org</a>. Errors and obsolete information should be expected') }
+#   sitewidemsg = { importance => "high",
+#		   txt => g('Please note that this is an experimental version of <a href="http://packages.debian.org/">packages.debian.org</a>. Errors and obsolete information should be expected') }
+#		   txt => "Site maintainance in progress, some temporary problems might occour." }
 -%]