diff options
| -rw-r--r-- | config/countryblock/countryblock.inc | 2 | ||||
| -rwxr-xr-x | config/countryblock/countryblock.sh | 4 | ||||
| -rw-r--r-- | config/countryblock/countryblock.tmp | 2 | ||||
| -rw-r--r-- | config/countryblock/countryblock.xml | 2 | ||||
| -rw-r--r-- | config/countryblock/countryblock_IPBlocklist.widget.tmp | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml | 14 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 14 |
7 files changed, 34 insertions, 6 deletions
diff --git a/config/countryblock/countryblock.inc b/config/countryblock/countryblock.inc index 64c1f4cc..5451b4bf 100644 --- a/config/countryblock/countryblock.inc +++ b/config/countryblock/countryblock.inc @@ -4,7 +4,7 @@ /* ========================================================================== */ /* countryblock.inc - Copyright (C) 2011 Tom Schaefer + Copyright (C) 2012 Tom Schaefer All rights reserved. */ /* ========================================================================== */ diff --git a/config/countryblock/countryblock.sh b/config/countryblock/countryblock.sh index ce3e3c04..e8454db1 100755 --- a/config/countryblock/countryblock.sh +++ b/config/countryblock/countryblock.sh @@ -1,6 +1,6 @@ #!/bin/sh -#version 2.0 +#version 2.4 2012 #check if countryblock running export resultr=`pfctl -s rules | grep -c countryblock` #echo $resultr @@ -82,4 +82,4 @@ mv /tmp/rules.debug /tmp/rules.debug.old mv /tmp/rules.debug.tmp /tmp/rules.debug rm errorOUT.txt -pfctl -o basic -f /tmp/rules.debug > /usr/local/www/packages/countryblock/errorOUT.txt 2>&1
\ No newline at end of file +pfctl -o basic -f /tmp/rules.debug > /usr/local/www/packages/countryblock/errorOUT.txt 2>&1 diff --git a/config/countryblock/countryblock.tmp b/config/countryblock/countryblock.tmp index 39ee6e64..eb98f283 100644 --- a/config/countryblock/countryblock.tmp +++ b/config/countryblock/countryblock.tmp @@ -1,6 +1,6 @@ <?php $pgtitle = "Firewall: Countryblock"; - // TomSchaefer.org countryblock package 2010 + // TomSchaefer.org countryblock package 2012 // // Notes: Find: ^(.*)$ // Replace: ob_start();\n$results = exec("cat countries.txt | grep XX");\nob_end_clean();\n\tif ($results == 'XX')\n\t\techo "\1";\n\telse\n\t\techo "\1";\n diff --git a/config/countryblock/countryblock.xml b/config/countryblock/countryblock.xml index 1d278d20..146918d3 100644 --- a/config/countryblock/countryblock.xml +++ b/config/countryblock/countryblock.xml @@ -8,7 +8,7 @@ /* ========================================================================== */ /* countryblock.xml - Copyright (C) 2011 Tom Schaefer + Copyright (C) 2012 Tom Schaefer All rights reserved. */ /* ========================================================================== */ diff --git a/config/countryblock/countryblock_IPBlocklist.widget.tmp b/config/countryblock/countryblock_IPBlocklist.widget.tmp index a62fcede..0ad1573b 100644 --- a/config/countryblock/countryblock_IPBlocklist.widget.tmp +++ b/config/countryblock/countryblock_IPBlocklist.widget.tmp @@ -1,6 +1,6 @@ <?php /* - Copyright 2011 Thomas Schaefer - Tomschaefer.org + Copyright 2012 Thomas Schaefer - Tomschaefer.org Part of pfSense widgets (www.pfsense.com) Redistribution and use in source and binary forms, with or without diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 520df97f..92cd08cb 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -6,6 +6,20 @@ <copy_packages_to_folder_ssh>/usr/local/www/files/packages/8/All/</copy_packages_to_folder_ssh> <packages> <package> + <name>Country Block</name> + <website/> + <descr>Block countries - This has been replaced by pfblocker. <u>This is a legacy app</u></descr> + <category>Firewall</category> + <pkginfolink>http://forum.pfsense.org/index.php/topic,25732.0.html</pkginfolink> + <config_file>http://www.pfsense.com/packages/config/countryblock/countryblock.xml</config_file> + <depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url> + <version>0.2.4</version> + <status>Beta</status> + <required_version>1.2.2</required_version> + <maintainer>tom@tomschaefer.org</maintainer> + <configurationfile>countryblock.xml</configurationfile> + </package> + <package> <name>Strikeback</name> <descr>Detect port scans with iplog and strikeback</descr> <website></website> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index d49c9bb3..ed192ef1 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -6,6 +6,20 @@ <copy_packages_to_folder_ssh>/usr/local/www/files/packages/amd64/8/All/</copy_packages_to_folder_ssh> <packages> <package> + <name>Country Block</name> + <website/> + <descr>Block countries - This has been replaced by pfblocker. <u>This is a legacy app</u></descr> + <category>Firewall</category> + <pkginfolink>http://forum.pfsense.org/index.php/topic,25732.0.html</pkginfolink> + <config_file>http://www.pfsense.com/packages/config/countryblock/countryblock.xml</config_file> + <depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url> + <version>0.2.4</version> + <status>Beta</status> + <required_version>1.2.2</required_version> + <maintainer>tom@tomschaefer.org</maintainer> + <configurationfile>countryblock.xml</configurationfile> + </package> + <package> <name>MAC-to-Vendor</name> <descr>The package make pfSense show NIC Vendor names instead of MAC addresses in the form Asustek:xx:xx:xx, full info about MAC and vendor is available in tooltip. Applies to pages Status->Interfaces, Status->DHCP leases, Status->Wireless, Diagnostics->ARP table. Vendor names are stored in the file /usr/local/pkg/mactovendor/mac-prefixes</descr> <website></website> |