[gentoo-commits] gentoo-x86 commit in net-misc/cfengine: ChangeLog cfengine-2.2.8-r1.ebuild

[Robin H. Johnson (robbat2)]

robbat2     08/12/05 08:25:52

  Modified:             ChangeLog cfengine-2.2.8-r1.ebuild
  Log:
  Bug #124314 - implement ROOT support. cfkeys must be run with ROOT==/, but is not run until emerge --config now.
  (Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc5-00117-g7f0f598 x86_64)

Revision  Changes    Path
1.89                 net-misc/cfengine/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cfengine/ChangeLog?rev=1.89&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cfengine/ChangeLog?rev=1.89&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cfengine/ChangeLog?r1=1.88&r2=1.89

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v
retrieving revision 1.88
retrieving revision 1.89
diff -p -w -b -B -u -u -r1.88 -r1.89
--- ChangeLog	5 Dec 2008 08:17:26 -0000	1.88
+++ ChangeLog	5 Dec 2008 08:25:52 -0000	1.89
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/cfengine
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.88 2008/12/05 08:17:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.89 2008/12/05 08:25:52 robbat2 Exp $
+
+  05 Dec 2008; Robin H. Johnson <robbat2@g.o>
+  cfengine-2.2.8-r1.ebuild:
+  Bug #124314 - implement ROOT support. cfkeys must be run with ROOT==/, but
+  is not run until emerge --config now.
 
 *cfengine-2.2.8-r1 (05 Dec 2008)
 *cfengine-2.1.22-r2 (05 Dec 2008)



1.2                  net-misc/cfengine/cfengine-2.2.8-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cfengine/cfengine-2.2.8-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cfengine/cfengine-2.2.8-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/cfengine/cfengine-2.2.8-r1.ebuild?r1=1.1&r2=1.2

Index: cfengine-2.2.8-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.2.8-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -w -b -B -u -u -r1.1 -r1.2
--- cfengine-2.2.8-r1.ebuild	5 Dec 2008 08:17:26 -0000	1.1
+++ cfengine-2.2.8-r1.ebuild	5 Dec 2008 08:25:52 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.2.8-r1.ebuild,v 1.1 2008/12/05 08:17:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.2.8-r1.ebuild,v 1.2 2008/12/05 08:25:52 robbat2 Exp $
 
 inherit eutils
 
@@ -63,18 +63,12 @@ src_install() {
 }
 
 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/
+	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"
@@ -85,4 +79,18 @@ pkg_postinst() {
 	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
 }