The following commit has been merged in the archive-master branch:
commit 9083dcf3a523120cfb4cd905d26dada501678aea
Merge: 1d7caad10f40cd0a997c026b47c699b69f7c75d5
6f5fa1dbee1bf3a6dba1fb1aa0f6575c0c10352e
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Fri Oct 24 18:48:49 2008 +0200
Merge branch 'master' into archive-master
Conflicts:
conf/apache.conf.sed.in
config.sh.sed.in
cron.d/100syncarchive_debports
templates/config/mirrors.tmpl
diff --combined conf/apache.conf.sed.in
index aa68eaa,8594aec..a3eca9b
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -8,7 -8,10 +8,7 @@@
# Nice caching..
ExpiresActive On
- ExpiresDefault "access plus 1 day"
- ExpiresByType image/gif "modification plus 1 year"
- ExpiresByType image/jpeg "modification plus 1 year"
- ExpiresByType image/png "modification plus 1 year"
+ ExpiresDefault "access plus 1 year"
# language stuff
# you need to keep this in sync with lib/Packages/I18N/Locale.pm
@@@ -69,21 -72,18 +69,18 @@@
ErrorLog /var/log/apache2/%SITE%-error.log
CustomLog /var/log/apache2/%SITE%-access.log combined
- Alias /cgi-bin/ %TOPDIR%/cgi-bin/
+ ScriptAlias /cgi-bin/ %TOPDIR%/cgi-bin/
PerlModule ModPerl::Registry
PerlTaintCheck On
- PerlRequire %TOPDIR%/bin/mod_perl-startup
+# PerlRequire %TOPDIR%/bin/mod_perl-startup
PerlSwitches -T
<Location /cgi-bin/>
- SetHandler perl-script
- PerlInitHandler Apache2::Reload
- PerlHandler ModPerl::Registry
+# SetHandler perl-script
- # mod-perl etch
+# PerlInitHandler Apache2::Reload
- # mod-perl sarge
- #PerlInitHandler Apache::Reload
+# PerlHandler ModPerl::Registry
Options +ExecCGI
- PerlSendHeader On
+# PerlSendHeader On
allow from all
</Location>
@@@ -113,12 -113,12 +110,12 @@@
# 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]
- RewriteRule ^/file:(.+)$
http://%SITE%/search?searchon=contents&keywords=$1 [R,L,NE]
+ RewriteRule ^/changelog:(.+)$ /changelogs/${changelog-url:$1} [R,L,NE]
+ RewriteRule ^/src:([^/]+)$
/search?searchon=sourcenames&keywords=$1 [R,L,NE]
+ RewriteRule ^/file:(.+)$ /search?searchon=contents&keywords=$1
[R,L,NE]
RewriteCond %{REQUEST_URI} !^/search$ [OR]
RewriteCond %{QUERY_STRING} ^$
- RewriteRule ^/([^/]+)$ http://%SITE%/search?keywords=$1
[R,L,NE]
+ RewriteRule ^/([^/]+)$ /search?keywords=$1 [R,L,NE]
RewriteCond %{QUERY_STRING} =""
RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -f [OR]
diff --combined config.sh.sed.in
index 645853f,7bdb5e6..051f1ae
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -19,12 -19,16 +19,12 @@@ cachedir=${topdir}/cach
# unset this if %SITE% moves somewhere where the packages files
# cannot be obtained locally
#
-#localdir=/org/ftp.debian.org/debian
+localdir=/srv/archive.debian.org/ftp
# path to private ftp directory
#ftproot=/org/ftp.root
-ftpsite=http://ftp.de.debian.org/debian
-security_ftpsite=http://security.debian.org/debian-security
-volatile_ftpsite=http://volatile.debian.org/debian-volatile
-backports_ftpsite=http://backports.org/debian
-debports_ftpsite=http://ftp.debian-ports.org/debian
+ftpsite=http://archive.debian.org/debian-archive
ddtp_ftpsite=
wget_cmd="wget --no-verbose --tries=2 --timeout=60"
@@@ -37,19 -41,21 +37,19 @@@ search_url="/search
# Architectures
#
polangs="de fi fr hu ja nl ru sv uk zh-cn"
- ddtplangs="ca cs da de eo es fi fr hu it ja km-kh ko nl pl pt pt-br ru sk sv
uk zh-cn zh-tw"
+ ddtplangs="ca cs da de eo es eu fi fr hu it ja km ko nl pl pt pt-br ru sk sv
uk zh zh-cn zh-tw"
-archives="us security debports backports volatile"
+archives="us"
sections="main contrib non-free"
parts="$sections"
-suites="sarge sarge-volatile sarge-backports etch etch-m68k etch-volatile
etch-backports lenny sid experimental"
+suites="bo hamm slink potato woody"
priorities="required important standard optional extra"
dists="$suites"
-architectures="alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc"
-arch_sarge="alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
-arch_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
-arch_lenny="${arch_etch} armel"
-arch_sid="${arch_sarge} armel hurd-i386 kfreebsd-i386 kfreebsd-amd64"
-arch_experimental="${arch_sid}"
-arch_lenny_proposed_updates="${arch_lenny}"
-arch_etch_proposed_updates="${arch_etch}"
+architectures="alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
+arch_bo="i386"
+arch_hamm="i386 m68k"
+arch_slink="alpha i386 m68k sparc"
+arch_potato="alpha arm i386 ia64 m68k powerpc sparc"
+arch_woody="alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
# Miscellaneous
#
diff --combined cron.d/120synctrans
index 3a09451,db71ae4..5bfd959
--- a/cron.d/120synctrans
+++ b/cron.d/120synctrans
@@@ -12,7 -12,7 +12,7 @@@ the
ddtp_ftpsite="$ftpsite"
fi
echo using remote mirror $ddtp_ftpsite
- for dist in $dists
+ for dist in sid
do
for part in main
do
@@@ -28,16 -28,17 +28,17 @@@
done
else
echo using local mirror
- for dist in $dists
+ for dist in sid
do
for part in main
do
test -d us/${dist}/${part}/i18n || mkdir -p us/${dist}/${part}/i18n
for lang in $ddtplangs
do
- echo retrieve translated Descs $dist/$part/$lang
- rsync -t
${localdir}/dists/${dist}/${part}/i18n/Translation-$lang.gz \
- us/${dist}/${part}/i18n/Translation-$lang.gz
+ locale=$(echo $lang|perl -p -e
's/^([a-z]{2})-([a-z]{2})$/"$1_".uc($2)/e')
+ echo "retrieve translated Descs $dist/$part/$lang ($locale)"
+ rsync -t
${localdir}/dists/${dist}/${part}/i18n/Translation-$locale.gz \
+ us/${dist}/${part}/i18n/Translation-$locale.gz
done
done
done
diff --combined lib/Packages/DoShow.pm
index e0c2627,9d6df68..388cc03
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@@ -230,7 -230,7 +230,7 @@@ sub do_show
$d{version} = $versions->{$a} if $multiple_versions;
$d{archive} = $archives->{$a};
- if ( ($suite ne "experimental")
+ if ( ($suite ne "woody") && ($suite ne "bo")
&& ($subsection ne 'debian-installer')) {
$d{contents_avail} = 1;
}
@@@ -241,13 -241,11 +241,13 @@@
#
# more information
#
+ my $changesandcopy = 0;
+ $changesandcopy = 1 if $suite eq "woody";
moreinfo( name => $pkg, data => $page, vars =>
\%contents,
opts => $opts,
env => \%FTP_SITES,
bugreports => 1, sourcedownload => 1,
- changesandcopy => 1, maintainers => 1,
+ changesandcopy => $changesandcopy,
maintainers => 1,
search => 1 );
} else { # unless $page->is_virtual
$contents{is_virtual} = 1;
@@@ -323,13 -321,11 +323,13 @@@
#
# more information
#
+ my $changesandcopy = 0;
+ $changesandcopy = 1 if $suite eq "woody";
moreinfo( name => $pkg, data => $page, vars => \%contents,
opts => $opts,
env => \%FTP_SITES,
bugreports => 1,
- changesandcopy => 1, maintainers => 1,
+ changesandcopy => $changesandcopy, maintainers =>
1,
search => 1, is_source => 1 );
} # else (unless $opts->{source})
@@@ -360,6 -356,7 +360,7 @@@ sub moreinfo
if ($info{sourcedownload}) {
$contents->{src}{url} = make_url($source,'',{source=>'source'});
$contents->{src}{pkg} = $source;
+ $contents->{src}{version} = $source_version;
my @downloads;
my $files = $page->get_src( 'files' );
diff --combined templates/config.tmpl
index 719dcf9,5ce7cc7..421579a
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -5,7 -5,7 +5,7 @@@
organisation = 'Debian'
project_homepage = 'http://www.debian.org/'
- packages_homepage = 'http://packages.debian.net/'
+ packages_homepage = 'http://archive.debian.net/'
searchformurl = packages_homepage
search_url = '/search'
tags_url = 'http://debtags.alioth.debian.org/'
@@@ -17,9 -17,10 +17,10 @@@
security_mirror = 'security.debian.org'
security_mirror_url = security_mirror _ '/debian-security'
security_suite_suffix = '/updates'
- changelogs_url = 'http://packages.debian.org/changelogs/'
+ changelogs_url = 'http://archive.debian.net/changelogs/'
policy_url = 'http://www.debian.org/doc/debian-policy/'
cn_help_url = project_homepage _ 'intro/cn'
+ patch_tracking_url = 'http://patch-tracking.debian.net/package'
logo = {
url => project_homepage,
src => '/Pics/openlogo-nd-25.png',
@@@ -38,13 -39,13 +39,13 @@@
url => project_homepage _ 'trademark'
}
contact = {
- name => g('Debian Web Mailinglist'),
- mail => '[EMAIL PROTECTED]',
+ name => 'Frank Lichtenheld',
+ mail => '[EMAIL PROTECTED]',
url => project_homepage _ 'contact',
}
admin = {
- name => g('%s Webmaster', organisation),
- mail => '[EMAIL PROTECTED]',
+ name => 'Frank Lichtenheld',
+ mail => '[EMAIL PROTECTED]',
}
trademarknotes = g('%s is a <a href="%s">trademark</a> of %s',
organisation, trademark.url, trademark.name)
# sponsor = {
@@@ -54,10 -55,8 +55,10 @@@
-%]
[%-
# 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 => g('Please note that this site contains information
about obsolete %s releases; if you search for current data, please use <a
href="http://%s/";>%s</a>.', organisation, 'packages.debian.org',
'packages.debian.org') }
-%]
[%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
[%- USE num = Number.Format( decimal_point => g('.'),
diff --combined templates/config/mirrors.tmpl
index ef12194,d10f124..9fa5ead
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@@ -11,29 -11,142 +11,29 @@@
mirrors = {
us => {
- mirror_list => 'http://www.debian.org/mirror/list',
+ mirror_list => 'http://www.debian.org/distrib/archive',
north_america => [
-#only amd64,i386 "ftp.us.debian.org/debian",
- "http.us.debian.org/debian",
-#only amd64,i386 "ftp.debian.org/debian",
- "ftp.egr.msu.edu/debian",
- "mirrors.kernel.org/debian",
-#not amd64 "ftp-mirror.internap.com/pub/debian",
-#only amd64,i386 "ftp.cerias.purdue.edu/pub/os/debian",
- "debian.lcs.mit.edu/debian",
- "debian.oregonstate.edu/debian",
+ "archive.debian.org/debian-archive",
+ "ftp.egr.msu.edu/debian-archive",
+ "ftp3.nrc.ca/debian-archive",
],
europa => [
- "ftp.de.debian.org/debian",
- "ftp.at.debian.org/debian",
-#no amd64 "ftp.bg.debian.org/debian",
- "ftp.ch.debian.org/debian",
- "ftp.cz.debian.org/debian",
- "ftp.dk.debian.org/debian",
- "ftp.ee.debian.org/debian",
- "ftp.es.debian.org/debian",
- "ftp.fi.debian.org/debian",
- "ftp.fr.debian.org/debian",
- "ftp.hr.debian.org/debian",
- "ftp.hu.debian.org/debian",
- "ftp.ie.debian.org/debian",
- "ftp.is.debian.org/debian",
- "ftp.it.debian.org/debian",
- "ftp.nl.debian.org/debian",
- "ftp.no.debian.org/debian",
- "ftp.pl.debian.org/debian",
-#only amd64,i386 "ftp.ru.debian.org/debian",
- "ftp.se.debian.org/debian",
-#only some arches "ftp.si.debian.org/debian",
- "ftp.tr.debian.org/debian",
- "ftp.uk.debian.org/debian",
- ],
- south_america => [
- "ftp.br.debian.org/debian",
- "ftp.cl.debian.org/debian",
- ],
- australia => [
- "ftp.au.debian.org/debian",
- "ftp.wa.au.debian.org/debian",
- "ftp.nz.debian.org/debian",
- ],
- asia => [
- "ftp.jp.debian.org/debian",
- "ftp2.jp.debian.org/debian",
- "ftp.kr.debian.org/debian",
-#no amd64 "ftp.hk.debian.org/debian",
- "ftp.tw.debian.org/debian",
-#only amd64,i386 "linux.csie.nctu.edu.tw/debian",
- "debian.linux.org.tw/debian",
- "linux.cdpa.nsysu.edu.tw/debian",
- ],
- },
-
- volatile => {
- title => g('volatile packages that need major changes during
the life of a stable release'),
- mirror_list =>
'http://www.debian.org/devel/debian-volatile/volatile-mirrors',
- europa => [
- "volatile.debian.net/debian-volatile",
- "ftp2.de.debian.org/debian-volatile",
- "ftp.sk.debian.org/debian-volatile",
- ],
- north_america => [
- "debian.domainmail.org/debian-volatile",
- ],
- south_america => [
- "sft.if.usp.br/debian-volatile",
- ],
- asia => [
- "ftp2.jp.debian.org/debian-volatile",
- ],
- australia => [
- "ftp.nz.debian.org/debian-volatile",
- ],
- },
-
- backports => {
- title => g('newer packages that have been adapted to stable
releases of Debian'),
- mirror_list =>
'http://www.backports.org/debian/README.mirrors.html',
- europa => [
- "www.backports.org/debian",
- "debian.sil.at/backports.org/",
- "backports.debian.or.at/backports.org",
- "mirror.realroute.net/backports.org",
- "backports.cisbg.com",
- "backports.linuxdediziert.de/backports.org",
- "debian.netcologne.de/debian-backports",
- "ftp.de.debian.org/backports.org",
- "mirror.buildd.net/backports.org",
- "ftp.estpak.ee/backports.org",
- "debian.acantho.net/backports.org",
- "backports.essentkabel.com/backports.org",
- "backports.sipo.nl",
- "ftp.tuke.sk",
+ "ftp.de.debian.org/debian-archive",
+# "ftp.ch.debian.org/debian-archive",
+ "ftp.nl.debian.org/debian-archive",
+ "debian.dynamica.it/debian-archive",
+ "debian.org.ua/debian-archive",
+ "ftp2.debian.org.ua/debian-archive",
+# "ftp.irb.hr/debian-archive",
+ "webb.ens-cachan.fr/ftp/debian-archive",
],
asia => [
- "backports.mithril-linux.org",
- ],
- australia => [
- "mirror.linux.org.au/backports.org",
- "mirror.pacific.net.au/linux/debian-backports",
- ],
- },
-
- debports => {
- title => g('ports of packages to architectures not yet
available in Debian'),
- mirror_list => 'http://wiki.debian.org/DebianPorts/Mirrors',
- unofficial_port => {
- 'kfreebsd-amd64' => {
- url_name => 'kfreebsd-gnu',
- name => 'GNU/kFreeBSD',
- },
- 'kfreebsd-i386' => {
- url_name => 'kfreebsd-gnu',
- name => 'GNU/kFreeBSD',
- },
- },
- north_america => [
- "www.gtlib.gatech.edu/pub/gnuab/debian",
- "www.superunprivileged.org/debian",
- ],
- europa => [
- "ftp.debian-ports.org/debian",
- "ftp.de.debian.org/debian-ports",
- "ftp.ch.debian.org/debian-ports",
- "ftp.easynet.be/ftp/gnuab/debian",
+ "ftp.kr.debian.org/debian-archive",
+# "ftp.twaren.net/Linux/Debian/debian-archive",
],
},
}
-ports_url = 'http://www.debian.org/ports/'
-
continents = {
north_america => g('North America'),
south_america => g('South America'),
@@@ -42,6 -155,4 +42,4 @@@
europa => g('Europe'),
africa => g('Africa'),
}
-
%]
-
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
