Revision bump to cfengine-3.0.5_p1-r2. Fix some typos. Remove --quiet option from the init scripts. Allow one to define extra options by using EXTRA_OPTIONS in /etc/conf.d/cf-*.

Package-Manager: portage-2.2.0_alpha2/cvs/Linux x86_64

7 files changed, 66 insertions, 130 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 38ca50876198..e011945d480b 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,15 @@
 # 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.108 2010/10/24 18:05:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.109 2010/10/28 19:39:02 idl0r Exp $
+
+*cfengine-3.0.5_p1-r2 (28 Oct 2010)
+
+  28 Oct 2010; Christian Ruppert <idl0r@gentoo.org> -cfengine-3.0.5.ebuild,
+  -cfengine-3.0.5_p1-r1.ebuild, +cfengine-3.0.5_p1-r2.ebuild,
+  files/cf-execd.rc6, files/cf-monitord.rc6, files/cf-serverd.rc6:
+  Revision bump to cfengine-3.0.5_p1-r2. Fix some typos. Remove --quiet option
+  from the init scripts. Allow one to define extra options by using
+  EXTRA_OPTIONS in /etc/conf.d/cf-*.
 
   24 Oct 2010; Raúl Porcel <armin76@gentoo.org>
   cfengine-3.0.5_p1-r1.ebuild:
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 80cd4ecee9ca..6485f94c22c2 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,8 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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 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 cf-execd.rc6 263 RMD160 c19d8ff89a9f4e5ad7f68a9139599ea0325a3dfb SHA1 8eaf29efdf3a3cc128622a4b38e2a3f79d1de232 SHA256 633465d58396b55029810ac208eec5f3a4f724fd2841391bf1feed5307196141
+AUX cf-monitord.rc6 275 RMD160 5c673ad3a83c697ce2461350f5c365054bf3846e SHA1 c6a758fbfc501e09a7afcd9080029c292073a65b SHA256 670fea4c749271352d316c9c4aee476ed7fea9ecf0a38fec6d029a90bf598673
+AUX cf-serverd.rc6 271 RMD160 47461c2cfec9ca87a3989f28af630eb22a31983f SHA1 d7ed5e36f27a84238f2c1268b6a8cf37142e2333 SHA256 dbe9d68b1d2d3819f316ed77c71c703af3b81582e9ccfbb3fe5bb933bd9dc623
 AUX cfengine-2.2.10-snprintf_buffer_overflow.patch 456 RMD160 58c7369342d9042dd6c02ec37bbc1e05b8272c50 SHA1 4668f24858a8c48c8f60f3840de6277612955ed1 SHA256 25a37e3d23163459844789b3817814768a7126f564fd473ec0a6d1136897ebff
 AUX cfengine-3.0.5_p1-Makefile.am.patch 1010 RMD160 63be934e2e0529f320034882cfa7a477bf818d6b SHA1 5370668dc725135cf27252c4928c54e6560ca0e7 SHA256 17558b112bdd3991f4ca18a135e8c96cd10f5477dab5eed208d8f33222ca4dac
 AUX cfengine-3.0.5_p1-configure.ac.patch 13597 RMD160 645163b58d05124f03dc8aa4525954f7412ce038 SHA1 a716dc0af3f835a5327e0e9096ef53d7c0e6120b SHA256 82ff6baf5e8c0215ddda4824d233cd9ab7a144e6bc8c409112980c03cc804835
@@ -12,11 +15,20 @@ AUX cfexecd.rc6 259 RMD160 05810d7582d962903033ed85b409818dd19089ef SHA1 f95df77
 AUX cfportage.README 2294 RMD160 05c285d3b79e266ac6229985b2fdbab1b7841752 SHA1 7f7598154775bf9f180383f69294a00624a69735 SHA256 c1a5a2af3b7e41a9b1c6d5e252e7a3673ec17d12ed3fa0aa34581b5893c8f833
 AUX cfservd.rc6 259 RMD160 8390afb5b3cf7ffbe0b74766ddf3f9d05c4d5b6c SHA1 c1fc1ccf15789c8acfc3857481ed69dc7f9b6d2b SHA256 892e9537c9b75861031a0755af886b2b931e1ca4dd2589847a2bacf00862de0f
 DIST cfengine-2.2.10.tar.gz 2690333 RMD160 67fd3dc80270dc000887e3dbf26f372338e2600f SHA1 032bec0bc59ffee7179422e96dfd902afbf94340 SHA256 f34697cc52e1342c5ec4b45a4adf9fbffdfa05a68bdc7c53382f72d03e106783
