From c797fe60e4758f61780ee77b4b5d2a73b1b7bca3 Mon Sep 17 00:00:00 2001
From: BBcan177 <bbcan177@gmail.com>
Date: Sun, 20 Mar 2016 22:18:28 -0400
Subject: Update pfblockerng.sh

* Improve Proofpoint/Emerging Threats IQRisk integrations
---
 config/pfblockerng/pfblockerng.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'config/pfblockerng/pfblockerng.sh')

diff --git a/config/pfblockerng/pfblockerng.sh b/config/pfblockerng/pfblockerng.sh
index ace6dbfe..9d2ccf02 100644
--- a/config/pfblockerng/pfblockerng.sh
+++ b/config/pfblockerng/pfblockerng.sh
@@ -779,7 +779,7 @@ processet() {
 				*)  echo "${i}" >> "${etdir}/ET_Unknown.txt";;
 			esac
 		done < "${pfborig}${alias}.orig"
-		data="$(ls ${etdir})"
+		data="$(ls ${etdir} | sed 's/\.txt//')"
 		printf "%-10s %-25s\n" '  Action' 'Category'
 		echo '-------------------------------------------'
 
@@ -787,13 +787,13 @@ processet() {
 			case "${etblock}" in
 				*$list*)
 					printf "%-10s %-25s\n" '  Block: ' "${list}"
-					cat "${etdir}/${list}" >> "${tempfile}"
+					cat "${etdir}/${list}.txt" >> "${tempfile}"
 					;;
 			esac
 			case "${etmatch}" in
 				*$list*)
 					printf "%-10s %-25s\n" '  Match: ' "${list}"
-					cat "${etdir}/${list}" >> "${tempfile2}"
+					cat "${etdir}/${list}.txt" >> "${tempfile2}"
 					;;
 			esac
 		done
@@ -978,4 +978,4 @@ case "${1}" in
 	*)
 		;;
 esac
-exitnow
\ No newline at end of file
+exitnow
-- 
cgit v1.2.3


From 9ae8e63f322010276709e1f6430c8c3bbf893ea5 Mon Sep 17 00:00:00 2001
From: BBcan177 <bbcan177@gmail.com>
Date: Sun, 20 Mar 2016 22:49:39 -0400
Subject: Update pfblockerng.sh

* Mod copyright
---
 config/pfblockerng/pfblockerng.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config/pfblockerng/pfblockerng.sh')

diff --git a/config/pfblockerng/pfblockerng.sh b/config/pfblockerng/pfblockerng.sh
index 9d2ccf02..c0b4433f 100644
--- a/config/pfblockerng/pfblockerng.sh
+++ b/config/pfblockerng/pfblockerng.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # pfBlockerNG IP Reputation Script - By BBcan177@gmail.com - 04-12-14
-# Copyright (c) 2015 BBcan177@gmail.com
+# Copyright (c) 2015-2016 BBcan177@gmail.com
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License Version 2 as
-- 
cgit v1.2.3