Update cfengine2 to version 2.0.10. Addresses PR#26614.

Notable changes include:

Persistent class protection added to returned remote vrpc calls to
prevent meaningless multiple replies.

Change added to IPRange to avoid possible bootstrap problem with
unconfigured resolver.  IP address setting was contingent on having DNS.
Misplaced } fixed in nameinfo

EmptyResolvConf removed only nameserver entries. Now removes everything.

Due to an error in constructing 2.1.9 some of the advertised
changes below were not included. They are included in this version.

Workaround error message for parser bug with nested variables.

WORKDIR/state/allclasses file caches all class date during cfagent
execution, just like the $(allclasses) variable, but the file can grow
much larger without overflow.

.cfengine -> .cfagent in non-root public keys (some missing conversions)
Expand buffer incorrectly zeroed out public name key causing empty
keyname in RSA dialogue

Old style bind reverse lookup added to Hostname2IPAddress

10 files changed, 81 insertions, 99 deletions

diff --git a/sysutils/cfengine2/MESSAGE b/sysutils/cfengine2/MESSAGE
new file mode 100644
index 00000000000..b016f728240
--- /dev/null
+++ b/sysutils/cfengine2/MESSAGE
@@ -0,0 +1,24 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2004/08/18 23:03:44 ben Exp $
+
+To set up cfengine, install sysutils/cfengine2-doc and see:
+
+${PREFIX}/share/doc/html/cfengine/cfengine-Tutorial.html
+
+At a minimum, you will need:
+
+1. /var/cfengine/inputs/update.conf
+
+2. Manually add the "cfengine" service to /etc/services or
+   automate it in /var/cfengine/inputs/cfagent.conf:
+
+editfiles: 
+ 
+ { /etc/services 
+   
+   Backup "false"
+   AppendIfNoSuchLine "cfengine 5308/tcp # CFengine"
+ }
+
+
+===========================================================================
diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index 2dd712a5d9f..cc086c1a03e 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2004/05/04 02:07:06 snj Exp $
+# $NetBSD: Makefile,v 1.8 2004/08/18 23:03:44 ben Exp $
 #
 
 .include "../../sysutils/cfengine2/Makefile.common"
-PKGREVISION=	1
 
 COMMENT=	Automate configuration and administration of large systems
 
@@ -15,11 +14,19 @@ BUILD_DEFS+=		USE_INET6
 CONFIGURE_ARGS+=	--with-berkeleydb=${BUILDLINK_PREFIX.db4}
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
 
