Merge remote-tracking branch 'stevee/proxy-squidclamav' into next

Conflicts:
	config/cfgroot/general-functions.pl

src/paks/squidclamav/update.sh

@@ -35,4 +35,14 @@ if [ "$VERSION" -lt "11" ]; then
  sed -e "s|logfile.*|logfile /var/log/squid/squidclamav.log|g" /etc/squidclamav.conf
 fi
 
+if [ "$VERSION" -lt "16" ]; then
+ sed -e "s/proxy none//g" -i /etc/squidclamav.conf
+ sed -e "s/^#squid_ip 127\.0\.0\.1/squid_ip 127\.0\.0\.1/g" \
+     -e "s/^#squid_port 3128/squid_port 800/g" \
+     -e "s/^#trust_cache 1/trust_cache 1/g" -i /etc/squidclamav.conf
+
+ # Regenerate configuration files.
+ perl /srv/web/ipfire/cgi-bin/proxy.cgi
+fi
+ 
 /etc/init.d/squid restart

src/patches/squidclamav-5.11-dont_use_ipv6.patch

@@ -0,0 +1,13 @@
+diff -Nur a/src/squidclamav.c b/src/squidclamav.c
+--- a/src/squidclamav.c	2012-10-29 09:46:06.000000000 +0100
++++ b/src/squidclamav.c	2013-07-06 19:10:56.375292374 +0200
+@@ -413,6 +413,9 @@
+ 	  /* Suppress error: SSL certificate problem, verify that the CA cert is OK */
+ 	  curl_easy_setopt (eh, CURLOPT_SSL_VERIFYHOST, 0);
+ 	  curl_easy_setopt (eh, CURLOPT_SSL_VERIFYPEER, 0);
++
++	  /* Prevent squidclamav from using IPv6 - fix by Nico Prenzel */
++	  curl_easy_setopt (eh, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
+ 	}
+    }
+   /* create a squidguard child process and setup pipes */