Merge pull request #144 from BBcan177/patch-1

pfsense · Jun 3, 2016 · 1df8876 · 1df8876
2 parents 1632e9b + 88fc815
commit 1df8876
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 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.16
+PORTVERSION=	2.0.17
 CATEGORIES=	net
 MASTER_SITES=	# empty
 DISTFILES=	# empty

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
@@ -2830,7 +2830,9 @@ function sync_package_pfblockerng($cron='') {
 										$line = trim($line);
 
 										// Parser for EasyList, enable collect of selected EasyList categories
-										if (isset($easylist) && strpos($line, '! *** easylist:') !== FALSE) {
+										if (isset($easylist) && (strpos($line, '! *** easylist:') !== FALSE) ||
+										    strpos($line, '! *** Fetched from:') !== FALSE) {
+
 											// Skip all previous Easylist entries
 
 											// Collect EasyList feed
@@ -2860,7 +2862,7 @@ function sync_package_pfblockerng($cron='') {
 												break;
 											}
 											// End of useable EasyPrivacy feed
-											elseif (substr($line, 27, 23) == 'easyprivacy_thirdparty.') {
+											elseif (substr($line, 91, 23) == 'easyprivacy_thirdparty.') {
 												break;
 											}
 										}