Remove old; bump to use new init script (and conf file) that will properly 'use logger' if needed.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

6 files changed, 70 insertions, 120 deletions

diff --git a/net-proxy/c-icap/ChangeLog b/net-proxy/c-icap/ChangeLog
index 511d1ea3271c..dfdcffe70ce3 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/ChangeLog,v 1.21 2012/12/04 11:24:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/ChangeLog,v 1.22 2012/12/28 12:42:46 flameeyes Exp $
+
+*c-icap-0.2.3-r1 (28 Dec 2012)
+
+  28 Dec 2012; Diego E. Pettenò <flameeyes@gentoo.org> +c-icap-0.2.3-r1.ebuild,
+  +files/c-icap.conf, +files/c-icap.init.3, -c-icap-0.1.7-r1.ebuild,
+  -c-icap-0.2.3.ebuild:
+  Remove old; bump to use new init script (and conf file) that will properly
+  'use logger' if needed.
 
   04 Dec 2012; <ago@gentoo.org> c-icap-0.2.2.ebuild:
   Stable for x86, wrt bug #441494
diff --git a/net-proxy/c-icap/Manifest b/net-proxy/c-icap/Manifest
index 7e6747fd60c9..c6b7943adf0a 100644
--- a/net-proxy/c-icap/Manifest
+++ b/net-proxy/c-icap/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX c-icap-0.1.3+db-5.0.patch 495 SHA256 5cc9ea93da6e14f546a4fbe34cdfbc796b8e871e6a618de400e709a61556fb01 SHA512 c9f87538922d0c06ab6153779d379b3f5a850c4f9a5c8adf073c2f13de0d585dad2bead8e30a1f138b64427fdeb784fc16cb590c48188beea717cdb25806a8d9 WHIRLPOOL b0f30d8a2341b83a1dd9a0477d7664ae6835e19daa70b08c524770d6a29af814468721ebc286ae4bdafe41b164c00b3d1dd82c8a77fbd76c7a7b03978a675372
 AUX c-icap-0.1.3-asneeded.patch 953 SHA256 353861571ab1116f59115ae4403ae4cdcc3bd799a0f3d1477f3e00fcb23783ee SHA512 b078babdd37ad7e9b3f53abb35fa4fb715c0b429574b6dcf1f05c6bf20adb25c1bdc2fcb5784d76f524b4ef9a82dd136bb875c57617394e460afeddc93a30b9f WHIRLPOOL 9f4dc78511985af6c3570fa484abb99916d5a87d72a5f16a763f4437034863137f0363863f32fff1ba3296ccde229929faedbb720460e016f961e71272300573
 AUX c-icap-0.1.3-implicit.patch 489 SHA256 8268e23ea1810f737a7c376f43a7c8e5a349b6dfa909e25f7018c3432add8dca SHA512 ffb499dc87792a292b48f1b7992693aad1869336fc75d66c01b5648038f2d5ef91a90e6d42e79ec3298c767c504fc3ba8705a17691da5d6c95f15b546e7e3509 WHIRLPOOL d043ed6239424980720a8841051546a2fa884f3686691374e498a5ca13b273c13fdd32611e798477f7839d522811e06254a11a156beaff7b4d8cb3a9734e9ea5
@@ -5,13 +8,24 @@ AUX c-icap-0.1.4-crosscompile.patch 1847 SHA256 5117a04c7472cd405781f9751a35c522
 AUX c-icap-0.1.6-implicit.patch 315 SHA256 b01d114efb6cb3ef5ce2a5945604ae96a7f8ee2b402f77bce0f60e3cd9f34f7e SHA512 bde1fa27bc09fea4d1ca0d3fdf5454fde15a5014109ef213134980d3848ecae3af74b13a8e1253aca7485734de7de2a318bbd9bc92c7e750f1d008386b17cb62 WHIRLPOOL 71da5c378613eab242be89b4704c5f61521a3e1861cf92bf77b6124a573e6823eb1498b8c1b8d359a4ae40ec8406c4739a4e62b5e67e6f6ad1a985551c29ac1b
 AUX c-icap-0.2.2-asneeded.patch 1060 SHA256 c7019c687684edf771ead652ea1f710d7750211c49bef0a65d42a62d82cfbed1 SHA512 d619c6cfc9b51c31bfc1aca30c5942e09ac2187998286785d6b1c3b0aa3f96dbe846eed7bb0f97379b5b9bf06cd7edd27fcbcbf1aee59fabb9576e68f7775bf5 WHIRLPOOL ab9c8aca61ab34b1f5309ebd23bd1672a05bd8c7a9e1225001a2e5ff63276c9b13c40cc3fdd85b71d9733992d214179578ffba1ec4aa3fdb63eddd65067bd756
 AUX c-icap-0.2.3-asneeded.patch 1074 SHA256 b80906e1897e512b01a75f915ffae3645b68a38f7f7226841d9962974dfb4fe3 SHA512 7d9380e7c19d7c80619839fadc718ae1693945a0703445fcd0937ea2c9589493aaf4e7a27e128ab27de7c6680d5d588bf081d2d3bc9c2394b7bdfa0fdca6407a WHIRLPOOL 6cbe3c0861c295996773e47375681f81774eaf51d106151f9b612d5da32504ee84e4aa8b65bc5ee041347884b2aba31df2a934f318c47b44834eda1fa223e5f8
