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

Package-Manager: portage-2.1.4.4

5 files changed, 90 insertions, 19 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"
+}
diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest
index 7b3db49045b2..a2d1e53b6874 100644
--- a/net-proxy/squidguard/Manifest
+++ b/net-proxy/squidguard/Manifest
@@ -4,27 +4,18 @@ Hash: SHA1
 AUX blockedsites 8 RMD160 69ecf774374ab43c8e3950977ac155bd475d1336 SHA1 d36a84e9d9f9d0296b0e8199ad27154ac6726395 SHA256 20169b61056128def8ac7b7eb393f7933362392b8d583b610b21bd3ce5c2015f
 AUX squidGuard.conf.blocksites 192 RMD160 7831192143b0db590872d6dd41a9504ef49b5bad SHA1 a328f9b6eb6d5c27816fde8317f6b821d49d93bd SHA256 6fab8600cbc8945f94260c68a5c4743244dd35ce195edaf3da453e284c4f8f3a
 AUX squidGuard.conf.minimal 61 RMD160 2cc5cc97f0c74e80e76f7ae3fb5fb7d09e29627b SHA1 ed963e093429e9fdf9c1fa06716781dd161d9448 SHA256 7070372be0dca55ade0a1beea8ac8d0461c38a8f5ef9d0a71ab47a9678f8f5df
-AUX squidguard-1.2.1-gentoo.patch 4137 RMD160 48bc8c0990ca0e165af0f1dc756da939f2df2f80 SHA1 727e2f15144fedeb68e52acdbd5871d31704940a SHA256 8ea7540586a974cba4afb3a9149c3436e8d3d59355f3e532de2cbfbbdc08344b
-AUX squidguard-1.2.1-regexp.patch 994 RMD160 551f0e9b1f403e891f2a61d3c631c8de0dc81078 SHA1 2c9dc96abf05612b86215ad31fdd2feb2867074e SHA256 a264bf2272f17e570dbdfe833a40d48f36e09b2295f1845658ada4226bb098ad
-AUX squidguard-1.2.1-tests.patch 3188 RMD160 7af54751b7e39b5cd01afe60c6c0901e0a34a7dd SHA1 808ec368163c050cc36dd7cb4bc300b225e16029 SHA256 15cf16bb5cbb0066a9e3087bd512a3c8582301178df15ed2f8be5080f841d4fc
 AUX squidguard-1.3-autoheader.patch 1517 RMD160 75caa54a404eb93713f7cc29a6c9144c3867f957 SHA1 9729db3a9134f61f011514176f1ad20d90800cbe SHA256 70783a9141f4507ef309de2066c8f250ff1ec90545ed8c099969e13f29232e2b
 AUX squidguard-1.3-bison.patch 3835 RMD160 74454f76e25e4fb946d39a889e54232a2f8f8f69 SHA1 b36cdd65e917049b5f759e8934adc33444bcc7eb SHA256 afd526a6ad7ca573dd5b044fe88ba19f552933000edd07f802e31b69b2c8a46e
 AUX squidguard-1.3-gentoo.patch 4238 RMD160 a24e51a3170dec1595348d8e3c5e611eca279a25 SHA1 b062fcfedf3506f609046080501ee515cc0ecb73 SHA256 bedfd2445aeec584d4720cecdb88002697254a2ca7d5c25043010a2b62c8e8bc
-DIST squidGuard-1.2.1.tar.gz 1947273 RMD160 0b998792a3612db28adb795c9fb0ea9b70118af3 SHA1 f8134ad0627ce61659f0d79a4a0bcf60e8b25796 SHA256 bc658e9bbadde5d5424caddc6a592c6fcd3346230269b0233092985e4b773592
-DIST squidGuard-1.3-patch-20080613.tar.gz 6779 RMD160 d59b96cf46495d37147939d489c26c0c65d4b48f SHA1 5ea46560b3563528a344f160e263ab57450eccc4 SHA256 a3f02df25eaeeaea247467bddaa204fc6824f5e2cb38e5217f4233894e66883f
 DIST squidGuard-1.3-patch-20080714.tar.gz 10502 RMD160 493a6a868f34d0b066c943f1969cf1e39debe6e2 SHA1 4345b0da96ca3470e55a4fe4df66217acbcf63cc SHA256 77bc306482059e231e3a3c3ee0d906a4d6dd40942421e12679e2d38e03eeee74
 DIST squidGuard-1.3.tar.gz 1905252 RMD160 4a6a9b5cf36d9e1d0994b3ec410f741a7b7955d3 SHA1 4a1e359679f328cff5970e92e93cc94236ead6c7 SHA256 be3342be74dadbf5c27ce0396db675a989c4f919a19e5c8240ce72c6b3c361a4
