From 307f13539d68c9ec91ba7293d022d230fb7ed6d9 Mon Sep 17 00:00:00 2001 From: Pawel Krawczyk Date: Mon, 12 Jan 2015 13:45:28 +0000 Subject: [PATCH] truncate set name to avoid iptables v1.4.7: Maximum prefix length 29 for --log-prefix manually handle compressed file only if no --compressed option was used --- blacklist.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/blacklist.sh b/blacklist.sh index 3937ce2..7667fec 100755 --- a/blacklist.sh +++ b/blacklist.sh @@ -72,13 +72,15 @@ for url in $urls; do headers=$(mktemp) # download the blocklist - set_name=$(echo "$url" | awk -F/ '{print $3;}') # set name is derived from source URL hostname + set_name=$(echo "$url" | awk -F/ '{print substring($3,0,21);}') # set name is derived from source URL hostname curl -v -s ${COMPRESS_OPT} -k "$url" >"${unsorted_blocklist}" 2>"${headers}" # this is required for blocklist.de that sends compressed content if asked for it or not - if grep -qi 'content-encoding: gzip' "${headers}"; then - mv "${unsorted_blocklist}" "${unsorted_blocklist}.gz" - gzip -d "${unsorted_blocklist}.gz" + if [ -z "$COMPRESS_OPT" ]; then + if grep -qi 'content-encoding: gzip' "${headers}"; then + mv "${unsorted_blocklist}" "${unsorted_blocklist}.gz" + gzip -d "${unsorted_blocklist}.gz" + fi fi sort -u <"${unsorted_blocklist}" | egrep "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$" >"${sorted_blocklist}"