Update to version 2.0.7p3.

Versions 2.0.7p1, 2.0.7p2 and 2.0.7p3 are patch releases.

Changes in version 2.0.7:

Resolv.conf search directive removed from code. This was wrong, in spite
of pressure to put it in.

EditBackup -> Backup corrected in manual
Check for class definitions that are not installable

SMTP client handling patch in cfexecd - must wait for reply

AppendIfNoLineMatching replaced with regex, not Setline value

ChecksumPurge = ( on ) causes cfagent to purge its checksum database of
files that no longer exist.

Forgotten built in function RandomInt(a,b) - returns a random number in variable
assignments. Actually introduced in 2.0.6. Forgot this control:

           rand = ( RandomInt(4,7) )

Major rewrite of parser

  - code simplifications
  - Allowed escaping of quotes in strings and newlines e.g.

        var1 = ( "a b c\"substring\" d e" )
        var2 = ( "a b
        c" )

Tidy code tidied and bug fixed for new scheduler

Moduledirectory defaults to /var/cfengine/modules

5 files changed, 62 insertions, 36 deletions

diff --git a/sysutils/cfengine2/Makefile.common b/sysutils/cfengine2/Makefile.common
index 78f90ae4f86..8ba443d3711 100644
--- a/sysutils/cfengine2/Makefile.common
+++ b/sysutils/cfengine2/Makefile.common
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile.common,v 1.4 2003/05/02 11:56:20 wiz Exp $
+# $NetBSD: Makefile.common,v 1.5 2003/05/29 21:08:26 seb Exp $
 #
 
-CFENGINE_VERSION= 2.0.6
+CFENGINE_VERSION= 2.0.7p3
 DISTNAME=	cfengine-${CFENGINE_VERSION}
-PKGREVISION=	1
 CATEGORIES=	sysutils net
 MASTER_SITES=	ftp://ftp.iu.hio.no/pub/cfengine/ \
 		http://sunsite.utk.edu/ftp/pub/cfengine/cfengine-ftp/
diff --git a/sysutils/cfengine2/distinfo b/sysutils/cfengine2/distinfo
index 405e0ecb5ac..25cca4b0929 100644
--- a/sysutils/cfengine2/distinfo
+++ b/sysutils/cfengine2/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.2 2003/04/26 08:33:00 seb Exp $
+$NetBSD: distinfo,v 1.3 2003/05/29 21:08:27 seb Exp $
 
-SHA1 (cfengine-2.0.6.tar.gz) = 8138fd9eb5dee9e53bdac350e1737db8fd0a2999
-Size (cfengine-2.0.6.tar.gz) = 1173772 bytes
+SHA1 (cfengine-2.0.7p3.tar.gz) = 8798a49c02841ecc7e493a577978fb271c57204a
+Size (cfengine-2.0.7p3.tar.gz) = 1216634 bytes
 SHA1 (patch-aa) = 93a957af8d124d5b6e584c1c3d3cdda73190d58c
-SHA1 (patch-ab) = 23366845e2548ba119764d5f4927ec53c9b15046
+SHA1 (patch-ab) = caf7e63f25d0bba61d37a0060c586c84b2742fe4
 SHA1 (patch-ad) = 559b8378c1cad5e88e1eba55c7f62e2336153186
 SHA1 (patch-ae) = 99496b14f80c8605886cd78a520af4d1c6cc0475
-SHA1 (patch-af) = 379ac2621c8902431ce53b7d85ab35e857cc3abf
+SHA1 (patch-af) = 470e6e6b89b70caaaecc036ebb5d6a4071d1c3ed
 SHA1 (patch-ag) = f64e2d1f9f3a5c0e0dc37a40c56f0188382e02ed
 SHA1 (patch-ah) = d0a79d2c5ce636e401486ff9740bd126fd94f172
 SHA1 (patch-ai) = 074eaadc318bb11a9f7987199f60e3d0dd69c4b0
-SHA1 (patch-aj) = 0febd73c9eaeae6eb3e52a101998ea6ebcf17e25
+SHA1 (patch-aj) = 4953a018297d59a21201703f5a019d623587d97f
diff --git a/sysutils/cfengine2/patches/patch-ab b/sysutils/cfengine2/patches/patch-ab
index 29b8f48e502..413d4e4b486 100644
--- a/sysutils/cfengine2/patches/patch-ab
+++ b/sysutils/cfengine2/patches/patch-ab
@@ -1,11 +1,31 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/12/22 13:04:38 seb Exp $
+$NetBSD: patch-ab,v 1.2 2003/05/29 21:08:27 seb Exp $
 
---- Makefile.in.orig	Wed Dec 18 08:39:40 2002
-+++ Makefile.in	Wed Dec 18 08:40:02 2002
-@@ -94,5 +94,5 @@
- am__quote = @am__quote@
- install_sh = @install_sh@
+--- Makefile.in.orig	2003-05-28 16:54:45.000000000 +0000
++++ Makefile.in
+@@ -142,7 +142,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
 -SUBDIRS = pub src contrib inputs doc 
-+SUBDIRS = pub src contrib inputs
++SUBDIRS = pub src contrib inputs 
  
  EXTRA_DIST = acconfig.h DOCUMENTATION doc/cfengine.8 COPYING ChangeLog INSTALL NEWS README
+ 
+@@ -176,6 +176,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/src/conf.h
+ CONFIG_CLEAN_FILES =
++depcomp =
++am__depfiles_maybe =
+ DIST_SOURCES =
+ 
+ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+@@ -196,7 +198,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
+  configure.lineno
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  Makefile
++	  $(AUTOMAKE) --foreign  --ignore-deps Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+ 
diff --git a/sysutils/cfengine2/patches/patch-af b/sysutils/cfengine2/patches/patch-af
index bf5afddc1b4..1c88d7d51c3 100644
--- a/sysutils/cfengine2/patches/patch-af
+++ b/sysutils/cfengine2/patches/patch-af
@@ -1,26 +1,24 @@
-$NetBSD: patch-af,v 1.2 2003/04/26 08:33:01 seb Exp $
+$NetBSD: patch-af,v 1.3 2003/05/29 21:08:27 seb Exp $
 
---- configure.orig	2003-04-09 12:32:54.000000000 +0000
+--- configure.orig	2003-05-28 16:53:58.000000000 +0000
 +++ configure
-@@ -4781,7 +4781,20 @@ echo "$as_me: error: Cannot find Berkele
-         echo "$as_me:4781: result: $BERKELEY_DB_DIR" >&5
+@@ -7611,6 +7611,19 @@ echo "$as_me: error: Cannot find Berkele
+         echo "$as_me:$LINENO: 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 "$as_me:$LINENO: 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:$LINENO: error: Cannot find BerkeleyDB" >&5
  echo "$as_me: error: Cannot find BerkeleyDB" >&2;}
     { (exit 1); exit 1; }; }