+AUX c-icap.conf 472 SHA256 4daeb52750c87b19fce1014f90f18140a7ba9efc1e92f5e920b7d940df22b694 SHA512 2eb0dfa7a2bec225629ea97fb30c67fcff95caa6db1914e7f65aa318fc22010ca97ce649534bd918146fd38503c01254fe7eb4bb66ba1b4993ddc40a02025621 WHIRLPOOL 81c8109fd3533af3aea5b7d0f8a308dc8ec57b3633ece4a3a9338db97eee14c007f949923ebc9352e64c440f8f7979d86e077b0a1f2c3a62c4949350ad350862
 AUX c-icap.init.2 575 SHA256 c5ff4b5cb9ba0640cb370089bd2fbd8f363ce1d225714e9bdaae7f0d32af64ab SHA512 62a34b68d61c37d15d0125c45292f9e09f06ba717e7bd5bdec3cc6f0f9b3238e674342b7f6ee04de566a708537e4c90d8605d9273dc2b288e5b9cb3ad4546b2d WHIRLPOOL c1e5ccb02a3f7fed5ce27fbc639a1c07cf453bd3717cb120539c23f9391f284f6766e6a5e41706256cb97352287bf5452064772dc4850b0d4f032033864ef753
+AUX c-icap.init.3 806 SHA256 69ca964732709ec0b95c66bf3c9da030c39da0f42af509d649b0e56f0170938b SHA512 87f3a71362c5d0615d8cff08bca2e9f4042990c96697d672d4c320de2ba7f584525f4041cc39e065632c56ecd381a29505a4e0bb29f01d755615332ddc37de3b WHIRLPOOL d330b229f05b9ec65eebd6454f32c539d7aa34a176812ba0672fac83ea785fe42c924a0adee4c5ea6ac38a7eac640d9c8e9d6c766850fb7314088293f9a15829
 AUX c-icap.logrotate 188 SHA256 a1ebd01837312c1fbb5b110486656656001c9b70ab0008f5ee73de6222005b54 SHA512 edc8dbbbaa06cf062b307e37ffee1dee9d566cc4b8a6947422125a22d956bcc639c483712ff6b6f6e9eb30852b4b0d5c293f1279463af89e8fc199828792a9e7 WHIRLPOOL f20fa59b07edd5c1b1a86d6d5e59523ba17b011d019af9b521f03f10a9f821c5d31230161abeabbd77a020ca59425e91e48588e85a469a9452ed8ff296390d3d
-DIST c_icap-0.1.7.tar.gz 530022 SHA256 abc263426ca789bc182c04a5bfcf2820d9059902d36c8680baf1032218c50b09 SHA512 942ab3a6952e354e7cf3f09c0106bfc5cfe9df49b885e6863d8a55c1b2337a97d5220b7df8c8f2e0bcde70de7d8ed6b5845a46a9240563e70afed0f931ff0875 WHIRLPOOL fbb42d7c1d63d42e7b9c3f9dceb169b014b56e20eb81b78020c55c9d6ece3602004d1915bd5bd0f18b6f203ed7d122e72b5e34711f23e1b5472b4cda5aa2b4b3
 DIST c_icap-0.2.2.tar.gz 581607 SHA256 3236fb63b7cb08df46f591d4a5b0cd6c3806fcd8a9831aa01915acc9435f6ed1 SHA512 798aa5c485e12c623706b73486aee69776d60258e0c6e3fd2c5c08c5ec8eee92115e5883a5a761ce4aaafeab77aff8a94c62117504debbb63b67276837e07fcb WHIRLPOOL f4fe754555a1c0b708bce9a1084fb1ca9677724bbc19d99365c770dd9654057928ff75f0271cef81323689762f5cbf3932c9dad8856e9552654d752f95961e03
 DIST c_icap-0.2.3.tar.gz 581549 SHA256 78ae3d3a577bb8570d77ca5cf2f266deaf72d77c6df64399e64e3bee363122ee SHA512 319e3ef6a021d372e0f8a2226e107e8b7ea450d115f4f907fdea36db9ab22b3a6ddcb5b7d4fe2e334e23cb1f17abf586445779663d302c3ed94e27a637a554b1 WHIRLPOOL 32fd9fd9b83739234c3ea00f66fb46868a624f424413b20d18c5ffa45d5f2a733ebda63d5d81b1b46c4978e2cd522669d3bcd9922c6a43a489f53173b8efac51
