Finally add a masked version 3.x ebuild for testing. Fixes #281244

Package-Manager: portage-2.1.7.16/cvs/Linux x86_64

6 files changed, 182 insertions, 2 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 0aac4cb497e0..7dbfb21ce64f 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,12 @@
 # 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.96 2010/01/26 11:00:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.97 2010/03/07 21:57:54 ramereth Exp $
+
+*cfengine-3.0.4 (07 Mar 2010)
+
+  07 Mar 2010; Lance Albertson <ramereth@gentoo.org> +cfengine-3.0.4.ebuild,
+  +files/cf-execd.rc6, +files/cf-monitord.rc6, +files/cf-serverd.rc6:
+  Finally add a masked version 3.x ebuild for testing. Fixes #281244
 
   26 Jan 2010; Robin H. Johnson <robbat2@gentoo.org>
   cfengine-2.1.22-r2.ebuild,
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 9a4771da290f..da1d4c7f6387 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,3 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX cf-execd.rc6 263 RMD160 bec43d07a575100aba0e845b70d2296ec1936417 SHA1 313fd7150e56cb62241863f9ae27edc1ba86b1b5 SHA256 a5fc7f9994c48fc18885d07ddef7e3a69abd500e6a0e2eff2f688f54e886d1b9
+AUX cf-monitord.rc6 275 RMD160 75fe87edaaeac30a40abf0dbf3bf41b6d1a73ba7 SHA1 b6b35fae103c593aee295da36fb5cc3389492205 SHA256 3e78f87709c8abd69bcc4a2c25787f986655c8c7d1221784600c59af23535bed
+AUX cf-serverd.rc6 271 RMD160 55ef90418fb1f6ca943c0807ba520644d6b2c20d SHA1 91e0b17009e80be23f6886e71b3584dc9533a3d6 SHA256 6829f3cd53334a657bf808ec96b995f2510baf2a16f2712b4609e09d5eaaff7d
 AUX cfengine-2.1-package-locking-fixup.patch 2194 RMD160 572ee1ac251de0102ed256545cc1f0deb6ebdf40 SHA1 af3972d0c19a902c588d1486e3c22c6fe3352068 SHA256 296236fba653b041f396d4b19387a29a3c39e9c6c3be4d319a97b2a33d3a10d5
 AUX cfengine-2.1.22-db48-namespace-fix.patch 3058 RMD160 5967a3697acdd3460b2a1b24fb7e9193f9f9356b SHA1 659d2047b33b4f7c3d78beada6c34f4243c02632 SHA256 cc3590d63bb84a92d76155b8fb1d61fbcda94c9ddaa55f549f02023c53af55fd
 AUX cfengine-2.1.22-package-fix.patch 431 RMD160 c92f6b497e1d03aeefb5fb7cb6fd64ce2ac5aa15 SHA1 a587359f0d180d776065546112c0623e91016dd8 SHA256 3fff21b705fb84d7e1efc3c7891f466182b977bd88855f55c85aa283b2ccd584
@@ -11,9 +17,18 @@ AUX module-cfportage.tbz2 3099 RMD160 21826b2263d6aa9ad83037d465adc40bafc0222b S
 DIST cfengine-2.1.22.tar.gz 3673965 RMD160 9109a5156aa24e29137ff51ad1b5a0050b62eb2f SHA1 79501a4d430bc5a955b56519e0d00f62d8353229 SHA256 fa30e5b29517370e5cea8d9935999e437709e574d103eb317eeed007c975d451
 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
 EBUILD cfengine-2.1.22-r2.ebuild 2544 RMD160 2c136ba13744c57d6e3735a8d6920a96ec207bae SHA1 10118a326a26378db15539b0757bcf479575a077 SHA256 b1144f77d16ce5ddb9609671694fc3e2946ccd68ac6f92be457f5bb70946c146
 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
-MISC ChangeLog 15364 RMD160 6b55e9a1aefcafaf9b12dd342462318cda18419f SHA1 307178be4915d0610020ed184f2e104b0b2216af SHA256 9228a94e01844e5c6790de6f648aa95f2b706baffb0fe00ab00b8199de8ed282
+EBUILD cfengine-3.0.4.ebuild 2919 RMD160 19514897d84cd82133d993d9b8f288f14d8e4213 SHA1 063c8803966397c3cc3bbffd528daa9a97ab0212 SHA256 f2ae0e0bfc2e190c4f3aadb6dafc70182bef151a4c1cd4e4f51dd7db6b1583aa
+MISC ChangeLog 15613 RMD160 ba0bc85b79a9dbdefadbf6253428bce8ed6e3360 SHA1 d6a8175796ae1e34ee88c2f1cb9428a81041df09 SHA256 f09a1ff9b91f18786049482965c412b9410b58c3d1331a9d1a658d9f995db3ba
 MISC metadata.xml 1778 RMD160 a2f0a0604ba979552761a74b22c0f5fd74d2b7b7 SHA1 88909229ff2a2773d58ff91499bd2272eca34499 SHA256 e39a880a0da5fdeb4f9a0548a99b1ff5ead65d12442c9de16db2776afdbd09a9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iD8DBQFLlCDlQW+hXSf0t0IRAuCBAJ0RszR3JF9XCTXorGPyBeg2IQTOXgCgkxp4
+PXgg/2gECEVKa46bgkExk6U=
+=B1dl
+-----END PGP SIGNATURE-----
diff --git a/net-misc/cfengine/cfengine-3.0.4.ebuild b/net-misc/cfengine/cfengine-3.0.4.ebuild
new file mode 100644
index 000000000000..ccdf3ad3552b
--- /dev/null
+++ b/net-misc/cfengine/cfengine-3.0.4.ebuild
@@ -0,0 +1,108 @@
+# 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.4.ebuild,v 1.1 2010/03/07 21:57:54 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"
+
+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}"
+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
+}
diff --git a/net-misc/cfengine/files/cf-execd.rc6 b/net-misc/cfengine/files/cf-execd.rc6
new file mode 100755
index 000000000000..65db15559a80
--- /dev/null
+++ b/net-misc/cfengine/files/cf-execd.rc6
@@ -0,0 +1,17 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting cf-execd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/cf-execd 
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping cf-execd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/cf-execd
+	eend $?
+}
diff --git a/net-misc/cfengine/files/cf-monitord.rc6 b/net-misc/cfengine/files/cf-monitord.rc6
new file mode 100755
index 000000000000..887aec7485ce
--- /dev/null
+++ b/net-misc/cfengine/files/cf-monitord.rc6
@@ -0,0 +1,17 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting cf-monitord"
+	start-stop-daemon --start --quiet --exec /usr/sbin/cf-monitord 
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping cf-monitord"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/cf-monitord
+	eend $?
+}
diff --git a/net-misc/cfengine/files/cf-serverd.rc6 b/net-misc/cfengine/files/cf-serverd.rc6
new file mode 100755
index 000000000000..fb30d1701479
--- /dev/null
+++ b/net-misc/cfengine/files/cf-serverd.rc6
@@ -0,0 +1,17 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting cf-serverd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/cf-serverd 
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping cf-serverd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/cf-serverd
+	eend $?
+}