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-*.

(Portage version: 2.2.0_alpha2/cvs/Linux x86_64)

6 files changed, 47 insertions, 123 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/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 $?
 }