pfBlocker SANS/DShield feed fix. Issue #10930

pfsense · Sep 30, 2020 · 4212278 · 4212278
1 parent b626112
commit 4212278
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 37 deletions.
diff --git a/net/pfSense-pkg-pfBlockerNG-devel/Makefile b/net/pfSense-pkg-pfBlockerNG-devel/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	pfSense-pkg-pfBlockerNG-devel
 PORTVERSION=	2.2.5
-PORTREVISION=	34
+PORTREVISION=	35
 CATEGORIES=	net
 MASTER_SITES=	# empty
 DISTFILES=	# empty

diff --git a/net/pfSense-pkg-pfBlockerNG-devel/files/usr/local/www/pfblockerng/pfblockerng_feeds.json b/net/pfSense-pkg-pfBlockerNG-devel/files/usr/local/www/pfblockerng/pfblockerng_feeds.json
@@ -90,42 +90,9 @@
 				},
 				{
 					"feed":		"Internet Storm Center",
-					"website":	"https://isc.sans.edu/",
-					"contact":	"https://isc.sans.edu/contact.html",
-					"url":		"https://isc.sans.edu/api/sources/attacks/1000/30?text",
-					"header":	"ISC_1000_30",
-					"alternate": [
-							{
-							"url":		"https://isc.sans.edu/api/sources/attacks/1000/1?text",
-							"header":	"ISC_1000_1"
-							},
-							{
-							"url":		"https://isc.sans.edu/api/sources/attacks/1000/7?text",
-							"header":	"ISC_1000_7"
-							},
-							{
-							"url":		"https://isc.sans.edu/api/sources/attacks/1000/14?text",
-							"header":	"ISC_1000_14"
-							},
-							{
-							"url":		"https://isc.sans.edu/api/sources/attacks/1000/60?text",
-							"header":	"ISC_1000_60"
-							},
-							{
-							"url":		"https://isc.sans.edu/api/sources/attacks/1000/90?text",
-							"header":	"ISC_1000_90"
-							},
-							{
-							"url":		"https://isc.sans.edu/api/sources/attacks/1000/120?text",
-							"header":	"ISC_1000_120"
-							}
-						]
-				},
-				{
-					"feed":		"Internet Storm Center",
-					"website":	"https://isc.sans.edu/",
-					"url":		"https://isc.sans.edu/feeds/block.txt",
-					"header":	"ISC_Block"
+					"website":	"https://www.dshield.org",
+					"url":		"https://www.dshield.org/block.txt",
+					"header":	"DShield"
 				},
 				{
 					"feed":		"Pulsedive",