From 1d63e8a8d9e8f7a4e999f77d4a606c3aa1bf7a67 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Thu, 9 Jun 2005 12:15:00 +0000
Subject: [PATCH] Make the sourceforge mirror site a config option, as
 sourceforge mirrors tend to change, move, go down, etc from time to time.

---
 Config.in                              | 9 +++++++++
 package/bridge/bridge.mk               | 2 +-
 package/e2fsprogs/e2fsprogs.mk         | 2 +-
 package/freetype/freetype.mk           | 2 +-
 package/hotplug/hotplug.mk             | 2 +-
 package/libmad/libmad.mk               | 2 +-
 package/libsysfs/libsysfs.mk           | 2 +-
 package/ltp-testsuite/ltp-testsuite.mk | 2 +-
 package/netsnmp/netsnmp.mk             | 2 +-
 package/openvpn/openvpn.mk             | 2 +-
 package/pcmcia/pcmcia.mk               | 2 +-
 package/strace/strace.mk               | 2 +-
 package/tcl/tcl.mk                     | 2 +-
 package/tn5250/tn5250.mk               | 2 +-
 package/vtun/vtun.mk                   | 2 +-
 package/zlib/zlib.mk                   | 2 +-
 target/cramfs/cramfs.mk                | 2 +-
 target/squashfs/squashfsroot.mk        | 2 +-
 18 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/Config.in b/Config.in
index 6ead7cb3de..7843417006 100644
--- a/Config.in
+++ b/Config.in
@@ -107,6 +107,15 @@ config BR2_TAR_VERBOSITY
 	bool "Tar verbose"
 	default n
 
+config BR2_SOURCEFORGE_MIRROR
+        string "Sourceforge mirror site"
+	default "unc"
+	help
+	    Sourceforge has a system of mirror sites.  Some sites may be closer
+	    to your location, and sometimes mirror sites go down and are no longer
+	    available.  This option allows you to select your preferred Sourceforge
+	    mirror site.
+
 config BR2_STAGING_DIR
 	string "Toolchain and header file location?"
 	default "$(BUILD_DIR)/staging_dir"
diff --git a/package/bridge/bridge.mk b/package/bridge/bridge.mk
index 32743c26df..2a3f9cdd5c 100644
--- a/package/bridge/bridge.mk
+++ b/package/bridge/bridge.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 #
-BRIDGE_SOURCE_URL=http://umn.dl.sourceforge.net/sourceforge/bridge/
+BRIDGE_SOURCE_URL=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/bridge/
 BRIDGE_SOURCE=bridge-utils-1.0.4.tar.gz
 BRIDGE_BUILD_DIR=$(BUILD_DIR)/bridge-utils-1.0.4
 BRIDGE_TARGET_BINARY:=usr/sbin/brctl
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 573d49e7dc..65e3f6e500 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -5,7 +5,7 @@
 #############################################################
 E2FSPROGS_VER:=1.37
 E2FSPROGS_SOURCE=e2fsprogs-$(E2FSPROGS_VER).tar.gz
-E2FSPROGS_SITE=http://telia.dl.sourceforge.net/sourceforge/e2fsprogs
+E2FSPROGS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs
 E2FSPROGS_DIR=$(BUILD_DIR)/e2fsprogs-$(E2FSPROGS_VER)
 E2FSPROGS_CAT:=zcat
 E2FSPROGS_BINARY:=misc/mke2fs
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 23a0b8f8bb..7eae269c6b 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -5,7 +5,7 @@
 #############################################################
 FREETYPE_VERSION:=2.1.9
 FREETYPE_SOURCE:=freetype-$(FREETYPE_VERSION).tar.bz2
-FREETYPE_SITE:=http://telia.dl.sourceforge.net/sourceforge/freetype
+FREETYPE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
 FREETYPE_CAT:=bzcat
 FREETYPE_DIR:=$(BUILD_DIR)/freetype-$(FREETYPE_VERSION)
 
diff --git a/package/hotplug/hotplug.mk b/package/hotplug/hotplug.mk
index 74ffc86039..8b86542537 100644
--- a/package/hotplug/hotplug.mk
+++ b/package/hotplug/hotplug.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 HOTPLUG_SOURCE=diethotplug-0.4.tar.gz
-HOTPLUG_SITE=http://aleron.dl.sourceforge.net/sourceforge/linux-hotplug
+HOTPLUG_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/linux-hotplug
 HOTPLUG_DIR=$(BUILD_DIR)/diethotplug-0.4
 
 $(DL_DIR)/$(HOTPLUG_SOURCE):
diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk
index 758f7c5469..77fee65fc5 100644
--- a/package/libmad/libmad.mk
+++ b/package/libmad/libmad.mk
@@ -6,7 +6,7 @@
 
 LIBMAD_VERSION=0.15.1b
 LIBMAD_SOURCE=libmad-$(LIBMAD_VERSION).tar.gz
-LIBMAD_SITE=http://easynews.dl.sourceforge.net/sourceforge/mad/
+LIBMAD_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mad/
 LIBMAD_DIR=$(BUILD_DIR)/${shell basename $(LIBMAD_SOURCE) .tar.gz}
 LIBMAD_WORKDIR=$(BUILD_DIR)/libmad-$(LIBMAD_VERSION)
 LIBMAD_CAT:=zcat
diff --git a/package/libsysfs/libsysfs.mk b/package/libsysfs/libsysfs.mk
index e41e760391..2e8c07d88b 100644
--- a/package/libsysfs/libsysfs.mk
+++ b/package/libsysfs/libsysfs.mk
@@ -23,7 +23,7 @@
 
 LIBSYSFS_VER:=1.3.0
 LIBSYSFS_DIR:=$(BUILD_DIR)/sysfsutils-$(LIBSYSFS_VER)
-LIBSYSFS_SITE:=http://easynews.dl.sourceforge.net/sourceforge/linux-diag
+LIBSYSFS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/linux-diag
 LIBSYSFS_SOURCE:=sysfsutils-$(LIBSYSFS_VER).tar.gz
 LIBSYSFS_CAT:=zcat
 
diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
index a7e6a63cc0..1b2971fbd3 100644
--- a/package/ltp-testsuite/ltp-testsuite.mk
+++ b/package/ltp-testsuite/ltp-testsuite.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 LTP_TESTSUITE_SOURCE:=ltp-full-20040506.tgz
-LTP_TESTSUITE_SITE:=http://aleron.dl.sourceforge.net/sourceforge/ltp
+LTP_TESTSUITE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ltp
 LTP_TESTSUITE_CAT:=zcat
 LTP_TESTSUITE_DIR:=$(BUILD_DIR)/ltp-full-20040506
 
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index 494d58a413..740ffa98b2 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-NETSNMP_URL:=http://aleron.dl.sourceforge.net/sourceforge/net-snmp/
+NETSNMP_URL:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/net-snmp/
 NETSNMP_DIR:=$(BUILD_DIR)/net-snmp-5.1.2
 NETSNMP_SOURCE:=net-snmp-5.1.2.tar.gz
 NETSNMP_PATCH1:=net-snmp_5.1.2-6.diff.gz
diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index 3f3f7d5889..e50a3c0af3 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -7,7 +7,7 @@
 #
 #############################################################
 OPENVPN_SOURCE:=openvpn-1.5.0.tar.gz
-OPENVPN_SITE:=http://aleron.dl.sourceforge.net/sourceforge/openvpn/
+OPENVPN_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/openvpn/
 OPENVPN_DIR:=$(BUILD_DIR)/openvpn-1.5.0
 OPENVPN_CAT:=zcat
 OPENVPN_BINARY:=openvpn
diff --git a/package/pcmcia/pcmcia.mk b/package/pcmcia/pcmcia.mk
index 31efd5c9bb..a28f25f737 100644
--- a/package/pcmcia/pcmcia.mk
+++ b/package/pcmcia/pcmcia.mk
@@ -22,7 +22,7 @@
 # USA
 
 PCMCIA_SOURCE:=pcmcia-cs-3.2.7.tar.gz
-PCMCIA_SITE:=http://aleron.dl.sourceforge.net/sourceforge/pcmcia-cs
+PCMCIA_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/pcmcia-cs
 PCMCIA_DIR:=$(BUILD_DIR)/pcmcia-cs-3.2.7
 PCMCIA_CAT:=zcat
 
