Version bump; add cross-compilation patch, thanks to Bertrand Jacquin in bug #370945.

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

5 files changed, 212 insertions, 5 deletions

diff --git a/net-proxy/c-icap/ChangeLog b/net-proxy/c-icap/ChangeLog
index 23a1ca6c076a..f7c31bee1175 100644
--- a/net-proxy/c-icap/ChangeLog
+++ b/net-proxy/c-icap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/c-icap
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/ChangeLog,v 1.4 2011/02/18 02:27:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/ChangeLog,v 1.5 2011/06/10 18:00:51 flameeyes Exp $
+
+*c-icap-0.1.6 (10 Jun 2011)
+
+  10 Jun 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/c-icap-0.1.4-crosscompile.patch, +c-icap-0.1.6.ebuild,
+  +files/c-icap-0.1.6-implicit.patch:
+  Version bump; add cross-compilation patch, thanks to Bertrand Jacquin in bug
+  #370945.
 
 *c-icap-0.1.4 (18 Feb 2011)
 
diff --git a/net-proxy/c-icap/Manifest b/net-proxy/c-icap/Manifest
index d8cc89a5f2a6..f231f3c884a8 100644
--- a/net-proxy/c-icap/Manifest
+++ b/net-proxy/c-icap/Manifest
@@ -4,18 +4,22 @@ Hash: SHA1
 AUX c-icap-0.1.3+db-5.0.patch 495 RMD160 482a3a15e718d21bd1d00a866f0c6c62cf7d1809 SHA1 d5e3ddb39ba692c9f67f97572c274f0756badc44 SHA256 5cc9ea93da6e14f546a4fbe34cdfbc796b8e871e6a618de400e709a61556fb01
 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-0.1.4-crosscompile.patch 1847 RMD160 3afba27bd03027bb916a7050db10d13cb90e7f6b SHA1 4c4d50764e2ef30bbf30072aa7a829441a9d6965 SHA256 5117a04c7472cd405781f9751a35c5226e9bf1d4457bb3da6e5dbad65a18facd
+AUX c-icap-0.1.6-implicit.patch 315 RMD160 5e452f2a3ec205474ac651ac7c09d3870197f1db SHA1 951b408eb74d22f94304c4ad34cb30632e3297cf SHA256 b01d114efb6cb3ef5ce2a5945604ae96a7f8ee2b402f77bce0f60e3cd9f34f7e
 AUX c-icap.init 1048 RMD160 b47f5163b4cc04c83fec24a3f444436e0c24f101 SHA1 e38a0e39bc977a74e8bfa33de061a25369192baa SHA256 a2f5f719e36266ed1e41f12d3e12dd275d066e55ad09105dc5577947105fa2b1
 AUX c-icap.logrotate 188 RMD160 69c5f637b8ebce3a7b25703ecad066ca7264d00e SHA1 0c1f7bc65ff5479a22234eaba823554b3f2a8bf5 SHA256 a1ebd01837312c1fbb5b110486656656001c9b70ab0008f5ee73de6222005b54
 DIST c_icap-0.1.3.tar.gz 526931 RMD160 b81a2b1cca9d8044e4d8c4013a1593e32e24e8a9 SHA1 c4ea6795387a8abd18faed189d60d9e8c1f92092 SHA256 8942bae3a3e016664cf56c89ffb34a4337d1c984dc80e61d1c39e437ffab7baf
 DIST c_icap-0.1.4.tar.gz 528179 RMD160 63637fc0afbe6380cf3609c212f8b3670f876594 SHA1 fa1546601f589e6281e93ed2a122099584e3e11b SHA256 0e09a4a62f57fd5687bc516e3a52938af5fc65e4ee760e5f322abdf3cc4ef826
