From c5931da98bd4aaba4fb4ef27f10f40c9ef96323a Mon Sep 17 00:00:00 2001
From: Thomas Schaefer <tom@tomschaefer.org>
Date: Thu, 18 Aug 2011 22:55:28 -0400
Subject: Fixed uniq bug

---
 config/ipblocklist/7/IP-Blocklist.sh    | 4 ++--
 config/ipblocklist/7/convert-execute.sh | 4 ++--
 config/ipblocklist/7/ipblocklist.tmp    | 5 +++--
 config/ipblocklist/7/ipblocklist.xml    | 2 +-
 config/ipblocklist/7/ipblocklist_if.tmp | 2 +-
 config/ipblocklist/7/settings.tmp       | 2 +-
 config/ipblocklist/7/whitelist.tmp      | 2 +-
 config/ipblocklist/8/IP-Blocklist.sh    | 4 ++--
 config/ipblocklist/8/convert-execute.sh | 4 ++--
 config/ipblocklist/8/ipblocklist.tmp    | 6 ++++--
 config/ipblocklist/8/ipblocklist.xml    | 2 +-
 config/ipblocklist/8/ipblocklist_if.tmp | 2 +-
 config/ipblocklist/8/settings.tmp       | 2 +-
 config/ipblocklist/8/whitelist.tmp      | 2 +-
 14 files changed, 23 insertions(+), 20 deletions(-)

(limited to 'config')

diff --git a/config/ipblocklist/7/IP-Blocklist.sh b/config/ipblocklist/7/IP-Blocklist.sh
index 442d9443..e4d2424f 100755
--- a/config/ipblocklist/7/IP-Blocklist.sh
+++ b/config/ipblocklist/7/IP-Blocklist.sh
@@ -51,13 +51,13 @@ done
 
 #clean up ipfw.ipfw (duplicates)
 rm /usr/local/www/packages/ipblocklist/lists/ipfw.ipfwTEMP
-/usr/bin/sort /usr/local/www/packages/ipblocklist/lists/ipfw.ipfw | uniq -u >> /usr/local/www/packages/ipblocklist/lists/ipfw.ipfwTEMP
+/usr/bin/sort /usr/local/www/packages/ipblocklist/lists/ipfw.ipfw | uniq >> /usr/local/www/packages/ipblocklist/lists/ipfw.ipfwTEMP
 mv /usr/local/www/packages/ipblocklist/lists/ipfw.ipfwTEMP /usr/local/www/packages/ipblocklist/lists/ipfw.ipfw
 #echo "ipfw clean"
 
 #clean up whitelist (duplicates)
 rm /usr/local/www/packages/ipblocklist/Wlists/whitelistTEMP
-/usr/bin/sort Wlists/whitelist | uniq -u >> /usr/local/www/packages/ipblocklist/Wlists/whitelistTEMP
+/usr/bin/sort Wlists/whitelist | uniq >> /usr/local/www/packages/ipblocklist/Wlists/whitelistTEMP
 mv /usr/local/www/packages/ipblocklist/Wlists/whitelistTEMP /usr/local/www/packages/ipblocklist/Wlists/whitelist
 #echo "whitelist clean"
 
diff --git a/config/ipblocklist/7/convert-execute.sh b/config/ipblocklist/7/convert-execute.sh
index 961015e0..75daf448 100755
--- a/config/ipblocklist/7/convert-execute.sh
+++ b/config/ipblocklist/7/convert-execute.sh
@@ -46,13 +46,13 @@ done
 
 #clean up ipfw.ipfw (duplicates)
 rm /usr/local/www/packages/ipblocklist/lists/ipfw.ipfwTEMP
-/usr/bin/sort lists/ipfw.ipfw | uniq -u >> /usr/local/www/packages/ipblocklist/lists/ipfw.ipfwTEMP
+/usr/bin/sort lists/ipfw.ipfw | uniq >> /usr/local/www/packages/ipblocklist/lists/ipfw.ipfwTEMP
 mv /usr/local/www/packages/ipblocklist/lists/ipfw.ipfwTEMP /usr/local/www/packages/ipblocklist/lists/ipfw.ipfw
 #echo "ipfw clean"
 
 #clean up whitelist (duplicates)
 rm Wlists/whitelistTEMP
