Merge commit 'alioth/master' into debian-master

diff --git a/bin/create_index_pages b/bin/create_index_pages
index d76bebab3f58e4cf04b65174a6c26e7ec3353f02..7847d8830f902a566ba9b55755871bccb8219790 100755 (executable)
--- a/bin/create_index_pages
+++ b/bin/create_index_pages
@@ -106,7 +106,7 @@ while (my ($pkg, $data) = each %packages) {
     my ($virt, $p_data) = split /\000/o, $data, 2;
     %virt = split /\01/o, $virt; 
     foreach (split /\000/o, $p_data||'') {
-       my @data = split ( /\s/o, $_, 8 );
+       my @data = split ( /\s/o, $_, 9 );
        $pkg{$data[1]} ||= new Packages::Page( $pkg );
        $pkg{$data[1]}->merge_package( { package => $pkg,
                                         archive => $data[0],
@@ -116,7 +116,7 @@ while (my ($pkg, $data) = each %packages) {
                                         subsection => $data[4],
                                         priority => $data[5],
                                         version => $data[6],
-                                        description => $data[7] } );
+                                        description => $data[8] } );
     }
     foreach (keys %virt) {
        next if $_ eq '-';

diff --git a/cgi-bin/index.php b/cgi-bin/index.php
deleted file mode 100644 (file)
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 5ed7453f90da1c1a23357877b9a6825017c15347..5f316e264c5d0522dee2a04f91a3a8875eac838a 100644 (file)
--- 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 e1ac8c78edb0f1237314946cacb744008a3bdd12..a6d9b78123c2e6c3db5739846f1e28654f414b28 100644 (file)
--- 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
@@ -37,8 +37,9 @@ root=""
 
 # Architectures
 #
-polangs="de fi fr hu ja 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"
+polangs="de fi fr ja 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"
+#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 9dc6689d5db49af1cbb84539a87cea34c2de86e7..68afe238a576946984063f6ad449f90d0e73f013 100755 (executable)
--- 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 ff6842687b9a7536a6c872312fae24d89990f1e3..4062122359e4530a47510b5bb53a2a6057547f23 100755 (executable)
--- 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/lib/Packages/DoNewPkg.pm b/lib/Packages/DoNewPkg.pm
index e5b9e88a3ca9148208dae1ddb601581d13c6c8bf..9be98d54aba8b0724c13106b7d8cf077220116b2 100644 (file)
--- a/lib/Packages/DoNewPkg.pm
+++ b/lib/Packages/DoNewPkg.pm
@@ -45,7 +45,7 @@ sub do_newpkg {
     };
     while (<NEWPKG>) {
        chomp;
-       my @data = split /\s/, $_, 10;
+       my @data = split /\s/, $_, 11;
 
        next unless $data[2]; #removed packages
        next unless $data[3] eq $suite;

diff --git a/templates/config.tmpl b/templates/config.tmpl
index def9bae5351a6f23bab2ec8754a9a0789225f7c5..86e7cc958d7feb88581df45ebd1ba66d7d994aad 100644 (file)
--- 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/'
@@ -49,6 +49,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." }
 -%]