+DIST c_icap-0.1.6.tar.gz 528708 RMD160 3949976edb3fe3265563f280cc2929c590c44930 SHA1 31d322eacdc4fe3ee5f8d5d2c93d7f4faef1f7d7 SHA256 5088b69c9de6093dfcf64fbbcb285f13a9049f34371089668badd88769eee5a9
 EBUILD c-icap-0.1.3.ebuild 2680 RMD160 c8570478729ff14af6d7c16c2965c9f9c329c904 SHA1 0ad3e4f1923717189a5f9f76148c9f7c3c4f0d1b SHA256 d99d73f0796e417113a4b4baf5674869765021794d1258d0d90630a4bdd2758f
 EBUILD c-icap-0.1.4.ebuild 2788 RMD160 59eb02db655d8bcbf58387c4b4aad042bc18326c SHA1 575836c0aaaca30fbb80402aa9b36bc1e0c8239a SHA256 15557c5eba2fefe113e699814a77cc3b2f5d81e208d0e8c4fdbb45342ddf56d3
-MISC ChangeLog 998 RMD160 f8df50f478f6ce3fa6f7a78693942d26f1ee1afb SHA1 625fbc68886dcff36bc60d68462aa0611804b9da SHA256 9ca22a58895ea798c5b0d23ec49ff8bb0aac7fdabddec682c413e313d7830b9a
+EBUILD c-icap-0.1.6.ebuild 3026 RMD160 a22296738b3ef6f786b0e51da4480cc97280a431 SHA1 8380988be143a822ef317494c6bd3be2362248db SHA256 295777abc439f40005c70dee9f19172999b2866c1101535b7b90759bd0606deb
+MISC ChangeLog 1276 RMD160 a8411bf443a5892774d59bb0c38090ce198194ee SHA1 000483810ce850bb7e7a447251b5de235ffbcb7c SHA256 2900a7ac9fdea60964f91a337e99e35892b9e37f916e7f5016aa4edfa22bd5b3
 MISC metadata.xml 314 RMD160 361f20765aacd066a4cd246dc6e1279b5867e1db SHA1 f94c897e86448ba1ecfd55a90f1391c5d050dcd5 SHA256 62f7e0195ddb28bcab113616feba8f590429a33552ec9bf96f5e3ad5c5f4e542
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1d2TcACgkQAiZjviIA2XifygCgofkqDiQquQja0LBo4QJ16lMR
-4xEAn1WHJvSchLnr5Zk1bQ+4WnkPsIz3
-=afdH
+iEYEARECAAYFAk3yW8MACgkQAiZjviIA2Xj7jwCgvpCsy5rLlantNcNjw0Pg+qRK
+Vd4AoLk/x6/UrIpuNYSwm8Ebxlcma1I/
+=w3mJ
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/c-icap/c-icap-0.1.6.ebuild b/net-proxy/c-icap/c-icap-0.1.6.ebuild
new file mode 100644
index 000000000000..2b6c7f5e9b68
--- /dev/null
+++ b/net-proxy/c-icap/c-icap-0.1.6.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2011 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.6.ebuild,v 1.1 2011/06/10 18:00:51 flameeyes Exp $
+
+EAPI=2
+
+inherit eutils multilib flag-o-matic 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 ~x86"
+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}/${PN}-0.1.3-asneeded.patch"
+	epatch "${FILESDIR}/${PN}-0.1.3-implicit.patch"
+	epatch "${FILESDIR}/${PN}-0.1.3+db-5.0.patch"
+	epatch "${FILESDIR}/${PN}-0.1.4-crosscompile.patch"
+	epatch "${FILESDIR}/${PN}-0.1.6-implicit.patch"
+	eautoreconf
+}
+
+src_configure() {
+	# some void *** pointers get casted around and can be troublesome to
+	# fix properly.
+	append-flags -fno-strict-aliasing
+
+	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
+
+	insopts -m0644
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
+
+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.4-crosscompile.patch b/net-proxy/c-icap/files/c-icap-0.1.4-crosscompile.patch
new file mode 100644
index 000000000000..2e2a325989bb
--- /dev/null
+++ b/net-proxy/c-icap/files/c-icap-0.1.4-crosscompile.patch
@@ -0,0 +1,72 @@
+--- a/configure.in	2010-12-21 17:50:08.000000000 +0100
++++ b/configure.in	2011-06-10 00:24:06.000000000 +0200
+@@ -423,10 +423,8 @@ 
+ )
+ 
+ dnl Checking if interprocess posix semaphores works....
+-POSIX_SEMAPHORES="0"
+-AC_MSG_CHECKING(if posix 1003.1b interprocess semaphores works)
+-AC_TRY_RUN(
+-[
++AC_CACHE_CHECK([if posix 1003.1b interprocess semaphores works], ac_cv_10031b_ipc_sem,
++[AC_TRY_RUN([
+ #include <semaphore.h>
+ #include <sys/wait.h>
+ 
+@@ -452,18 +450,24 @@ 
+       exit(0);
+ }
+ ],
+-AC_DEFINE(HAVE_POSIX_SEMAPHORES,1,[Define HAVE_POSIX_SEMAPHORES if posix 1003.1b semaphores works])
+-POSIX_SEMAPHORES="1"
+-AC_MSG_RESULT(yes),
+-AC_MSG_RESULT(no)
++ac_cv_10031b_ipc_sem=yes,
++ac_cv_10031b_ipc_sem=no,
++[AC_MSG_ERROR([cross-compiling,
++	presetting ac_cv_10031b_ipc_sem=(yes|no) will help])]
+ )
++])
++AS_IF(
++ [test $ac_cv_10031b_ipc_sem = yes],
++ [AC_DEFINE(HAVE_POSIX_SEMAPHORES,1,[Define HAVE_POSIX_SEMAPHORES if posix 1003.1b semaphores works])
++  POSIX_SEMAPHORES="1"
++ ],[
++  POSIX_SEMAPHORES="0"
++ ])
+ AC_SUBST(POSIX_SEMAPHORES)
+ 
+ dnl Checking for file locking
+-POSIX_FILE_LOCK="0"
+-AC_MSG_CHECKING(if fcntl file locking works)	
+-AC_TRY_RUN(
+-[
++AC_CACHE_CHECK([if fcntl file locking works], ac_cv_fcntl,
++[AC_TRY_RUN([
+ #include <unistd.h>
+ #include <fcntl.h>
+ 
+@@ -487,11 +491,19 @@ 
+      return 0;
+ }
+ ],
+-AC_DEFINE(HAVE_POSIX_FILE_LOCK,1,[Define HAVE_POSIX_FILE_LOCK if posix fcntl file locking works])
+-POSIX_FILE_LOCK="1"
+-AC_MSG_RESULT(yes),
+-AC_MSG_RESULT(no)
++ac_cv_fcntl=yes,
++ac_cv_fcntl=no,
++[AC_MSG_ERROR([cross-compiling,
++	presetting ac_cv_fcntl=(yes|no) will help])]
+ )
++])
++AS_IF(
++ [test $ac_cv_fcntl = yes],
++ [AC_DEFINE(HAVE_POSIX_FILE_LOCK,1,[Define HAVE_POSIX_FILE_LOCK if posix fcntl file locking works])
++  POSIX_FILE_LOCK="1"
++ ],[
++  POSIX_FILE_LOCK="0"
++ ])
+ AC_SUBST(POSIX_FILE_LOCK)
+ 
+ #pthread_rwlock
diff --git a/net-proxy/c-icap/files/c-icap-0.1.6-implicit.patch b/net-proxy/c-icap/files/c-icap-0.1.6-implicit.patch
new file mode 100644
index 000000000000..aabffea7dc53
--- /dev/null
+++ b/net-proxy/c-icap/files/c-icap-0.1.6-implicit.patch
@@ -0,0 +1,12 @@
+Index: c_icap-0.1.6/txtTemplate.c
+===================================================================
+--- c_icap-0.1.6.orig/txtTemplate.c
++++ c_icap-0.1.6/txtTemplate.c
+@@ -27,6 +27,7 @@
+ #include <sys/param.h>
+ #include <assert.h>
+ #include <stdlib.h>
++#include <ctype.h>
+ 
+ #include "body.h"
+ #include "c-icap.h"