Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pfBlockerNG - version 2.0.6 #39

Merged
merged 5 commits into from
Dec 28, 2015
Merged

pfBlockerNG - version 2.0.6 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e2aaad3
Update pfblockerng.php
BBcan177 Dec 28, 2015
891e7eb
Update pfblockerng.inc
BBcan177 Dec 28, 2015
553adcd
Update pfblockerng.xml
BBcan177 Dec 28, 2015
fd4e353
Update Makefile
BBcan177 Dec 28, 2015
313f3a5
Update info.xml
BBcan177 Dec 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion net/pfSense-pkg-pfBlockerNG/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= pfSense-pkg-pfBlockerNG
PORTVERSION= 2.0.5
PORTVERSION= 2.0.6
CATEGORIES= net
MASTER_SITES= # empty
DISTFILES= # empty
Expand Down
2 changes: 1 addition & 1 deletion net/pfSense-pkg-pfBlockerNG/files/usr/local/pkg/pfblockerng.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions net/pfSense-pkg-pfBlockerNG/files/usr/local/pkg/pfblockerng/pfblockerng.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion net/pfSense-pkg-pfBlockerNG/files/usr/local/share/pfSense-pkg-pfBlockerNG/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion net/pfSense-pkg-pfBlockerNG/files/usr/local/www/pfblockerng/pfblockerng.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},";
Expand Down