From: Frank Lichtenheld Date: Sun, 28 Oct 2007 21:22:28 +0000 (+0100) Subject: Merge commit 'origin/master' into debian-master X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=commitdiff_plain;h=a1687e009279c235d322b8929f9d31dd947b8c14;hp=7d06e82e8b559dae35d06ce09e9e5dde80fce439 Merge commit 'origin/master' into debian-master Conflicts: bin/create_index_pages config.sh.sed.in cron.d/050checkinst --- 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 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 42978b7..49ed5f7 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 ja nl 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" +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/debian/control b/debian/control index 4a4d48a..3cc7ffb 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Source: packages -Build-Depends: git-core, rsync, dpkg-dev, procmail, +Build-Depends: rsync, dpkg-dev, procmail, gettext, liblocale-gettext-perl, locales | locales-all, libi18n-acceptlanguage-perl, libcompress-zlib-perl, libhtml-parser-perl, libio-stringy-perl, libmldbm-perl, libtext-iconv-perl, libhtml-template-perl, diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm index ff68426..39ecab7 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; @@ -279,14 +279,14 @@ sub do_dispatch { my $locale = get_locale($opts{lang}); my $charset = get_charset($opts{lang}); - setlocale ( LC_ALL, $locale ) - or do { debug( "couldn't set locale $locale, using default" ) if DEBUG; - setlocale( LC_ALL, get_locale() ) - or do { - debug( "couldn't set default locale either" ) if DEBUG; +# setlocale ( LC_ALL, $locale ) +# or do { debug( "couldn't set locale $locale, using default" ) if DEBUG; +# setlocale( LC_ALL, get_locale() ) +# or do { +# debug( "couldn't set default locale either" ) if DEBUG; setlocale( LC_ALL, "C" ); - }; - }; +# }; +# }; debug( "locale=$locale charset=$charset", 1 ) if DEBUG; $opts{h_suites} = { map { $_ => 1 } @suites }; diff --git a/templates/config.tmpl b/templates/config.tmpl index def9bae..86e7cc9 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/' @@ -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 packages.debian.org. Errors and obsolete information should be expected') } +# sitewidemsg = { importance => "high", +# txt => g('Please note that this is an experimental version of packages.debian.org. Errors and obsolete information should be expected') } +# txt => "Site maintainance in progress, some temporary problems might occour." } -%]