Update cfengine to 2.1.9, addresses PR#26608.

9 files changed, 105 insertions, 158 deletions

diff --git a/sysutils/cfengine2/Makefile.common b/sysutils/cfengine2/Makefile.common
index fa0ae2ef4cd..88299f2a7f2 100644
--- a/sysutils/cfengine2/Makefile.common
+++ b/sysutils/cfengine2/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.6 2003/09/16 19:24:26 seb Exp $
+# $NetBSD: Makefile.common,v 1.7 2004/08/10 14:18:44 ben Exp $
 #
 
-CFENGINE_VERSION= 2.0.8p1
+CFENGINE_VERSION= 2.1.9
 DISTNAME=	cfengine-${CFENGINE_VERSION}
 CATEGORIES=	sysutils net
 MASTER_SITES=	ftp://ftp.iu.hio.no/pub/cfengine/ \
diff --git a/sysutils/cfengine2/distinfo b/sysutils/cfengine2/distinfo
index eb98702b2ac..4e6f0d87d7e 100644
--- a/sysutils/cfengine2/distinfo
+++ b/sysutils/cfengine2/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.4 2003/09/16 19:24:26 seb Exp $
+$NetBSD: distinfo,v 1.5 2004/08/10 14:18:44 ben Exp $
 
-SHA1 (cfengine-2.0.8p1.tar.gz) = 7ba589a6a7f5f231d66c6b1a41dc0757502801f3
-Size (cfengine-2.0.8p1.tar.gz) = 1240535 bytes
-SHA1 (patch-aa) = 93a957af8d124d5b6e584c1c3d3cdda73190d58c
-SHA1 (patch-ab) = caf7e63f25d0bba61d37a0060c586c84b2742fe4
+SHA1 (cfengine-2.1.9.tar.gz) = bbe3027df4b2e2f0128bdac61a99f8fabd678267
+Size (cfengine-2.1.9.tar.gz) = 3099090 bytes
 SHA1 (patch-ad) = 559b8378c1cad5e88e1eba55c7f62e2336153186
 SHA1 (patch-ae) = 99496b14f80c8605886cd78a520af4d1c6cc0475
-SHA1 (patch-af) = 470e6e6b89b70caaaecc036ebb5d6a4071d1c3ed
-SHA1 (patch-ag) = f64e2d1f9f3a5c0e0dc37a40c56f0188382e02ed
+SHA1 (patch-af) = e13dec2fb9010d1c1a86ed69f9b0e5fa55deea88
+SHA1 (patch-ag) = a98372a18f6720a0919990636699cf160f6d8d5a
 SHA1 (patch-ah) = d0a79d2c5ce636e401486ff9740bd126fd94f172
-SHA1 (patch-ai) = 074eaadc318bb11a9f7987199f60e3d0dd69c4b0
-SHA1 (patch-aj) = 4953a018297d59a21201703f5a019d623587d97f
+SHA1 (patch-ai) = 2f71c484bac8ad61e40769313e79e7598532a559
+SHA1 (patch-aj) = 8bf0d1e3af5b4fac229eb7eb62459e9c6afe4ead
+SHA1 (patch-ak) = de92fc7e9e0a44be121adba4f9388ccd77018621
diff --git a/sysutils/cfengine2/patches/patch-aa b/sysutils/cfengine2/patches/patch-aa
deleted file mode 100644
index b628e0e1f76..00000000000
--- a/sysutils/cfengine2/patches/patch-aa
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/12/22 13:04:38 seb Exp $
-
---- Makefile.am.orig	Wed Dec 18 08:39:09 2002
-+++ Makefile.am	Wed Dec 18 08:39:16 2002
-@@ -1,3 +1,3 @@
--SUBDIRS = pub src contrib inputs doc 
-+SUBDIRS = pub src contrib inputs 
- 
- EXTRA_DIST = acconfig.h DOCUMENTATION doc/cfengine.8 COPYING ChangeLog INSTALL NEWS README
diff --git a/sysutils/cfengine2/patches/patch-ab b/sysutils/cfengine2/patches/patch-ab
deleted file mode 100644
index 413d4e4b486..00000000000
--- a/sysutils/cfengine2/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/05/29 21:08:27 seb Exp $
-
---- 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 
- 
- 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 1c88d7d51c3..f613ef4e06c 100644
--- a/sysutils/cfengine2/patches/patch-af
+++ b/sysutils/cfengine2/patches/patch-af
@@ -1,24 +1,16 @@
-$NetBSD: patch-af,v 1.3 2003/05/29 21:08:27 seb Exp $
+$NetBSD: patch-af,v 1.4 2004/08/10 14:18:44 ben Exp $
 
---- configure.orig	2003-05-28 16:53:58.000000000 +0000
-+++ configure
-@@ -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
-+	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:$LINENO: result: $d" >&5
-+echo "${ECHO_T}$d" >&6
+--- 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
-+    fi
-+    if test x"$BERKELEY_DB_LIB" = "x"; then
-         { { echo "$as_me:$LINENO: error: Cannot find BerkeleyDB" >&5
- echo "$as_me: error: Cannot find BerkeleyDB" >&2;}
-    { (exit 1); exit 1; }; }
+             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
index d329b296ba6..2ff5fa0172d 100644
--- a/sysutils/cfengine2/patches/patch-ag
+++ b/sysutils/cfengine2/patches/patch-ag
@@ -1,11 +1,11 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/12/22 13:04:38 seb Exp $
+$NetBSD: patch-ag,v 1.2 2004/08/10 14:18:44 ben Exp $
 
