From 2597837a47eafcfc01f17ac21beff5df1a92c29b Mon Sep 17 00:00:00 2001 From: root Date: Sun, 25 Jul 2010 12:58:54 -0400 Subject: updated ipblocklist to v2.1 fixed bug for 2.0 beta x86 and x64 --- config/ipblocklist/convert-execute.sh | 5 +++-- config/ipblocklist/ipblocklist.inc | 6 ++++-- config/ipblocklist/ipblocklist.tmp | 4 ++-- config/ipblocklist/ipblocklist.xml | 4 ++-- pkg_config.7.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 7 files changed, 14 insertions(+), 11 deletions(-) diff --git a/config/ipblocklist/convert-execute.sh b/config/ipblocklist/convert-execute.sh index dd668baa..d4e4a687 100755 --- a/config/ipblocklist/convert-execute.sh +++ b/config/ipblocklist/convert-execute.sh @@ -1,4 +1,5 @@ -#Version 2 +#!/bin/sh +#Version 2.1 #kill tables to elminate dups pfctl -t ipblocklist -T kill @@ -45,7 +46,7 @@ mv Wlists/whitelistTEMP Wlists/whitelist #find my line for table export i=`grep -n 'block quick from any to ' /tmp/rules.debug | grep -o '[0-9]\{2,4\}'` -export t=`grep -n 'User Aliases' /tmp/rules.debug |grep -o '[0-9]'` +export t=`grep -n 'User Aliases' /tmp/rules.debug |grep -o '[0-9]\{1,2\}'` i=$(($i+'1')) t=$(($t+'1')) diff --git a/config/ipblocklist/ipblocklist.inc b/config/ipblocklist/ipblocklist.inc index c5ce30f4..9f1c5ad0 100755 --- a/config/ipblocklist/ipblocklist.inc +++ b/config/ipblocklist/ipblocklist.inc @@ -3,7 +3,7 @@ /* /* ========================================================================== */ /* - ipblocklist.inc v2 + ipblocklist.inc v2.1 Copyright (C) 2010 Tom Schaefer All rights reserved. */ @@ -105,6 +105,8 @@ function php_install_command() unlink_if_exists("/tmp/convert-execute.sh"); exec("cp /tmp/IP-Blocklist.sh /usr/local/etc/rc.d/IP-Blocklist.sh"); unlink_if_exists("/tmp/IP-Blocklist.sh"); + //Touch files + touch /usr/local/www/packages/ipblocklist/wlists.txt @@ -127,4 +129,4 @@ function deinstall_command() conf_mount_ro(); } -?> \ No newline at end of file +?> diff --git a/config/ipblocklist/ipblocklist.tmp b/config/ipblocklist/ipblocklist.tmp index 6387cb34..baa0ff09 100755 --- a/config/ipblocklist/ipblocklist.tmp +++ b/config/ipblocklist/ipblocklist.tmp @@ -1,5 +1,5 @@ - \ No newline at end of file + diff --git a/config/ipblocklist/ipblocklist.xml b/config/ipblocklist/ipblocklist.xml index 16c26c3e..117afcea 100755 --- a/config/ipblocklist/ipblocklist.xml +++ b/config/ipblocklist/ipblocklist.xml @@ -41,7 +41,7 @@ perl http://forum.pfsense.org/index.php/topic,24769.0.html IP Blocklist Settings - 0.1.9 + 0.2.1 Settings /usr/local/pkg/ipblocklist.inc @@ -142,4 +142,4 @@ deinstall_command(); - \ No newline at end of file + diff --git a/pkg_config.7.xml b/pkg_config.7.xml index 06af2263..746bf712 100755 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -24,7 +24,7 @@ http://forum.pfsense.org/index.php/topic,24769.0.html http://pfsense.org/packages/config/ipblocklist/ipblocklist.xml http://files.pfsense.org/packages/7/All/ - 0.2.0 + 0.2.1 Beta 1.2.2 tom@tomschaefer.org diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 8813d363..7acb78e9 100755 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -24,7 +24,7 @@ http://forum.pfsense.org/index.php/topic,24769.0.html http://pfsense.org/packages/config/ipblocklist/ipblocklist.xml http://files.pfsense.org/packages/7/All/ - 0.2.0 + 0.2.1 Beta 1.2.2 tom@tomschaefer.org diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 31b03501..8fe4d526 100755 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -24,7 +24,7 @@ http://forum.pfsense.org/index.php/topic,24769.0.html http://pfsense.org/packages/config/ipblocklist/ipblocklist.xml http://files.pfsense.org/packages/amd64/8/All/ - 0.2.0 + 0.2.1 Beta 1.2.2 tom@tomschaefer.org -- cgit v1.2.3