-EBUILD squidguard-1.2.1-r2.ebuild 1770 RMD160 2a4fd5c47eef6b013194b35ec981ee4ed9b3ed92 SHA1 8614a391d3dc68b59cec4c7bb9b1eb03239fe064 SHA256 250a254dfaab12ee8e8f5a4eeec9192327fe0535e354b3b0181371ca61515ec8
-EBUILD squidguard-1.3-r1.ebuild 1992 RMD160 c1515931630c52de9b02ecaeca758cd4f3a79cfa SHA1 75ca8db1892454fbc2aa212b88ae64ca1a4688e9 SHA256 d76ecce6aeab423b35b8cd5823284b340325dda773b6ce0eb48a7a66f1e8cc9d
-EBUILD squidguard-1.3-r2.ebuild 2027 RMD160 c2ac6aa8cef7e7e1e580f360231ba85e36737903 SHA1 647e3035c6928d5bd24b43e74c808c5e78651bc3 SHA256 50e58ea2ee2b9ebfecb2e0b3da38fdbd13f9927bc73d9038b1db850f7d6d3a42
-EBUILD squidguard-1.3-r3.ebuild 2117 RMD160 f9b1767bb9b39440235fc6d6e99fce21b0fcd344 SHA1 a96f21e5115981be67e4875617fed1c111252372 SHA256 45c4da0260582448a723abf78e7c1bd0d3d10133dbf22d5fe01fe0327fa936a7
-EBUILD squidguard-1.3.ebuild 1736 RMD160 7a470b72aa5e655844f29215a391cb614d877f60 SHA1 496a11c64d3812a713f09fe02e0732b478a63da6 SHA256 ae82b9f515d7954838a56bffb638a419e8b99af6f9b3160ab1742793e7977a53
-MISC ChangeLog 6367 RMD160 f0bdc2f5a0e99f26cda3b07ac07c087b1412d18d SHA1 e2a328eeb0ff14ee4873da1c6d0e1c5b6a9ac475 SHA256 deeee2475ca513a204bc7a5a16ded1af2b37e837a94fec28c3bbd07e65906b53
+EBUILD squidguard-1.3-r3.ebuild 2100 RMD160 629ff7541c95b340ff4fa31babed5a3e35463ad9 SHA1 673ad4cf36cfe4c560a4530ebbda5f5c2bc81538 SHA256 247133bd88ece3e53316c4ac3d96417bafefa37f32b541c847b3aea51c19e4cf
+MISC ChangeLog 6744 RMD160 613e61469f072fd9f710509845b1214b3d19a148 SHA1 1255684fef19f34ffddfbc124256283296dec986 SHA256 3e728674cb6e14e39f5d80f21053c69d52f39a81cddbd5666dbe785cc06d4b80
 MISC metadata.xml 264 RMD160 8daa5ffa55f6c07663817efed222d64000e6ddb9 SHA1 d2fece889cd4f6e8b3b1242a7e6e4ae6eb064afa SHA256 f8d4693b4abf0f53f7c5372bef0d946217d4a2dbb7d2a81e6ca4a6c59413c057
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkh+ZBcACgkQPrHvTlXvhtukJACfYcHW+92pOoY70e2+y+DthH7g
-ymUAoKUoR/tak4Tk5LdOfjQBam7SoNh+
-=2uJp
+iEYEARECAAYFAkjxrikACgkQPrHvTlXvhtvPCgCfRorntWWhWzTER81huzBSuRKi
+xpYAn1MFFl+ylg8iEgq4vX2zU/EYIZe3
+=Opsu
 -----END PGP SIGNATURE-----