Version bump. Remove squid run-time dependency (#241212).

Package-Manager: portage-2.1.4.4

4 files changed, 85 insertions, 5 deletions

diff --git a/net-proxy/squidclamav/ChangeLog b/net-proxy/squidclamav/ChangeLog
index a747198b8760..e5f3109fd108 100644
--- a/net-proxy/squidclamav/ChangeLog
+++ b/net-proxy/squidclamav/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/squidclamav
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/ChangeLog,v 1.7 2008/07/13 14:29:24 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/ChangeLog,v 1.8 2008/10/12 07:53:36 mrness Exp $
+
+*squidclamav-3.6 (12 Oct 2008)
+
+  12 Oct 2008; Alin Năstac <mrness@gentoo.org>
+  +files/squidclamav-3.6-gentoo.patch, +squidclamav-3.6.ebuild:
+  Version bump. Remove squid run-time dependency (#241212).
 
   13 Jul 2008; Alin Năstac <mrness@gentoo.org>
   -files/squidclamav-3.2-gentoo.patch, -squidclamav-3.2.ebuild:
diff --git a/net-proxy/squidclamav/Manifest b/net-proxy/squidclamav/Manifest
index 947dcd93a07b..e781d60698fe 100644
--- a/net-proxy/squidclamav/Manifest
+++ b/net-proxy/squidclamav/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA1
 
 AUX squidclamav-3.5-gentoo.patch 847 RMD160 1ec28c3a1de5ede8bbd6db4c10cf7dc394103b2d SHA1 6616ce6d404f8ecd96f3ec8e2ed4484f31e23ec0 SHA256 0e8ac0f2acb87e5c9f5fec70f75be0d1a24554c2eb18d8cfc29ef5143d2ba2f1
+AUX squidclamav-3.6-gentoo.patch 846 RMD160 43e107c889cf677f9f072613226c48212ae76594 SHA1 0e85f37b2a62bb3a3ad23c25cf50f8c8654a79b0 SHA256 bc29eec7f5a5fd57f8e270ebefbe01484fcfd18df8e477a08d91e5407be77baa
 DIST squidclamav-3.5.tar.gz 100096 RMD160 40cec47d7aa2c1dd441e9efd53733611f8e0701d SHA1 2e10c72355757ef38f43d729889a15628fd2e4e9 SHA256 47e73b34d23ae6abffa6c75cc9002177a78ea22fe94c42d08a7a7c575717a42e
+DIST squidclamav-3.6.tar.gz 100056 RMD160 0ae53c4ee40c9efcaf9c7ed578b980c59182032f SHA1 d37dc4fc7867ec3178f5c1522ae95651c8adedb3 SHA256 fd5b3008a183ac0debc8b9c0dcc0c4a25f20864f03c6daec176b4352c819334d
 EBUILD squidclamav-3.5.ebuild 1239 RMD160 18d360b9e59d67ac60b03b40c2b501d0efda9d76 SHA1 1922bdcc925554949510b10da7f329fe052704a5 SHA256 48901215044e82c6cbcdf74f136f454943042d51fdb9ead1a2dae4b9f9350464
-MISC ChangeLog 1434 RMD160 84d953d7103db06f2a1b48eddce71ee41554ba26 SHA1 d625ea0bb87c21c2276463f23ec2e999c047431e SHA256 a5b4ae440f5447449f7a25553b06f460f5eea2ac727f25d7c7313b79a58f6a9c
+EBUILD squidclamav-3.6.ebuild 1222 RMD160 907f0e11d85cb7ae3a157263a776540118e9a664 SHA1 dc827285f10a0a0c7ac5e4e02aac258985076c1f SHA256 7cfb4b66f9e88245760d205f0e3c3b84a7c694c256192e62a32002c6626f2e90
+MISC ChangeLog 1639 RMD160 9153e3e28aa73cc2eec7ae1daa5306c7e8c446c1 SHA1 3d8bda73cb2c7da46a1fca36a51bec2f94616c4d SHA256 fcb9a1bfdd2a088d81be901ee60b4fc99c34d6c9aec704cc4b438715ed076a71
 MISC metadata.xml 327 RMD160 f8064541c8e6cb884bc8742791f177f1fa5bafcf SHA1 c19339e33115e3eec128917cfdf1645d4f06e001 SHA256 e36b5b3fe77428545f7ae44d2f036f11dcbd84a6391e5c6d691ac1698d46af71
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkh6EUoACgkQPrHvTlXvhtsW0wCfT7tGGjclF2DuUp4WE4KMf6ZI
-uIMAnjWAz/GZHwfqC4l+3vCuxzfPF3gQ
-=8MP6
+iEYEARECAAYFAkjxrQcACgkQPrHvTlXvhtutUACfQF+cmgQpdrEui8ucaJXMKaxe
+IAoAn3x0tLo8/O1w6CjLmfNwDyxaYAsO
+=MoE6
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squidclamav/files/squidclamav-3.6-gentoo.patch b/net-proxy/squidclamav/files/squidclamav-3.6-gentoo.patch
new file mode 100644
index 000000000000..6283013dfb9b
--- /dev/null
+++ b/net-proxy/squidclamav/files/squidclamav-3.6-gentoo.patch
@@ -0,0 +1,28 @@
+diff -ur squidclamav-3.6.orig/squidclamav.conf.dist squidclamav-3.6/squidclamav.conf.dist
+--- squidclamav-3.6.orig/squidclamav.conf.dist	2008-09-30 11:44:23.000000000 +0000
++++ squidclamav-3.6/squidclamav.conf.dist	2008-10-12 07:49:55.000000000 +0000
+@@ -29,7 +29,7 @@
+ #
+ #	stat 0|1
+ #
+-#	squidguard /usr/local/squidGuard/bin/squidGuard
++#	squidguard /usr/bin/squidGuard
+ #
+ #	whitelist this.trustdomain.com
+ #	whitelist .*\.domain\.*
+@@ -39,12 +39,12 @@
+ #proxy http://127.0.0.1:3128/
+ #logfile /var/log/squidclamav.log
+ #redirect http://proxy.domain.com/cgi-bin/clwarn.cgi
+-#squidguard /usr/local/squidGuard/bin/squidGuard
++#squidguard /usr/bin/squidGuard
+ #debug 0
+ #force 1
+ #stat 1
+-#clamd_local /tmp/clamd
+-#clamd_ip 192.168.1.5
++#clamd_local /var/run/clamav/clamd.sock
++#clamd_ip 127.0.0.1
+ #clamd_port 3310
+ #timeout 60
+ #abort ^.*\.gz$
diff --git a/net-proxy/squidclamav/squidclamav-3.6.ebuild b/net-proxy/squidclamav/squidclamav-3.6.ebuild
new file mode 100644
index 000000000000..5b16b98bc8b8
--- /dev/null
+++ b/net-proxy/squidclamav/squidclamav-3.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/squidclamav-3.6.ebuild,v 1.1 2008/10/12 07:53:36 mrness Exp $
+
+inherit eutils
+
+DESCRIPTION="A Squid redirector to allow easy antivirus file scanning, using ClamAV"
+HOMEPAGE="http://www.samse.fr/GPL/"
+SRC_URI="http://www.samse.fr/GPL/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-misc/curl
+	dev-libs/openssl
+	sys-libs/zlib
+	app-arch/bzip2"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+}
+
+src_install() {
+	dosbin squidclamav || die "dosbin failed"
+	insinto /etc
+	newins squidclamav.conf.dist squidclamav.conf
+	keepdir /var/log/squidclamav
+	fowners squid:squid /var/log/squidclamav
+	dodoc ChangeLog README squidclamav.conf.dist clwarn.cgi*
+}
+
+pkg_postinst() {
+	einfo "To enable squidclam, add the following lines to /etc/squid/squid.conf:"
+	einfo "    url_rewrite_program /usr/sbin/squidclamav"
+	einfo "    url_rewrite_children 15"
+	einfo "    url_rewrite_access deny localhost # prevent loops"
+	einfo "    url_rewrite_access deny SSL_ports # SSL URLs cannot be scanned"
+}