7 files changed, 83 insertions, 171 deletions
diff --git a/etc/pacman.d/community b/etc/pacman.d/community
deleted file mode 100644
index 8575278c..00000000
--- a/etc/pacman.d/community
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# The Community tree.  These are community-maintained packages from the
-# Arch User Repository (http://aur.archlinux.org)
-
-# North America
-Server = ftp://ftp.archlinux.org/community/os/i686
-Server = ftp://ftp.nethat.com/pub/linux/archlinux/community/os/i686
-Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/community/os/i686
-Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/community/os/i686
-# Europe
-Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/community/os/i686
-Server = ftp://ftp.archlinux.de/pub/archlinux/community/os/i686
-Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/community/os/i686
-Server = ftp://ftp.mpi-sb.mpg.de/pub/linux/mirror/ftp.ibiblio.org/pub/Linux/distributions/archlinux/community/os/i686
-Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/community/os/i686
-Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/community/os/i686
-Server = ftp://mi.mirror.garr.it/mirrors/archlinux/community/os/i686
-Server = ftp://ftp.belnet.be/packages/archlinux/community/os/i686
-Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/community/os/i686
-Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/community/os/i686
-Server = ftp://sunsite.icm.edu.pl/site/linux-sunsite/distributions/archlinux/community/os/i686
-Server = ftp://mirror.icis.pcz.pl/archlinux/community/os/i686
-Server = ftp://ftp.pangora.org/archlinux/community/os/i686
-Server = ftp://ftp.fsn.hu/pub/linux/distributions/archlinux/community/os/i686
-Server = ftp://ftp.ntua.gr/pub/linux/archlinux/community/os/i686
-Server = ftp://ftp.kegep.tuc.gr/archlinux/community/os/i686
-Server = ftp://ftp.estpak.ee/pub/archlinux/community/os/i686
-Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/community/os/i686
-Server = http://darkstar.ist.utl.pt/archlinux/community/os/i686
-Server = ftp://saule.mintis.lt/pub/linux/community/os/i686
-# Australia
-Server = http://mirror.pacific.net.au/ibiblio/distributions/archlinux/community/os/i686
-# Asia
-Server = ftp://cle.linux.org.tw/pub/ArchLinux/community/os/i686
diff --git a/etc/pacman.d/current b/etc/pacman.d/current
deleted file mode 100644
index 9c486a27..00000000
--- a/etc/pacman.d/current
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# CURRENT: Arch Linux core repository
-#
-# North America
-Server = ftp://ftp.archlinux.org/current/os/i686
-Server = ftp://ftp.nethat.com/pub/linux/archlinux/current/os/i686
-Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/current/os/i686
-Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/current/os/i686
-# Europe
-Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/current/os/i686
-Server = ftp://ftp.archlinux.de/pub/archlinux/current/os/i686
-Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/current/os/i686
-Server = ftp://ftp.mpi-sb.mpg.de/pub/linux/mirror/ftp.ibiblio.org/pub/Linux/distributions/archlinux/current/os/i686
-Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/current/os/i686
-Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/current/os/i686
-Server = ftp://mi.mirror.garr.it/mirrors/archlinux/current/os/i686
-Server = ftp://ftp.belnet.be/packages/archlinux/current/os/i686
-Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/current/os/i686
-Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/current/os/i686
-Server = ftp://sunsite.icm.edu.pl/site/linux-sunsite/distributions/archlinux/current/os/i686
-Server = ftp://mirror.icis.pcz.pl/archlinux/current/os/i686
-Server = ftp://ftp.pangora.org/archlinux/current/os/i686
-Server = ftp://ftp.fsn.hu/pub/linux/distributions/archlinux/current/os/i686
-Server = ftp://ftp.ntua.gr/pub/linux/archlinux/current/os/i686
-Server = ftp://ftp.kegep.tuc.gr/archlinux/current/os/i686
-Server = ftp://ftp.estpak.ee/pub/archlinux/current/os/i686
-Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/current/os/i686
-Server = http://darkstar.ist.utl.pt/archlinux/current/os/i686
-Server = ftp://saule.mintis.lt/pub/linux/current/os/i686
-# Australia
-Server = http://mirror.pacific.net.au/ibiblio/distributions/archlinux/current/os/i686
-# Asia
-Server = ftp://cle.linux.org.tw/pub/ArchLinux/current/os/i686
diff --git a/etc/pacman.d/extra b/etc/pacman.d/extra
deleted file mode 100644
index e7de9228..00000000
--- a/etc/pacman.d/extra
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# EXTRA: Arch Linux secondary repository
-#
-# North America
-Server = ftp://ftp.archlinux.org/extra/os/i686
-Server = ftp://ftp.nethat.com/pub/linux/archlinux/extra/os/i686
-Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/extra/os/i686
-Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/extra/os/i686
-# Europe
-Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/extra/os/i686
-Server = ftp://ftp.archlinux.de/pub/archlinux/extra/os/i686
-Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/extra/os/i686
-Server = ftp://ftp.mpi-sb.mpg.de/pub/linux/mirror/ftp.ibiblio.org/pub/Linux/distributions/archlinux/extra/os/i686
-Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/extra/os/i686
-Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/extra/os/i686
-Server = ftp://mi.mirror.garr.it/mirrors/archlinux/extra/os/i686
-Server = ftp://ftp.belnet.be/packages/archlinux/extra/os/i686
-Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/extra/os/i686
-Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/extra/os/i686
-Server = ftp://sunsite.icm.edu.pl/site/linux-sunsite/distributions/archlinux/extra/os/i686
-Server = ftp://mirror.icis.pcz.pl/archlinux/extra/os/i686
-Server = ftp://ftp.pangora.org/archlinux/extra/os/i686
-Server = ftp://ftp.fsn.hu/pub/linux/distributions/archlinux/extra/os/i686
-Server = ftp://ftp.ntua.gr/pub/linux/archlinux/extra/os/i686
-Server = ftp://ftp.kegep.tuc.gr/archlinux/extra/os/i686
-Server = ftp://ftp.estpak.ee/pub/archlinux/extra/os/i686
-Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/extra/os/i686
-Server = http://darkstar.ist.utl.pt/archlinux/extra/os/i686
-Server = ftp://saule.mintis.lt/pub/linux/extra/os/i686
-# Australia
-Server = http://mirror.pacific.net.au/ibiblio/distributions/archlinux/extra/os/i686
-# Asia
-Server = ftp://cle.linux.org.tw/pub/ArchLinux/extra/os/i686
diff --git a/etc/pacman.d/gen-mirrorlist.sh b/etc/pacman.d/gen-mirrorlist.sh
new file mode 100755
index 00000000..cbb6362c
--- /dev/null
+++ b/etc/pacman.d/gen-mirrorlist.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+# gen-mirrorlist.sh
+# There's absolutely no way to make autoconf do this, so instead, autoconf will
+# call this script - simple enough.
+
+
+REPOS="current extra unstable release community"
+
+for i in $REPOS; do
+    rm -f $i
+    cat mirrorlist | sed "s|@@REPO@@|$i|g" > $i
+done
diff --git a/etc/pacman.d/mirrorlist.in b/etc/pacman.d/mirrorlist.in
new file mode 100644
index 00000000..5c765f4a
--- /dev/null
+++ b/etc/pacman.d/mirrorlist.in
@@ -0,0 +1,71 @@
+#
+# @@REPO@@: Arch Linux @@REPO@@ repository
+#
+
+# United States
+Server = ftp://ftp.archlinux.org/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.nethat.com/pub/linux/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/@@REPO@@/os/@CARCH@
+Server = http://www2.cddc.vt.edu/linux/distributions/archlinux/@@REPO@@/os/@CARCH@
+
+# Europe
+# - Austria
+Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/@@REPO@@/os/@CARCH@
+# - Belgium
+Server = ftp://ftp.belnet.be/packages/archlinux/@@REPO@@/os/@CARCH@
+# - Czech Republic
+Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/@@REPO@@/os/@CARCH@
+# - Estonia
+Server = ftp://ftp.estpak.ee/pub/archlinux/@@REPO@@/os/@CARCH@
+# - France
+Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://mir1.archlinuxfr.org/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://mir2.archlinuxfr.org/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/@@REPO@@/os/@CARCH@
+#Server = http://mirrors.jakimowicz.com/archlinux/@@REPO@@/os/@CARCH@
+# - Germany
+#Server = ftp://ftp.archlinux.de/pub/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/@@REPO@@/os/@CARCH@
+# - Great Britain
+Server = http://ftp.parrswood.manchester.sch.uk/Mirrors/ftp.archlinux.org/@@REPO@@/os/@CARCH@
+# - Greece
+Server = ftp://ftp.ntua.gr/pub/linux/archlinux/@@REPO@@/os/@CARCH@
+# - Ireland
+Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/@@REPO@@/os/@CARCH@
+# - Italy
+Server = ftp://mi.mirror.garr.it/mirrors/archlinux/@@REPO@@/os/@CARCH@
+# - Lithuania
+Server = ftp://saule.mintis.lt/pub/linux/@@REPO@@/os/@CARCH@
+# - Netherlands
+Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/@@REPO@@/os/@CARCH@
+# - Norway
+Server = ftp://mirror.djzradio.net/archlinux/@@REPO@@/os/@CARCH@
+# - Poland
+Server = ftp://sunsite.icm.edu.pl/site/linux-sunsite/distributions/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://mirror.icis.pcz.pl/archlinux/@@REPO@@/os/@CARCH@
+# - Portugal
+Server = ftp://gul.est.ips.pt/repos/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://cesium.di.uminho.pt/pub/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://darkstar.ist.utl.pt/pub/archlinux/@@REPO@@/os/@CARCH@
+# - Romania
+Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/@@REPO@@/os/@CARCH@
+# - Sweden
+Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.gigabit.nu/@@REPO@@/os/@CARCH@
+# - Switzerland
+Server = ftp://archlinux.puzzle.ch/@@REPO@@/os/@CARCH@
+# - Ukraine
+Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/@@REPO@@/os/@CARCH@
+
+# Australia
+Server = ftp://mirror.pacific.net.au/linux/archlinux/@@REPO@@/os/@CARCH@
+
+# Asia
+# - China
+Server = http://mirror.vxmatrix.net/ArchLinux/@@REPO@@/os/@CARCH@
+Server = http://dxmirror.vxmatrix.net/ArchLinux/@@REPO@@/os/@CARCH@
+Server = http://cncmirror.vxmatrix.net/ArchLinux/@@REPO@@/os/@CARCH@
diff --git a/etc/pacman.d/release b/etc/pacman.d/release
deleted file mode 100644
index 29ecd895..00000000
--- a/etc/pacman.d/release
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# The Release tree.  This tree is a snapshot view of the Current (core)
-# repository as it was when the last ISO was released.
-#
-# If you use the RELEASE tree, you should disable the CURRENT
-# tree to avoid conflicts.
-#
-
-# North America
-Server = ftp://ftp.archlinux.org/release/os/i686
-Server = ftp://ftp.nethat.com/pub/linux/archlinux/release/os/i686
-Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/release/os/i686
-Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/release/os/i686
-# Europe
-Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/release/os/i686
-Server = ftp://ftp.archlinux.de/pub/archlinux/release/os/i686
-Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/release/os/i686
-Server = ftp://ftp.mpi-sb.mpg.de/pub/linux/mirror/ftp.ibiblio.org/pub/Linux/distributions/archlinux/release/os/i686
-Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/release/os/i686
-Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/release/os/i686
-Server = ftp://mi.mirror.garr.it/mirrors/archlinux/release/os/i686
-Server = ftp://ftp.belnet.be/packages/archlinux/release/os/i686
-Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/release/os/i686
-Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/release/os/i686
-Server = ftp://sunsite.icm.edu.pl/site/linux-sunsite/distributions/archlinux/release/os/i686
-Server = ftp://mirror.icis.pcz.pl/archlinux/release/os/i686
-Server = ftp://ftp.pangora.org/archlinux/release/os/i686
-Server = ftp://ftp.fsn.hu/pub/linux/distributions/archlinux/release/os/i686
-Server = ftp://ftp.ntua.gr/pub/linux/archlinux/release/os/i686
-Server = ftp://ftp.kegep.tuc.gr/archlinux/release/os/i686
-Server = ftp://ftp.estpak.ee/pub/archlinux/release/os/i686
-Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/release/os/i686
-Server = http://darkstar.ist.utl.pt/archlinux/release/os/i686
-Server = ftp://saule.mintis.lt/pub/linux/release/os/i686
-# Australia
-Server = http://mirror.pacific.net.au/ibiblio/distributions/archlinux/release/os/i686
-# Asia
-Server = ftp://cle.linux.org.tw/pub/ArchLinux/release/os/i686
diff --git a/etc/pacman.d/unstable b/etc/pacman.d/unstable
deleted file mode 100644
index 0e55bc7f..00000000
--- a/etc/pacman.d/unstable
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# UNSTABLE: Development/Unstable branches of software
-#
-# North America
-Server = ftp://ftp.archlinux.org/unstable/os/i686
-Server = ftp://ftp.nethat.com/pub/linux/archlinux/unstable/os/i686
-Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/unstable/os/i686
-Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/unstable/os/i686
-# Europe
-Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/unstable/os/i686
-Server = ftp://ftp.archlinux.de/pub/archlinux/unstable/os/i686
-Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/unstable/os/i686
-Server = ftp://ftp.mpi-sb.mpg.de/pub/linux/mirror/ftp.ibiblio.org/pub/Linux/distributions/archlinux/unstable/os/i686
-Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/unstable/os/i686
-Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/unstable/os/i686
-Server = ftp://mi.mirror.garr.it/mirrors/archlinux/unstable/os/i686
-Server = ftp://ftp.belnet.be/packages/archlinux/unstable/os/i686
-Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/unstable/os/i686
-Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/unstable/os/i686
-Server = ftp://sunsite.icm.edu.pl/site/linux-sunsite/distributions/archlinux/unstable/os/i686
-Server = ftp://mirror.icis.pcz.pl/archlinux/unstable/os/i686
-Server = ftp://ftp.pangora.org/archlinux/unstable/os/i686
-Server = ftp://ftp.fsn.hu/pub/linux/distributions/archlinux/unstable/os/i686
-Server = ftp://ftp.ntua.gr/pub/linux/archlinux/unstable/os/i686
-Server = ftp://ftp.kegep.tuc.gr/archlinux/unstable/os/i686
-Server = ftp://ftp.estpak.ee/pub/archlinux/unstable/os/i686
-Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/unstable/os/i686
-Server = http://darkstar.ist.utl.pt/archlinux/unstable/os/i686
-Server = ftp://saule.mintis.lt/pub/linux/unstable/os/i686
-# Australia
-Server = http://mirror.pacific.net.au/ibiblio/distributions/archlinux/unstable/os/i686
-# Asia
-Server = ftp://cle.linux.org.tw/pub/ArchLinux/unstable/os/i686