-/usr/bin/sort Wlists/whitelist | uniq -u >> Wlists/whitelistTEMP
+/usr/bin/sort Wlists/whitelist | uniq >> Wlists/whitelistTEMP
 mv Wlists/whitelistTEMP Wlists/whitelist
 #echo "whitelist clean"
 
diff --git a/config/ipblocklist/7/ipblocklist.tmp b/config/ipblocklist/7/ipblocklist.tmp
index 4f64427e..44fd9313 100755
--- a/config/ipblocklist/7/ipblocklist.tmp
+++ b/config/ipblocklist/7/ipblocklist.tmp
@@ -1,5 +1,5 @@
 <?php
-	//Version 2.2
+	//Version 3.3
 	header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
 	header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
 	require_once('config.inc');
@@ -126,7 +126,7 @@ if(isset($_POST['formSubmit']))
 	$tab_array[2] = array("Whitelist", false, "whitelist.php");
 	$tab_array[3] = array("Interfaces", false, "ipblocklist_if.php");
 	$tab_array[4] = array("Help", false, "http://doc.pfsense.org/index.php/IP_Blocklist");
-	$tab_array[5] = array("Email", false, "email.php");
+	//$tab_array[5] = array("Email", false, "email.php");
 	display_top_tabs($tab_array);
 ?> 
 </form>
@@ -229,6 +229,7 @@ if(isset($_POST['formSubmit']))
 	?>
 <br><br>
 <small>Created by <a href="http://www.tomschaefer.org/pfsense">TomSchaefer</a></small>
+<br /><small><a href="http://www.iblocklist.com/pfsense">I-Blocklist.com</a></small>
 <!--<input type="submit" value="Save/Update"><br><br>
 --><p>
 </p>
diff --git a/config/ipblocklist/7/ipblocklist.xml b/config/ipblocklist/7/ipblocklist.xml
index 5189fd5e..4752061e 100755
--- a/config/ipblocklist/7/ipblocklist.xml
+++ b/config/ipblocklist/7/ipblocklist.xml
@@ -41,7 +41,7 @@
 	<requirements>perl</requirements>
 	<faq>http://forum.pfsense.org/index.php/topic,24769.0.html</faq>
 	<name>IP Blocklist Settings</name>
-	<version>0.3.2</version>
+	<version>0.3.3</version>
 	<title>Settings</title>
 	<include_file>/usr/local/pkg/ipblocklist.inc</include_file>
 	<menu>
diff --git a/config/ipblocklist/7/ipblocklist_if.tmp b/config/ipblocklist/7/ipblocklist_if.tmp
index 71bff9c3..42ba2d07 100755
--- a/config/ipblocklist/7/ipblocklist_if.tmp
+++ b/config/ipblocklist/7/ipblocklist_if.tmp
@@ -133,7 +133,7 @@ include("head.inc");
 	$tab_array[2] = array("Whitelist", false, "whitelist.php");
 	$tab_array[3] = array("Interfaces", true, "ipblocklist_if.php");
 	$tab_array[4] = array("Help", false, "http://doc.pfsense.org/index.php/IP_Blocklist");
-	$tab_array[5] = array("Email", false, "email.php");
+	//$tab_array[5] = array("Email", false, "email.php");
 	display_top_tabs($tab_array);
 ?> 
   </td></tr>
diff --git a/config/ipblocklist/7/settings.tmp b/config/ipblocklist/7/settings.tmp
index dee85e1a..a13dd22b 100755
--- a/config/ipblocklist/7/settings.tmp
+++ b/config/ipblocklist/7/settings.tmp
@@ -48,7 +48,7 @@ header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
 	$tab_array[2] = array("Whitelist", false, "whitelist.php");
 	$tab_array[3] = array("Interfaces", false, "ipblocklist_if.php");
 	$tab_array[4] = array("Help", false, "http://doc.pfsense.org/index.php/IP_Blocklist");
-	$tab_array[5] = array("Email", false, "email.php");
+	//$tab_array[5] = array("Email", false, "email.php");
 	display_top_tabs($tab_array);
 ?>
 
