[Astlinux-commits] SF.net SVN: astlinux:[7398] branches/1.0

[<abe...@us...>]

Revision: 7398
          http://sourceforge.net/p/astlinux/code/7398
Author:   abelbeck
Date:     2015-12-12 21:48:41 +0000 (Sat, 12 Dec 2015)
Log Message:
-----------
build system, move '--no-check-certificate' to getter_script.sh when needed, and cleanup pevious hacks

Modified Paths:
--------------
    branches/1.0/package/iperf3/iperf3.mk
    branches/1.0/package/ntp/ntp.mk
    branches/1.0/package/perl/perl.mk
    branches/1.0/toolchain/getter_script.sh

Modified: branches/1.0/package/iperf3/iperf3.mk
===================================================================
--- branches/1.0/package/iperf3/iperf3.mk	2015-12-12 18:04:48 UTC (rev 7397)
+++ branches/1.0/package/iperf3/iperf3.mk	2015-12-12 21:48:41 UTC (rev 7398)
@@ -6,6 +6,6 @@
 
 IPERF3_VERSION = 3.0.11
 IPERF3_SOURCE = iperf-$(IPERF3_VERSION)-source.tar.gz
-IPERF3_SITE = --no-check-certificate https://iperf.fr/download/iperf_3.0
+IPERF3_SITE = https://iperf.fr/download/iperf_3.0
 
 $(eval $(call AUTOTARGETS,package,iperf3))

Modified: branches/1.0/package/ntp/ntp.mk
===================================================================
--- branches/1.0/package/ntp/ntp.mk	2015-12-12 18:04:48 UTC (rev 7397)
+++ branches/1.0/package/ntp/ntp.mk	2015-12-12 21:48:41 UTC (rev 7398)
@@ -5,7 +5,7 @@
 #############################################################
 NTP_VERSION = 4.2.8p4
 NTP_SOURCE = ntp-$(NTP_VERSION).tar.gz
-NTP_SITE = --no-check-certificate https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
+NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
 NTP_DEPENDENCIES = host-bison host-flex host-pkg-config
 
 NTP_CONF_OPT = \

Modified: branches/1.0/package/perl/perl.mk
===================================================================
--- branches/1.0/package/perl/perl.mk	2015-12-12 18:04:48 UTC (rev 7397)
+++ branches/1.0/package/perl/perl.mk	2015-12-12 21:48:41 UTC (rev 7398)
@@ -18,7 +18,7 @@
 PERL_MODULES += Digest/MD5 Digest/SHA Getopt/Long Time/Local File/Glob Sys/Hostname
 
 PERL_CROSS_VERSION = 1.0.1
-#PERL_CROSS_SITE = --no-check-certificate https://raw.github.com/arsv/perl-cross/releases
+#PERL_CROSS_SITE = https://raw.github.com/arsv/perl-cross/releases
 PERL_CROSS_SITE = http://files.astlinux.org
 PERL_CROSS_SOURCE = perl-$(PERL_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz
 

Modified: branches/1.0/toolchain/getter_script.sh
===================================================================
--- branches/1.0/toolchain/getter_script.sh	2015-12-12 18:04:48 UTC (rev 7397)
+++ branches/1.0/toolchain/getter_script.sh	2015-12-12 21:48:41 UTC (rev 7398)
@@ -6,18 +6,29 @@
 
 WGET_ARGS="--passive-ftp --timeout=30 -c -t 2"
 
-wget $WGET_ARGS $@ || (
-	echo Retrying from astlinux alternate site...
-	index=$#-1
-	# Copy all params into an array
-	for (( i=0; $?==0; i++ ));do a[$i]=$1; shift; done
-	# Chop all but filename from last param and prepend out URL
-	a[$index]=${a[index]/*\//http:\/\/$SITE/}
-	# Now wget that from our server
-	wget $WGET_ARGS ${a[@]}
-)
+wget $WGET_ARGS $@
+wget_rtn=$?
 
+# SSL verification failure
+if [ $wget_rtn -eq 5 ]; then
+  wget --no-check-certificate $WGET_ARGS $@
+  wget_rtn=$?
+fi
 
+# Alternate site on error
+if [ $wget_rtn -ne 0 ]; then
+  echo "Retrying from AstLinux alternate site..."
+  (
+    index=$#-1
+    # Copy all params into an array
+    for (( i=0; $?==0; i++ ));do a[$i]=$1; shift; done
+    # Chop all but filename from last param and prepend out URL
+    a[$index]=${a[index]/*\//http:\/\/$SITE/}
+    # Now wget that from our server
+    wget $WGET_ARGS ${a[@]}
+  )
+fi
+
 for i in $@; do
   URL="$i"
 done

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.