Updated to version 2.2.10

        Protocol fix, potential integer error in server decoding.

4 files changed, 35 insertions, 30 deletions

diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index 4b2fdd62976..ae83ceff4c3 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2010/04/17 16:22:28 zafer Exp $
+# $NetBSD: Makefile,v 1.31 2010/05/09 22:09:30 pettai Exp $
 #
 
-DISTNAME=		cfengine-2.2.8
-PKGREVISION=	3
+DISTNAME=		cfengine-2.2.10
 CATEGORIES=		sysutils net
 MASTER_SITES=		http://www.cfengine.org/tarballs/ \
 			http://ftp.osuosl.org/pub/cfengine/ \
@@ -10,24 +9,28 @@ MASTER_SITES=		http://www.cfengine.org/tarballs/ \
 MAINTAINER=		rhaen@NetBSD.org
 HOMEPAGE=		http://www.cfengine.org/
 COMMENT=		Automate configuration and administration of large systems
+LICENSE=		gnu-gpl-v2
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=		YES
-PTHREAD_OPTS+=		require
 BUILD_DEFS+=		IPV6_READY
 
-CONFIGURE_ARGS+=	--with-berkeleydb=${BUILDLINK_PREFIX.db4}
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
 USE_TOOLS+=		flex perl:run
 USE_LIBTOOL=		yes
+
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--with-berkeleydb=${BUILDLINK_PREFIX.db4}
+CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
+
+PTHREAD_OPTS+=		require
 REPLACE_PERL=		contrib/cfdoc
-PKG_DESTDIR_SUPPORT=	user-destdir
 
 RCD_SCRIPTS=		cfexecd cfservd cfenvd
 
 post-install:
-	${INSTALL_MAN_DIR} ${DESTDIR}/${PREFIX}/${PKGMANDIR}/man8
-	${INSTALL_MAN} ${WRKSRC}/doc/*.8 ${DESTDIR}/${PREFIX}/${PKGMANDIR}/man8
-	${INSTALL_DATA_DIR} ${DESTDIR}/var/cfengine/inputs
+	${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_MAN} ${WRKSRC}/doc/*.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_DATA_DIR} ${DESTDIR}var/cfengine/inputs
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../databases/db4/buildlink3.mk"
diff --git a/sysutils/cfengine2/distinfo b/sysutils/cfengine2/distinfo
index 583cf85eff9..c2db961379b 100644
--- a/sysutils/cfengine2/distinfo
+++ b/sysutils/cfengine2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2010/01/02 10:55:05 sekiya Exp $
+$NetBSD: distinfo,v 1.13 2010/05/09 22:09:30 pettai Exp $
 
-SHA1 (cfengine-2.2.8.tar.gz) = 670b5fc15a4dd5c80b301adf1e1bf7979161a049
-RMD160 (cfengine-2.2.8.tar.gz) = a35ac5d87a345f38a779719314d3978ee9e3045c
-Size (cfengine-2.2.8.tar.gz) = 2715678 bytes
+SHA1 (cfengine-2.2.10.tar.gz) = 032bec0bc59ffee7179422e96dfd902afbf94340
+RMD160 (cfengine-2.2.10.tar.gz) = 67fd3dc80270dc000887e3dbf26f372338e2600f
+Size (cfengine-2.2.10.tar.gz) = 2690333 bytes
 SHA1 (patch-aa) = cdbebcf1a8d284bbaa9e8e0deb60112c5e33287c
-SHA1 (patch-ab) = 5c90d568392cba0b1049b607f861a4cf65e82740
-SHA1 (patch-ac) = 0962334c9251cf16bc4faa42d2b16c2b60a5c549
+SHA1 (patch-ab) = bd2946d1cd5b21e3cf664258360c38c9651542a9
+SHA1 (patch-ac) = ca643a6dd76307053923c93b321533b684d22474
diff --git a/sysutils/cfengine2/patches/patch-ab b/sysutils/cfengine2/patches/patch-ab
index 700cd499913..d32d9e0a147 100644
--- a/sysutils/cfengine2/patches/patch-ab
+++ b/sysutils/cfengine2/patches/patch-ab
@@ -1,22 +1,22 @@
-$NetBSD: patch-ab,v 1.6 2008/09/07 10:14:31 rhaen Exp $
+$NetBSD: patch-ab,v 1.7 2010/05/09 22:09:30 pettai Exp $
 
---- configure.orig	2008-08-26 10:26:51.000000000 +0200
-+++ configure	2008-08-26 10:27:42.000000000 +0200
-@@ -24254,7 +24254,7 @@
+--- configure.orig	2010-03-22 15:25:59.000000000 +0100
++++ configure	2010-03-22 15:27:57.000000000 +0100
+@@ -16104,7 +16104,7 @@
      elif test -d "$BERKELEY_DB_DIR"; then
  
          BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include"
--        for v in . db46 db45 db44 db43 db42 db41 db40 db4 db33 db32 db3 db; do
-+        for v in . db46 db45 db44 db43 db42 db41 db40 db4 db33 db32 db3 db db4; do
+-        for v in . db47 db46 db45 db44 db43 db42 db41 db40 db4 db33 db32 db3 db; do
++        for v in . db47 db46 db45 db44 db43 db42 db41 db40 db4 db33 db32 db3 db db4; do
              if test -f "$BERKELEY_DB_DIR/include/$v/db.h"; then
                  BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include/$v"
  		break
-@@ -24262,7 +24262,7 @@
+@@ -16112,7 +16112,7 @@
          done
  
          BERKELEY_DB_LIB="-ldb"
--        for v in db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44; do
-+        for v in db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db4; do
+-        for v in db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44; do
++        for v in db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db4; do
              if test -f "$BERKELEY_DB_DIR/lib/lib$v.so"; then
                  BERKELEY_DB_LIB="-l$v"
  		break
diff --git a/sysutils/cfengine2/patches/patch-ac b/sysutils/cfengine2/patches/patch-ac
index f80ee585669..438dec1892f 100644
--- a/sysutils/cfengine2/patches/patch-ac
+++ b/sysutils/cfengine2/patches/patch-ac
@@ -1,7 +1,9 @@
---- src/nameinfo.c.orig	2010-01-01 17:23:25.000000000 +0900
-+++ src/nameinfo.c	2010-01-01 17:23:48.000000000 +0900
-@@ -37,7 +37,7 @@
- #include <sys/syssgi.h>
+$NetBSD: patch-ac,v 1.2 2010/05/09 22:09:30 pettai Exp $
+
+--- src/nameinfo.c.orig	2010-03-22 15:32:43.000000000 +0100
++++ src/nameinfo.c	2010-03-22 15:31:57.000000000 +0100
+@@ -40,7 +40,7 @@
+ #include <sys/systemcfg.h>
  #endif
  
 -#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN