Version bump, remove old. This time 6.8 works with the latest c-icap.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 18 insertions, 77 deletions

diff --git a/net-proxy/squidclamav/ChangeLog b/net-proxy/squidclamav/ChangeLog
index 323a8876d39d..105614dca88e 100644
--- a/net-proxy/squidclamav/ChangeLog
+++ b/net-proxy/squidclamav/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/squidclamav
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/ChangeLog,v 1.22 2012/07/24 19:10:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/ChangeLog,v 1.23 2012/07/26 19:48:35 flameeyes Exp $
+
+*squidclamav-6.8 (26 Jul 2012)
+
+  26 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> +squidclamav-6.8.ebuild,
+  -squidclamav-6.5.ebuild, -squidclamav-6.7.ebuild:
+  Version bump, remove old. This time 6.8 works with the latest c-icap.
 
 *squidclamav-6.7 (24 Jul 2012)
 
diff --git a/net-proxy/squidclamav/Manifest b/net-proxy/squidclamav/Manifest
index ce30044fcd7b..368b35871e6c 100644
--- a/net-proxy/squidclamav/Manifest
+++ b/net-proxy/squidclamav/Manifest
@@ -3,23 +3,21 @@ Hash: SHA256
 
 AUX squidclamav-6.1-crash.patch 704 SHA256 d2bfb3c4894a05f9f435252b6625dd7c07c05d84f77c0cb633d8214d82b2ebad SHA512 abd02e2bb7c721a135d37352ebacdd34511847ee0b48dd94f490c0ff960b141379b04da1674656b94b99dfcaa99683a5236770133eff22548121e9239446bb2e WHIRLPOOL 83ca31ae6d6ec033fb224245d4e57b62c393361f09811e6c45050e4897a87b0171ad30c9cbfc4819c5fab56c8303fe2c84da82989aece9457e654289a1d4af06
 DIST squidclamav-6.4.tar.gz 840856 SHA256 d057ed4dc688fb0e0152dd7a6bb0541b0172451229cbd6b3819509a4a42d2f12 SHA512 ab4a1add4a9b1651bfdc45acf66701463fc2dd0d588a6d08608524e143a41df49a1b65e53e4f5922745e516a895322fc0f0809b4bec22a0049aebd91c89e5042 WHIRLPOOL c46a0c42f6d244cdc146391cd07d3f8377171728a41b6cb0e482e76f81d87dcb8df666eb700e31883b0d83008f70f47ffd858f8fd9a7e02478931798ba58847a
-DIST squidclamav-6.5.tar.gz 842470 SHA256 4bf9050fe2209d6053e7fdaba9636ec3b7f0e7428f43df2faf48a579ad2e3fc4
 DIST squidclamav-6.6.tar.gz 842312 SHA256 e274a38703851a1e7a0020de2adca3515f7c4bc8c1a92973b8c11580e08fa0c0 SHA512 f143b8d0e6812b3a498e681e5be16c8ac568f82101ab71776ea8f12d449186b754aaadf1ab416d4fd0c695f9c9b38248fca46953a11cafc91cecca027a82cb36 WHIRLPOOL 8e707719d15f08804f4c96699005eb2b828b3205d05550c2d5bffc85fa1f83be1ef2dff042ea0ac715a8179c4942e13002457cb0f38989f227cab3f82b8332ab
-DIST squidclamav-6.7.tar.gz 840401 SHA256 40b92a4d5191942c8ebc1bfd1098081dad06b4012caac816a4510af2ddc119aa SHA512 8d5f025e42edbbe66ae721014ffe8e9b8163fb6a288e3777c4d3c6edd6f4463a7fee4e5df38d23398f14ddfe1a6f7225a1a02bc1f7609a0fb11a8b55db4e8328 WHIRLPOOL f5e37fe9aba6c5395cc371c55eea016f5af141250c4e47fcc52baed4d8a989f6159a7f92564c79e5ab03915b50290bb7fafda23cd9b9d464325403fc612ccac9
+DIST squidclamav-6.8.tar.gz 840634 SHA256 70dc1de6aa1a5cc705e336512699a0da530cf6f6e1130b261c5983ee89b34c49 SHA512 03d4ccbb970c1b3c9f0d632eae2b0c43fa0d2fc4b2fd495ef972018c069e20b7a4d198989a6010a1778c87a173fa90c49ea3d2332b89a5a9f6b5b7cb914879d0 WHIRLPOOL 4502a912f60af6f48bf662b67957f8c919a04627d02b120e64ef0566f9108c89fef45793d3a6646ffb41892718acf90bfc5c493cfef29ca3b9cbb1c4bcdb3d8d
 EBUILD squidclamav-6.4.ebuild 1800 SHA256 305dda0237bd1d7421fb35b6863cb22be434ecf5eb62a6b6c7caffbb070b580b SHA512 21711865f927733450795c846388ce2e03470c5bcd8b3ad1aec00729b9d920ef839b8e713ccc496c053d7c83f1e8e0162455901fd8d0bca8f9fa5452c70a13c6 WHIRLPOOL e5fe0860d9a41cd615c4e3a5d1fc35cade54972fe40b9338a19f3deef17bd86d7a355305330d1c5b4e60c084f8d9b53e9e006d6cd7c45e6ad0969390ee82898d
