From 3f85cf67fc51b2d39c5cfa39bb16d5ca982e78dd Mon Sep 17 00:00:00 2001 From: RISCi_ATOM Date: Wed, 26 Apr 2017 07:17:39 -0400 Subject: [PATCH] Remove FTP mirrors from libreCMC core (Makefiles and download.pl) --- package/libs/libmnl/Makefile | 2 +- package/libs/libnetfilter-conntrack/Makefile | 3 ++- package/libs/libnetfilter-cthelper/Makefile | 3 ++- package/libs/libnetfilter-cttimeout/Makefile | 2 +- package/libs/libnetfilter-log/Makefile | 3 ++- package/libs/libnfnetlink/Makefile | 2 +- package/libs/openssl/Makefile | 4 +--- package/network/utils/conntrack-tools/Makefile | 5 +++-- package/network/utils/curl/Makefile | 3 +-- package/network/utils/iptables/Makefile | 5 ++--- scripts/download.pl | 10 ---------- 11 files changed, 16 insertions(+), 26 deletions(-) diff --git a/package/libs/libmnl/Makefile b/package/libs/libmnl/Makefile index 6d05e25440..36d17f8493 100644 --- a/package/libs/libmnl/Makefile +++ b/package/libs/libmnl/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ http://www.netfilter.org/projects/libmnl/files \ - ftp://ftp.netfilter.org/pub/libmnl + PKG_HASH:=171f89699f286a5854b72b91d06e8f8e3683064c5901fb09d954a9ab6f551f81 PKG_MAINTAINER:=Jo-Philipp Wich diff --git a/package/libs/libnetfilter-conntrack/Makefile b/package/libs/libnetfilter-conntrack/Makefile index 399aa6ce1d..df317bcfd9 100644 --- a/package/libs/libnetfilter-conntrack/Makefile +++ b/package/libs/libnetfilter-conntrack/Makefile @@ -14,7 +14,8 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ http://www.netfilter.org/projects/libnetfilter_conntrack/files/ \ - ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/ + + PKG_HASH:=efcc08021284e75f4d96d3581c5155a11f08fd63316b1938cbcb269c87f37feb PKG_MAINTAINER:=Jo-Philipp Wich diff --git a/package/libs/libnetfilter-cthelper/Makefile b/package/libs/libnetfilter-cthelper/Makefile index a67296a1f2..9cd315e934 100644 --- a/package/libs/libnetfilter-cthelper/Makefile +++ b/package/libs/libnetfilter-cthelper/Makefile @@ -14,7 +14,8 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ http://www.netfilter.org/projects/libnetfilter_cthelper/files/ \ - ftp://ftp.netfilter.org/pub/libnetfilter_cthelper/ + + PKG_HASH:=07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d PKG_FIXUP:=autoreconf diff --git a/package/libs/libnetfilter-cttimeout/Makefile b/package/libs/libnetfilter-cttimeout/Makefile index acd1b7b342..c0fc4e9106 100644 --- a/package/libs/libnetfilter-cttimeout/Makefile +++ b/package/libs/libnetfilter-cttimeout/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ http://www.netfilter.org/projects/libnetfilter_cttimeout/files/ \ - ftp://ftp.netfilter.org/pub/libnetfilter_cttimeout/ + PKG_HASH:=aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba PKG_FIXUP:=autoreconf diff --git a/package/libs/libnetfilter-log/Makefile b/package/libs/libnetfilter-log/Makefile index c80c46f930..46b77b8a21 100644 --- a/package/libs/libnetfilter-log/Makefile +++ b/package/libs/libnetfilter-log/Makefile @@ -14,7 +14,8 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ http://www.netfilter.org/projects/libnetfilter_log/files/ \ - ftp://ftp.netfilter.org/pub/libnetfilter_log/ + + PKG_HASH:=74e0fe75753dba3ac114531b5e73240452c789a3f3adccf5c51217da1d933b21 PKG_MAINTAINER:=Yousong Zhou diff --git a/package/libs/libnfnetlink/Makefile b/package/libs/libnfnetlink/Makefile index 6d931a4ddd..b8115ef10e 100644 --- a/package/libs/libnfnetlink/Makefile +++ b/package/libs/libnfnetlink/Makefile @@ -14,8 +14,8 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ http://www.netfilter.org/projects/libnfnetlink/files/ \ - ftp://ftp.netfilter.org/pub/libnfnetlink/ \ http://mirrors.evolva.ro/netfilter.org/libnfnetlink/ + PKG_HASH:=f270e19de9127642d2a11589ef2ec97ef90a649a74f56cf9a96306b04817b51a PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0+ diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index 9b6430234e..40f4c1a383 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -19,10 +19,8 @@ PKG_BUILD_PARALLEL:=0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.openssl.org/source/ \ - ftp://ftp.openssl.org/source/ \ http://www.openssl.org/source/old/$(PKG_BASE)/ \ - ftp://ftp.funet.fi/pub/crypt/mirrors/ftp.openssl.org/source \ - ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ + PKG_HASH:=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 PKG_LICENSE:=OpenSSL diff --git a/package/network/utils/conntrack-tools/Makefile b/package/network/utils/conntrack-tools/Makefile index 128fa9e6f3..84cadeb252 100644 --- a/package/network/utils/conntrack-tools/Makefile +++ b/package/network/utils/conntrack-tools/Makefile @@ -14,8 +14,9 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ http://www.netfilter.org/projects/conntrack-tools/files \ - ftp://ftp.netfilter.org/pub/conntrack-tools \ - http://mirrors.evolva.ro/netfilter.org/conntrack-tools + http://mirrors.evolva.ro/netfilter.org/conntrack-tools \ + + PKG_HASH:=b7caf4fcc4c03575df57d25e5216584d597fd916c891f191dac616ce68bdba6c PKG_MAINTAINER:=Jo-Philipp Wich diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile index 68558a9eda..46d19db370 100644 --- a/package/network/utils/curl/Makefile +++ b/package/network/utils/curl/Makefile @@ -14,10 +14,9 @@ PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://curl.haxx.se/download/ \ http://www.mirrorspace.org/curl/ \ - ftp://ftp.sunet.se/pub/www/utilities/curl/ \ - ftp://ftp.planetmirror.com/pub/curl/ \ http://www.mirrormonster.com/curl/download/ \ http://curl.mirrors.cyberservers.net/download/ + PKG_HASH:=d16185a767cb2c1ba3d5b9096ec54e5ec198b213f45864a38b3bda4bbf87389b PKG_LICENSE:=MIT diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile index ac869f0385..f019a99119 100644 --- a/package/network/utils/iptables/Makefile +++ b/package/network/utils/iptables/Makefile @@ -14,9 +14,8 @@ PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \ - ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \ - ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \ - ftp://ftp.no.netfilter.org/pub/netfilter/iptables/ + + PKG_HASH:=52004c68021da9a599feed27f65defcfb22128f7da2c0531c0f75de0f479d3e0 PKG_FIXUP:=autoreconf diff --git a/scripts/download.pl b/scripts/download.pl index de6bc59faf..30f9db96bf 100755 --- a/scripts/download.pl +++ b/scripts/download.pl @@ -198,8 +198,6 @@ foreach my $mirror (@ARGV) { push @mirrors, "http://mirror.csclub.uwaterloo.ca/apache/$1"; push @mirrors, "http://mirror.navercorp.com/apache/$1"; push @mirrors, "http://ftp.jaist.ac.jp/pub/apache/$1"; - push @mirrors, "ftp://apache.cs.utah.edu/apache.org/$1"; - push @mirrors, "ftp://apache.mirrors.ovh.net/ftp.apache.org/dist/$1"; } elsif ($mirror =~ /^\@GITHUB\/(.+)$/) { # give github a few more tries (different mirrors) for (1 .. 5) { @@ -212,8 +210,6 @@ foreach my $mirror (@ARGV) { push @mirrors, "http://www.nic.funet.fi/pub/gnu/gnu/$1"; push @mirrors, "http://mirror.internode.on.net/pub/gnu/$1"; push @mirrors, "http://mirror.navercorp.com/gnu/$1"; - push @mirrors, "ftp://mirror.csclub.uwaterloo.ca/gnu/$1"; - push @mirrors, "ftp://download.xs4all.nl/pub/gnu/"; } elsif ($mirror =~ /^\@SAVANNAH\/(.+)$/) { push @mirrors, "https://mirror.netcologne.de/savannah/$1"; push @mirrors, "http://mirror.csclub.uwaterloo.ca/nongnu/$1"; @@ -221,8 +217,6 @@ foreach my $mirror (@ARGV) { push @mirrors, "http://nongnu.uib.no/$1"; push @mirrors, "http://ftp.igh.cnrs.fr/pub/nongnu/$1"; push @mirrors, "http://public.p-knowledge.co.jp/Savannah-nongnu-mirror/$1"; - push @mirrors, "ftp://cdimage.debian.org/mirror/gnu.org/savannah/$1"; - push @mirrors, "ftp://ftp.acc.umu.se/mirror/gnu.org/savannah/$1"; } elsif ($mirror =~ /^\@KERNEL\/(.+)$/) { my @extra = ( $1 ); if ($filename =~ /linux-\d+\.\d+(?:\.\d+)?-rc/) { @@ -237,8 +231,6 @@ foreach my $mirror (@ARGV) { push @mirrors, "http://mirrors.mit.edu/kernel/$dir"; push @mirrors, "http://ftp.nara.wide.ad.jp/pub/kernel.org/$dir"; push @mirrors, "http://www.ring.gr.jp/archives/linux/kernel.org/$dir"; - push @mirrors, "ftp://ftp.riken.jp/Linux/kernel.org/$dir"; - push @mirrors, "ftp://www.mirrorservice.org/sites/ftp.kernel.org/pub/$dir"; } } elsif ($mirror =~ /^\@KERNEL_LIBRE\/(.+)$/) { my @extra = ( $1 ); @@ -257,8 +249,6 @@ foreach my $mirror (@ARGV) { push @mirrors, "http://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/$1"; push @mirrors, "http://mirror.internode.on.net/pub/gnome/sources/$1"; push @mirrors, "http://ftp.belnet.be/ftp.gnome.org/sources/$1"; - push @mirrors, "ftp://ftp.cse.buffalo.edu/pub/Gnome/sources/$1"; - push @mirrors, "ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/sources/$1"; } else { push @mirrors, $mirror; -- 2.25.1