minor fixes to perms. see changelog for full details.

6 files changed, 116 insertions, 5 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 963579f65188..68d497648cf6 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/cfengine
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.46 2004/11/10 02:58:57 weeve Exp $
+# $
+
+*cfengine-2.1.11-r2 (14 Nov 2004)
+
+  14 Nov 2004; Kurt Lieber <klieber@gentoo.org> +files/cfservd.rc6,
+  +cfengine-2.1.11-r2.ebuild:
+  added init script, changed perms for module:cfportage. thanks to jaervosz for
+  the changes
 
   09 Nov 2004; Jason Wever <weeve@gentoo.org> cfengine-2.1.11-r1.ebuild:
   Stable on sparc.
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index ba44df997a9a..22ffbc448f24 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,14 +1,17 @@
-MD5 a399b881d51ccb6f2e68575f9e0788e8 ChangeLog 6885
 MD5 87a96ecdae01b29f18591925ec989ff4 cfengine-2.1.10-r2.ebuild 1871
 MD5 01f3f2cc7f689075ee2fc50f1b3e7f99 cfengine-2.1.11-r1.ebuild 1828
+MD5 025e3fb04dc650babb778b0537edeae6 cfengine-2.1.11-r2.ebuild 2184
 MD5 c43d635d5a652147971486b2b09e8345 metadata.xml 873
 MD5 2af42bcc42a23046558831ca3a11a30a cfengine-2.1.7.ebuild 1628
+MD5 229dfc84bbaca35532da9c9371b5103b ChangeLog 7015
 MD5 08f5b76b494f5e82db441002c0f7cdb9 cfengine-2.1.9.ebuild 1624
+MD5 f1a9344587920c108d487766f61e90cf files/cfservd.rc6 259
 MD5 f4fe82c710efac73c0895ad268c54196 files/cfportage.README 2294
-MD5 13f423656685d25e1e1e3d0bf261b474 files/digest-cfengine-2.1.7 67
 MD5 24084321590f39650eaf07a073bf0582 files/digest-cfengine-2.1.10-r2 68
+MD5 0436f0fa78bed80815c0c8372182a174 files/digest-cfengine-2.1.11-r1 68
 MD5 bf538c6d3db7c825355a0e8d34fa6efc files/module:cfportage 10247
+MD5 13f423656685d25e1e1e3d0bf261b474 files/digest-cfengine-2.1.7 67
 MD5 1815c2c18d0905908868d2d550b9246a files/digest-cfengine-2.1.9 67
-MD5 0436f0fa78bed80815c0c8372182a174 files/digest-cfengine-2.1.11-r1 68
-MD5 0ca630e6cbe847ee7cafe8798fe0114e files/module-cfportage.tbz2 3284
+MD5 0436f0fa78bed80815c0c8372182a174 files/digest-cfengine-2.1.11-r2 68
+MD5 ade9e66709bdb04df3f0beba72f3a008 files/module-cfportage.tbz2 3099
 MD5 a9aa786ac4c8e32d55d8469af8ddf29b files/cfengine-2.1.10-setnetgrent.patch 1037
diff --git a/net-misc/cfengine/cfengine-2.1.11-r2.ebuild b/net-misc/cfengine/cfengine-2.1.11-r2.ebuild
new file mode 100644
index 000000000000..946342820db0
--- /dev/null
+++ b/net-misc/cfengine/cfengine-2.1.11-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.11-r2.ebuild,v 1.1 2004/11/14 17:27:32 klieber Exp $
+
+inherit gnuconfig eutils
+
+DESCRIPTION="An agent/software robot and a high level policy language for building expert systems to administrate and configure large computer networks"
+HOMEPAGE="http://www.iu.hio.no/cfengine/"
+SRC_URI="ftp://ftp.iu.hio.no/pub/cfengine/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~arm ~amd64"
+IUSE=""
+
+DEPEND="virtual/libc
+	>=sys-libs/db-3.2
+	>=dev-libs/openssl-0.9.6k"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	gnuconfig_update ${S}
+}
+
+src_compile() {
+
+	# Enforce /var/cfengine for historical compatibility
+	econf \
+		--with-workdir=/var/cfengine \
+		--with-berkeleydb=/usr || die
+
+	# Fix Makefile to skip doc & inputs install to wrong locations
+	sed -i -e 's/\(SUBDIRS.*\) inputs doc/\1/' Makefile
+
+	emake || die
+}
+
+src_install() {
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/cfservd.rc6" cfservd
+
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS ChangeLog COPYING README TODO
+
+	# Manually install doc and inputs
+	doinfo doc/*.info*
+	dohtml doc/*.html
+	dodoc inputs/*.example
+	dodoc ${FILESDIR}/cfportage.README
+
+	# 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
+	tar jxf ${FILESDIR}/module-cfportage.tbz2 -C ${D}/var/cfengine/modules
+	fowners root:root /var/cfengine/modules/module\:cfportage
+}
+
+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/
+
+	einfo
+	einfo "Now an init script for cfservd is provided."
+	einfo
+	einfo "To run cfengine out of cron every half hour modify your crontab:"
+	einfo "0,30 * * * *    /usr/sbin/cfexecd -F"
+	einfo
+}
diff --git a/net-misc/cfengine/files/cfservd.rc6 b/net-misc/cfengine/files/cfservd.rc6
new file mode 100755
index 000000000000..a7ec9ad81a73
--- /dev/null
+++ b/net-misc/cfengine/files/cfservd.rc6
@@ -0,0 +1,17 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting cfservd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/cfservd 
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping cfservd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/cfservd
+	eend $?
+}
diff --git a/net-misc/cfengine/files/digest-cfengine-2.1.11-r2 b/net-misc/cfengine/files/digest-cfengine-2.1.11-r2
new file mode 100644
index 000000000000..6dd49e278549
--- /dev/null
+++ b/net-misc/cfengine/files/digest-cfengine-2.1.11-r2
@@ -0,0 +1 @@
+MD5 6d6bd644e4e8b4374d4eb9ed5bd154a2 cfengine-2.1.11.tar.gz 3119529
diff --git a/net-misc/cfengine/files/module-cfportage.tbz2 b/net-misc/cfengine/files/module-cfportage.tbz2
index 3463a9c8b1d3..df25be27d293 100644
--- a/net-misc/cfengine/files/module-cfportage.tbz2
+++ b/net-misc/cfengine/files/module-cfportage.tbz2