Update cfengine2 and cfengine2-doc to version 2.0.6.

Package changes
	Vicf moved from $PREFIX/sbin to $PREFIX/share/examples/cfengine
	as it can really be used as is: site tuning is required.

	Both packages now share the same distinfo file.

Changes in version 2.0.6

	SKIPVERIFY removed from AccessControl checks. This was
	wrongly allowing access to files if they only had an accepted
	encryption key.

	SetLine added to AppendIfNoLineMatching to allow current
	line to be added.

	 ForEachLineIn "/tmp/in"
	    AppendIfNoLineMatching "ThisLine"
	 EndLoop

	Changed /etc/services reference to port 5308 in ipv6
	compatible calls.

	Efficiency, removed getpwnam from GetFile(). Was unnecessarily
	looking up the uid multiple times, which delays copying
	speed. Copy rates improved by five to ten times!!

	Single copy uses too much cache memory. Optimize by only
	caching copies that use the singlecopy keyword.

	Message status change: %s is a link which points to %s,
	but that file doesn't seem to exist Verbose only

	Patches to editfiles to check empty files. DefineinGroup
	added.

Changes in version 2.0.5

	Cfrun ipv6 patch

	Syslog messages name patch

	mountables, binservers variable usage fix

	backup=timestamp added in copy so that multiple backups
	can coexist.  Other backups use this by default.

	Cfenvd records loadaverage - and av.db renamed to cf_averages.db
	since records in av.db no longer compatible.

	Iteration added to disk paths

	Typo in filters.c UID -> USER meant that Owner field in
	filters would not always work for processes.  Bug in removal
	of spaces in process-filter matches could cause some criteria
	to fail to match.

	Netstat changed entry in solaris 2.9
	Hard class hpux10 -> hpux and the old hpux is deprecated

	tidy //tmp would start tidying / due to error in
	ExpandWildcardsAndDo. FIxed

	Cfenvd netstat state recorded in separate files now in
	WORKDIR, by protocol and incoming/outgoing. This allows
	accurate record of the state to which classes refer.

	excludes and ignores would not appended in a tidy command
	if a path already existed in another previous command.
	Fixed so that all excludes and ignores are concatenated
	for all related paths.

	Local AF_LOCAL addresses not handled by sockaddr in IPv6
	compatible functions.  Now returns 127.0.0.1 (why not ::1??)

	Typo in tidy.c prevented tidy old links from working.
	Documentation patches.

	Checksums no longer performed on dry run (-n) in files,
	but still in copy.

	No errors written to syslog in dryrun mode.
	Umask patch in editfiles - umask was not properly installed

	New copy options / variables singlecopy= and autodefine
	added.

	Alerts added as own section alerts: allow users to define
	a custom message triggered by a class activation. Alerts
	can also quote state information from cfenvd and the process
	table.

	tidy define= does not set class if file could not be tidied.

	debian detect patch (Andy Stribblehill)
	cfservd descriptor leak (Andy Stribblehill)
	cfservd daemonize modification

9 files changed, 211 insertions, 79 deletions

diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index 1bb2ccacf9b..bd2a9699225 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/03/05 15:55:57 seb Exp $
+# $NetBSD: Makefile,v 1.3 2003/04/26 08:33:00 seb Exp $
 #
 
 .include "../../sysutils/cfengine2/Makefile.common"
@@ -9,6 +9,8 @@ USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 PTHREAD_OPTS+=		require
 
+BUILD_DEFS+=		USE_INET6
+
 CONFIGURE_ARGS+=	--with-berkeleydb=${BUILDLINK_PREFIX.db4}
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
 
diff --git a/sysutils/cfengine2/Makefile.common b/sysutils/cfengine2/Makefile.common
index eb51c683766..e041daba313 100644
--- a/sysutils/cfengine2/Makefile.common
+++ b/sysutils/cfengine2/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.2 2003/04/25 21:08:41 seb Exp $
+# $NetBSD: Makefile.common,v 1.3 2003/04/26 08:33:00 seb Exp $
 #
 
-CFENGINE_VERSION= 2.0.4
+CFENGINE_VERSION= 2.0.6
 DISTNAME=	cfengine-${CFENGINE_VERSION}
 CATEGORIES=	sysutils net
 MASTER_SITES=	ftp://ftp.iu.hio.no/pub/cfengine/ \
