From: Gerfried Fuchs Date: Thu, 12 Aug 2010 21:57:02 +0000 (+0200) Subject: Merge branch 'master' into archive-master X-Git-Url: https://git.deb.at/?a=commitdiff_plain;ds=sidebyside;h=f6000bc63f707c11cbb15433f66b41144c91522e;hp=-c;p=deb%2Fpackages.git Merge branch 'master' into archive-master Conflicts: config.sh.sed.in templates/config.tmpl templates/config/mirrors.tmpl --- f6000bc63f707c11cbb15433f66b41144c91522e diff --combined conf/apache.conf.sed.in index 49d88fa,fb36e4a..37037a7 --- 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 @@@ -62,25 -65,25 +62,25 @@@ AddEncoding x-gzip .gz - + ServerAdmin webmaster@debian.org DocumentRoot %TOPDIR%/www/ ServerName %SITE% 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 - SetHandler perl-script - PerlInitHandler Apache2::Reload - PerlHandler ModPerl::Registry +# SetHandler perl-script +# PerlInitHandler Apache2::Reload +# PerlHandler ModPerl::Registry Options +ExecCGI - PerlSendHeader On +# PerlSendHeader On allow from all diff --combined config.sh.sed.in index 50f6dc1,55ba5b3..94dceef --- a/config.sh.sed.in +++ b/config.sh.sed.in @@@ -19,16 -19,17 +19,16 @@@ 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 -ddtp_ftpsite= +ftpsite=http://archive.debian.org/debian +security_ftpsite=http://archive.debian.org/debian-security +volatile_ftpsite=http://archive.debian.org/debian-volatile +backports_ftpsite=http://archive.debian.org/backports.org +ddtp_ftpsite=http://ftp.de.debian.org/debian wget_cmd="wget --no-verbose --tries=2 --timeout=60" check_release_cmd="perl -I${libdir} ${bindir}/check-release --verbose --ignoremissing --keyring ${configdir}/trusted.gpg" @@@ -39,21 -40,22 +39,21 @@@ search_url="/search # Architectures # - polangs="de fi fr hu ja nl ru sk sv uk zh-cn" + polangs="bg de fi fr hu ja nl ru sk sv uk zh-cn" 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 security backports volatile" sections="main contrib non-free" parts="$sections" -suites="etch etch-m68k etch-volatile etch-backports lenny lenny-volatile lenny-backports squeeze sid experimental" +suites="bo hamm slink potato woody sarge sarge-volatile sarge-backports" priorities="required important standard optional extra" dists="$suites" -architectures="alpha amd64 arm armel avr32 hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 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_squeeze="alpha amd64 armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc" -arch_sid="${arch_squeeze} avr32 hurd-i386 m68k" -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" +arch_sarge="${arch_woody}" # Miscellaneous # diff --combined templates/config.tmpl index 9ea162e,85c52f7..8c86558 --- a/templates/config.tmpl +++ b/templates/config.tmpl @@@ -6,7 -6,8 +6,7 @@@ organisation = 'Debian' project_homepage = 'http://www.debian.org/' packages_homepage = '/' - packages_homepage_abs = 'http://packages.debian.net/' - old_releases = 'http://archive.debian.net/' + packages_homepage_abs = 'http://archive.debian.net/' searchformurl = packages_homepage search_url = '/search' tags_url = 'http://debtags.alioth.debian.org/' @@@ -15,13 -16,13 +15,13 @@@ ddpo_url = 'http://qa.debian.org/developer.php?login=' src_bugs_url = bugs_url _ 'src:' mirror_url = 'http://ftp.debian.org/' - security_mirror = 'security.debian.org' + security_mirror = 'archive.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' - patch_tracking_url = 'http://patch-tracker.debian.org/package' ++# patch_tracking_url = 'http://patch-tracker.debian.org/package' logo = { url => project_homepage, src => '/Pics/openlogo-nd-25.png', @@@ -40,32 -41,30 +40,32 @@@ url => project_homepage _ 'trademark' } contact = { - name => g('Debian Web Mailinglist'), - mail => 'debian-www@lists.debian.org', + name => 'Frank Lichtenheld', + mail => 'djpig@debian.org', url => project_homepage _ 'contact', } admin = { - name => g('%s Webmaster', organisation), - mail => 'webmaster@debian.org', + name => 'Frank Lichtenheld', + mail => 'djpig@debian.org', } trademarknotes = g('%s is a trademark of %s', organisation, trademark.url, trademark.name) sponsors = [ - { - url => 'http://example.invalid/', - name => 'Example Sponsor, Inc.', - }, - { - url => 'http://example2.invalid/', - name => 'Example2 Sponsor, Inc.', - }, +# { +# url => 'http://example.invalid/', +# name => 'Example Sponsor, Inc.', +# }, +# { +# url => 'http://example2.invalid/', +# name => 'Example2 Sponsor, Inc.', +# }, ] -%] [%- # 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 => g('Please note that this site contains information about obsolete %s releases; if you search for current data, please use %s.', 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 81dc3ae,28c4a0e..a222eb1 --- a/templates/config/mirrors.tmpl +++ b/templates/config/mirrors.tmpl @@@ -11,46 -11,189 +11,49 @@@ mirrors = { us => { + url => 'http://www.debian.org/', - mirror_list => 'http://www.debian.org/mirror/list', + mirror_list => 'http://www.debian.org/distrib/archive', north_america => [ - "ftp.us.debian.org/debian", - "http.us.debian.org/debian", -#only amd64,i386 "ftp.debian.org/debian", - "ftp.ca.debian.org/debian", - "ftp.mx.debian.org/debian", - "ftp.egr.msu.edu/debian", - "mirrors.kernel.org/debian", - "ftp-mirror.internap.com/pub/debian", -#only some arches "ftp.cerias.purdue.edu/pub/os/debian", - "debian.lcs.mit.edu/debian", - "debian.oregonstate.edu/debian", + "ftp.egr.msu.edu/debian-archive", + "ftp3.nrc.ca/debian-archive", ], europa => [ - "ftp.de.debian.org/debian", - "ftp.at.debian.org/debian", - "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", -#only some arches "ftp.no.debian.org/debian", - "ftp.pl.debian.org/debian", - "ftp.ro.debian.org/debian", - "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", - "download.unesp.br/linux/debian", - "sft.if.usp.br/debian", -#not reachable "debian.unesr.edu.ve/debian", - "debian.torredehanoi.org/debian", - ], - oceania => [ - "ftp.au.debian.org/debian", - "ftp.wa.au.debian.org/debian", - "ftp.nz.debian.org/debian", - "mirror.pacific.net.au/debian", - "ftp.iinet.net.au/debian/debian", - "mirror.optus.net/debian", + "archive.debian.org/debian", + "ftp.de.debian.org/archive/debian", + "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 => [ - "ftp.jp.debian.org/debian", - "ftp2.jp.debian.org/debian", - "ftp.kr.debian.org/debian", -#only some arches "ftp.hk.debian.org/debian", - "ftp.tw.debian.org/debian", - "debian.nctu.edu.tw/debian", - "debian.linux.org.tw/debian", - "linux.cdpa.nsysu.edu.tw/debian", - "ftp.nara.wide.ad.jp/debian", - "mirrors.geekbone.org/debian", - "ftp.yz.yamagata-u.ac.jp/debian", - "debian.thaios.net/debian", - "www.anheng.com.cn/debian", - "ftp.daum.net/debian", - ], - africa => [ - "debian.mirror.ac.za/debian", + "ftp.kr.debian.org/debian-archive", +# "ftp.twaren.net/Linux/Debian/debian-archive", ], }, - volatile => { + url => 'http://www.debian.org/volatile/', title => g('volatile packages that need major changes during the life of a stable release'), - mirror_list => 'http://www.debian.org/volatile/volatile-mirrors', europa => [ - "volatile.debian.org/debian-volatile", - "ftp.at.debian.org/debian-volatile", - "ftp.be.debian.org/debian-volatile", - "ftp.ch.debian.org/debian-volatile", - "ftp.de.debian.org/debian-volatile", - "ftp2.de.debian.org/debian-volatile", - "ftp.ee.debian.org/debian-volatile", - "ftp.fi.debian.org/debian-volatile", - "ftp.gr.debian.org/debian-volatile", - "ftp.nl.debian.org/debian-volatile", - "ftp.ru.debian.org/debian-volatile", - "ftp.sk.debian.org/debian-volatile", - "ftp.ua.debian.org/debian-volatile", - "ftp.uk.debian.org/debian-volatile", - ], - north_america => [ - "mirror.csclub.uwaterloo.ca/debian-volatile", - "ftp3.nrc.ca/debian-volatile", - "gulus.usherbrooke.ca/debian-volatile", - ], - south_america => [ - "ftp.br.debian.org/debian-volatile", - "ftp.cl.debian.org/debian-volatile", - "sft.if.usp.br/debian-volatile", - ], - asia => [ - "ftp2.jp.debian.org/debian-volatile", - "ftp.tw.debian.org/debian-volatile", - "mirror.unej.ac.id/debian-volatile", - "mirrors.geekbone.org/debian-volatile", - ], - oceania => [ - "ftp.nz.debian.org/debian-volatile", + "archive.debian.org/debian-volatile", ], }, - backports => { + url => 'http://www.backports.org/', 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", - ], - asia => [ - "backports.mithril-linux.org", - ], - oceania => [ - "mirror.linux.org.au/backports.org", - "mirror.pacific.net.au/linux/debian-backports", - ], - }, - - debports => { - url => 'http://www.debian-ports.org/', - title => g('ports of packages to architectures not yet or not anymore available in Debian'), - mirror_list => 'http://wiki.debian.org/DebianPorts/Mirrors', - unofficial_port => { - avr32 => { - url => 'http://avr32.debian.net/', - name => 'AVR32', - }, - m68k => { - url_name => 'm68k', - name => 'M68K', - }, - }, - north_america => [ - "www.gtlib.gatech.edu/pub/gnuab/debian", - ], - europa => [ - "ftp.debian-ports.org/debian", - "ftp.de.debian.org/debian-ports", - "ftp.ch.debian.org/debian-ports", - ], - asia => [ - "debian.nctu.edu.tw/debian-ports", + "archive.debian.org/backports.org", ], }, } -ports_url = 'http://www.debian.org/ports/' - continents = { north_america => g('North America'), south_america => g('South America'), asia => g('Asia'), - australia => g('Australia and New Zealand'), + oceania => g('Oceania'), europa => g('Europe'), africa => g('Africa'), } diff --combined templates/html/download.tmpl index d1dfbc3,9a93047..e73964b --- a/templates/html/download.tmpl +++ b/templates/html/download.tmpl @@@ -65,7 -65,7 +65,7 @@@ deb http://[% mirrors.$archive.euro [% END %] [% END %]
- [% FOREACH continent IN [ 'europa','australia' ] %] + [% FOREACH continent IN [ 'europa','oceania' ] %] [% IF a.$continent %]

[% continents.$continent %]

    @@@ -106,8 -106,8 +106,8 @@@ - - +
    [% g('Exact Size') %] [% g('%s Byte (%s %s)', size, num.format_number(pkgsize,1), pkgsize_unit) %]
    [% g('MD5 checksum') %] [% md5sum %]
    [% g('SHA1 checksum') %] [% sha1 || g('Not Available') %]
    [% g('SHA256 checksum') %] [% sha256 || g('Not Available') %]
    [%- PROCESS 'html/foot.tmpl' page_name="$pkg/download" -%]