summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2011-11-01 18:47:11 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2011-11-01 18:47:11 +0000
commit06f2e7b92d5031f05198289d0a6bfc36f95574fc (patch)
tree253c23ffa8182749e7945a568347eb52434c0395 /net-misc
parentVersion bump. ebuild based on Victor Tseng <palatis@gmail.com> (diff)
downloadhistorical-06f2e7b92d5031f05198289d0a6bfc36f95574fc.tar.gz
historical-06f2e7b92d5031f05198289d0a6bfc36f95574fc.tar.bz2
historical-06f2e7b92d5031f05198289d0a6bfc36f95574fc.zip
Revbump with a fix for some hardened boxes in infra and OSUOSL.
Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/cfengine/ChangeLog8
-rw-r--r--net-misc/cfengine/Manifest17
-rw-r--r--net-misc/cfengine/cfengine-2.2.10-r4.ebuild111
3 files changed, 120 insertions, 16 deletions
diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 86f995bfe801..6bd3942e4504 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-misc/cfengine
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.138 2011/09/20 15:35:34 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.139 2011/11/01 18:47:11 robbat2 Exp $
+
+*cfengine-2.2.10-r4 (01 Nov 2011)
+
+ 01 Nov 2011; Robin H. Johnson <robbat2@gentoo.org>
+ +cfengine-2.2.10-r4.ebuild:
+ Revbump with a fix for some hardened boxes in infra and OSUOSL.
*cfengine-3.2.1 (20 Sep 2011)
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 015ceb86b21d..a5bed3f8a0f1 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX 511666-segfault.patch 731 RMD160 5a1965029fcc27f95ef89aaf74ea7b5e93ff30eb SHA1 1c93030161d91bab21e46df355bbb7da77772f27 SHA256 cb38c886bf92c1ae48000a65a93a2cf610a9b9d991c44fb1b7df00c3bd9af54d
AUX admit-noclass-520696.patch 400 RMD160 35073a17f2618c189bc3dd9b1a4264b117d6abdb SHA1 39e8a42c9ecca02d51d340fd6dabe91626c494c8 SHA256 d882a327a3788640f96ef7fa5a38953365f358722883ce105c8be973fbb6c5d2
AUX cf-execd.rc6 318 RMD160 462f1700ca412a2ffbdc7e9f96e9d7354906a770 SHA1 0c161245a34a7562cbe37e878545ad90d551f508 SHA256 1862d1d86752b96cf92810f324f5746f0d73730cfce75e9598bea5e0b391a2e9
@@ -15,19 +12,9 @@ DIST cfengine-3.1.4.tar.gz 1599876 RMD160 75be7bed44718dd4f45ddccd235a46563391ee
DIST cfengine-3.1.5.tar.gz 1141253 RMD160 d2605a74ce30bbb06e9d92a57dd102524419d496 SHA1 e362742ed3d1d605be222cc901820ac0811ff177 SHA256 7c9742dfae84893bedb74b9c40f1604567c20cafbda188cf289442de350cd826
DIST cfengine-3.2.1.tar.gz 1101587 RMD160 183fae047e14826cec9b201c6206508b08117166 SHA1 21e6f1677cf1add2190e0b96b5688761514a6619 SHA256 88110d9be61240f4b2bd7976258538d650044b04e07821fbb9ad4f43587ab196
EBUILD cfengine-2.2.10-r3.ebuild 3136 RMD160 5a5c5da9d39b2a132724677e5b9635184a7244e6 SHA1 e6d6b692df225df50270a4e0df3dabc5d47c3eec SHA256 4bc18b1fc87207e318dca2a0ee29484405bfa080e234eba370148a61af053823
+EBUILD cfengine-2.2.10-r4.ebuild 3322 RMD160 6f78b025bfc9d61774335e9e2a6ae2f368c128ba SHA1 bfd65c0d4807585215a55c94f4c2d042aa2afb8a SHA256 46c348de33648a2e3922c1a3e25a69607c695ab057fdbf737d129d181d2b990c
EBUILD cfengine-3.1.4.ebuild 4531 RMD160 7ead54fa2d45fed3970b67fdd4f7759bddf172d2 SHA1 20f84a8f0789508cc45a8236c680cc591c23b617 SHA256 33dd24dd8dda9c5e46941410a6177dce0421290730fbbe1a46f9a1fcb6683b87
EBUILD cfengine-3.1.5.ebuild 4056 RMD160 576424e59d3f2aaeeb380644c0460eadf2a6c4f5 SHA1 d366c993095e25efa2b82b7968b34120c4088f13 SHA256 147eaec6ed168702ac0cc4ea146e63aff51b042179beb44d6617f0110870ff81
EBUILD cfengine-3.2.1.ebuild 4074 RMD160 486866f383f1f79d25d71e6499cf687f92788891 SHA1 c247779683c91a1a9843061ebf42e038fd540071 SHA256 14eb7ce0bfd9201a8aa305a2049d669ca39e0125d1a65328189b2246afa8aeda
-MISC ChangeLog 23274 RMD160 150f8fbcbba8dbba712aa72dc3f811c94dcda632 SHA1 ca87793e2b10c41fe485f49e531eb2558681a2cf SHA256 3481b1ec45b44272bc8f6e0b3d53d857cbc365a6ce0d75ad3c00f802bb4de537
+MISC ChangeLog 23461 RMD160 50a7458e2c892db8324e93d938d4f665f0bf4431 SHA1 c0e54fe3f21f4264ce6735c274f69e24d685cdf7 SHA256 ea0f86e18a0f949db3cb196b00a6a643c24d780730d1b92c51db8e55b1997eb5
MISC metadata.xml 2591 RMD160 d5907725b22a9608780c95f44e9cdf28645b4e40 SHA1 a6780f88141ed5fe46d201fe32aacabbb7e05b91 SHA256 f871e8ac89cf6f0b46aabf0409aa387307288c72cd0ac4a6bf1231ed01e4ddf0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBCAAGBQJOeLLLAAoJEMOx0zmdw4Z1058H/1cuCtBKPNn4xKIGZ5nh0WuI
-QD3lwMXWC7+wjGFU2/0IC/FlEoErsIm7aW6WSWUZK08drSYbQFFL+ZUOrFOQruv1
-H+zi+5XTJvo2zhIPD5NSmRlvS94ufK7honEoCsfYyeTiaU6ySJuLQiC1V2JRN5+V
-fWrp/BFNayWnIow/JI0cNP/judrJsIw9tYv6OsVbMKkpYtm14wyXbfgC1wv5Nzrc
-ZnH7gZLYqPEbzc9OhLu4dF417wKli7Uf5bXFt3KHXrWJmvZZ1U3WAzI+wA4dJnI3
-sbzZsankKLGqMHjhwxibG5ADldOezhffuIv3rhCUGfnRw7MVESk1vJRyzDE4H/k=
-=Gaga
------END PGP SIGNATURE-----
diff --git a/net-misc/cfengine/cfengine-2.2.10-r4.ebuild b/net-misc/cfengine/cfengine-2.2.10-r4.ebuild
new file mode 100644
index 000000000000..db262cc7b66c
--- /dev/null
+++ b/net-misc/cfengine/cfengine-2.2.10-r4.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-misc/cfengine/cfengine-2.2.10-r4.ebuild,v 1.1 2011/11/01 18:47:11 robbat2 Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="An automated suite of programs for configuring and maintaining
+Unix-like computers"
+HOMEPAGE="http://www.cfengine.org/"
+SRC_URI="http://cfengine.com/source_code/download?file=${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
+IUSE="vim-syntax"
+
+DEPEND=">=sys-libs/db-4
+ >=dev-libs/openssl-0.9.7
+ app-portage/portage-utils"
+RDEPEND="${DEPEND}"
+PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
+
+src_prepare() {
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520696
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511666
+ # http://bugs.gentoo.org/339808
+ epatch "${FILESDIR}/admit-noclass-520696.patch" \
+ "${FILESDIR}/511666-segfault.patch" \
+ "${FILESDIR}/${P}-snprintf_buffer_overflow.patch"
+
+ # 2048 causes crashes on some 32-bit hardened kernels, and the warning
+ # messages say to turn it back down.
+ use x86 && sed -ie "s:CF_IFREQ 2048:CF_IFREQ 1024:g" src/cf.defs.h
+}
+
+src_configure() {
+ # Enforce /var/cfengine for historical compatibility
+ econf \
+ --with-workdir=/var/cfengine \
+ --with-berkeleydb=/usr
+
+ # 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
+
+ # Fix man pages
+ sed -i -e 's/\/usr\/local/\/usr/' doc/*.8
+}
+
+src_install() {
+ newinitd "${FILESDIR}"/cfservd.rc6 cfservd || die
+ newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd || die
+ newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd || die
+
+ make DESTDIR="${D}" install || die
+
+ # Remove static library and libtool file as they are not needed
+ rm "${D}"/usr/$(get_libdir)/*.la
+ rm "${D}"/usr/$(get_libdir)/*.a
+
+ dodoc AUTHORS ChangeLog README TODO INSTALL
+
+ # Manually install doc and inputs
+ doman doc/*.8
+ docinto examples
+ doinfo doc/*.info*
+ 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
+}
+
+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,servd,execd} "${ROOT}"/var/cfengine/bin/
+
+ einfo
+ einfo "NOTE: The cfportage module has been deprecated in favor of the"
+ einfo " upstream 'packages' action."
+ einfo
+ einfo "Init scripts for cfservd, cfenvd, and cfexecd are now provided."
+ einfo
+ einfo "To run cfengine out of cron every half hour modify your crontab:"
+ einfo "0,30 * * * * /usr/sbin/cfexecd -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/cfkey
+ fi
+ else
+ die "cfengine cfkey does not support any value of ROOT other than /."
+ fi
+}