From: Frank Lichtenheld Date: Tue, 5 Aug 2008 21:43:21 +0000 (-0300) Subject: Merge branch 'master' into debian-master X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=f14d4143bf140c785853260b8f89373f0f858544;hp=2e6f79973eb99ec0eb277cb79e759c288f52c15f;p=deb%2Fpackages.git Merge branch 'master' into debian-master --- 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 @@ - 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 "

Error happened, code $exit

\n"; - } - echo "
".htmlspecialchars($stderr);
-	echo "
"; -} - -$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 2067d86..7327825 100644 --- a/conf/apache.conf.sed.in +++ b/conf/apache.conf.sed.in @@ -72,6 +72,8 @@ ErrorLog /var/log/apache2/%SITE%-error.log CustomLog /var/log/apache2/%SITE%-access.log combined + CBandUser pdo + Alias /cgi-bin/ %TOPDIR%/cgi-bin/ PerlModule ModPerl::Registry @@ -113,8 +115,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 c2bed2f..0f6f11d 100644 --- a/conf/maintainerdb.override +++ b/conf/maintainerdb.override @@ -3,8 +3,6 @@ nonus.debian.org Archive Maintenance nonus NonUS Archive non-us NonUS Archive bugs Bug Tracking System -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 9fddcb8..7feedbc 100644 --- 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=/org/ftp.root/debian # path to private ftp directory #ftproot=/org/ftp.root diff --git a/cron.d/300maintainerdb b/cron.d/300maintainerdb index 7d1bde8..898a4c0 100755 --- 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 3af54e0..5ca566a 100644 --- 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 edaf9b6..c50889e 100644 --- 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 98525eb..e79d091 100644 --- 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/' @@ -47,15 +47,16 @@ mail => 'webmaster@debian.org', } trademarknotes = g('%s is a trademark 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 %s. 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 %s. 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('.'),