diff --git a/config/ipblocklist/7/whitelist.tmp b/config/ipblocklist/7/whitelist.tmp
index 2af50ac4..51bd9f97 100755
--- a/config/ipblocklist/7/whitelist.tmp
+++ b/config/ipblocklist/7/whitelist.tmp
@@ -46,7 +46,7 @@ header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
 	$tab_array[2] = array("Whitelist", true, "whitelist.php");
 	$tab_array[3] = array("Interfaces", false, "ipblocklist_if.php");
 	$tab_array[4] = array("Help", false, "http://doc.pfsense.org/index.php/IP_Blocklist");
-	$tab_array[5] = array("Email", false, "email.php");
+	//$tab_array[5] = array("Email", false, "email.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
diff --git a/config/ipblocklist/8/IP-Blocklist.sh b/config/ipblocklist/8/IP-Blocklist.sh
index 442d9443..e4d2424f 100755
--- a/config/ipblocklist/8/IP-Blocklist.sh
+++ b/config/ipblocklist/8/IP-Blocklist.sh
@@ -51,13 +51,13 @@ done
 
 #clean up ipfw.ipfw (duplicates)
 rm /usr/local/www/packages/ipblocklist/lists/ipfw.ipfwTEMP
-/usr/bin/sort /usr/local/www/packages/ipblocklist/lists/ipfw.ipfw | uniq -u >> /usr/local/www/packages/ipblocklist/lists/ipfw.ipfwTEMP
+/usr/bin/sort /usr/local/www/packages/ipblocklist/lists/ipfw.ipfw | uniq >> /usr/local/www/packages/ipblocklist/lists/ipfw.ipfwTEMP
 mv /usr/local/www/packages/ipblocklist/lists/ipfw.ipfwTEMP /usr/local/www/packages/ipblocklist/lists/ipfw.ipfw
 #echo "ipfw clean"
 
 #clean up whitelist (duplicates)
 rm /usr/local/www/packages/ipblocklist/Wlists/whitelistTEMP
-/usr/bin/sort Wlists/whitelist | uniq -u >> /usr/local/www/packages/ipblocklist/Wlists/whitelistTEMP
+/usr/bin/sort Wlists/whitelist | uniq >> /usr/local/www/packages/ipblocklist/Wlists/whitelistTEMP
 mv /usr/local/www/packages/ipblocklist/Wlists/whitelistTEMP /usr/local/www/packages/ipblocklist/Wlists/whitelist
 #echo "whitelist clean"
 
diff --git a/config/ipblocklist/8/convert-execute.sh b/config/ipblocklist/8/convert-execute.sh
index 961015e0..75daf448 100755
--- a/config/ipblocklist/8/convert-execute.sh
+++ b/config/ipblocklist/8/convert-execute.sh
@@ -46,13 +46,13 @@ done
 
 #clean up ipfw.ipfw (duplicates)
 rm /usr/local/www/packages/ipblocklist/lists/ipfw.ipfwTEMP
-/usr/bin/sort lists/ipfw.ipfw | uniq -u >> /usr/local/www/packages/ipblocklist/lists/ipfw.ipfwTEMP
+/usr/bin/sort lists/ipfw.ipfw | uniq >> /usr/local/www/packages/ipblocklist/lists/ipfw.ipfwTEMP
 mv /usr/local/www/packages/ipblocklist/lists/ipfw.ipfwTEMP /usr/local/www/packages/ipblocklist/lists/ipfw.ipfw
 #echo "ipfw clean"
 
 #clean up whitelist (duplicates)
 rm Wlists/whitelistTEMP
-/usr/bin/sort Wlists/whitelist | uniq -u >> Wlists/whitelistTEMP
+/usr/bin/sort Wlists/whitelist | uniq >> Wlists/whitelistTEMP
 mv Wlists/whitelistTEMP Wlists/whitelist
 #echo "whitelist clean"
 
diff --git a/config/ipblocklist/8/ipblocklist.tmp b/config/ipblocklist/8/ipblocklist.tmp
index 4f64427e..e3ea1fdf 100755
--- a/config/ipblocklist/8/ipblocklist.tmp
+++ b/config/ipblocklist/8/ipblocklist.tmp
@@ -1,5 +1,5 @@
 <?php