diff --git a/package/strace/strace.mk b/package/strace/strace.mk
index ead0fbcbdc..2a2cdc36da 100644
--- a/package/strace/strace.mk
+++ b/package/strace/strace.mk
@@ -5,7 +5,7 @@
 #############################################################
 STRACE_VER:=4.5.7
 STRACE_SOURCE:=strace-$(STRACE_VER).tar.bz2
-STRACE_SITE:=http://aleron.dl.sourceforge.net/sourceforge/strace
+STRACE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/strace
 STRACE_CAT:=bzcat
 STRACE_DIR:=$(BUILD_DIR)/strace-$(STRACE_VER)
 
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index 6be6559641..5195bf7503 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -5,7 +5,7 @@
 #############################################################
 TCL_VERSION:=8.4.9
 TCL_SOURCE:=tcl$(TCL_VERSION)-src.tar.gz
-TCL_SITE:=http://heanet.dl.sourceforge.net/sourceforge/tcl
+TCL_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tcl
 TCL_DIR:=$(BUILD_DIR)/tcl$(TCL_VERSION)
 
 $(DL_DIR)/$(TCL_SOURCE):
diff --git a/package/tn5250/tn5250.mk b/package/tn5250/tn5250.mk
index 5002874b8d..6cf425e162 100644
--- a/package/tn5250/tn5250.mk
+++ b/package/tn5250/tn5250.mk
@@ -1,4 +1,4 @@
-TN5250_SITE:=http://aleron.dl.sourceforge.net/sourceforge/tn5250
+TN5250_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tn5250
 TN5250_DIR:=$(BUILD_DIR)/tn5250-0.16.4
 TN5250_SOURCE:=tn5250-0.16.4.tar.gz
 
diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk
index 365b020c03..0ef29ea7ce 100644
--- a/package/vtun/vtun.mk
+++ b/package/vtun/vtun.mk
@@ -7,7 +7,7 @@
 #
 #############################################################
 VTUN_SOURCE:=vtun-2.6.tar.gz
-VTUN_SITE:=http://aleron.dl.sourceforge.net/sourceforge/vtun/
+VTUN_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/vtun/
 VTUN_DIR:=$(BUILD_DIR)/vtun-2.6
 VTUN_CAT:=zcat
 VTUN_BINARY:=vtund
diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk
index 7a02fa979c..4b8f92d55a 100644
--- a/package/zlib/zlib.mk
+++ b/package/zlib/zlib.mk
@@ -5,7 +5,7 @@
 #############################################################
 ZLIB_VER=1.2.2
 ZLIB_SOURCE=zlib-$(ZLIB_VER).tar.bz2
-ZLIB_SITE=http://aleron.dl.sourceforge.net/sourceforge/libpng
+ZLIB_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
 ZLIB_DIR=$(BUILD_DIR)/zlib-$(ZLIB_VER)
 ZLIB_CFLAGS= $(TARGET_CFLAGS) -fPIC
 ifeq ($(BR2_LARGEFILE),y)
diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk
index bc8424000a..68a55d4066 100644
--- a/target/cramfs/cramfs.mk
+++ b/target/cramfs/cramfs.mk
@@ -5,7 +5,7 @@
 #############################################################
 CRAMFS_DIR=$(BUILD_DIR)/cramfs-1.1
 CRAMFS_SOURCE=cramfs-1.1.tar.gz
-CRAMFS_SITE=http://aleron.dl.sourceforge.net/sourceforge/cramfs
+CRAMFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/cramfs
 
 $(DL_DIR)/$(CRAMFS_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(CRAMFS_SITE)/$(CRAMFS_SOURCE)
diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk
index 5a4536fed6..d969efed03 100644
--- a/target/squashfs/squashfsroot.mk
+++ b/target/squashfs/squashfsroot.mk
@@ -5,7 +5,7 @@
 #############################################################
 SQUASHFS_DIR=$(BUILD_DIR)/squashfs1.3r3
 SQUASHFS_SOURCE=squashfs1.3r3.tar.gz
-SQUASHFS_SITE=http://aleron.dl.sourceforge.net/sourceforge/squashfs
+SQUASHFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/squashfs
 
 $(DL_DIR)/$(SQUASHFS_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(SQUASHFS_SITE)/$(SQUASHFS_SOURCE)
-- 
2.30.2