[Astlinux-commits] SF.net SVN: astlinux:[7626] branches/1.0/package/arnofw/ reload-spamhaus-drop

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

Revision: 7626
          http://sourceforge.net/p/astlinux/code/7626
Author:   abelbeck
Date:     2016-04-01 16:21:31 +0000 (Fri, 01 Apr 2016)
Log Message:
-----------
reload-spamhaus-drop, use HTTPS for www.spamhaus.org/drop/ downloads

Modified Paths:
--------------
    branches/1.0/package/arnofw/reload-spamhaus-drop

Modified: branches/1.0/package/arnofw/reload-spamhaus-drop
===================================================================
--- branches/1.0/package/arnofw/reload-spamhaus-drop	2016-03-31 18:09:41 UTC (rev 7625)
+++ branches/1.0/package/arnofw/reload-spamhaus-drop	2016-04-01 16:21:31 UTC (rev 7626)
@@ -2,7 +2,7 @@
 #
 # reload-spamhaus-drop
 #
-# http://www.spamhaus.org/drop/
+# https://www.spamhaus.org/drop/
 #
 # Retrieve the latest spamhaus-drop files, and copy it to 'outfile'.
 # If 'infile' is specified, it is appended to 'outfile'.
@@ -16,11 +16,18 @@
 # than once every hour.
 #
 
-URLS="http://www.spamhaus.org/drop/drop.txt http://www.spamhaus.org/drop/edrop.txt"
+URLS="https://www.spamhaus.org/drop/drop.txt https://www.spamhaus.org/drop/edrop.txt"
 
 TMP_FILE="/tmp/dropfile.txt"
 TMP_DROP="/tmp/drop.txt"
 
+download_file()
+{
+  local file="$1" url="$2"
+
+  curl -sSfL --globoff --retry 1 --connect-timeout 15 --max-time 1800 -o "$file" "$url" >/dev/null
+}
+
 if [ -z "$1" ]; then
   echo "Usage: reload-spamhaus-drop outfile [ infile ]"
   exit 1
@@ -39,7 +46,7 @@
 unset IFS
 for URL in $URLS; do
   rm -f $TMP_FILE
-  if ! /usr/sbin/download-file "$TMP_FILE" "$URL"; then
+  if ! download_file "$TMP_FILE" "$URL"; then
     rm -f $TMP_DROP $TMP_FILE
     MESG="Retrieving Spamhaus DROP list failed for '$URL', no action."
     logger -s -t reload-spamhaus-drop -p kern.info "$MESG"

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