bumpage to fix 68709 and 64411

5 files changed, 112 insertions, 2 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 00acb8c77800..90c01857bd06 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,11 @@
 # 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.39 2004/10/06 18:22:26 klieber Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.40 2004/10/25 22:53:07 klieber Exp $
+
+*cfengine-2.1.10-r1 (25 Oct 2004)
+
+  25 Oct 2004; Kurt Lieber <klieber@gentoo.org> +cfengine-2.1.10-r1.ebuild:
+  bumpage to fix 68709 and 64411
 
   06 Oct 2004; Kurt Lieber <klieber@gentoo.org> cfengine-2.1.10.ebuild:
   added ~amd64 to ebuild
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 21b1014db758..128ce931bb7e 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -4,9 +4,10 @@ MD5 1acbd7e429fe695dcbc6de58ee8fb152 cfengine-2.1.5.ebuild 1623
 MD5 8479239f6bf3719f3f8b8171e59f7137 cfengine-2.1.6.ebuild 1627
 MD5 c43d635d5a652147971486b2b09e8345 metadata.xml 873
 MD5 2af42bcc42a23046558831ca3a11a30a cfengine-2.1.7.ebuild 1628
-MD5 8ebf618be1fc683320bb1c3a769cd4d8 ChangeLog 6007
+MD5 0ca5f7f75863b1725733c1304466d59c ChangeLog 6152
 MD5 08f5b76b494f5e82db441002c0f7cdb9 cfengine-2.1.9.ebuild 1624
 MD5 5d51f960bf5096976cb3d605a0df00ec cfengine-2.1.10.ebuild 1634
+MD5 6bbb424a8c7811a41f428298e9e5a5e3 cfengine-2.1.10-r1.ebuild 1857
 MD5 f4fe82c710efac73c0895ad268c54196 files/cfportage.README 2294
 MD5 c95df57a119e762a238f89210448914e files/digest-cfengine-2.1.1 67
 MD5 0e4089dc686aa3db08565e1b64db2ea0 files/digest-cfengine-2.1.3 67
@@ -16,3 +17,6 @@ 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 24084321590f39650eaf07a073bf0582 files/digest-cfengine-2.1.10 68
+MD5 0ca630e6cbe847ee7cafe8798fe0114e files/module-cfportage.tbz2 3284
+MD5 24084321590f39650eaf07a073bf0582 files/digest-cfengine-2.1.10-r1 68
+MD5 a9aa786ac4c8e32d55d8469af8ddf29b files/cfengine-2.1.10-setnetgrent.patch 1037
diff --git a/net-misc/cfengine/cfengine-2.1.10-r1.ebuild b/net-misc/cfengine/cfengine-2.1.10-r1.ebuild
new file mode 100644
index 000000000000..62c7b991f258
--- /dev/null
+++ b/net-misc/cfengine/cfengine-2.1.10-r1.ebuild
@@ -0,0 +1,71 @@
+# 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.10-r1.ebuild,v 1.1 2004/10/25 22:53:07 klieber Exp $
+
+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}
+	epatch ${FILESDIR}/${PN}-2.1.10-setnetgrent.patch
+}
+
+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() {
+	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
+
+	# 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
+	cd ${D}/var/cfengine/modules
+	tar pjxf ${FILESDIR}/module-cfportage.tbz2
+}
+
+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/
+}
diff --git a/net-misc/cfengine/files/cfengine-2.1.10-setnetgrent.patch b/net-misc/cfengine/files/cfengine-2.1.10-setnetgrent.patch
new file mode 100644
index 000000000000..dc7090e092ae
--- /dev/null
+++ b/net-misc/cfengine/files/cfengine-2.1.10-setnetgrent.patch
@@ -0,0 +1,29 @@
+diff -Nrup cfengine-2.1.10.orig/src/patches.c cfengine-2.1.10/src/patches.c
+--- cfengine-2.1.10.orig/src/patches.c	2004-04-17 10:11:04.000000000 -0400
++++ cfengine-2.1.10/src/patches.c	2004-10-24 11:21:15.000000000 -0400
+@@ -85,11 +85,12 @@ return strncmp(buf1,buf2,n); 
+ 
+ /*********************************************************/
+ 
+-void setnetgrent(netgroup)
++int setnetgrent(netgroup)
+ 
+ const char *netgroup;
+ 
+ {
++	return 0;
+ }
+ 
+ /**********************************************************/
+diff -Nrup cfengine-2.1.10.orig/src/prototypes.h cfengine-2.1.10/src/prototypes.h
+--- cfengine-2.1.10.orig/src/prototypes.h	2004-06-25 11:12:38.000000000 -0400
++++ cfengine-2.1.10/src/prototypes.h	2004-10-24 11:20:46.000000000 -0400
+@@ -805,7 +805,7 @@ int StrnCmp ARGLIST((char *s1,char *s2,s
+ 
+ #ifndef HAVE_GETNETGRENT
+ 
+-void setnetgrent ARGLIST((const char *netgroup));
++int setnetgrent ARGLIST((const char *netgroup));
+ int getnetgrent ARGLIST((char **host, char **user, char **domain));
+ void endnetgrent ARGLIST((void));
+ #endif
diff --git a/net-misc/cfengine/files/digest-cfengine-2.1.10-r1 b/net-misc/cfengine/files/digest-cfengine-2.1.10-r1
new file mode 100644
index 000000000000..c012ef7cc95c
--- /dev/null
+++ b/net-misc/cfengine/files/digest-cfengine-2.1.10-r1
@@ -0,0 +1 @@
+MD5 7a867c74ca3ad806a41b6f7339e67fa3 cfengine-2.1.10.tar.gz 3100323