@@ -9,3 +9,6 @@ MASTER_SITES=	ftp://ftp.iu.hio.no/pub/cfengine/ \
 
 MAINTAINER=	mike@ethmoid.org
 HOMEPAGE=	http://www.cfengine.org/
+
+DISTINFO_FILE=	${.CURDIR}/../../sysutils/cfengine2/distinfo
+PATCHDIR=	${.CURDIR}/../../sysutils/cfengine2/patches
diff --git a/sysutils/cfengine2/PLIST b/sysutils/cfengine2/PLIST
index 6c940d281bf..382ebf94cff 100644
--- a/sysutils/cfengine2/PLIST
+++ b/sysutils/cfengine2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/22 13:04:38 seb Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/04/26 08:33:00 seb Exp $
 sbin/cfagent
 sbin/cfdoc
 sbin/cfenvd
@@ -7,7 +7,6 @@ sbin/cfexecd
 sbin/cfkey
 sbin/cfrun
 sbin/cfservd
-sbin/vicf
 share/cfengine/cf.chflags.example
 share/cfengine/cf.freebsd.example
 share/cfengine/cf.ftp.example
@@ -28,4 +27,6 @@ share/cfengine/cfrc.example
 share/cfengine/cfrun.hosts.example
 share/cfengine/cfservd.conf.example
 share/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 bed96377ed1..405e0ecb5ac 100644
--- a/sysutils/cfengine2/distinfo
+++ b/sysutils/cfengine2/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/12/22 13:04:38 seb Exp $
+$NetBSD: distinfo,v 1.2 2003/04/26 08:33:00 seb Exp $
 
-SHA1 (cfengine-2.0.4.tar.gz) = d5f0e6bbbee559b30e57184555c022dd26dbfa8c
-Size (cfengine-2.0.4.tar.gz) = 1149946 bytes
+SHA1 (cfengine-2.0.6.tar.gz) = 8138fd9eb5dee9e53bdac350e1737db8fd0a2999
+Size (cfengine-2.0.6.tar.gz) = 1173772 bytes
 SHA1 (patch-aa) = 93a957af8d124d5b6e584c1c3d3cdda73190d58c
 SHA1 (patch-ab) = 23366845e2548ba119764d5f4927ec53c9b15046
-SHA1 (patch-ad) = d4861f1dd7547050edd216493d5640fd276a07ee
+SHA1 (patch-ad) = 559b8378c1cad5e88e1eba55c7f62e2336153186
 SHA1 (patch-ae) = 99496b14f80c8605886cd78a520af4d1c6cc0475
-SHA1 (patch-af) = 4b6f720fcfb45bdbcc3dc7271cd08ce06d12f3f0
+SHA1 (patch-af) = 379ac2621c8902431ce53b7d85ab35e857cc3abf
 SHA1 (patch-ag) = f64e2d1f9f3a5c0e0dc37a40c56f0188382e02ed
-SHA1 (patch-ah) = b0290d9edc57f0df953fd74e9741d69f52502c0e
-SHA1 (patch-ai) = 659b3031613f6d882853372d0c9dc5f36e6773ba
+SHA1 (patch-ah) = d0a79d2c5ce636e401486ff9740bd126fd94f172
+SHA1 (patch-ai) = 074eaadc318bb11a9f7987199f60e3d0dd69c4b0
+SHA1 (patch-aj) = 0febd73c9eaeae6eb3e52a101998ea6ebcf17e25
diff --git a/sysutils/cfengine2/patches/patch-ad b/sysutils/cfengine2/patches/patch-ad
index 26b3f2e62fa..d4768bafe1b 100644
--- a/sysutils/cfengine2/patches/patch-ad
+++ b/sysutils/cfengine2/patches/patch-ad
@@ -1,21 +1,36 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/12/22 13:04:38 seb Exp $
+$NetBSD: patch-ad,v 1.2 2003/04/26 08:33:01 seb Exp $
 
---- contrib/vicf.in.orig	Thu May  4 19:42:31 2000
-+++ contrib/vicf.in	Wed Dec 18 09:09:35 2002
-@@ -4,4 +4,5 @@
+--- contrib/vicf.in.orig	2003-02-09 11:33:04.000000000 +0000
++++ contrib/vicf.in
+@@ -3,14 +3,15 @@
+ prefix=@prefix@
  exec_prefix=@exec_prefix@
  sbindir=@sbindir@
 +ECHO=@ECHO@
  EDITOR="${EDITOR-vi}"
