From 6cb78de63c6dfc708020db50d75bba52ada23ddc Mon Sep 17 00:00:00 2001
From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Fri, 3 Oct 2008 13:53:02 +0200
Subject: [PATCH] Remove support for the sarge amd64 archive

Not really supported anymore anyway.
---
 config.sh.sed.in              |  5 ++---
 cron.d/100syncarchive_amd64   | 33 ---------------------------------
 templates/config/mirrors.tmpl | 30 ------------------------------
 3 files changed, 2 insertions(+), 66 deletions(-)
 delete mode 100755 cron.d/100syncarchive_amd64

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 63bc714..7bdb5e6 100644
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -28,7 +28,6 @@ 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
 ddtp_ftpsite=
 
@@ -43,14 +42,14 @@ search_url="/search"
 #
 polangs="de fi fr hu ja nl ru 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 amd64 debports backports volatile"
+archives="us security debports backports volatile"
 sections="main contrib non-free"
 parts="$sections"
 suites="sarge sarge-volatile sarge-backports etch etch-m68k etch-volatile etch-backports lenny sid experimental"
 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_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"
diff --git a/cron.d/100syncarchive_amd64 b/cron.d/100syncarchive_amd64
deleted file mode 100755
index 070e6d7..0000000
--- a/cron.d/100syncarchive_amd64
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/bash
-
-. `dirname $0`/../config.sh
-
-test -d ${archivedir} || mkdir -p ${archivedir}
-cd ${archivedir}
-
-# Main archive
-#
-arch=amd64
-
-for dist in sarge
-  do
-  echo "retrieve Release(.gpg) $dist"
-  test -d amd64/${dist} || mkdir -p amd64/${dist}
-  (cd amd64/${dist} &&
-      $wget_cmd -N ${amd64_ftpsite}/dists/${dist}/Release &&
-      $wget_cmd -N ${amd64_ftpsite}/dists/${dist}/Release.gpg )
-
-  for part in ${parts} main/debian-installer
-    do
-    echo retrieve Packages $dist/$part/$arch
-    test -d amd64/${dist}/${part}/binary-${arch} || mkdir -p amd64/${dist}/${part}/binary-${arch}
-    (cd amd64/${dist}/${part}/binary-${arch} &&
-	$wget_cmd -N ${amd64_ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
-  done
-  echo retrieve Contents $dist/$arch
-  (cd amd64/${dist} &&
-      $wget_cmd -N ${amd64_ftpsite}/dists/${dist}/Contents-${arch}.gz)
-
-  $check_release_cmd $archivedir/amd64/${dist}/Release
-done
-
diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index 9547482..c5c1d33 100644
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -117,36 +117,6 @@ mirrors = {
 		],
 	},
 
-	amd64 => {
-		mirror_list => 'http://amd64.debian.net/README.mirrors.html',
-		unofficial_port => {
-			amd64 => {
-				url_name => 'amd64',
-				name => 'AMD64',
-			}
-		},
-		europa => [
-			"amd64.debian.net/debian",
-			"ftp.de.debian.org/debian-amd64/debian",
-			"ftp.es.debian.org/debian-amd64/debian",
-			"ftp.nl.debian.org/debian-amd64/debian",
-			"ftp.sk.debian.org/debian-amd64/debian",
-			"bytekeeper.as28747.net/debian-amd64/debian",
-			"mirror.switch.ch/debian-amd64/debian",
-		],
-		asia => [
-			"ftp.jp.debian.org/debian-amd64/debian/",
-			"hanzubon.jp/debian-amd64/debian",
-		],
-		north_america => [
-			"mirror.espri.arizona.edu/debian-amd64/debian",
-			"debian.csail.mit.edu/debian-amd64/debian",
-		],
-		australia => [
-			"public.planetmirror.com/pub/debian-amd64/debian",
-		],
-	},
-
 	debports => {
 		mirror_list => 'http://wiki.debian.org/DebianPorts/Mirrors',
 		unofficial_port => {
-- 
2.39.2