Merge branch 'master' into archive-master

Conflicts:

	config.sh.sed.in
	lib/Packages/Dispatcher.pm

diff --combined config.sh.sed.in
index 4931dbceffdef300205b7a6eb8a65c45f64fa66a,111cabca2d4fbc4a584dc17e2bcd5d226fc7713c..645853f5a11c43671beb77af9a7ff7e8b802eb64
--- 1/config.sh.sed.in
--- 2/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -19,13 -19,18 +19,13 @@@ 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
 -amd64_ftpsite=http://amd64.debian.net/debian
 -debports_ftpsite=http://ftp.debian-ports.org/debian
 +ftpsite=http://archive.debian.org/debian-archive
- ddtp_ftpsite=http://ddtp.debian.net/debian
+ ddtp_ftpsite=
  
  wget_cmd="wget --no-verbose --tries=2 --timeout=60"
  check_release_cmd="perl -I${libdir} ${bindir}/check-release --verbose --ignoremissing --keyring ${configdir}/trusted.gpg"
@@@ -38,18 -43,20 +38,18 @@@ search_url="/search
  #
  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"
 -archives="us security amd64 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 amd64 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 lib/Packages/Dispatcher.pm
index 7ded77ef31f78077d4016e46d3637a0e6e7a5904,d8b750c18d784604f2d37d461b16e50c543ede97..35b04598f2a7b87824a41ca4f97541f57d0281e3
--- 1/lib/Packages/Dispatcher.pm
--- 2/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@@ -94,9 -94,11 +94,11 @@@ sub do_dispatch 
      &Packages::DB::init();
      my $last_modified = $Packages::DB::db_read_time;
      my $now = time;
 -    my $expires = $last_modified + (12*3600);
++    my $expires = $last_modified + (365*24*3600);
+     $expires = $now + 3600 if $expires < $now;
      # allow some fudge, since the db mod time is not the end of
      # the cron job
-     $last_modified = $now if $last_modified - $now < 3600; 
+     $last_modified = $now if $now - $last_modified < 3600;
  
      if ($input->http('If-Modified-Since') and
        (my $modtime = str2time($input->http('If-Modified-Since'), 'UTC'))) {
@@@ -351,7 -353,7 +353,7 @@@
                             -last_modified => strftime("%a, %d %b %Y %T %z",
                                                        localtime($last_modified)),
                             -expires => strftime("%a, %d %b %Y %T %z",
-                                                 localtime($last_modified + (365*24*3600))),
+                                                 localtime($expires)),
                             );
        #use Data::Dumper;
        #print '<pre>'.Dumper(\%ENV, \%page_content, get_all_messages()).'</pre>';