- CFINPUTS="${CFINPUTS-"@pkgdata@"}
-@@ -21,5 +22,5 @@
+ CFINPUTS="${CFINPUTS-"@pkgdata@"}"
+ export EDITOR CFINPUTS
+ NOPARSE="cf.preconf|cfd.conf"
+ 
+-if [ "`hostname`" != "sentral" ]
++if [ "`hostname`" != "CHANGEME" ]
+ then
+-	echo $0 can only be run on host sentral.
++	echo $0 can only be run on host CHANGEME.
+ 	exit 1
+ fi
+ 
+@@ -20,7 +21,7 @@ EdFile () {
+ 	echo "File not found: ${file}"
  	echo "Only these files are eligible for editing:"
  	\ls $CFINPUTS
 -	/usr/ucb/echo -n "Create new file? (Y/n) "
 +	${ECHO} -n "Create new file? (Y/n) "
  	read answer
  	if [ "$answer" = "n" ]
-@@ -33,8 +34,8 @@
+ 	then
+@@ -32,14 +33,15 @@ EdFile () {
+     if [ -f ${CFINPUTS}/.${file}.lock -a "$force" = "n" ]
      then
  	i=30
 -	/usr/ucb/echo -n "File ${file} is busy -- waiting up to $i seconds..."
@@ -26,10 +41,19 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/12/22 13:04:38 seb Exp $
 +		${ECHO} -n .
  		i=`expr $i - 1`
  		if [ $i = 0 ]
-@@ -63,5 +64,5 @@
+ 		then
+-			echo "\nSorry, file is busy -- try again later."
++			${ECHO} ""
++			${ECHO} "Sorry, file is busy -- try again later."
+ 			exit 0
+ 		fi
+ 		sleep 1
+@@ -62,7 +64,7 @@ EdFile () {
+ 	then
  		echo PARSE ERROR IN NEW INPUT-FILE:
  		cat /tmp/cfparse.$$
 -		/usr/ucb/echo -n "Re-edit file? (Y/n) "
 +		${ECHO} -n "Re-edit file? (Y/n) "
  		read answer
  		if [ "$answer" = "n" ]
+ 		then
diff --git a/sysutils/cfengine2/patches/patch-af b/sysutils/cfengine2/patches/patch-af
index 113a1eef61d..bf5afddc1b4 100644
--- a/sysutils/cfengine2/patches/patch-af
+++ b/sysutils/cfengine2/patches/patch-af
@@ -1,13 +1,26 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/12/22 13:04:38 seb Exp $
+$NetBSD: patch-af,v 1.2 2003/04/26 08:33:01 seb Exp $
 
---- configure.orig	Tue Dec 17 14:08:36 2002
-+++ configure	Tue Dec 17 15:30:26 2002
-@@ -3488,6 +3488,6 @@
-         done
+--- configure.orig	2003-04-09 12:32:54.000000000 +0000
++++ configure
+@@ -4781,7 +4781,20 @@ echo "$as_me: error: Cannot find Berkele
+         echo "$as_me:4781: result: $BERKELEY_DB_DIR" >&5
+ echo "${ECHO_T}$BERKELEY_DB_DIR" >&6
+     else
+-        { { echo "$as_me:4784: error: Cannot find BerkeleyDB" >&5
++	d="$BERKELEY_DB_DIR"
++	for v in db-4 db4 db3 db; do
++	    if test -f "$d/include/$v/db.h" ; then
++		test "x$d" != "x/usr" && BERKELEY_DB_LDFLAGS="-L$d/lib"
++		BERKELEY_DB_CFLAGS="-I$d/include/$v"
++		BERKELEY_DB_LIB="-l$v"
++		echo "$as_me:4790: result: $d" >&5
++echo "${ECHO_T}$d" >&6
++		break
++	    fi
++	done
++    fi
++    if test x"$BERKELEY_DB_LIB" = "x"; then
++        { { echo "$as_me:4797: error: Cannot find BerkeleyDB" >&5
+ echo "$as_me: error: Cannot find BerkeleyDB" >&2;}
+    { (exit 1); exit 1; }; }
      fi
--    if test "x$BERKELEY_DB_DIR" = "xyes" ; then
--        for d in /opt /usr/local /usr; do
-+    if test "x$BERKELEY_DB_DIR" != "x" ; then
-+        for d in $BERKELEY_DB_DIR /opt /usr/local /usr; do
-             for v in db4 db3 db; do
-                 if test -f "$d/include/$v/db.h" ; then
diff --git a/sysutils/cfengine2/patches/patch-ah b/sysutils/cfengine2/patches/patch-ah
index b85dce75f68..a8a83c62af6 100644
--- a/sysutils/cfengine2/patches/patch-ah
+++ b/sysutils/cfengine2/patches/patch-ah
@@ -1,26 +1,18 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/12/22 13:04:38 seb Exp $
+$NetBSD: patch-ah,v 1.2 2003/04/26 08:33:01 seb Exp $
 
---- src/cfenvd.c.orig	Fri Aug  2 04:57:44 2002
-+++ src/cfenvd.c	Thu Dec 19 17:16:13 2002
-@@ -512,11 +512,21 @@
- if (!NO_FORK)
-    {
-+   int fd;
- #ifdef HAVE_SETSID
-    setsid();
- #endif 
-+   fd = open("/dev/null", O_RDWR, 0);
-    fclose (stdin);
-    fclose (stdout);
-    fclose (stderr);
-    closelog();
+--- contrib/Makefile.am.orig	2001-11-21 18:59:51.000000000 +0000
++++ contrib/Makefile.am
+@@ -1,9 +1,12 @@
+ s1 = cfdoc
+ s2 = cfengine.el
+ 
+-sbin_SCRIPTS = vicf $(s1)
++sbin_SCRIPTS = $(s1)
+ pkgdata_SCRIPTS = $(s2)
+ 
++exampledir = $(prefix)/share/examples/cfengine
++example_SCRIPTS = vicf
 +
-+   if (fd != -1)
-+      {
-+      dup2(fd,STDIN_FILENO);
-+      dup2(fd,STDOUT_FILENO);
-+      dup2(fd,STDERR_FILENO);
-+      close(fd);
-+      }
-    }
+ EXTRA_DIST = README README.vicf $(s1) $(s2)
  
+ #
diff --git a/sysutils/cfengine2/patches/patch-ai b/sysutils/cfengine2/patches/patch-ai
index ced668b5962..39538feff43 100644
--- a/sysutils/cfengine2/patches/patch-ai
+++ b/sysutils/cfengine2/patches/patch-ai
@@ -1,26 +1,23 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/12/22 13:04:38 seb Exp $
+$NetBSD: patch-ai,v 1.2 2003/04/26 08:33:01 seb Exp $
 
---- src/cfexecd.c.orig	Thu Dec 19 17:21:24 2002
-+++ src/cfexecd.c	Thu Dec 19 17:21:26 2002
-@@ -250,11 +250,21 @@
- if (!NO_FORK)
-   {
-+  int fd;
- #ifdef HAVE_SETSID
-   setsid();
- #endif 
-+  fd = open("/dev/null", O_RDWR, 0);
-   fclose (stdin);
-   fclose (stdout);
-   fclose (stderr);
-   closelog();
-+
-+  if (fd != -1)
-+     {
-+     dup2(fd,STDIN_FILENO);
-+     dup2(fd,STDOUT_FILENO);
-+     dup2(fd,STDERR_FILENO);
-+     close(fd);
-+     }
-   }
- 
+--- configure.ac.orig	2003-04-07 17:47:46.000000000 +0000
++++ configure.ac
+@@ -133,6 +133,18 @@ else
+         BERKELEY_DB_LIB="-ldb"
+         AC_MSG_RESULT($BERKELEY_DB_DIR)
+     else
++	d="$BERKELEY_DB_DIR"
++	for v in db-4 db4 db3 db; do
++	    if test -f "$d/include/$v/db.h" ; then
++		test "x$d" != "x/usr" && BERKELEY_DB_LDFLAGS="-L$d/lib"
++		BERKELEY_DB_CFLAGS="-I$d/include/$v"
++		BERKELEY_DB_LIB="-l$v"
++		AC_MSG_RESULT($d)
++		break
++	    fi
++	done
++    fi
++    if test x"$BERKELEY_DB_LIB" = "x"; then
+         AC_MSG_ERROR(Cannot find BerkeleyDB)
+     fi
+     AC_DEFINE(USE_BERKELEY_DB, 1, [Define if BerkeleyDB is available.])
diff --git a/sysutils/cfengine2/patches/patch-aj b/sysutils/cfengine2/patches/patch-aj
new file mode 100644
index 00000000000..86754008dee
--- /dev/null
+++ b/sysutils/cfengine2/patches/patch-aj
@@ -0,0 +1,99 @@
+$NetBSD: patch-aj,v 1.1 2003/04/26 08:33:01 seb Exp $
+
+--- contrib/Makefile.in.orig	2003-04-09 13:11:16.000000000 +0000
++++ contrib/Makefile.in
+@@ -96,9 +96,12 @@ install_sh = @install_sh@
+ s1 = cfdoc
+ s2 = cfengine.el
+ 
+-sbin_SCRIPTS = vicf $(s1)
++sbin_SCRIPTS = $(s1)
+ pkgdata_SCRIPTS = $(s2)
+ 
++exampledir = $(prefix)/share/examples/cfengine
++example_SCRIPTS = vicf
++
+ EXTRA_DIST = README README.vicf $(s1) $(s2)
+ 
+ #
+@@ -128,7 +131,7 @@ subdir = contrib
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/src/conf.h
+ CONFIG_CLEAN_FILES = vicf
+-SCRIPTS = $(pkgdata_SCRIPTS) $(sbin_SCRIPTS)
++SCRIPTS = $(example_SCRIPTS) $(pkgdata_SCRIPTS) $(sbin_SCRIPTS)
+ 
+ DIST_SOURCES =
+ DIST_COMMON = README Makefile.am Makefile.in vicf.in
+@@ -142,6 +145,26 @@ Makefile:  $(srcdir)/Makefile.in  $(top_
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ vicf: $(top_builddir)/config.status vicf.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
++exampleSCRIPT_INSTALL = $(INSTALL_SCRIPT)
++install-exampleSCRIPTS: $(example_SCRIPTS)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(exampledir)
++	@list='$(example_SCRIPTS)'; for p in $$list; do \
++	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++	  if test -f $$d$$p; then \
++	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
++	    echo " $(exampleSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(exampledir)/$$f"; \
++	    $(exampleSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(exampledir)/$$f; \
++	  else :; fi; \
++	done
++
++uninstall-exampleSCRIPTS:
++	@$(NORMAL_UNINSTALL)
++	@list='$(example_SCRIPTS)'; for p in $$list; do \
++	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
++	  echo " rm -f $(DESTDIR)$(exampledir)/$$f"; \
++	  rm -f $(DESTDIR)$(exampledir)/$$f; \
++	done
+ pkgdataSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+@@ -217,7 +240,7 @@ check: check-am
+ all-am: Makefile $(SCRIPTS)
+ 
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(sbindir)
++	$(mkinstalldirs) $(DESTDIR)$(exampledir) $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(sbindir)
+ 
+ install: install-am
+ install-exec: install-exec-am
+@@ -263,7 +286,7 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-pkgdataSCRIPTS
++install-data-am: install-exampleSCRIPTS install-pkgdataSCRIPTS
+ 
+ install-exec-am: install-sbinSCRIPTS
+ 
+@@ -281,17 +304,18 @@ mostlyclean: mostlyclean-am
+ 
+ mostlyclean-am: mostlyclean-generic
+ 
+-uninstall-am: uninstall-info-am uninstall-pkgdataSCRIPTS \
+-	uninstall-sbinSCRIPTS
++uninstall-am: uninstall-exampleSCRIPTS uninstall-info-am \
++	uninstall-pkgdataSCRIPTS uninstall-sbinSCRIPTS
+ 
+ .PHONY: all all-am check check-am clean clean-generic distclean \
+ 	distclean-generic distdir dvi dvi-am info info-am install \
+-	install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am install-man \
+-	install-pkgdataSCRIPTS install-sbinSCRIPTS install-strip \
+-	installcheck installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-generic \
+-	uninstall uninstall-am uninstall-info-am \
++	install-am install-data install-data-am install-exampleSCRIPTS \
++	install-exec install-exec-am install-info install-info-am \
++	install-man install-pkgdataSCRIPTS install-sbinSCRIPTS \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-generic uninstall uninstall-am \
++	uninstall-exampleSCRIPTS uninstall-info-am \
+ 	uninstall-pkgdataSCRIPTS uninstall-sbinSCRIPTS
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.