---- src/cfservd.c.orig	Thu Dec 19 13:24:23 2002
-+++ src/cfservd.c	Thu Dec 19 13:24:50 2002
-@@ -722,5 +722,5 @@
+--- 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)
-+      if (VSYSTEMHARDCLASS == openbsd || VSYSTEMHARDCLASS == netbsd)
- 	 {
- 	 continue;  /* openbsd doesn't map ipv6 addresses */
+-      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
index 39538feff43..7238240f5c3 100644
--- a/sysutils/cfengine2/patches/patch-ai
+++ b/sysutils/cfengine2/patches/patch-ai
@@ -1,23 +1,16 @@
-$NetBSD: patch-ai,v 1.2 2003/04/26 08:33:01 seb Exp $
+$NetBSD: patch-ai,v 1.3 2004/08/10 14:18:44 ben Exp $
 
---- 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)
+--- 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
-+    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.])
+             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-aj b/sysutils/cfengine2/patches/patch-aj
index 11ffb950e94..1742802d0be 100644
--- a/sysutils/cfengine2/patches/patch-aj
+++ b/sysutils/cfengine2/patches/patch-aj
@@ -1,43 +1,33 @@
-$NetBSD: patch-aj,v 1.2 2003/05/29 21:08:27 seb Exp $
+$NetBSD: patch-aj,v 1.3 2004/08/10 14:18:44 ben Exp $
 
---- contrib/Makefile.in.orig	2003-05-28 16:55:26.000000000 +0000
-+++ contrib/Makefile.in
-@@ -145,9 +145,12 @@ target_vendor = @target_vendor@
- 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)
- 
- #
-@@ -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
+--- contrib/Makefile.in.orig	2004-08-09 13:27:41.000000000 -0400
++++ contrib/Makefile.in	2004-08-09 20:44:12.000000000 -0400
+@@ -50,5 +50,7 @@
+ pkgdataSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 -SCRIPTS = $(pkgdata_SCRIPTS) $(sbin_SCRIPTS)
 +SCRIPTS = $(example_SCRIPTS) $(pkgdata_SCRIPTS) $(sbin_SCRIPTS)
- 
 +depcomp =
 +am__depfiles_maybe =
+ SOURCES =
  DIST_SOURCES =
- DIST_COMMON = README Makefile.am Makefile.in vicf.in
- all: all-am
-@@ -187,11 +192,31 @@ all: all-am
- .SUFFIXES:
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+@@ -168,4 +170,6 @@
+ sbin_SCRIPTS = vicf $(s1)
+ pkgdata_SCRIPTS = $(s2)
++exampledir = $(prefix)/share/examples/cfengine
++example_SCRIPTS = vicf
+ EXTRA_DIST = README README.vicf $(s1) $(s2)
+ 
+@@ -205,5 +209,5 @@
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  contrib/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  contrib/Makefile'; \
  	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)/$@
+ 	  $(AUTOMAKE) --gnu  contrib/Makefile
+@@ -218,4 +222,26 @@
+ 	esac;
+ 
 +exampleSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 +install-exampleSCRIPTS: $(example_SCRIPTS)
 +	@$(NORMAL_INSTALL)
@@ -58,29 +48,18 @@ $NetBSD: patch-aj,v 1.2 2003/05/29 21:08:27 seb Exp $
 +	  echo " rm -f $(DESTDIR)$(exampledir)/$$f"; \
 +	  rm -f $(DESTDIR)$(exampledir)/$$f; \
 +	done
- pkgdataSCRIPT_INSTALL = $(INSTALL_SCRIPT)
- install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS)
- 	@$(NORMAL_INSTALL)
-@@ -276,7 +301,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
-@@ -322,7 +347,7 @@ info: info-am
- 
++
++
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+@@ -353,5 +379,5 @@
  info-am:
  
 -install-data-am: install-pkgdataSCRIPTS
 +install-data-am: install-exampleSCRIPTS install-pkgdataSCRIPTS
  
  install-exec-am: install-sbinSCRIPTS
- 
-@@ -348,17 +373,18 @@ ps: ps-am
- 
+@@ -379,15 +405,16 @@
  ps-am:
  
 -uninstall-am: uninstall-info-am uninstall-pkgdataSCRIPTS \
@@ -89,20 +68,19 @@ $NetBSD: patch-aj,v 1.2 2003/05/29 21:08:27 seb Exp $
 +	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 \
+ 	distclean-generic distdir dvi dvi-am html html-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 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 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 pdf pdf-am ps ps-am 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.
diff --git a/sysutils/cfengine2/patches/patch-ak b/sysutils/cfengine2/patches/patch-ak
new file mode 100644
index 00000000000..21d6621b6fc
--- /dev/null
+++ b/sysutils/cfengine2/patches/patch-ak
@@ -0,0 +1,25 @@
+$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)
+        {