-DIST cfengine-3.0.5.tar.gz 1512755 RMD160 a8ad67570dd382c13dcecd3b80e6d029c2efd1e3 SHA1 3d014c410ad0479040b33f82d85fd737a28372bd SHA256 4aea3c7a6b38a211b85d76d0b30f525684d741062897d47d19c88334f4cf79d5
 DIST cfengine-3.0.5p1.tar.gz 1517992 RMD160 909ee306cdbd0e674fbdb54ddcbca66b0cc5213b SHA1 bc7cc5fbc6c9a973f2f74c45e6835934230b6d63 SHA256 38a389969ff095775e206df24b0fbc66ae30fa404d92dcb26b94a568e790610b
 EBUILD cfengine-2.2.10-r3.ebuild 3113 RMD160 2f9c3d613e0b47d92084702e870bf22e7b9430a6 SHA1 fd7066de09810f8659834d790eb1953c98e48b47 SHA256 bc5c3bb658ff03441ecc378542026203f3ac0b4d028c071fa7af7de64efbe320
 EBUILD cfengine-2.2.10.ebuild 2720 RMD160 f79ad7c72b4ceac12a0323434b3797c4dbc1f3cb SHA1 cddf8f46bd13c6d1c83bddbcdff56673151f6104 SHA256 6b20bf4737274d6bfbe519dd717a4b19f689296accb431e7b0dae6b16e41a34d
-EBUILD cfengine-3.0.5.ebuild 2976 RMD160 c099526c8658650ca8f111628c2cf97b797e1c3c SHA1 f05732b9c9858e7b29dccc207ea6ec4db60643bd SHA256 bd4e1fcd4f7b10a795c9acc45030a647e98d516bafc7679d6f3629383f8bfa05
-EBUILD cfengine-3.0.5_p1-r1.ebuild 3659 RMD160 59290f56d8e076a12d5f458b0ac834d697ddf68d SHA1 c4e1d3d0ac2a14478050b143ec827380f3d9ed69 SHA256 c8df7e187bdee810174da4ea6a5d5481e5795634c6487035a090e33469021435
-MISC ChangeLog 18339 RMD160 7fb6dbe798932be31f0973cb1bdfd64afbd5170e SHA1 0dafa1614aa84209b9ec3f84462244e18eff5f0f SHA256 5c5f52f1bc8ff24d43c752c0f53144ad051fb73b8d91b4afbbe49602b9f06173
+EBUILD cfengine-3.0.5_p1-r2.ebuild 4294 RMD160 03dd1ef6331e5fd6e45d3b013367bccfe28f665f SHA1 c1862b48d5014eb658f66a057835dbc0db674ade SHA256 24585d554ef4334417f3517d3578dcd036f469c5f508a88c9fa0b02777e783f8
+MISC ChangeLog 18764 RMD160 a9ac39530dba1a65eeb2fe2f77661a2e3f4c41d3 SHA1 3d52b36ac967a34dae0a496f7322e027d90e6447 SHA256 b53dbd0f403b3ec5af38caa4fdf2d9fe1e0978008a3eba67ec5a6d0d271a0335
 MISC metadata.xml 2550 RMD160 54b3002fb2ec4fa40c1f8ada30a96888dce49152 SHA1 783075e090785dd673ac6ba68c5ec20706348c9b SHA256 7872950fe463d7c39fe36a2381ca3819784a52325069b2bc607ddd5849934640
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBAgAGBQJMydFbAAoJEMOx0zmdw4Z1ktUH/REPem4ur/AHeL/X/FFCZlI2
+5+J9MY/ecfTNWlzYZuJBQOJdgA78ho8SC1+N09wYMfd/dKJvC4tL601zDDG6pjE/
+ZHMbkLwqa97f9HGrEZZWMj/pFDgH6nLB9RnHW5TBNGUHC5LT00dxRPjUtHs/PS/N
+c/p1mvblyxUo49Jd1njjgPHnWhBv4x7bdUwqWe62AqcuqYzuZmTkIfALMmoeUsdM
+RYH5L7Eg2w2CWIPxGTEB1m9Y5A5p+NTqPIbm3JJgQJnTFFhoaMhd9m8lOurj2zOT
+xnoTl6gGwr/LSw4Vu2TkTg5FtSQKGbYLM4LT5RvHQY+CoFNhh6ijIqRsrzc75sM=
+=JiPj
+-----END PGP SIGNATURE-----
diff --git a/net-misc/cfengine/cfengine-3.0.5.ebuild b/net-misc/cfengine/cfengine-3.0.5.ebuild
deleted file mode 100644
index 80e51588e02f..000000000000
--- a/net-misc/cfengine/cfengine-3.0.5.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# 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.3 2010/08/29 10:57:19 idl0r 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="3"
-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? ( dev-db/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
-}
diff --git a/net-misc/cfengine/cfengine-3.0.5_p1-r1.ebuild b/net-misc/cfengine/cfengine-3.0.5_p1-r2.ebuild
index 014fabec3d90..f214c92c19df 100644
--- a/net-misc/cfengine/cfengine-3.0.5_p1-r1.ebuild
+++ b/net-misc/cfengine/cfengine-3.0.5_p1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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_p1-r1.ebuild,v 1.3 2010/10/24 18:05:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.0.5_p1-r2.ebuild,v 1.1 2010/10/28 19:39:02 idl0r Exp $
 
 EAPI="3"
 