+USE_PKGINSTALL=		YES
+RCD_SCRIPTS=		cfexecd cfservd cfenvd
+
 pre-configure:
 	${MV} -f ${WRKSRC}/contrib/vicf.in ${WRKSRC}/contrib/vicf.in.orig
 	${SED} -e "s|@ECHO@|${ECHO}|" \
 		${WRKSRC}/contrib/vicf.in.orig > ${WRKSRC}/contrib/vicf.in
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/inputs/*.example \
+		${PREFIX}/share/examples/cfengine
+	${INSTALL_DATA_DIR} /var/cfengine/inputs
+
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../databases/db4/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/sysutils/cfengine2/Makefile.common b/sysutils/cfengine2/Makefile.common
index 88299f2a7f2..7052b389e57 100644
--- a/sysutils/cfengine2/Makefile.common
+++ b/sysutils/cfengine2/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.7 2004/08/10 14:18:44 ben Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/08/18 23:03:44 ben Exp $
 #
 
-CFENGINE_VERSION= 2.1.9
+CFENGINE_VERSION= 2.1.10
 DISTNAME=	cfengine-${CFENGINE_VERSION}
 CATEGORIES=	sysutils net
 MASTER_SITES=	ftp://ftp.iu.hio.no/pub/cfengine/ \
diff --git a/sysutils/cfengine2/PLIST b/sysutils/cfengine2/PLIST
index 382ebf94cff..2908670c30e 100644
--- a/sysutils/cfengine2/PLIST
+++ b/sysutils/cfengine2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/04/26 08:33:00 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/08/18 23:03:44 ben Exp $
 sbin/cfagent
 sbin/cfdoc
 sbin/cfenvd
@@ -7,26 +7,26 @@ sbin/cfexecd
 sbin/cfkey
 sbin/cfrun
 sbin/cfservd
-share/cfengine/cf.chflags.example
-share/cfengine/cf.freebsd.example
-share/cfengine/cf.ftp.example
-share/cfengine/cf.groups.example
-share/cfengine/cf.linux.example
-share/cfengine/cf.main.example
-share/cfengine/cf.motd.example
-share/cfengine/cf.preconf.example
-share/cfengine/cf.services.example
-share/cfengine/cf.site.example
-share/cfengine/cf.solaris.example
-share/cfengine/cf.sun4.example
-share/cfengine/cf.users.example
-share/cfengine/cfagent.conf-advanced.example
-share/cfengine/cfagent.conf.example
 share/cfengine/cfengine.el
-share/cfengine/cfrc.example
-share/cfengine/cfrun.hosts.example
-share/cfengine/cfservd.conf.example
-share/cfengine/update.conf.example
+share/examples/cfengine/cf.chflags.example
+share/examples/cfengine/cf.freebsd.example
+share/examples/cfengine/cf.ftp.example
+share/examples/cfengine/cf.groups.example
+share/examples/cfengine/cf.linux.example
+share/examples/cfengine/cf.main.example
+share/examples/cfengine/cf.motd.example
+share/examples/cfengine/cf.preconf.example
+share/examples/cfengine/cf.services.example
+share/examples/cfengine/cf.site.example
+share/examples/cfengine/cf.solaris.example
+share/examples/cfengine/cf.sun4.example
+share/examples/cfengine/cf.users.example
+share/examples/cfengine/cfagent.conf-advanced.example
+share/examples/cfengine/cfagent.conf.example
+share/examples/cfengine/cfrc.example
+share/examples/cfengine/cfrun.hosts.example
+share/examples/cfengine/cfservd.conf.example
+share/examples/cfengine/update.conf.example
 share/examples/cfengine/vicf
 @dirrm share/examples/cfengine
 @dirrm share/cfengine
diff --git a/sysutils/cfengine2/distinfo b/sysutils/cfengine2/distinfo
index 4e6f0d87d7e..4972bdb4879 100644
--- a/sysutils/cfengine2/distinfo
+++ b/sysutils/cfengine2/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.5 2004/08/10 14:18:44 ben Exp $
+$NetBSD: distinfo,v 1.6 2004/08/18 23:03:44 ben Exp $
 
-SHA1 (cfengine-2.1.9.tar.gz) = bbe3027df4b2e2f0128bdac61a99f8fabd678267
-Size (cfengine-2.1.9.tar.gz) = 3099090 bytes
+SHA1 (cfengine-2.1.10.tar.gz) = 01e80f12881b35704896757d338548dddc44883c
+Size (cfengine-2.1.10.tar.gz) = 3100323 bytes
 SHA1 (patch-ad) = 559b8378c1cad5e88e1eba55c7f62e2336153186
 SHA1 (patch-ae) = 99496b14f80c8605886cd78a520af4d1c6cc0475
-SHA1 (patch-af) = e13dec2fb9010d1c1a86ed69f9b0e5fa55deea88
-SHA1 (patch-ag) = a98372a18f6720a0919990636699cf160f6d8d5a
 SHA1 (patch-ah) = d0a79d2c5ce636e401486ff9740bd126fd94f172
-SHA1 (patch-ai) = 2f71c484bac8ad61e40769313e79e7598532a559
 SHA1 (patch-aj) = 8bf0d1e3af5b4fac229eb7eb62459e9c6afe4ead
-SHA1 (patch-ak) = de92fc7e9e0a44be121adba4f9388ccd77018621
+SHA1 (patch-al) = 8837267fe8ffa1f003b4dd48a8fe397ab9b0a3d9
diff --git a/sysutils/cfengine2/patches/patch-af b/sysutils/cfengine2/patches/patch-af
deleted file mode 100644
index f613ef4e06c..00000000000
--- a/sysutils/cfengine2/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.4 2004/08/10 14:18:44 ben Exp $
-
---- configure.orig	2004-08-09 21:14:27.000000000 -0400
-+++ configure	2004-08-09 21:14:59.000000000 -0400
-@@ -8447,4 +8447,5 @@
-             if test -f "$BERKELEY_DB_DIR/include/$v/db.h"; then
-                 BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include/$v"
-+		break
-             fi
-         done
-@@ -8454,4 +8455,5 @@
-             if test -f "$BERKELEY_DB_DIR/lib/lib$v.so"; then
-                 BERKELEY_DB_LIB="-l$v"
-+		break
-             fi
-         done
diff --git a/sysutils/cfengine2/patches/patch-ag b/sysutils/cfengine2/patches/patch-ag
deleted file mode 100644
index 2ff5fa0172d..00000000000
--- a/sysutils/cfengine2/patches/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2004/08/10 14:18:44 ben Exp $
-
---- src/cfservd.c.orig	2004-08-03 04:04:56.000000000 -0400
-+++ src/cfservd.c	2004-08-09 20:17:45.000000000 -0400
-@@ -764,5 +764,5 @@
-       Debug("Bound to address %s on %s=%d\n",sockaddr_ntop(ap->ai_addr),CLASSTEXT[VSYSTEMHARDCLASS],VSYSTEMHARDCLASS);
- 
--      if (VSYSTEMHARDCLASS == openbsd || VSYSTEMHARDCLASS == freebsd)
-+      if (VSYSTEMHARDCLASS == openbsd || VSYSTEMHARDCLASS == freebsd || VSYSTEMHARDCLASS == netbsd)
-          {
-          continue;  /* *bsd doesn't map ipv6 addresses */
diff --git a/sysutils/cfengine2/patches/patch-ai b/sysutils/cfengine2/patches/patch-ai
deleted file mode 100644
index 7238240f5c3..00000000000
--- a/sysutils/cfengine2/patches/patch-ai
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2004/08/10 14:18:44 ben Exp $
-
---- configure.ac.orig	2004-08-09 20:55:01.000000000 -0400
-+++ configure.ac	2004-08-09 20:55:48.000000000 -0400
-@@ -159,4 +159,5 @@
-             if test -f "$BERKELEY_DB_DIR/include/$v/db.h"; then
-                 BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include/$v"
-+		break
-             fi
-         done
-@@ -166,4 +167,5 @@
-             if test -f "$BERKELEY_DB_DIR/lib/lib$v.so"; then
-                 BERKELEY_DB_LIB="-l$v"
-+		break
-             fi
-         done
diff --git a/sysutils/cfengine2/patches/patch-ak b/sysutils/cfengine2/patches/patch-ak
deleted file mode 100644
index 21d6621b6fc..00000000000
--- a/sysutils/cfengine2/patches/patch-ak
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2004/08/10 14:18:44 ben Exp $
-
---- src/df.c.orig	2004-04-29 17:01:02.000000000 -0400
-+++ src/df.c	2004-08-09 21:28:39.000000000 -0400
-@@ -49,5 +49,5 @@
- 
- {
--#if defined SOLARIS || defined OSF || defined UNIXWARE 
-+#if defined SOLARIS || defined OSF || defined UNIXWARE || (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000)
-     struct statvfs buf;
- #elif defined ULTRIX
-@@ -71,5 +71,5 @@
-        return CF_INFINITY;
-        }
--#elif defined SOLARIS || defined OSF || defined UNIXWARE 
-+#elif defined SOLARIS || defined OSF || defined UNIXWARE || (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000)
-     if (statvfs (file, &buf) != 0)
-        {
-@@ -78,5 +78,5 @@
-        return CF_INFINITY;
-        }
--#elif defined IRIX || defined SCO || defined CFCRAY || defined UNIXWARE
-+#elif defined IRIX || defined SCO || defined CFCRAY || defined UNIXWARE || (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000)
-     if (statfs (file, &buf, sizeof (struct statfs), 0) != 0)
-        {
diff --git a/sysutils/cfengine2/patches/patch-al b/sysutils/cfengine2/patches/patch-al
new file mode 100644
index 00000000000..3ae1adce8b7
--- /dev/null
+++ b/sysutils/cfengine2/patches/patch-al
@@ -0,0 +1,22 @@
+$NetBSD: patch-al,v 1.1 2004/08/18 23:03:44 ben Exp $
+
+--- Makefile.in.orig	Mon Aug  9 10:27:40 2004
++++ Makefile.in
+@@ -60,7 +60,7 @@ RECURSIVE_TARGETS = all-recursive check-
+ 	uninstall-recursive
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = pub src contrib inputs doc
++DIST_SUBDIRS = pub src contrib doc
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+@@ -184,7 +184,7 @@ target_os = @target_os@
+ target_vendor = @target_vendor@
+ @BUILD_DOC_FALSE@DOC_DIR = 
+ @BUILD_DOC_TRUE@DOC_DIR = doc
+-SUBDIRS = pub src contrib inputs $(DOC_DIR)
++SUBDIRS = pub src contrib $(DOC_DIR)
+ EXTRA_DIST = acconfig.h doc/cfengine.8 COPYING ChangeLog INSTALL NEWS README
+ 
+ #