Initial import of the c-icap server to be used with Squid and SquidClamav 6.

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

8 files changed, 226 insertions, 6 deletions

diff --git a/net-proxy/c-icap/ChangeLog b/net-proxy/c-icap/ChangeLog
new file mode 100644
index 000000000000..c43c6ca1296c
--- /dev/null
+++ b/net-proxy/c-icap/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for net-proxy/c-icap
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/ChangeLog,v 1.1 2010/11/22 15:44:41 flameeyes Exp $
+
+*c-icap-0.1.3 (22 Nov 2010)
+
+  22 Nov 2010; Diego E. Pettenò <flameeyes@gentoo.org> +c-icap-0.1.3.ebuild,
+  +files/c-icap-0.1.3-asneeded.patch, +files/c-icap-0.1.3-implicit.patch,
+  +files/c-icap.init, +metadata.xml:
+  Initial import of the c-icap server to be used with Squid and SquidClamav 6.
+
diff --git a/net-proxy/c-icap/Manifest b/net-proxy/c-icap/Manifest
new file mode 100644
index 000000000000..49766baf0113
--- /dev/null
+++ b/net-proxy/c-icap/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX c-icap-0.1.3-asneeded.patch 953 RMD160 bd4c51d283f3e0e74fa2c3d26a65a6c01e2ccfb6 SHA1 266d6ecc6883577645cac3954d7f3b377715c958 SHA256 353861571ab1116f59115ae4403ae4cdcc3bd799a0f3d1477f3e00fcb23783ee
+AUX c-icap-0.1.3-implicit.patch 489 RMD160 b3ef8769bbe897a3d160406e086f34766c656aa5 SHA1 a812bfafb718d05eec0ee2b6b406b1d1802ee330 SHA256 8268e23ea1810f737a7c376f43a7c8e5a349b6dfa909e25f7018c3432add8dca
+AUX c-icap.init 1048 RMD160 b47f5163b4cc04c83fec24a3f444436e0c24f101 SHA1 e38a0e39bc977a74e8bfa33de061a25369192baa SHA256 a2f5f719e36266ed1e41f12d3e12dd275d066e55ad09105dc5577947105fa2b1
+DIST c_icap-0.1.3.tar.gz 526931 RMD160 b81a2b1cca9d8044e4d8c4013a1593e32e24e8a9 SHA1 c4ea6795387a8abd18faed189d60d9e8c1f92092 SHA256 8942bae3a3e016664cf56c89ffb34a4337d1c984dc80e61d1c39e437ffab7baf
+EBUILD c-icap-0.1.3.ebuild 2635 RMD160 73dae1867c72b41a2438dbdb2f249a9b8e3e5948 SHA1 8fdf7c6e46ae878571d093fb13c3606c8536e302 SHA256 3f31103aa06340fe098e2849fe3f8ded3e1d5ecd3ae697950bf3d6255022a69a
+MISC ChangeLog 506 RMD160 1256e778ca6445ce24daa93da4b2a22ded50594e SHA1 f6f08e211af753c15bbcf9cd199419ba48c20392 SHA256 ed3686afb7ac55ade93349b49df73395dd3592cb71642063ef229ca3c67c3ffd
+MISC metadata.xml 314 RMD160 361f20765aacd066a4cd246dc6e1279b5867e1db SHA1 f94c897e86448ba1ecfd55a90f1391c5d050dcd5 SHA256 62f7e0195ddb28bcab113616feba8f590429a33552ec9bf96f5e3ad5c5f4e542
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzqj94ACgkQAiZjviIA2XgsZgCgjWtUsKIwtVap+IqFBN6t/8Ip
+DpwAoJ83S0m66zRVm3xig6NaUnrY5BWG
+=amZp
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/c-icap/c-icap-0.1.3.ebuild b/net-proxy/c-icap/c-icap-0.1.3.ebuild
new file mode 100644
index 000000000000..f9b50e087807
--- /dev/null
+++ b/net-proxy/c-icap/c-icap-0.1.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/c-icap-0.1.3.ebuild,v 1.1 2010/11/22 15:44:41 flameeyes Exp $
+
+EAPI=2
+
+inherit eutils multilib autotools
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="C Implementation of an ICAP server"
+HOMEPAGE="http://c-icap.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="berkdb ldap ipv6 ldap"
+
+RDEPEND="berkdb? ( sys-libs/db )
+	ldap? ( net-nds/openldap )
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+	epatch "${FILESDIR}/${P}-implicit.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/${PN} \
+		--disable-dependency-tracking \
+		--disable-maintainer-mode \
+		--disable-static \
+		--enable-large-files \
+		$(use_enable ipv6) \
+		$(use_with berkdb bdb) \
+		$(use_with ldap)
+}
+
+src_compile() {
+	emake LOGDIR="/var/log" || die
+}
+
+src_install() {
+	emake \
+		LOGDIR="/var/log" \
+		DESTDIR="${D}" install || die
+
+	find "${D}" -name '*.la' -delete || die
+
+	# Move the daemon out of the way
+	dodir /usr/libexec
+	mv "${D}"/usr/bin/c-icap "${D}"/usr/libexec || die
+
+	# Remove the default configuration files since we have etc-update to
+	# take care of it for us.
+	rm "${D}"/etc/${PN}/c-icap.*.default || die
+
+	# Fix the configuration file; for some reason it's a bit messy
+	# around.
+	sed -i \
+		-e 's:/usr/var/:/var/:g' \
+		-e 's:/var/log/:/var/log/c-icap/:g' \
+		-e 's:/usr/etc/:/etc/c-icap/:g' \
+		-e 's:/usr/local/c-icap/etc/:/etc/c-icap/:g' \
+		-e 's:/usr/lib/:/usr/'$(get_libdir)'/:g' \
+		"${D}"/etc/${PN}/c-icap.conf \
+		|| die
+
+	dodoc AUTHORS README TODO ChangeLog || die
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN} || die
+	keepdir /var/log/c-icap || die
+}
+
+pkg_postinst() {
+	elog "To enable Squid to call the ICAP modules from a local server you should set"
+	elog "the following in your squid.conf:"
+	elog ""
+	elog "    icap_enable on"
+	elog ""
+	elog "    # not strictly needed, but some modules might make use of these"
+	elog "    icap_send_client_ip on"
+	elog "    icap_send_client_username on"
+	elog ""
+	elog "    icap_service service_req reqmod_precache bypass=1 icap://localhost:1344/service"
+	elog "    adaptation_access service_req allow all"
+	elog ""
+	elog "    icap_service service_resp respmod_precache bypass=0 icap://localhost:1344/service"
+	elog "    adaptation_access service_resp allow all"
+	elog ""
+	elog "You obviously will have to replace \"service\" with the actual ICAP service to"
+	elog "use."
+}
diff --git a/net-proxy/c-icap/files/c-icap-0.1.3-asneeded.patch b/net-proxy/c-icap/files/c-icap-0.1.3-asneeded.patch
new file mode 100644
index 000000000000..44adca98fa7f
--- /dev/null
+++ b/net-proxy/c-icap/files/c-icap-0.1.3-asneeded.patch
@@ -0,0 +1,24 @@
+Index: c_icap-0.1.3/Makefile.am
+===================================================================
+--- c_icap-0.1.3.orig/Makefile.am
++++ c_icap-0.1.3/Makefile.am
+@@ -37,8 +37,8 @@ c_icap_SOURCES = aserver.c request.c cfg
+ # libicapapi ......
+ libicapapi_la_CFLAGS= -Iinclude/ @ZLIB_ADD_FLAG@ -DCI_BUILD_LIB
+ 
+-libicapapi_la_LIBADD = @ZLIB_ADD_LDFLAG@
+-libicapapi_la_LDFLAGS= -shared -version-info @CICAPLIB_VERSION@
++libicapapi_la_LIBADD = @ZLIB_ADD_LDFLAG@ @THREADS_LDADD@ @DL_ADD_FLAG@
++libicapapi_la_LDFLAGS= -shared -version-info @CICAPLIB_VERSION@ @THREADS_LDFLAGS@
+ 
+ 
+ #c_icap the main server 
+@@ -47,7 +47,7 @@ c_icap_CFLAGS= -Iinclude/ -DCONFDIR=\"$(
+                           -DSERVDIR=\"$(SERVICESDIR)\" -DLOGDIR=\"$(LOGDIR)\"  \
+                           -DDATADIR=\"$(DATADIR)\"
+ 
+-c_icap_LDADD = @THREADS_LDADD@ libicapapi.la @DL_ADD_FLAG@
++c_icap_LDADD = libicapapi.la
+ c_icap_LDFLAGS = -rdynamic -rpath @libdir@ @THREADS_LDFLAGS@
+ 
+ 
diff --git a/net-proxy/c-icap/files/c-icap-0.1.3-implicit.patch b/net-proxy/c-icap/files/c-icap-0.1.3-implicit.patch
new file mode 100644
index 000000000000..64c9eaddef2d
--- /dev/null
+++ b/net-proxy/c-icap/files/c-icap-0.1.3-implicit.patch
@@ -0,0 +1,21 @@
+Index: c_icap-0.1.3/cfg_param.c
+===================================================================
+--- c_icap-0.1.3.orig/cfg_param.c
++++ c_icap-0.1.3/cfg_param.c
+@@ -30,6 +30,7 @@
+ #include "cfg_param.h"
+ #include "commands.h"
+ #include "acl.h"
++#include "txtTemplate.h"
+ 
+ #define LINESIZE 8192
+ #define MAX_DIRECTIVE_SIZE 80
+@@ -870,6 +871,8 @@ void system_shutdown()
+     ci_txt_template_close();
+ }
+ 
++extern void reset_http_auth();
++
+ int system_reconfigure()
+ {
+      int old_port;
diff --git a/net-proxy/c-icap/files/c-icap.init b/net-proxy/c-icap/files/c-icap.init
new file mode 100644
index 000000000000..9b3623add2d4
--- /dev/null
+++ b/net-proxy/c-icap/files/c-icap.init
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 2010-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/files/c-icap.init,v 1.1 2010/11/22 15:44:40 flameeyes Exp $
+
+depend() {
+    need localmount net
+}
+
+start() {
+	# Find the currently-configured pid file and command socket
+	pidfile=$(awk '$1 == "PidFile" { print $2 }' /etc/c-icap/c-icap.conf)
+	cmdsocket=$(awk '$1 == "CommandsSocket" { print $2 }' /etc/c-icap/c-icap.conf)
+
+	if ! [ -d "$(dirname "${pidfile}")" ] || ! [ -d "$(dirname "${cmdsocket}")" ]; then
+		mkdir -p "$(dirname "${pidfile}")" "$(dirname "${cmdsocket}")"
+	fi
+
+	ebegin "Starting c-icap daemon"
+	start-stop-daemon \
+		--start --pidfile ${pidfile} \
+		--exec /usr/libexec/c-icap -- ${EXTRA_OPTS}
+	eend $?
+}
+
+stop() {
+	# Find the currently-configured pid file
+	pidfile=$(awk '$1 == "PidFile" { print $2 }' /etc/c-icap/c-icap.conf)
+
+	ebegin "Stopping c-icap daemon"
+	start-stop-daemon \
+		--stop --pidfile ${pidfile} \
+		--exec /usr/libexec/c-icap
+	eend $?
+}
diff --git a/net-proxy/c-icap/metadata.xml b/net-proxy/c-icap/metadata.xml
new file mode 100644
index 000000000000..eb2f0eae9292
--- /dev/null
+++ b/net-proxy/c-icap/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>flameeyes@gentoo.org</email>
+    <description>Co-maintainer, not trying to call for exclusive</description>
+  </maintainer>
+  <herd>net-proxy</herd>
+</pkgmetadata>
diff --git a/net-proxy/squidclamav/Manifest b/net-proxy/squidclamav/Manifest
index 5b63e8b990b6..2e1d23690660 100644
--- a/net-proxy/squidclamav/Manifest
+++ b/net-proxy/squidclamav/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA1
 
 AUX squidclamav-4.0-gentoo.patch 622 RMD160 164f117186fac16c5e69daa52472f214f65a6cca SHA1 888bdb74fc4be625efddd54b70e1e40fcdcdab9b SHA256 676edb03579af84dfcffc2cc120050fa94b88daf0a7e8f5dc8291f3da36f8738
+AUX squidclamav-6.1-crash.patch 704 RMD160 5803802a5bf926876e81f99a1f268468cef75393 SHA1 56a379a00c96825f971bcb6a6f83900cca4b0a0e SHA256 d2bfb3c4894a05f9f435252b6625dd7c07c05d84f77c0cb633d8214d82b2ebad
 DIST squidclamav-4.0.tar.gz 102704 RMD160 1c51629626e8c70d6def6694337186893a8284b0 SHA1 da9564d8f55d6d2c425feb6a00c8c316e24092f9 SHA256 ed1149cf05eb06165864e5a08bb8a7dcc28f9b9c9fe5c397d5010396b160bae6
+DIST squidclamav-6.1.tar.gz 864708 RMD160 0d05aaf1337635d534f752fef64cfa1bfd518c19 SHA1 9e63ef4b34b8934a97dd5ae61706ca9a2bab276e SHA256 7f85a45949444c56c3765092607c4d5c65ccc2f3abd168fef4ca3fe16e9270fc
 EBUILD squidclamav-4.0.ebuild 1219 RMD160 2df98bb50c4559366d256c23d950427fc4dccc31 SHA1 491b7b1dfd4515250f4d2f42157200ed2f6a8854 SHA256 9a142525190952464559412509470cc69196a1cfe95014679c39fdb3d48bbbc7
-MISC ChangeLog 2015 RMD160 20f34db17bdf769fc94c470c6be058e727e2026a SHA1 16385d1631deaa69567649bae1296db7b8a0288b SHA256 6fdf801858df21ac4e125b15041d483f49f1dc641665cf41563fa747d96bc323
-MISC metadata.xml 327 RMD160 f8064541c8e6cb884bc8742791f177f1fa5bafcf SHA1 c19339e33115e3eec128917cfdf1645d4f06e001 SHA256 e36b5b3fe77428545f7ae44d2f036f11dcbd84a6391e5c6d691ac1698d46af71
+EBUILD squidclamav-6.1.ebuild 1686 RMD160 3d7f3c2ce0d0950047728a0a6a84ed2135b34f01 SHA1 503cf7910023db44973d4e295867b66c042cb307 SHA256 845bbc873fc253c1bd36cd6e5e10ae874069468a81d6d55c52762f75292d1573
+MISC ChangeLog 2290 RMD160 cce9d1b4b127a697b312d95253d89974d8f1f99a SHA1 5971ba2e28f640b38ece81cc20efbe5d5cdad9d4 SHA256 51a6edfc5700987d0712decf0c74c3e05e24f34a02c72f66503aec97a74938ae
+MISC metadata.xml 601 RMD160 b1d903cfa58a59a30b7927289ee7ece696dcb8a0 SHA1 e5f0e64372872f416af03774c8dc733550934663 SHA256 97bfe798448c67e1d15b82b7acf38f5ff3641a40e5f90d7cc5e57d907342a17d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkrbMN4ACgkQ9A5kJBGSrst0ZgCghHFefXtqIKIEwxTQFn752eMo
-U1MAniZPMps+fP5ZrWaW90sthD5fl/N0
-=LIox
+iEYEARECAAYFAkzqkDEACgkQAiZjviIA2XjXZgCggr2QhJH2aM6UlOVKAFWCSCtN
+EQ0AoMuVGhWC54ChDv/jGTQFkuDxY/nk
+=kLeI
 -----END PGP SIGNATURE-----