From: Michael Marineau Date: Wed, 21 Mar 2007 21:05:41 +0000 (+0000) Subject: Fix packages inform output in cfengine-2.1.22 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=95f30f982cf36b8fa95c25ddbd3888447bb4625d;p=gentoo.git Fix packages inform output in cfengine-2.1.22 Package-Manager: portage-2.1.1-r2 --- diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog index b794f36bdd40..86e3b44d180f 100644 --- a/net-misc/cfengine/ChangeLog +++ b/net-misc/cfengine/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/cfengine # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.79 2007/02/20 00:43:53 marineam Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.80 2007/03/21 21:05:41 marineam Exp $ + +*cfengine-2.1.22-r1 (21 Mar 2007) + + 21 Mar 2007; Michael Marineau + +files/cfengine-2.1.22-package-fix.patch, +cfengine-2.1.22-r1.ebuild: + Minor fix, backport r347 from trunk to 2.1.22 to fix inform for package + install. *cfengine-2.1.22 (20 Feb 2007) diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest index 00d394be2304..d5636235b1e0 100644 --- a/net-misc/cfengine/Manifest +++ b/net-misc/cfengine/Manifest @@ -1,6 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX cfengine-2.1.22-package-fix.patch 431 RMD160 c92f6b497e1d03aeefb5fb7cb6fd64ce2ac5aa15 SHA1 a587359f0d180d776065546112c0623e91016dd8 SHA256 3fff21b705fb84d7e1efc3c7891f466182b977bd88855f55c85aa283b2ccd584 +MD5 6778f393fc23ba11c7f8ae932ecf498b files/cfengine-2.1.22-package-fix.patch 431 +RMD160 c92f6b497e1d03aeefb5fb7cb6fd64ce2ac5aa15 files/cfengine-2.1.22-package-fix.patch 431 +SHA256 3fff21b705fb84d7e1efc3c7891f466182b977bd88855f55c85aa283b2ccd584 files/cfengine-2.1.22-package-fix.patch 431 AUX cfportage.README 2294 RMD160 05c285d3b79e266ac6229985b2fdbab1b7841752 SHA1 7f7598154775bf9f180383f69294a00624a69735 SHA256 c1a5a2af3b7e41a9b1c6d5e252e7a3673ec17d12ed3fa0aa34581b5893c8f833 MD5 f4fe82c710efac73c0895ad268c54196 files/cfportage.README 2294 RMD160 05c285d3b79e266ac6229985b2fdbab1b7841752 files/cfportage.README 2294 @@ -34,14 +38,18 @@ EBUILD cfengine-2.1.21.ebuild 2251 RMD160 45a9bbb251583747c6347add11c9a753ce22e9 MD5 347765f84c18c5903fb63160b70088a9 cfengine-2.1.21.ebuild 2251 RMD160 45a9bbb251583747c6347add11c9a753ce22e90b cfengine-2.1.21.ebuild 2251 SHA256 391a1f5bcf4b2f509c90bdfb3efdb06f4ccbc770b7002ece5513b3142f53b760 cfengine-2.1.21.ebuild 2251 +EBUILD cfengine-2.1.22-r1.ebuild 2329 RMD160 8fd98c886f6c80a305e4c09ec166ae228a32253e SHA1 81119c2525e5fec9e1c09e08357cb465035a9cfa SHA256 09c5bc740f6dfc11b831c3832b186809c86525e830c3061526c1f24a2cfc5acf +MD5 bb208b82244e01a179437ab6f7e3c955 cfengine-2.1.22-r1.ebuild 2329 +RMD160 8fd98c886f6c80a305e4c09ec166ae228a32253e cfengine-2.1.22-r1.ebuild 2329 +SHA256 09c5bc740f6dfc11b831c3832b186809c86525e830c3061526c1f24a2cfc5acf cfengine-2.1.22-r1.ebuild 2329 EBUILD cfengine-2.1.22.ebuild 2251 RMD160 4ff15a40e18a1dce1c0756c24ace6318296eb0bb SHA1 baf90ae39b56587d65d6a663550a3eac53c4ba9f SHA256 69199018d0886c10330bdfda10de03c6b833b73e4cf85c6f2acbeca61cb9a9f2 MD5 3d6b77338743bef0b271a061ede660e6 cfengine-2.1.22.ebuild 2251 RMD160 4ff15a40e18a1dce1c0756c24ace6318296eb0bb cfengine-2.1.22.ebuild 2251 SHA256 69199018d0886c10330bdfda10de03c6b833b73e4cf85c6f2acbeca61cb9a9f2 cfengine-2.1.22.ebuild 2251 -MISC ChangeLog 11506 RMD160 318ebc0ae44839c2016d31e373afae67a1207f70 SHA1 95c54c54d19bebcd5ec1f723d4816b66de2fb94a SHA256 99e60495d1eec244e138d1bcbb6f1779544fb74bdd87378461fa1ef8e5bd3cf9 -MD5 9721d84c19f059f0efacb15b82c8f7fe ChangeLog 11506 -RMD160 318ebc0ae44839c2016d31e373afae67a1207f70 ChangeLog 11506 -SHA256 99e60495d1eec244e138d1bcbb6f1779544fb74bdd87378461fa1ef8e5bd3cf9 ChangeLog 11506 +MISC ChangeLog 11753 RMD160 4676f591098edb0f0528559d154e91a73bbc0200 SHA1 8ff680d5591511a126608611345b675520e2529a SHA256 190c17a2340c3227ef2861686e26abc87a4f5bd1715538a6f7df16f25a96b1a1 +MD5 008bce1ec87b4bbd2329c85f157d61d7 ChangeLog 11753 +RMD160 4676f591098edb0f0528559d154e91a73bbc0200 ChangeLog 11753 +SHA256 190c17a2340c3227ef2861686e26abc87a4f5bd1715538a6f7df16f25a96b1a1 ChangeLog 11753 MISC metadata.xml 1778 RMD160 a2f0a0604ba979552761a74b22c0f5fd74d2b7b7 SHA1 88909229ff2a2773d58ff91499bd2272eca34499 SHA256 e39a880a0da5fdeb4f9a0548a99b1ff5ead65d12442c9de16db2776afdbd09a9 MD5 3db3dc96acb63eb4967de18b96b8c927 metadata.xml 1778 RMD160 a2f0a0604ba979552761a74b22c0f5fd74d2b7b7 metadata.xml 1778 @@ -61,10 +69,13 @@ SHA256 c99e28ac9e2ddcc92d27936ca1ba8d6659654682164f9ab8d569229978823560 files/di MD5 2b4800f747f5eab29f1dcc4f638f848e files/digest-cfengine-2.1.22 250 RMD160 6ca8b486309457a6ba2252bc2dfec4fcc3810ae3 files/digest-cfengine-2.1.22 250 SHA256 6c1e18e824b5acc49ee4df428b92e2326164183a03ba42ceb6726e29246e9990 files/digest-cfengine-2.1.22 250 +MD5 2b4800f747f5eab29f1dcc4f638f848e files/digest-cfengine-2.1.22-r1 250 +RMD160 6ca8b486309457a6ba2252bc2dfec4fcc3810ae3 files/digest-cfengine-2.1.22-r1 250 +SHA256 6c1e18e824b5acc49ee4df428b92e2326164183a03ba42ceb6726e29246e9990 files/digest-cfengine-2.1.22-r1 250 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.4 (GNU/Linux) -iD8DBQFF2kRRiP+LossGzjARAqiPAJ9KJSoSZP8Nb1xKb9Sx6JUL31vocwCgjXm2 -Bql5nV3J8Li4urffubSrcGg= -=QZkL +iD8DBQFGAZ4wiP+LossGzjARAtRSAKDBK5Gp2uN6pe+TLvcMhF9Vc2hG+gCgvRZ6 +8jnGcJ1qFmHDT773dW1Slzg= +=XtLK -----END PGP SIGNATURE----- diff --git a/net-misc/cfengine/cfengine-2.1.22-r1.ebuild b/net-misc/cfengine/cfengine-2.1.22-r1.ebuild new file mode 100644 index 000000000000..2d6ac1ad298b --- /dev/null +++ b/net-misc/cfengine/cfengine-2.1.22-r1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.22-r1.ebuild,v 1.1 2007/03/21 21:05:41 marineam Exp $ + +inherit eutils + +DESCRIPTION="An agent/software robot and a high level policy language for building expert systems to administrate and configure large computer networks" +HOMEPAGE="http://www.iu.hio.no/cfengine/" +SRC_URI="ftp://ftp.iu.hio.no/pub/cfengine/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86" +IUSE="" + +DEPEND=">=sys-libs/db-3.2 + >=dev-libs/openssl-0.9.7" + +src_unpack() { + unpack ${A} + + epatch ${FILESDIR}/${P}-package-fix.patch +} + +src_compile() { + # Enforce /var/cfengine for historical compatibility + econf \ + --with-workdir=/var/cfengine \ + --with-berkeleydb=/usr || die + + # Fix Makefile to skip doc,inputs, & contrib install to wrong locations + sed -i -e 's/\(DIST_SUBDIRS.*\) contrib inputs doc/\1/' Makefile + sed -i -e 's/\(SUBDIRS.*\) contrib inputs/\1/' Makefile + sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile + + emake || die +} + +src_install() { + newinitd "${FILESDIR}"/cfservd.rc6 cfservd + + make DESTDIR="${D}" install || die + dodoc AUTHORS ChangeLog README TODO INSTALL + + # Manually install doc and inputs + doinfo doc/*.info* + dohtml doc/*.html + doman doc/*.8 + dodoc ${FILESDIR}/cfportage.README + docinto examples + dodoc inputs/*.example + + # Create cfengine working directory + mkdir -p ${D}/var/cfengine + fperms 700 /var/cfengine + keepdir /var/cfengine/bin + keepdir /var/cfengine/inputs + dodir /var/cfengine/modules + tar jxf ${FILESDIR}/module-cfportage.tbz2 -C ${D}/var/cfengine/modules + fowners root:0 /var/cfengine/modules/module\:cfportage +} + +pkg_postinst() { + if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ] + then + einfo "Generating keys for localhost." + /usr/sbin/cfkey + fi + + + # 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 /usr/sbin/cf{agent,servd,execd} /var/cfengine/bin/ + + einfo + einfo "Now an init script for cfservd is provided." + einfo + einfo "To run cfengine out of cron every half hour modify your crontab:" + einfo "0,30 * * * * /usr/sbin/cfexecd -F" + einfo +} diff --git a/net-misc/cfengine/files/cfengine-2.1.22-package-fix.patch b/net-misc/cfengine/files/cfengine-2.1.22-package-fix.patch new file mode 100644 index 000000000000..b4b40823bf17 --- /dev/null +++ b/net-misc/cfengine/files/cfengine-2.1.22-package-fix.patch @@ -0,0 +1,11 @@ +diff -ru 2.1.22-orig/src/package.c 2.1.22-r1/src/package.c +--- 2.1.22-orig/src/package.c 2007-03-09 11:48:31.000000000 -0800 ++++ cfengine-2.1.22/src/package.c 2007-03-09 11:50:26.000000000 -0800 +@@ -446,6 +446,7 @@ + { + ReadLine(line,CF_BUFSIZE-1,pp); + snprintf(OUTPUT,CF_BUFSIZE,"Package install: %s\n",line); ++ CfLog(cfinform,OUTPUT,""); + } + + if (cfpclose(pp) != 0) diff --git a/net-misc/cfengine/files/digest-cfengine-2.1.22-r1 b/net-misc/cfengine/files/digest-cfengine-2.1.22-r1 new file mode 100644 index 000000000000..fd575ec51c81 --- /dev/null +++ b/net-misc/cfengine/files/digest-cfengine-2.1.22-r1 @@ -0,0 +1,3 @@ +MD5 5452c988225751da9ed2f1edf3426866 cfengine-2.1.22.tar.gz 3673965 +RMD160 9109a5156aa24e29137ff51ad1b5a0050b62eb2f cfengine-2.1.22.tar.gz 3673965 +SHA256 fa30e5b29517370e5cea8d9935999e437709e574d103eb317eeed007c975d451 cfengine-2.1.22.tar.gz 3673965