-EBUILD c-icap-0.1.7-r1.ebuild 3061 SHA256 4b61dac695fd10ac4ecb26b5991953785d2ca3d2feaf7ec2f798638e913b7dd1 SHA512 804fedf1742d8e27732d3182f4c83b21648b8b1bed7c748d1bca9fc23a027b306bcdf5ec4474dcdb56a87e02822c17ffc87dc1a460cdc1eba30702f1307a683e WHIRLPOOL 32339bd03bd0b83dff2699de02ab660bd1bece0c3cd1291997027118fce5387dedbc9029460cc6c69bc24942d33a602b1779b0135720f7f1ee92cc81519fee4b
 EBUILD c-icap-0.2.2.ebuild 3094 SHA256 c21fe9b47948a9f8e6bb1e668c350d39d9fa2a71139935ef1b637826f1b551a5 SHA512 ca12f5a8bc47979267fd6e057bd4e29bc5e5117dc66a7f34712203346e34f7825b98922e6f858ba9a3fc7583dbd8f4f0e104cbf43adb01fdd9b164d18c6168bd WHIRLPOOL 29f29f6b8128e9fc6044feb9317f5515d809805f0a215410acd2f08b5ab5d792e080cdec3be73aefd2e8dbc51fb56573e3394ad26138a1a2c0c5d79c2b726869
-EBUILD c-icap-0.2.3.ebuild 3102 SHA256 442375f8bc93a527cb5fc601320369eda8637ea05710b34fad3f55b18e2d9d35 SHA512 26e5d20f57f38d09320be9d7bc84cd0381b25eacf447e07f3f49f96312a55e275323ba3fc15dc511a2abcb0542bf996028da241efa03ef146faae20eea6b4723 WHIRLPOOL 03e1a860a8799097435a036a0552594f8805356ee47da9a5131e82c22b728f5de0cfc7eaa5d5b7a018a8174d977849113b14f676be303534dab009d146934f64
-MISC ChangeLog 3497 SHA256 9b809b7b689ba1f38d26f954d584043a87f0b31c89c62bc66fd679efc83f8e85 SHA512 7d123cff955356f9c7cef186d298ccc8552241854c53ab07cf8a4ea1c8744edc29f7a9dcc8e0fa0201e739993e8d415b726cf81d16f130f5b3d0a44c6627df00 WHIRLPOOL 15672515325b8d8cd8fdfb006ac6090c6fcdcd44fd5560091f35d317ed4cc704beb5f8d04174b22ae18ce2b2cb07bc35921019f9b602dc040ec5f74cc85b357a
+EBUILD c-icap-0.2.3-r1.ebuild 3146 SHA256 6970162889ba2dc4a83d8fd3b17ae5916d4672a75eed5e9ab2c12c8ca4585798 SHA512 33dd22addc2763d21ae73a18cab38bd64bbfcf7025e5da3d02e0f67fe641e470ff27251a564f23f37f6347b46d4d0a8bd21d81af02db2f916180686a1303a45d WHIRLPOOL c478d54adc54e69a72dbb3ad59ef25439bd800b3fff1047fba76d459fbbbddc2892fde970cceecf7868c5587d2af3313c730ad9feeedf3a5b74ed03a20d60493
+MISC ChangeLog 3813 SHA256 af4becaf9b7a5478e3a93df4be7d6a5cab31af61da29d098f1ac846a1a3126c1 SHA512 bf63a01c56b44c4bbaa82c82a53c4f08dd6b7a92351a850c32cb9b98a69b58b6f776d4d1c44732d47809f931e8851cd7e9053aff9d22e5849e43f78c9bba7112 WHIRLPOOL dbc011290e320986d26d2db4d668ad69ae131948a6100f4f6f2f22993ca21cf4c50a59a7bca1f3c476c7059071578be62da1723a388d9db471ff2889316d2bdf
 MISC metadata.xml 314 SHA256 62f7e0195ddb28bcab113616feba8f590429a33552ec9bf96f5e3ad5c5f4e542 SHA512 2bc33979e81c3b5e27aac5fa048357ab3c3b52bda6892fd7423ddbaeeebc76a06e972b6c6b21b9f76164e25f28879dff3552132d06cad52ff75f71df36938348 WHIRLPOOL 168fc9f4e5140f1b07bc437e7f92cc8ce6c47e8ec9739824c7c1340f2bfe1036b27c39de4a604f4c415cfe6473115cfb45a98920b2349503c0eeebd18b80d3f3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ3ZPqAAoJEBzRPIrUMBNChisH/3t0BOEAKYuaTFxgKO5q6FaO