-     fi
diff --git a/sysutils/cfengine2/patches/patch-aj b/sysutils/cfengine2/patches/patch-aj
index 86754008dee..11ffb950e94 100644
--- a/sysutils/cfengine2/patches/patch-aj
+++ b/sysutils/cfengine2/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.1 2003/04/26 08:33:01 seb Exp $
+$NetBSD: patch-aj,v 1.2 2003/05/29 21:08:27 seb Exp $
 
---- contrib/Makefile.in.orig	2003-04-09 13:11:16.000000000 +0000
+--- contrib/Makefile.in.orig	2003-05-28 16:55:26.000000000 +0000
 +++ contrib/Makefile.in
-@@ -96,9 +96,12 @@ install_sh = @install_sh@
+@@ -145,9 +145,12 @@ target_vendor = @target_vendor@
  s1 = cfdoc
  s2 = cfengine.el
  
@@ -16,16 +16,25 @@ $NetBSD: patch-aj,v 1.1 2003/04/26 08:33:01 seb Exp $
  EXTRA_DIST = README README.vicf $(s1) $(s2)
  
  #
-@@ -128,7 +131,7 @@ subdir = contrib
+@@ -178,8 +181,10 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  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)
  
++depcomp =
++am__depfiles_maybe =
  DIST_SOURCES =
  DIST_COMMON = README Makefile.am Makefile.in vicf.in
-@@ -142,6 +145,26 @@ Makefile:  $(srcdir)/Makefile.in  $(top_
+ all: all-am
+@@ -187,11 +192,31 @@ all: all-am
+ .SUFFIXES:
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  contrib/Makefile
++	  $(AUTOMAKE) --foreign  --ignore-deps contrib/Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
  vicf: $(top_builddir)/config.status vicf.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
@@ -52,7 +61,7 @@ $NetBSD: patch-aj,v 1.1 2003/04/26 08:33:01 seb Exp $
  pkgdataSCRIPT_INSTALL = $(INSTALL_SCRIPT)
  install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS)
  	@$(NORMAL_INSTALL)
-@@ -217,7 +240,7 @@ check: check-am
+@@ -276,7 +301,7 @@ check: check-am
  all-am: Makefile $(SCRIPTS)
  
  installdirs:
@@ -61,7 +70,7 @@ $NetBSD: patch-aj,v 1.1 2003/04/26 08:33:01 seb Exp $
  
  install: install-am
  install-exec: install-exec-am
-@@ -263,7 +286,7 @@ info: info-am
+@@ -322,7 +347,7 @@ info: info-am
  
  info-am:
  
@@ -70,9 +79,9 @@ $NetBSD: patch-aj,v 1.1 2003/04/26 08:33:01 seb Exp $
  
  install-exec-am: install-sbinSCRIPTS
  
-@@ -281,17 +304,18 @@ mostlyclean: mostlyclean-am
+@@ -348,17 +373,18 @@ ps: ps-am
  
- mostlyclean-am: mostlyclean-generic
+ ps-am:
  
 -uninstall-am: uninstall-info-am uninstall-pkgdataSCRIPTS \
 -	uninstall-sbinSCRIPTS
@@ -85,14 +94,14 @@ $NetBSD: patch-aj,v 1.1 2003/04/26 08:33:01 seb Exp $
 -	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 \
+-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+-	pdf-am ps ps-am 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 \
++	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
 +	uninstall-exampleSCRIPTS uninstall-info-am \
  	uninstall-pkgdataSCRIPTS uninstall-sbinSCRIPTS