From 23744c595ea9ff1f8fab61396f651f50a6e5d174 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sat, 5 Nov 2016 22:32:00 +0100
Subject: [PATCH] firewall: prune unused bogons scripting #1248

---
 src/etc/rc.update_bogons | 46 ++++++----------------------------------
 1 file changed, 6 insertions(+), 40 deletions(-)

diff --git a/src/etc/rc.update_bogons b/src/etc/rc.update_bogons
index 6f1531050..214060879 100755
--- a/src/etc/rc.update_bogons
+++ b/src/etc/rc.update_bogons
@@ -4,11 +4,10 @@
 proc_error=""
 
 # Download and extract if necessary
-process_url() {
+process_url()
+{
 	local file=$1
 	local url=$2
-	local filename=${url##*/}
-	local ext=${filename#*.}
 
 	/usr/bin/fetch -a -T 30 -q -o $file "${url}"
 
@@ -16,36 +15,6 @@ process_url() {
 		echo "Could not download ${url}" | logger
 		proc_error="true"
 	fi
-
-	case "$ext" in
-		tar)
-			mv $file $file.tmp
-			/usr/bin/tar -xf $file.tmp -O > $file 2> /dev/null
-			;;
-		tar.gz)
-			mv $file $file.tmp
-			/usr/bin/tar -xzf $file.tmp -O > $file 2> /dev/null
-			;;
-		tgz)
-			mv $file $file.tmp
-			/usr/bin/tar -xzf $file.tmp -O > $file 2> /dev/null
-			;;
-		tar.bz2)
-			mv $file $file.tmp
-			/usr/bin/tar -xjf $file.tmp -O > $file 2> /dev/null
-			;;
-		*)
-			;;
-	esac
-
-	if [ -f $file.tmp ]; then
-		rm $file.tmp
-	fi
-
-	if [ ! -f $file ]; then
-		echo "Could not extract ${filename}" | logger
-		proc_error="true"
-	fi
 }
 
 echo "rc.update_bogons is starting up." | logger
@@ -60,11 +29,8 @@ fi
 
 echo "rc.update_bogons is beginning the update cycle." | logger
 
-# Set default values if not overriden
-v4url=${v4url:-"https://pkg.opnsense.org/bogons/fullbogons-ipv4.txt"}
-v6url=${v6url:-"https://pkg.opnsense.org/bogons/fullbogons-ipv6.txt"}
-v4urlcksum=${v4urlcksum:-"${v4url}.md5"}
-v6urlcksum=${v6urlcksum:-"${v6url}.md5"}
+v4url="https://pkg.opnsense.org/bogons/fullbogons-ipv4.txt"
+v6url="https://pkg.opnsense.org/bogons/fullbogons-ipv6.txt"
 
 process_url /tmp/bogons "${v4url}"
 process_url /tmp/bogonsv6 "${v6url}"
@@ -75,9 +41,9 @@ if [ "$proc_error" != "" ]; then
 	exit
 fi
 
-BOGON_V4_CKSUM=`/usr/bin/fetch -T 30 -q -o - "${v4urlcksum}" | awk '{ print $4 }'`
+BOGON_V4_CKSUM=`/usr/bin/fetch -T 30 -q -o - "${v4url}.md5" | awk '{ print $4 }'`
 ON_DISK_V4_CKSUM=`md5 /tmp/bogons | awk '{ print $4 }'`
-BOGON_V6_CKSUM=`/usr/bin/fetch -T 30 -q -o - "${v6urlcksum}" | awk '{ print $4 }'`
+BOGON_V6_CKSUM=`/usr/bin/fetch -T 30 -q -o - "${v6url}.md5" | awk '{ print $4 }'`
 ON_DISK_V6_CKSUM=`md5 /tmp/bogonsv6 | awk '{ print $4 }'`
 
 if [ "$BOGON_V4_CKSUM" = "$ON_DISK_V4_CKSUM" ] || [ "$BOGON_V6_CKSUM" = "$ON_DISK_V6_CKSUM" ]; then