+4zQ9jN97xu0Eyh+bnl1FnynGDWzVayG7GbXmaDA+uIFJ09imqAF5tdu6xWCNJqP+
+/NoibdwW9chaiJ+738/8W7Awx2ItGljtHy4ulVM42vmx7FdxtkvHSfhgtUU2PjQW
+xpohFXAdgmaKxx4/ljuP8N4xzJh2dEBnOMiI3GM/10oc53oLv03x1dzye4UuL/Cm
+qTLyAfyC0DErWMNYT22fbUxZ6cTNwDnjq3G0e6JCh7/GriGWjGGVtmvkMmxkVY1j
+zMoiNtku4cU0J1eYzD3uPJn2Qh1UeOkpyPJi+a6wK7joiV0RkHfCBt2N6k2nU+A=
+=lhm2
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/c-icap/c-icap-0.1.7-r1.ebuild b/net-proxy/c-icap/c-icap-0.1.7-r1.ebuild
deleted file mode 100644
index 9870beb04cd2..000000000000
--- a/net-proxy/c-icap/c-icap-0.1.7-r1.ebuild
+++ /dev/null
@@ -1,113 +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/c-icap/c-icap-0.1.7-r1.ebuild,v 1.5 2012/03/20 14:48:44 jer 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 ~arm x86"
-IUSE="berkdb ipv6 ldap"
-
-RDEPEND="berkdb? ( sys-libs/db )
-	ldap? ( net-nds/openldap )
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	sys-apps/openrc"
-
-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.2" ${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/c-icap-0.2.3.ebuild b/net-proxy/c-icap/c-icap-0.2.3-r1.ebuild
index eb9387abf70a..76f5d736bde7 100644
--- a/net-proxy/c-icap/c-icap-0.2.3.ebuild
+++ b/net-proxy/c-icap/c-icap-0.2.3-r1.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/c-icap/c-icap-0.2.3.ebuild,v 1.1 2012/11/15 20:27:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/c-icap-0.2.3-r1.ebuild,v 1.1 2012/12/28 12:42:46 flameeyes Exp $
 
 EAPI=4
 
@@ -83,7 +83,8 @@ src_install() {
 
 	dodoc AUTHORS README TODO ChangeLog
 
-	newinitd "${FILESDIR}/${PN}.init.2" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.3" ${PN}
+	newconfd "${FILESDIR}/${PN}.conf" ${PN}
 	keepdir /var/log/c-icap
 
 	insopts -m0644
diff --git a/net-proxy/c-icap/files/c-icap.conf b/net-proxy/c-icap/files/c-icap.conf
new file mode 100644
index 000000000000..e5be18e7c2de
--- /dev/null
+++ b/net-proxy/c-icap/files/c-icap.conf
@@ -0,0 +1,13 @@
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/files/c-icap.conf,v 1.1 2012/12/28 12:42:46 flameeyes Exp $
+
+# Use this to change the configuration file to use for c-icap.
+configfile=/etc/c-icap/c-icap.conf
+
+# Use this to set any extra option for the daemon. Do not use the -f
+# option here.
+EXTRA_OPTS=""
+
+# If you enabled LDAP support, and you'd like to access tables stored
+# in the local LDAP instance, you want to uncomment the following
+# line.
+#rc_need="slapd"
diff --git a/net-proxy/c-icap/files/c-icap.init.3 b/net-proxy/c-icap/files/c-icap.init.3
new file mode 100644
index 000000000000..f5c57680602b
--- /dev/null
+++ b/net-proxy/c-icap/files/c-icap.init.3
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2012 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.3,v 1.1 2012/12/28 12:42:46 flameeyes Exp $
+
+: ${configfile:=/etc/c-icap/c-icap.conf}
+
+get_config() {
+    local value=$(awk '$1 == "'$1'" { print $2 }' ${configfile})
+    echo ${value:-$2}
+}
+
+command="/usr/libexec/c-icap"
+command_arguments="${EXTRA_OPTS} -f ${configfile}"
+pidfile=$(get_config PidFile /var/run/c-icap/c-icap.pid)
+
+depend() {
+	need localmount
+	config ${configfile}
+	[ "$(get_config Logger file_logger)" = "sys_logger" ] && use logger
+}
+
+start_pre() {
+	local cmdsocket=$(get_config CommandsSocket /var/run/c-icap/c-icap.ctl)
+
+	checkpath -d "$(dirname "${cmdsocket}")" "$(dirname "${pidfile}")"
+}