Merge commit 'alioth/master' into debian-master

diff --git a/bin/build-maintainerdb b/bin/build-maintainerdb
index b64be0023413ef0decd1eb919dc20fa1459d6117..6386b3ce8160540f71e852b7657019e20439974d 100755 (executable)
--- a/bin/build-maintainerdb
+++ b/bin/build-maintainerdb
@@ -45,7 +45,7 @@ my $maildomain = "packages.debian.org";
 my $ptsdomain = "packages.qa.debian.org";
 
 
-my $maintainerfile = "$topdir/../ftp.root/debian/indices/Maintainers";
+my $maintainerfile = "$topdir/../ftp.debian.org/ftp/indices/Maintainers";
 my $maintainerdb = "$topdir/conf/maintainer";
 my $overridefile = "$topdir/conf/maintainerdb.override";
 my @postcall = ( "/usr/sbin/postmap", $maintainerdb );

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 2067d8608d57c4c2e4024c9be1b2b78e8a0ea585..521ba4d1aaf307e02e7c24ce95440715fd4b27bf 100644 (file)
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -113,8 +113,8 @@
    RewriteRule ^/favicon.ico$ - [L]
    RewriteRule ^/robots.txt$ - [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:([^/]+)$          http://%SITE%/search?searchon=sourcenames&keywords=$1 [R,L,NE]

diff --git a/conf/maintainerdb.override b/conf/maintainerdb.override
index c2bed2fa9af85ee83b4dd8427c7946a1d2c28bda..0f6f11d86acf64287b99f7fe3ce7be7b8b3240ab 100644 (file)
--- a/conf/maintainerdb.override
+++ b/conf/maintainerdb.override
@@ -3,8 +3,6 @@ nonus.debian.org     Archive Maintenance <ftp.debian.org@packages.debian.org>
 nonus                NonUS Archive <nonus.debian.org@packages.debian.org>
 non-us               NonUS Archive <nonus.debian.org@packages.debian.org>
 bugs                 Bug Tracking System <bugs.debian.org@packages.debian.org>
-aboot                jeff@planetfall.com (Jefferson E. Noxon)
-blt8.0               g.russell@dcs.napier.ac.uk
 egcs                 debian-gcc@lists.debian.org
 gcc                  debian-gcc@lists.debian.org
 glibc               debian-glibc@lists.debian.org

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 63bc714d6aa2bcc761eaa3a365c4af2c0dab743e..e8b51488bda350c1db6505ccb1da0a821a142ca1 100644 (file)
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -19,7 +19,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=/srv/ftp.debian.org/ftp
 
 # path to private ftp directory
 #ftproot=/org/ftp.root

diff --git a/cron.d/300maintainerdb b/cron.d/300maintainerdb
index 7d1bde850d1e3651884efef019066a797fb88556..898a4c0bae6d70450902fb62b76de391f449d281 100755 (executable)
--- a/cron.d/300maintainerdb
+++ b/cron.d/300maintainerdb
@@ -2,11 +2,5 @@
 
 . `dirname $0`/../config.sh
 
-echo >&2 This script is disabled by default, since it is not useful without
-echo >&2 further setup and also some advertising of the actual addresses.
-echo >&2 Before you enable this you should have the consent of the people that
-echo >&2 this will send mail to!
-exit 1
-
 cd ${bindir}
 ${bindir}/build-maintainerdb

diff --git a/debian/control b/debian/control
index 3af54e020d187d0622dc790cc11fef08415b7168..5ca566ae37baafa43b75ae3cda4dbc2e6357e404 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: packages
-Build-Depends: git-core, rsync, dpkg-dev, procmail, gettext,
+Build-Depends: rsync, dpkg-dev, procmail, gettext,
  liblocale-maketext-lexicon-perl, libi18n-acceptlanguage-perl, libnumber-format-perl,
  libcompress-zlib-perl, libhtml-parser-perl, libio-stringy-perl,
  libmldbm-perl, libtext-iconv-perl, libhtml-template-perl,

diff --git a/setup-site.conf b/setup-site.conf
index edaf9b67f8eabc3aa37f68f685f4cc8ef4420501..c50889e0eca36c8ef91614319dbe39c2ffafa7cd 100644 (file)
--- a/setup-site.conf
+++ b/setup-site.conf
@@ -1,2 +1,2 @@
-topdir=/srv/packages.debian.org
-site=packages.debian.net
+topdir=/org/packages.debian.org
+site=packages.debian.org

diff --git a/templates/config.tmpl b/templates/config.tmpl
index 5ce7cc736eddbc6501d8432c58ccf1b19f09d081..22f00a083435ec6e985a2f4e0d1374ef314064b6 100644 (file)
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -5,7 +5,7 @@
 
    organisation = 'Debian'
    project_homepage = 'http://www.debian.org/'
-   packages_homepage = 'http://packages.debian.net/'
+   packages_homepage = 'http://packages.debian.org/'
    searchformurl = packages_homepage
    search_url = '/search'
    tags_url = 'http://debtags.alioth.debian.org/'
@@ -48,15 +48,16 @@
        mail => 'webmaster@debian.org',
    }
    trademarknotes = g('%s is a <a href="%s">trademark</a> of %s', organisation, trademark.url, trademark.name)
-#   sponsor = {
-#      url => 'http://example.invalid/',
-#      name => 'Example Sponsor, Inc.',
-#   }
+   sponsor = {
+       url => 'http://1und1.de/',
+       name => '1&1 Internet AG',
+   }
 -%]
 [%-
    # possible values for importance: high, normal, low
-   sitewidemsg = { importance => "high",
-                  txt => g('Please note that this is an experimental version of <a href="http://%s/">%s</a>. Errors and obsolete information should be expected', 'packages.debian.org', 'packages.debian.org') }
+#   sitewidemsg = { importance => "high",
+#                 txt => g('Please note that this is an experimental version of <a href="http://%s/">%s</a>. Errors and obsolete information should be expected', 'packages.debian.org', 'packages.debian.org') }
+#                 txt => "Site maintainance in progress, some temporary problems might occour." }
 -%]
 [%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
 [%- USE num = Number.Format( decimal_point => g('.'),