From: Diego Elio Pettenò Date: Fri, 21 Oct 2011 23:56:20 +0000 (+0000) Subject: Revision bump to use a more OpenRC-designed init script. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=669f49649a485ac8bc4e02a23263ff050fe8b1fa;p=gentoo.git Revision bump to use a more OpenRC-designed init script. Package-Manager: portage-2.2.0_alpha69/cvs/Linux x86_64 --- diff --git a/net-proxy/c-icap/ChangeLog b/net-proxy/c-icap/ChangeLog index 85223837063d..5fb562c481c9 100644 --- a/net-proxy/c-icap/ChangeLog +++ b/net-proxy/c-icap/ChangeLog @@ -1,6 +1,12 @@ # 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.9 2011/10/11 17:24:43 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/ChangeLog,v 1.10 2011/10/21 23:56:20 flameeyes Exp $ + +*c-icap-0.1.7-r1 (21 Oct 2011) + + 21 Oct 2011; Diego E. Pettenò + +c-icap-0.1.7-r1.ebuild, +files/c-icap.init.2: + Revision bump to use a more OpenRC-designed init script. *c-icap-0.1.7 (11 Oct 2011) diff --git a/net-proxy/c-icap/Manifest b/net-proxy/c-icap/Manifest index 555c5391f953..979e6aef7692 100644 --- a/net-proxy/c-icap/Manifest +++ b/net-proxy/c-icap/Manifest @@ -7,17 +7,19 @@ AUX c-icap-0.1.3-implicit.patch 489 RMD160 b3ef8769bbe897a3d160406e086f34766c656 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.init.2 579 RMD160 fa65b6540eb33b3b54f1a6a4c591ebd2851c5922 SHA1 a4213f75565df37aeba7dccd503a4ccaaff7e74b SHA256 0580dfe6ef40f33d16758de4d85403ecf617d9103bbaf5cef2f765289d77276e AUX c-icap.logrotate 188 RMD160 69c5f637b8ebce3a7b25703ecad066ca7264d00e SHA1 0c1f7bc65ff5479a22234eaba823554b3f2a8bf5 SHA256 a1ebd01837312c1fbb5b110486656656001c9b70ab0008f5ee73de6222005b54 DIST c_icap-0.1.6.tar.gz 528708 RMD160 3949976edb3fe3265563f280cc2929c590c44930 SHA1 31d322eacdc4fe3ee5f8d5d2c93d7f4faef1f7d7 SHA256 5088b69c9de6093dfcf64fbbcb285f13a9049f34371089668badd88769eee5a9 DIST c_icap-0.1.7.tar.gz 530022 RMD160 8dd2698ac8d8c61566f3a8f37b8b72ef01a2f48a SHA1 e41bebb3975df43268e51b1e1bf61c5c5ed88ff2 SHA256 abc263426ca789bc182c04a5bfcf2820d9059902d36c8680baf1032218c50b09 EBUILD c-icap-0.1.6.ebuild 3023 RMD160 4d707bf18ee466c399b56975dfd2318d7027aace SHA1 227786697569f14f2e4cdc3d853f049a534c43c9 SHA256 3758e3801c9c6589b3d3876e75dde902fc93676dee840c3e730b22a7ef51ea64 +EBUILD c-icap-0.1.7-r1.ebuild 3069 RMD160 c113b54068683df2cba195e33d147f17ee8c7bf4 SHA1 adaf628f3370accf5e6375b9651845808899c401 SHA256 6d935a9c6bcadafc8f71db065c209174627c58c7fa6a698e300334aec54fb6c9 EBUILD c-icap-0.1.7.ebuild 3026 RMD160 b8e7b7d288dffdf6d14b2abcb0578df4abea9b6a SHA1 8a65442e00ae6b8936a14fd46d44aad10c198a07 SHA256 dabf62bee06ec8ab05780bdcb04321830b79a6e34756cd9811983b61b43f30f2 -MISC ChangeLog 1723 RMD160 844f53bc6348b74364a2ae9f0261b925ab381b50 SHA1 04f0b23ec23d3354ea3ad212182e7c12ec97a697 SHA256 65e0b64b8e55868910b84583d113b1e8f44dc63ca24edd5234a9bf08cc0a1810 +MISC ChangeLog 1921 RMD160 8fb6a9df9eb70937a507d5d78c34620bfbe83300 SHA1 9708cfcfcb2055e9274f5631392cc94ff8fdc7a2 SHA256 dd213b6d214f7c995672bad83d9e648164f8f460fc44543c0ed73683b0b60294 MISC metadata.xml 314 RMD160 361f20765aacd066a4cd246dc6e1279b5867e1db SHA1 f94c897e86448ba1ecfd55a90f1391c5d050dcd5 SHA256 62f7e0195ddb28bcab113616feba8f590429a33552ec9bf96f5e3ad5c5f4e542 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk6Ue6cACgkQAiZjviIA2XiUBwCg7vIQmGN5wh4JI6s8RMvQFBOx -jd0AoPB2xpS9j9SnJAnPPDCHvX1foeQh -=xrlD +iEYEARECAAYFAk6iBp8ACgkQAiZjviIA2Xh1FACgrhHNzR0fRvBes/pg0DS+PD/Y +2AoAoKEbbdESCTWz2ISaRUnAxpIaNxmf +=IG0+ -----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 new file mode 100644 index 000000000000..1395d8516ebd --- /dev/null +++ b/net-proxy/c-icap/c-icap-0.1.7-r1.ebuild @@ -0,0 +1,113 @@ +# 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.7-r1.ebuild,v 1.1 2011/10/21 23:56:20 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}" +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/files/c-icap.init.2 b/net-proxy/c-icap/files/c-icap.init.2 new file mode 100644 index 000000000000..a649e7c8b206 --- /dev/null +++ b/net-proxy/c-icap/files/c-icap.init.2 @@ -0,0 +1,19 @@ +#!/sbin/runscript +# 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/files/c-icap.init.2,v 1.1 2011/10/21 23:56:20 flameeyes Exp $ + +pidfile=$(awk '$1 == "PidFile" { print $2 }' /etc/c-icap/c-icap.conf) + +command="/usr/libexec/c-icap" +command_arguments="${EXTRA_OPTS}" + +depend() { + need localmount net +} + +start_pre() { + cmdsocket=$(awk '$1 == "CommandsSocket" { print $2 }' /etc/c-icap/c-icap.conf) + + checkpath -d "$(dirname "${cmdsocket}")" "$(dirname "${pidfile}")" +} diff --git a/net-proxy/squidclamav/Manifest b/net-proxy/squidclamav/Manifest index e59dc13d9e6e..2fbea4a57a81 100644 --- a/net-proxy/squidclamav/Manifest +++ b/net-proxy/squidclamav/Manifest @@ -1,22 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- 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 -DIST squidclamav-6.3.tar.gz 843729 RMD160 93c21bc1183cbef1199bab10eb32e05b574fc98f SHA1 b5149e52bc9ce55303c98ddcdeb763e2cd71fb5f SHA256 a6d6b65d7ad6696c96fe1d76bff1fa657e09dbd00c2ac8db1f02c6e75308d20c DIST squidclamav-6.4.tar.gz 840856 RMD160 5aa714479aa84db2cd959acab630998f2d46e0ac SHA1 8953c45572a08d36d2d5b86eb7cb88062c179f8a SHA256 d057ed4dc688fb0e0152dd7a6bb0541b0172451229cbd6b3819509a4a42d2f12 -EBUILD squidclamav-4.0.ebuild 1219 RMD160 2df98bb50c4559366d256c23d950427fc4dccc31 SHA1 491b7b1dfd4515250f4d2f42157200ed2f6a8854 SHA256 9a142525190952464559412509470cc69196a1cfe95014679c39fdb3d48bbbc7 EBUILD squidclamav-6.1.ebuild 1688 RMD160 af5322e9d80b53f517a86a8841f2e9e3691adde7 SHA1 1311396abb401907945d19c0b330f2bf61c66e26 SHA256 0767bd00d9f6075cd631126b9d74451a2c6b1f2fa03d855770afe2846d8eadcf -EBUILD squidclamav-6.3.ebuild 1829 RMD160 ea54e14f0d904b3efc0b593b7fe5d7f26fc9ae7b SHA1 a38318f1ded07dd861de51ab5cdb424a6661ae52 SHA256 9e54055b119f75defaa5440450f06bb2b0a9dc532389a1fbd737fd00b5ecf4f7 EBUILD squidclamav-6.4.ebuild 1803 RMD160 f6adfe822f35d6fc8bb7194ebb15da4d261b0792 SHA1 664217d8b96cfd8db0a74fa65bbd9d0ab4597b18 SHA256 69bfe439f48506e7d293b8daceb9726f118f5465fdb143ebca3ce6467df69ebe -MISC ChangeLog 2885 RMD160 14f75d87c9e37ec30a752f598943c071c84ff796 SHA1 80c19d00f46e5ec36e8e5242e5a5ab9fc1dba018 SHA256 a08d8cc8ed5ec2f61094245c7d29bd415ead35ffad79a3528470076180c2aab2 +MISC ChangeLog 3047 RMD160 e6c5b3b012ee25023328543a78829c18084ba1d0 SHA1 3f7514227c8f1691031bd6f587e12dacb7e976b0 SHA256 fa6213670c34e32895be21e3170375e081e44a396f106bb939b0e1ad941a35e8 MISC metadata.xml 601 RMD160 b1d903cfa58a59a30b7927289ee7ece696dcb8a0 SHA1 e5f0e64372872f416af03774c8dc733550934663 SHA256 97bfe798448c67e1d15b82b7acf38f5ff3641a40e5f90d7cc5e57d907342a17d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk5P9NAACgkQAiZjviIA2XjGFQCg3zOypw72qdcnnyHAyTPGQtIJ -zU8AmgLp0/YHeLULjkUz3Or6xrjlj5ht -=kXhq +iEYEARECAAYFAk6iBxgACgkQAiZjviIA2Xg8WQCg5GqCYjOrjWUeCff+Gd7VyEvq +YFQAn063n1FqQp9owQtM4TqcaWDrYq14 +=nKyz -----END PGP SIGNATURE-----