Merge pull request #39 from BBcan177/patch-1

pfsense · Dec 28, 2015 · f42ad7d · f42ad7d
2 parents 27cda83 + 313f3a5
commit f42ad7d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/net/pfSense-pkg-pfBlockerNG/Makefile b/net/pfSense-pkg-pfBlockerNG/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pfSense-pkg-pfBlockerNG
-PORTVERSION=	2.0.5
+PORTVERSION=	2.0.6
 CATEGORIES=	net
 MASTER_SITES=	# empty
 DISTFILES=	# empty

diff --git a/net/pfSense-pkg-pfBlockerNG/files/usr/local/pkg/pfblockerng.xml b/net/pfSense-pkg-pfBlockerNG/files/usr/local/pkg/pfblockerng.xml
@@ -45,7 +45,7 @@
 	]]>
 	</copyright>
 	<name>pfblockerng</name>
-	<version>2.0.5</version>
+	<version>2.0.6</version>
 	<title>Firewall/pfBlockerNG</title>
 	<include_file>/usr/local/pkg/pfblockerng/pfblockerng.inc</include_file>
 	<addedit_string>pfBlockerNG: Save General Settings</addedit_string>

diff --git a/net/pfSense-pkg-pfBlockerNG/files/usr/local/pkg/pfblockerng/pfblockerng.inc b/net/pfSense-pkg-pfBlockerNG/files/usr/local/pkg/pfblockerng/pfblockerng.inc
@@ -3452,7 +3452,7 @@ function sync_package_pfblockerng($cron='') {
 										if (strpos($line, '-') !== FALSE) {
 											$matches = explode('-', $line);
 											if (count($matches) == 2) {
-												$a_cidr = ip_range_to_subnet_array_temp($matches[0],$matches[1]);
+												$a_cidr = ip_range_to_subnet_array($matches[0],$matches[1]);
 												if (!empty($a_cidr)) {
 													foreach ($a_cidr as $cidr) {
 														$cidr = sanitize_ipaddr($cidr, $custom);
@@ -3495,7 +3495,7 @@ function sync_package_pfblockerng($cron='') {
 										if (strpos($oline, '-') !== FALSE) {
 											// Network range 192.168.0.0-192.168.0.254
 											if (preg_match($pfb['range'], $oline, $matches)) {
-												$a_cidr = ip_range_to_subnet_array_temp($matches[1], $matches[2]);
+												$a_cidr = ip_range_to_subnet_array($matches[1], $matches[2]);
 												if (!empty($a_cidr)) {
 													foreach ($a_cidr as $cidr) {
 														$cidr = sanitize_ipaddr($cidr, $custom);

diff --git a/net/pfSense-pkg-pfBlockerNG/files/usr/local/share/pfSense-pkg-pfBlockerNG/info.xml b/net/pfSense-pkg-pfBlockerNG/files/usr/local/share/pfSense-pkg-pfBlockerNG/info.xml
@@ -11,7 +11,7 @@
 			Domain Name (DNSBL) blocking via Unbound DNS Resolver.]]></descr>
 		<category>Security</category>
 		<pkginfolink>https://forum.pfsense.org/index.php?topic=102470.0</pkginfolink>
-		<version>2.0.5</version>
+		<version>2.0.6</version>
 		<status>RELEASE</status>
 		<required_version>2.3</required_version>
 		<maintainer>BBCan177@gmail.com</maintainer>

diff --git a/net/pfSense-pkg-pfBlockerNG/files/usr/local/www/pfblockerng/pfblockerng.php b/net/pfSense-pkg-pfBlockerNG/files/usr/local/www/pfblockerng/pfblockerng.php
@@ -519,7 +519,7 @@ function pfblockerng_uc_countries() {
 			while (($cc = @fgetcsv($handle)) !== FALSE) {
 				$cc_key		= $cc[4];
 				$country_key	= $cc[5];
-				$a_cidr		= implode(',', ip_range_to_subnet_array_temp($cc[0], $cc[1]));
+				$a_cidr		= implode(',', ip_range_to_subnet_array($cc[0], $cc[1]));
 				foreach ($cont_array as $key => $iso) {
 					if (strpos($iso['iso'], $cc_key) !== FALSE) {
 						$cont_array[$key][$cc_key][$iptype]  .= "{$a_cidr},";