Fix packages inform output in cfengine-2.1.22

(Portage version: 2.1.1-r2)

4 files changed, 106 insertions, 1 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index b794f36bdd40..86e3b44d180f 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/cfengine
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.79 2007/02/20 00:43:53 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.80 2007/03/21 21:05:41 marineam Exp $
+
+*cfengine-2.1.22-r1 (21 Mar 2007)
+
+  21 Mar 2007; Michael Marineau <marineam@gentoo.org>
+  +files/cfengine-2.1.22-package-fix.patch, +cfengine-2.1.22-r1.ebuild:
+  Minor fix, backport r347 from trunk to 2.1.22 to fix inform for package
+  install.
 
 *cfengine-2.1.22 (20 Feb 2007)
 
diff --git a/net-misc/cfengine/cfengine-2.1.22-r1.ebuild b/net-misc/cfengine/cfengine-2.1.22-r1.ebuild
new file mode 100644
index 000000000000..2d6ac1ad298b
--- /dev/null
+++ b/net-misc/cfengine/cfengine-2.1.22-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.22-r1.ebuild,v 1.1 2007/03/21 21:05:41 marineam Exp $
+
+inherit 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="~amd64 ~arm ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=sys-libs/db-3.2
+	>=dev-libs/openssl-0.9.7"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-package-fix.patch
+}
+
+src_compile() {
+	# Enforce /var/cfengine for historical compatibility
+	econf \
+		--with-workdir=/var/cfengine \
+		--with-berkeleydb=/usr || die
+
+	# Fix Makefile to skip doc,inputs, & contrib install to wrong locations
+	sed -i -e 's/\(DIST_SUBDIRS.*\) contrib inputs doc/\1/' Makefile
+	sed -i -e 's/\(SUBDIRS.*\) contrib inputs/\1/' Makefile
+	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile
+
+	emake || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/cfservd.rc6 cfservd
+
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README TODO INSTALL
+
+	# Manually install doc and inputs
+	doinfo doc/*.info*
+	dohtml doc/*.html
+	doman doc/*.8
+	dodoc ${FILESDIR}/cfportage.README
+	docinto examples
+	dodoc inputs/*.example
+
+	# 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:0 /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/cfengine-2.1.22-package-fix.patch b/net-misc/cfengine/files/cfengine-2.1.22-package-fix.patch
new file mode 100644
index 000000000000..b4b40823bf17
--- /dev/null
+++ b/net-misc/cfengine/files/cfengine-2.1.22-package-fix.patch
@@ -0,0 +1,11 @@
+diff -ru 2.1.22-orig/src/package.c 2.1.22-r1/src/package.c
+--- 2.1.22-orig/src/package.c   2007-03-09 11:48:31.000000000 -0800
++++ cfengine-2.1.22/src/package.c     2007-03-09 11:50:26.000000000 -0800
+@@ -446,6 +446,7 @@
+          {
+          ReadLine(line,CF_BUFSIZE-1,pp);
+          snprintf(OUTPUT,CF_BUFSIZE,"Package install: %s\n",line);
++         CfLog(cfinform,OUTPUT,""); 
+          }
+       
+       if (cfpclose(pp) != 0)
diff --git a/net-misc/cfengine/files/digest-cfengine-2.1.22-r1 b/net-misc/cfengine/files/digest-cfengine-2.1.22-r1
new file mode 100644
index 000000000000..fd575ec51c81
--- /dev/null
+++ b/net-misc/cfengine/files/digest-cfengine-2.1.22-r1
@@ -0,0 +1,3 @@
+MD5 5452c988225751da9ed2f1edf3426866 cfengine-2.1.22.tar.gz 3673965
+RMD160 9109a5156aa24e29137ff51ad1b5a0050b62eb2f cfengine-2.1.22.tar.gz 3673965
+SHA256 fa30e5b29517370e5cea8d9935999e437709e574d103eb317eeed007c975d451 cfengine-2.1.22.tar.gz 3673965