From: Lance Albertson Date: Wed, 16 Jun 2010 16:28:34 +0000 (+0000) Subject: Version bump, resolves #324235 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=797a76b8fb88e15799f1e607e918f62e215bc921;p=gentoo.git Version bump, resolves #324235 Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog index 23434d2626ba..fc61e9340f0a 100644 --- a/net-misc/cfengine/ChangeLog +++ b/net-misc/cfengine/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/cfengine # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.100 2010/05/28 14:09:50 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.101 2010/06/16 16:28:34 ramereth Exp $ + +*cfengine-3.0.5 (16 Jun 2010) + + 16 Jun 2010; Lance Albertson +cfengine-3.0.5.ebuild: + Version bump, resolves #324235 28 May 2010; Torsten Veller metadata.xml: Remove klieber from metadata.xml (#317393) diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest index 9947d9291b03..8615aac6a239 100644 --- a/net-misc/cfengine/Manifest +++ b/net-misc/cfengine/Manifest @@ -20,18 +20,20 @@ DIST cfengine-2.1.22.tar.gz 3673965 RMD160 9109a5156aa24e29137ff51ad1b5a0050b62e DIST cfengine-2.2.10.tar.gz 2690333 RMD160 67fd3dc80270dc000887e3dbf26f372338e2600f SHA1 032bec0bc59ffee7179422e96dfd902afbf94340 SHA256 f34697cc52e1342c5ec4b45a4adf9fbffdfa05a68bdc7c53382f72d03e106783 DIST cfengine-2.2.8.tar.gz 2715678 RMD160 a35ac5d87a345f38a779719314d3978ee9e3045c SHA1 670b5fc15a4dd5c80b301adf1e1bf7979161a049 SHA256 6423ad330057b28524bf4a91b064d459af2be01d5cddb5064c15d8cb1130e7b8 DIST cfengine-3.0.4.tar.gz 2217103 RMD160 6c7507d72b646b055b82513c943cecd237430072 SHA1 71c6c41bc717a03df6db8585e11a673415f1f94c SHA256 7e0aa7807e68ca7a9ccda9ed0b57fd20c91020bd2810c2140b2802e8ca461a21 +DIST cfengine-3.0.5.tar.gz 1512755 RMD160 a8ad67570dd382c13dcecd3b80e6d029c2efd1e3 SHA1 3d014c410ad0479040b33f82d85fd737a28372bd SHA256 4aea3c7a6b38a211b85d76d0b30f525684d741062897d47d19c88334f4cf79d5 EBUILD cfengine-2.1.22-r2.ebuild 2544 RMD160 2c136ba13744c57d6e3735a8d6920a96ec207bae SHA1 10118a326a26378db15539b0757bcf479575a077 SHA256 b1144f77d16ce5ddb9609671694fc3e2946ccd68ac6f92be457f5bb70946c146 EBUILD cfengine-2.2.10-r2.ebuild 3026 RMD160 207e3472692821d04ac70539038abf895c9bd163 SHA1 7911f0e5fa96e152b0658c232621b75b1bf30232 SHA256 61cc0e5cc7ba710c94c828f19abcda7523d26dd9e75553ab5898c310433cbb06 EBUILD cfengine-2.2.10.ebuild 2720 RMD160 f79ad7c72b4ceac12a0323434b3797c4dbc1f3cb SHA1 cddf8f46bd13c6d1c83bddbcdff56673151f6104 SHA256 6b20bf4737274d6bfbe519dd717a4b19f689296accb431e7b0dae6b16e41a34d EBUILD cfengine-2.2.8-r1.ebuild 2677 RMD160 555ec1ab9cc2a84dba02cc5dcfd7c62532196c51 SHA1 706b55a68fba41158a30f1b773a3b92f1ae50034 SHA256 6d265c2ae8a63c20ab3553a92d6489a4b747bc64618fb5c0687e89f8ee594081 EBUILD cfengine-2.2.8.ebuild 2324 RMD160 ef2b1d60c3723fb596bcadd4bfff1292b4a0e7cd SHA1 66ade9c3000a5d2c4a870b1932b5ecd0e055b9d8 SHA256 eca8411b2605956b66b32010ffa63dbbbc793e68d7640c5fb84b485afe0aa03a EBUILD cfengine-3.0.4.ebuild 2980 RMD160 9a3f34ba4c6d4caca3f2d88408ed884caf4c02bc SHA1 3afa99fc4b8228ba23e3ea5ee4918146df47a847 SHA256 76374b301fa4ac5f249d75c4460cd6cbe66cc06e9987973bbc8bf4bc6a7424fa -MISC ChangeLog 16253 RMD160 362bf57017b3d882ff28a9e396b0225471e6f3fa SHA1 6597b52209d56ec299af79722bdf5410e67f4211 SHA256 7fe8acc54de7ac934c92732c6d9c4f01cdf38fbf8d5806b1d765208316aa2bce +EBUILD cfengine-3.0.5.ebuild 2980 RMD160 35b213c8ba5da3b0843c7557821541dc37f7b376 SHA1 23fe9bf6b5df1ff068a2dbdb85387bd31420ac0a SHA256 817db614128826462f9d6ee3a9593bf1b96d97cb4ac9d2014fc6750cefb5263b +MISC ChangeLog 16399 RMD160 18fd10af545acbbfd1efa672360de54e1c1ae2c0 SHA1 7cf00793861ae083043dc08c598bab53680c0d64 SHA256 4c08a9c7b97f60d7af342b9830d830be0fe75ac107f358e8a1e9b762d6a19d19 MISC metadata.xml 1686 RMD160 feb731593309de9818306910dd6dedd9832314dd SHA1 2ffff9e8bea63927ebf137685329b64fcb01287b SHA256 dddd8010e4647feebbe2ffb445bae1f720ce4bb87a26439144e57ecbb475b339 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) +Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkv/zrQACgkQV3J2n04Eauzn9gCfbW4tpNJ0Ll05WGba69JsdP3L -rFkAn2+HIyzfKB83feYidihrhz495eCr -=K2pL +iD8DBQFMGPumQW+hXSf0t0IRAmUUAKC5Mw/JRotPULX7nTTtYecsAlOctQCgqd8L +MNSGa5C0j1TJcKbW+FuF5DE= +=ZNfL -----END PGP SIGNATURE----- diff --git a/net-misc/cfengine/cfengine-3.0.5.ebuild b/net-misc/cfengine/cfengine-3.0.5.ebuild new file mode 100644 index 000000000000..7454ecbd074d --- /dev/null +++ b/net-misc/cfengine/cfengine-3.0.5.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.0.5.ebuild,v 1.1 2010/06/16 16:28:34 ramereth Exp $ + +EAPI="2" + +inherit eutils + +MY_PV="${PV//_beta/b}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="An automated suite of programs for configuring and maintaining +Unix-like computers" +HOMEPAGE="http://www.cfengine.org/" +SRC_URI="http://www.cfengine.org/tarballs/${MY_P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86" +IUSE="mysql postgres selinux vim-syntax" + +DEPEND=">=sys-libs/db-4 + >=dev-libs/openssl-0.9.7 + dev-libs/libpcre + mysql? ( virtual/mysql ) + postgres? ( virtual/postgresql-base ) + app-portage/portage-utils" +RDEPEND="${DEPEND}" +PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )" +S="${WORKDIR}/${MY_P}" + +src_configure() { + local myconf + + if use mysql || use postgres ; then + myconf="--with-sql" + else + myconf="--without-sql" + fi + # selinux incorrectly enables if it sets --disable-selinux + if use selinux ; then + myconf="${myconf} $(use_enable selinux)" + fi + + # Enforce /var/cfengine for historical compatibility + econf \ + "${myconf}" \ + --with-workdir=/var/cfengine \ + --docdir=/usr/share/doc/"${P}" \ + --with-berkeleydb=/usr || die + + # Fix Makefile to skip inputs + sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile + sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile + # Fix Makefiles to install tests in correct directory + for i in file_masters file_operands units ; do + sed -i -e "s/\(docdir.*\) =.*/\1 = \/usr\/share\/doc\/${P}\/tests\/${i}/" \ + tests/${i}/Makefile + done +} + +src_install() { + newinitd "${FILESDIR}"/cf-serverd.rc6 cf-servd + newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord + newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd + + make DESTDIR="${D}" install || die + dodoc AUTHORS ChangeLog README TODO INSTALL + + # Manually install inputs + docinto examples + dodoc inputs/*.cf + + # Create cfengine working directory + mkdir -p "${D}"/var/cfengine + fperms 700 /var/cfengine + keepdir /var/cfengine/bin + keepdir /var/cfengine/inputs +} + +pkg_postinst() { + # Copy cfagent into the cfengine tree otherwise cfexecd won't + # find it. Most hosts cache their copy of the cfengine + # binaries here. This is the default search location for the + # binaries. + + cp -f /usr/sbin/cf-{agent,serverd,execd} "${ROOT}"/var/cfengine/bin/ + + einfo + einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided." + einfo + einfo "To run cfengine out of cron every half hour modify your crontab:" + einfo "0,30 * * * * /usr/sbin/cf-execd -F" + einfo + + elog "You MUST generate the keys for cfengine by running:" + elog "emerge --config ${CATEGORY}/${PN}" +} + +pkg_config() { + if [ "${ROOT}" == "/" ]; then + if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then + einfo "Generating keys for localhost." + /usr/sbin/cf-key + fi + else + die "cfengine cfkey does not support any value of ROOT other than /." + fi +}