From 51d68cc08e352a2cc87c18b7f99a961237a2b7cb Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Thu, 24 Sep 2015 10:58:12 +0200
Subject: squid3-dev - fix default value handling for antivirus client forward
 options (Bug #4663)

---
 config/squid3/33/squid.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/squid3/33/squid.inc b/config/squid3/33/squid.inc
index 73be7162..0f71def8 100755
--- a/config/squid3/33/squid.inc
+++ b/config/squid3/33/squid.inc
@@ -1308,6 +1308,7 @@ function squid_resync_antivirus(){
 	if ($antivirus_config['enable']=="on"){
 		switch ($antivirus_config['client_info']){
 			case "both":
+			default:
 				$icap_send_client_ip="on";
 				$icap_send_client_username="on";
 				break;
-- 
cgit v1.2.3


From 7266ef1e9c7938269c5753831fcc694cf95842a9 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Thu, 24 Sep 2015 10:59:42 +0200
Subject: squid3-dev - fix default value handling for antivirus client forward
 options (Bug #4663)

---
 config/squid3/33/squid_antivirus.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/squid3/33/squid_antivirus.xml b/config/squid3/33/squid_antivirus.xml
index 67319297..59f33fe2 100755
--- a/config/squid3/33/squid_antivirus.xml
+++ b/config/squid3/33/squid_antivirus.xml
@@ -110,7 +110,7 @@
 			<fieldname>client_info</fieldname>
       <description><![CDATA[Select what client info to forward to clamav.]]></description>
   		<type>select</type>
-			<default_value>strip</default_value>
+			<default_value>both</default_value>
 			<options>
 				<option><name>Send Both client username and ip info(Default)</name><value>both</value></option>
 				<option><name>Send only client username</name><value>username</value></option>
-- 
cgit v1.2.3


From 1fab12c73322c6198d508286bb93ef27a412a78d Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Thu, 24 Sep 2015 11:00:40 +0200
Subject: squid3 - fix default value handling for antivirus client forward
 options (Bug #4663)

---
 config/squid3/34/squid.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc
index ec30910f..665c0d7c 100755
--- a/config/squid3/34/squid.inc
+++ b/config/squid3/34/squid.inc
@@ -1323,6 +1323,7 @@ function squid_resync_antivirus() {
 	if ($antivirus_config['enable']=="on") {
 		switch ($antivirus_config['client_info']) {
 		case "both":
+		default:
 			$icap_send_client_ip="on";
 			$icap_send_client_username="on";
 			break;
-- 
cgit v1.2.3


From 5199d00c6b79a141f3371f7c65848164f26c1fe5 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Thu, 24 Sep 2015 11:01:28 +0200
Subject: squid3 - fix default value handling for antivirus client forward
 options (Bug #4663)

---
 config/squid3/34/squid_antivirus.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/squid3/34/squid_antivirus.xml b/config/squid3/34/squid_antivirus.xml
index c722598d..5c1b57d5 100755
--- a/config/squid3/34/squid_antivirus.xml
+++ b/config/squid3/34/squid_antivirus.xml
@@ -110,7 +110,7 @@
 			<fieldname>client_info</fieldname>
       <description><![CDATA[Select what client info to forward to clamav.]]></description>
   		<type>select</type>
-			<default_value>strip</default_value>
+			<default_value>both</default_value>
 			<options>
 				<option><name>Send Both client username and ip info(Default)</name><value>both</value></option>
 				<option><name>Send only client username</name><value>username</value></option>
-- 
cgit v1.2.3


From 163e550805822e11845f4ee75af2f4156061efcc Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Thu, 24 Sep 2015 11:02:03 +0200
Subject: Bump squid3 package version

---
 pkg_config.10.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 6abd59c0..728cf50c 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1052,7 +1052,7 @@
 		<pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink>
 		<website>http://www.squid-cache.org/</website>
 		<category>Network</category>
-		<version>0.3.3</version>
+		<version>0.3.4</version>
 		<status>beta</status>
 		<required_version>2.2</required_version>
 		<maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>
-- 
cgit v1.2.3


From 84eef6b809d61c904b61c6d7906429e16321f5d4 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Thu, 24 Sep 2015 11:02:45 +0200
Subject: Bump squid3-dev package version

---
 pkg_config.8.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index b1f27212..484b6b6b 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1167,7 +1167,7 @@
 		<pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink>
 		<website>http://www.squid-cache.org/</website>
 		<category>Network</category>
-		<version>3.3.10 pkg 2.2.9</version>
+		<version>3.3.10 pkg 2.3.0</version>
 		<status>beta</status>
 		<required_version>2.0</required_version>
 		<maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>
-- 
cgit v1.2.3


From a95f4b2f7435fcca00ab3d10e3c9276ca2af4d44 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Thu, 24 Sep 2015 11:03:31 +0200
Subject: Bump squid3-dev package version

---
 pkg_config.8.xml.amd64 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 3dd1702c..829bd0cf 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1154,7 +1154,7 @@
 		<pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink>
 		<website>http://www.squid-cache.org/</website>
 		<category>Network</category>
-		<version>3.3.10 pkg 2.2.9</version>
+		<version>3.3.10 pkg 2.3.0</version>
 		<status>beta</status>
 		<required_version>2.0</required_version>
 		<maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>
-- 
cgit v1.2.3