@@ -17,7 +17,7 @@ SRC_URI="http://www.cfengine.org/tarballs/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="3"
-KEYWORDS="~amd64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~s390 ~x86"
 
 IUSE="examples gd graphviz html ldap libvirt mysql pcre postgres qdbm selinux tests tokyocabinet vim-syntax"
 
@@ -91,7 +91,7 @@ src_configure() {
 }
 
 src_install() {
-	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-servd || die
+	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
 	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
 	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
 
@@ -112,7 +112,7 @@ src_install() {
 	# binaries here. This is the default search location for the
 	# binaries.
 	for bin in know promises agent monitord serverd execd runagent key report; do
-		dosym /usr/sbin/cf-$bin /var/cfengine/bin/$bin || die
+		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
 	done
 
 	if use html; then
@@ -122,13 +122,37 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo
+	echo
 	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
+	echo
 
 	elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:"
-	elog "/usr/sbin/cf-key"
+	elog "emerge --config ${CATEGORY}/${PN}"
+
+	# Fix old cf-servd, remove it after some releases.
+	local found=0
+	for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
+		found=1
+		rm $fname
+		ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:')
+	done
+
+	if [ "${found}" -eq 1 ]; then
+		echo
+		elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd"
+	fi
+}
+
+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
index 65db15559a80..0dcbb7b45a0d 100755
--- a/net-misc/cfengine/files/cf-execd.rc6
+++ b/net-misc/cfengine/files/cf-execd.rc6
@@ -6,12 +6,12 @@ depend() {
 
 start() {
 	ebegin "Starting cf-execd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/cf-execd 
+	start-stop-daemon --start --exec /usr/sbin/cf-execd -- ${EXTRA_OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping cf-execd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/cf-execd
+	start-stop-daemon --stop --exec /usr/sbin/cf-execd
 	eend $?
 }
diff --git a/net-misc/cfengine/files/cf-monitord.rc6 b/net-misc/cfengine/files/cf-monitord.rc6
index 887aec7485ce..bcd3092b042b 100755
--- a/net-misc/cfengine/files/cf-monitord.rc6
+++ b/net-misc/cfengine/files/cf-monitord.rc6
@@ -6,12 +6,12 @@ depend() {
 
 start() {
 	ebegin "Starting cf-monitord"
-	start-stop-daemon --start --quiet --exec /usr/sbin/cf-monitord 
+	start-stop-daemon --start --exec /usr/sbin/cf-monitord -- ${EXTRA_OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping cf-monitord"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/cf-monitord
+	start-stop-daemon --stop --exec /usr/sbin/cf-monitord
 	eend $?
 }
diff --git a/net-misc/cfengine/files/cf-serverd.rc6 b/net-misc/cfengine/files/cf-serverd.rc6
index fb30d1701479..802bc7c437f0 100755
--- a/net-misc/cfengine/files/cf-serverd.rc6
+++ b/net-misc/cfengine/files/cf-serverd.rc6
@@ -6,12 +6,12 @@ depend() {
 
 start() {
 	ebegin "Starting cf-serverd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/cf-serverd 
+	start-stop-daemon --start --exec /usr/sbin/cf-serverd -- ${EXTRA_OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping cf-serverd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/cf-serverd
+	start-stop-daemon --stop --exec /usr/sbin/cf-serverd
 	eend $?
 }