-EBUILD squidclamav-6.5.ebuild 1803 SHA256 84e5a987e25493f722193080937d59a5c30b5cf08d845fc72b77616a40e59a75 SHA512 1d2db610027ec809397b3f4d2cac9aa7b31a7996718538d944254521e40b91c0d6cd7225a76a6a62a4f2b1d23b2f1fb0fd22c4668d29432f6c04131fbb87c666 WHIRLPOOL 8fe4af64536b7a58135a665902629bf58188e77a11a7a219f2d8d3203e5157680b36085cc31b8eda23af5671bb766c45fc00bdf4fa68711d0ba379a7f057a5d2
 EBUILD squidclamav-6.6.ebuild 1803 SHA256 2965e03d25905326f165c59d130a2bff5215e92f28d0809787e18a06a9e07047 SHA512 07fd250974fd43290d1205d3580cad6d603c83d9468aa411ab7b5b713896e71494e95210c09e8a9a1e57645bd6043d3d1b1418b97f4af01b84048eb342386efb WHIRLPOOL b63ae900d581ffbbbc4e0b5ada4d0c9af11a7f00e65f0aad4c69445210a7adb5bb828f68101eac78f5e81b0eb31b16704f8de84e73591a8db5dc6efe20fa3628
-EBUILD squidclamav-6.7.ebuild 1803 SHA256 b299fe753f989a6f440488c85938c5536961dc281848c614cef4548c05fb6a29 SHA512 703483bec225c6e3ca0f2ad7d8d59fee10bc0465434270e6ab4ac1889b0b79bdaa8f5a73765087f3ee39494d4dd612673587578bd52d7c4c8df9824db982406e WHIRLPOOL 29285b55f5a2334873ddb2f2d003e4fc8b4eaa5841540d13851ab399f6e2ee6ad8482ad6897118cf636645cf6d8317d053a6360d650bb84c9d49965ff800cfcd
-MISC ChangeLog 3772 SHA256 343e0df543dee741deddb9d197ae1735c8c40029fad6fe9bfc15938a5acba483 SHA512 27e7b7af9788110a7bf375360d474b757596822179c3d2ee6b3a09850a35ac4cc14fab1332146fb7998383c814efc16a1947c58450135293806f6091ccfd6bba WHIRLPOOL df908ad6d8981fb971bacd8d5f0d875217de32762682aa5920497284fc51d9639ef550037a19b1944d904a14ac1774532e3d8bb3bbe728c13ab0c6c88a9d7158
+EBUILD squidclamav-6.8.ebuild 1803 SHA256 b5d3db4337c1d8e0c8d29f1d9b617e7e3e4bbc5c162024b024ec7cc5461031c7 SHA512 bc98c449fc3b5501566150401d85e217c70043bfb4527b49ee036ac158e81ccbd94a330c7c75a21bce5f7b678f2feb48424db0db304019325bd657f05d6471ab WHIRLPOOL f8ba5b6f8ffcba29b44aea92adc4b6174d44d4bde0ef3cdb888a0009f13e5643299e09961feb4215f7621b9710595fe9ba8db5df9b66e643d01875f89867c799
+MISC ChangeLog 4010 SHA256 603d411023ef79b2c80708a629ba2e110cc5bacf99f25fdafaaab2f4d1517aae SHA512 8b004a38a8383621e4348a921b3d196f3d81678ecfdb1264f4118ded84931030cc450ba11330d8af726d9de4db8579e9e6f85161c1c58f0d17ee837b9b947889 WHIRLPOOL ccbef1921cfa8e54de72ffe9f662eab2bd1cd9a0d7158986d4272e74d78b5bbd77447ed8f156d84b349a1412f1b546592bdcc85c0e13d64cf97ef9bcf43196b4
 MISC metadata.xml 601 SHA256 97bfe798448c67e1d15b82b7acf38f5ff3641a40e5f90d7cc5e57d907342a17d SHA512 6dd0fc5f78b1fb03cdb808b00007885b7f26a44fbe10ffda9b669950379177d39cdc75dd742fc484c0a85fa4db6f8abbc33176279aaa4e0eaffa3208e32abebe WHIRLPOOL 94217fe3c925d002cc7456e71591982633fdbbdc2c3051e9d2907d24f429b88f9fbd566bd9e843cf79e3f45cfb2aebf745ba5db9a05c6f0244730a2cc660a866
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQDvPMAAoJEBzRPIrUMBNC50sH/1QeJ0S/J4QfMW/kTBlh3250
-2TK8dYzUascmCHh2pca6IZQKfCPPo2OWHNkIxR6Vq3KzsYlzdf4RYiFS3fAeHSCc
-SZKdG2Hq2dVBe9j5j5yh+d6nSE1Gw29lSBxkvJk7I+Yli2PYkIiK1x89SY3Da7l8
-6bZ1Iy5ZONlaTsoYMvKG40tI5zELOGeQRnFd9LLJtsqLlfLFHBgnNA6bULQ/WFKL
-OoHogdKu1U19AEMLrQG5GQYubAC6BZTU5JHuEr953y9E8ZrppexsIfEKcjURCrF/
-APIonjQYcfYFmlPKYkPUDmkuA43zIR17fCx3HRLZ/NlOTlx8YGwACWKH9OT+8mQ=
-=2roA
+iQEcBAEBCAAGBQJQEZ8+AAoJEBzRPIrUMBNC6RAH/3O+tbym+Nbt5DRZXlB8mYpt
+YnEA4xL2/N2T73NBwfYqsYjeHLacGUFMuvHQKF7TWsEdJxuVx4SQ+0SLO1YPLuiR
+kEX6RPiHPYnY75LmA8ESqNTMu6kveEOdDto7/Coq/K3G/7Z9Ec3uYXb7jP7BWlkp
+BZV4rKQYAGP0NtLhTBIPQSJHpQmYo28oFjl67EcPsGNYF11NGpBt8JZp+twZrCrH
+eAT4Mlf6nPYnqM6Kj322QBqJpRedMLRDwR+nPQBCJxLkE+453NlWwl+f0AG95SLw
+zHGtd9P2OaDDuFM7wdti/UfjZzIvbWpno/B9lw5YRV3ZZ34T8RRqFTyZWfYWq24=
+=Bl0S
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squidclamav/squidclamav-6.7.ebuild b/net-proxy/squidclamav/squidclamav-6.7.ebuild
deleted file mode 100644
index ad0e5125844e..000000000000
--- a/net-proxy/squidclamav/squidclamav-6.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/squidclamav-6.7.ebuild,v 1.1 2012/07/24 19:10:40 flameeyes Exp $
-
-EAPI=4
-
-inherit libtool autotools
-
-DESCRIPTION="HTTP Antivirus for Squid based on ClamAv and ICAP"
-HOMEPAGE="http://squidclamav.darold.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="net-proxy/c-icap"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# version 6.3 causes maintainer-mode rebuild from tarball, and
-	# contains acinclude.m4 with libtool macros which cause trouble.
-	rm acinclude.m4 || die
-	eautoreconf
-	elibtoolize
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die
-
-	# delete its own documentation installed
-	rm -r "${D}"/usr/share/${PN} || die
-
-	dodoc README AUTHORS ChangeLog
-
-	# Fix configuration file to adapt to the Gentoo configuration
-	sed -i \
-		-e '/clamd_local/s:\.ctl:.sock:' \
-		"${D}"/etc/squidclamav.conf || die
-}
-
-pkg_postinst() {
-	elog "Starting from version 6, Squid Clamav is now a module for the c-icap"
-	elog "server, which is called from squid, rather than being a redirector"
-	elog "directly."
-	elog ""
-	elog "To enable the service, you should add this to your c-icap.conf file:"
-	elog ""
-	elog "    Service clamav squidclamav.so"
-	elog ""
-	elog "And then this to squid.conf (for a local ICAP server):"
-	elog ""
-	elog "    icap_enable on"
-	elog ""
-	elog "    # not strictly needed, but useful for special access"
-	elog "    icap_send_client_ip on"
-	elog "    icap_send_client_username on"
-	elog ""
-	elog "    icap_service clamav respmod_precache bypass=0 icap://localhost:1344/clamav"
-	elog "    adaptation_access clamav allow all"
-}
diff --git a/net-proxy/squidclamav/squidclamav-6.5.ebuild b/net-proxy/squidclamav/squidclamav-6.8.ebuild
index 5d65aec64ef4..aa8bc87fc679 100644
--- a/net-proxy/squidclamav/squidclamav-6.5.ebuild
+++ b/net-proxy/squidclamav/squidclamav-6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/squidclamav-6.5.ebuild,v 1.1 2012/01/15 22:03:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/squidclamav-6.8.ebuild,v 1.1 2012/07/26 19:48:35 flameeyes Exp $
 
 EAPI=4