-	//Version 2.2
+	//Version 3.3
 	header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
 	header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
 	require_once('config.inc');
@@ -126,7 +126,7 @@ if(isset($_POST['formSubmit']))
 	$tab_array[2] = array("Whitelist", false, "whitelist.php");
 	$tab_array[3] = array("Interfaces", false, "ipblocklist_if.php");
 	$tab_array[4] = array("Help", false, "http://doc.pfsense.org/index.php/IP_Blocklist");
-	$tab_array[5] = array("Email", false, "email.php");
+	//$tab_array[5] = array("Email", false, "email.php");
 	display_top_tabs($tab_array);
 ?> 
 </form>
@@ -229,6 +229,8 @@ if(isset($_POST['formSubmit']))
 	?>
 <br><br>
 <small>Created by <a href="http://www.tomschaefer.org/pfsense">TomSchaefer</a></small>
+<br />
+<small><a href="http://www.iblocklist.com/">I-Blocklist.com</a></small>
 <!--<input type="submit" value="Save/Update"><br><br>
 --><p>
 </p>
diff --git a/config/ipblocklist/8/ipblocklist.xml b/config/ipblocklist/8/ipblocklist.xml
index 99fba793..88786386 100755
--- a/config/ipblocklist/8/ipblocklist.xml
+++ b/config/ipblocklist/8/ipblocklist.xml
@@ -41,7 +41,7 @@
 	<requirements>perl</requirements>
 	<faq>http://forum.pfsense.org/index.php/topic,24769.0.html</faq>
 	<name>IP Blocklist Settings</name>
-	<version>0.3.2</version>
+	<version>0.3.3</version>
 	<title>Settings</title>
 	<include_file>/usr/local/pkg/ipblocklist.inc</include_file>
 	<menu>
diff --git a/config/ipblocklist/8/ipblocklist_if.tmp b/config/ipblocklist/8/ipblocklist_if.tmp
index 71bff9c3..42ba2d07 100755
--- a/config/ipblocklist/8/ipblocklist_if.tmp
+++ b/config/ipblocklist/8/ipblocklist_if.tmp
@@ -133,7 +133,7 @@ include("head.inc");
 	$tab_array[2] = array("Whitelist", false, "whitelist.php");
 	$tab_array[3] = array("Interfaces", true, "ipblocklist_if.php");
 	$tab_array[4] = array("Help", false, "http://doc.pfsense.org/index.php/IP_Blocklist");
-	$tab_array[5] = array("Email", false, "email.php");
+	//$tab_array[5] = array("Email", false, "email.php");
 	display_top_tabs($tab_array);
 ?> 
   </td></tr>
diff --git a/config/ipblocklist/8/settings.tmp b/config/ipblocklist/8/settings.tmp
index dee85e1a..a13dd22b 100755
--- a/config/ipblocklist/8/settings.tmp
+++ b/config/ipblocklist/8/settings.tmp
@@ -48,7 +48,7 @@ header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
 	$tab_array[2] = array("Whitelist", false, "whitelist.php");
 	$tab_array[3] = array("Interfaces", false, "ipblocklist_if.php");
 	$tab_array[4] = array("Help", false, "http://doc.pfsense.org/index.php/IP_Blocklist");
-	$tab_array[5] = array("Email", false, "email.php");
+	//$tab_array[5] = array("Email", false, "email.php");
 	display_top_tabs($tab_array);
 ?>
 
diff --git a/config/ipblocklist/8/whitelist.tmp b/config/ipblocklist/8/whitelist.tmp
index 2af50ac4..51bd9f97 100755
--- a/config/ipblocklist/8/whitelist.tmp
+++ b/config/ipblocklist/8/whitelist.tmp
@@ -46,7 +46,7 @@ header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
 	$tab_array[2] = array("Whitelist", true, "whitelist.php");
 	$tab_array[3] = array("Interfaces", false, "ipblocklist_if.php");
 	$tab_array[4] = array("Help", false, "http://doc.pfsense.org/index.php/IP_Blocklist");
-	$tab_array[5] = array("Email", false, "email.php");
+	//$tab_array[5] = array("Email", false, "email.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
-- 
cgit v1.2.3