- updated to 2.2.3

- new maintainer
- PKG_DESTDIR_SUPPORT
- ok by joerg
2.2.3
        Feedback release after 2.2.2 and LISA 07, minor tweaks and bug fixes

        "Harmless features"

        IgnoreInterfaceRegex( "vm.*" ) added to control
        function added for removing data from special interfaces from class data

        Option checkroot=true/false added to copy directive. This switches
        on/off the change in 2.2.2 about setting permissions on the
        destination root when recursively copying files. Default is now
        false.

        Can escape colons in the strings now to avoid confusion with
        expansion separator.

        cfenvgraph --erasehistory users,www_in etc will now set the
        average and variance of learned cfenvd data to zero. The current
        week's trace is not affected.

        audit=true/false flag added to most actions

2.2.2

        The build procedure for cfengine changes in this version to
        incorporate an intermediate library. The default behaviour is now
        to build a static library which will be used by cfengine 3 and
        other application interfaces. To build a shared library, use

        --enable-shared=yes

        NOTE to developers: if running from the compiled code you now need
        to delete the files cfagent cfservd etc and recompile to see changes
        appear in the code. This is due to the libtool build process.

        libtoolizing compilation process for migration to cfengine shared library
        (this is to support mulitple interfaces in future, and cf 3)

        --

        XML and HTML output options added to equip the internal instrumentation
        with readable output in cfshow e.g.

           cfshow --performance --html > output.html
           firefox output.html

        provides an easier summary and searchability in browser function

        Instrumentation changed to use realtime functions where possible. Standard
        unix timer is too insensitive to measure performance.

        The beginning of an integrated auditing system has been added. See references
        to AuditLog() in the code. This logs to a compressed database and can be extracted
        in ascii, html, xml using cfshow, e.g. cfshow  --audit --html > output.html
        Auditing is switched on by

        control:
         cfinputs_version = ( 1.2.1 ) # record this version in log, e.g. cvs revision
         Auditing = true

        --

        cfshow --classes

        also shows the relative frequencies of classes
        that have occurred on the system and the last time these were
        observed.

        cfshow -f cfagent.conf --regex "lin.*"

        displays all rules in the named file whose classes match the named
        regular expression. Note that the class "any" is not automatically matched
        and the search is based on the class text from the file. The output is not
        related to which classes are currently defined, and it will not recognise
        the history of classes implicit through class-restricted imported files.

        --

        SCLI interface modifications.

        --

        Intermittency entropy code added to the copy instrumentation for
        automatic host reliability measurements.

        Special variable

           IgnoreFriendRegex = ( regex )

        prevents last-seen warnings about hosts matching the named regex

        --

        UserExists("name") and GroupExists("name") functions added to builtin functions.

        ClassMatch function added in classes/groups to match regular expressions of other classes

        --

        Additional octet variables added on default IPv4 address, for convenience:

        e.g.
           590  : ipv4_2[eth1]=192.168
           1895 : ipv4[eth1]=192.168.1.101
           2100 : ipv4_1[eth1]=192
           4049 : ipv4_3[eth1]=192.168.1


        Methods can now expand some list variables, one list only per argument set.
        This is a limited compromise pending cfengine 3. A patch for expansion of
        variables in the control part of a program in methods has also been added.

        Bug fix and code simplication of variable expansion.

        -----

        tied variable expansion added. Allows method workaround for file dissemination
        by name, e.g. copy from

        host1.conf -> /dir/host1/file.conf
        host2.conf -> /dir/host2/file.conf  e.g. for virtual or diskless machines

        -----

        Major changes to package manager code by Jo Rhett. Variable expansion
        fixed by Mark.

        -----

        Option "best" added to checksum= in files action, this allows cross checking
        of the two best known hash algorithms for each file. Currently this is md5 and sha
        due to limitations in OpenSSL libcrypto.

        UnCommentToLineMatching regex added

2.2.1
        scli: type section added. This is a special case of shellcommands, which
        send commands to the special shell scli by Juergen Schoenwaelder for
        communicating with snmp devices.

        Code refactoring for package management.
        Bug fixes for problems introduced in 2.2.0.

        Copy directory would not set owner correctly on root

2.2.0
        Apart from minor changes, this version is about structural internal
        changes that ease the eventual confluence with cfengine 3 and the work
        going on behind the scenes there. Every effort is being made to
        make this change easy for users and existing installations. New features
        will be introduced into 2.2.x gradually, and the new front-end will
        eventually merge into this.

        This version accompanies a new introduction to cfengine published as
        a SAGE Short Topics book.

        * Some changes

        EMANICS extensions and reference testing for context sensitive
        network navigation patterns using voluntary cooperation contracts.

        PrintFile("name") function added to alerts

        !! List expansion in editfiles actions. This is an important change
        because it can potentially affect existing configurations that contain
        variables with a list separator in them. EditSplit is used for this.

        elsdefine fixed in tidy

        processes with action=warn only install fix

        ifelapsed/expireafter fixed in editfiles

        Instrumentation of copy/shellcommands measuring time/averages
        use cfshow --performance

        background=true in shellcommands was not implemented! (Fixed)

        SLES10 recognition
        RedHat/Fedora further classes

        SELinux support begun by Jeff Sheltren UCSB, who notes.
        > Currently, I have editfiles and copy working with selinux security
        > contexts, although so far copy only has support for regular files; I
        > haven't worked on links, etc. yet.
        > Use --enable-selinux during compilation

        Bug / misleading error message in ReadArray fixed

        HostRange bug for numericals in hostname fixed by Steve Radar.

5 files changed, 41 insertions, 16 deletions

diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index 99d69e09389..9009bc6825e 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2007/10/10 11:11:35 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2007/12/09 22:45:13 rhaen Exp $
 #
 
 .include "../../sysutils/cfengine2/Makefile.common"
 
 COMMENT=	Automate configuration and administration of large systems
-PKGREVISION=	1
 
 GNU_CONFIGURE=		YES
 PTHREAD_OPTS+=		require
@@ -13,14 +12,16 @@ BUILD_DEFS+=		IPV6_READY
 
 CONFIGURE_ARGS+=	--with-berkeleydb=${BUILDLINK_PREFIX.db4}
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
-USE_TOOLS+=		flex
+USE_TOOLS+=		flex perl:run
+REPLACE_PERL=		contrib/cfdoc
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 RCD_SCRIPTS=		cfexecd cfservd cfenvd
 
 post-install:
-	${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man8
-	${INSTALL_MAN} ${WRKSRC}/doc/*.8 ${PREFIX}/${PKGMANDIR}/man8
-	${INSTALL_DATA_DIR} /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/Makefile.common b/sysutils/cfengine2/Makefile.common
index d6b6bea0b3f..38ddf0e9d19 100644
--- a/sysutils/cfengine2/Makefile.common
+++ b/sysutils/cfengine2/Makefile.common
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile.common,v 1.10 2007/02/07 00:03:28 wiz Exp $
+# $NetBSD: Makefile.common,v 1.11 2007/12/09 22:45:14 rhaen Exp $
 #
 
-CFENGINE_VERSION= 2.1.22
+CFENGINE_VERSION= 2.2.3
 DISTNAME=	cfengine-${CFENGINE_VERSION}
 CATEGORIES=	sysutils net
-MASTER_SITES=	ftp://ftp.iu.hio.no/pub/cfengine/ \
-		http://sunsite.utk.edu/ftp/pub/cfengine/cfengine-ftp/
+MASTER_SITES=	http://www.cfengine.org/downloads/ \
+		http://ftp.osuosl.org/pub/cfengine/ \
+		ftp://sunsite.uio.no/pub/cfengine/
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	rhaen@NetBSD.org
 HOMEPAGE=	http://www.cfengine.org/
 
 DISTINFO_FILE=	${.CURDIR}/../../sysutils/cfengine2/distinfo
diff --git a/sysutils/cfengine2/PLIST b/sysutils/cfengine2/PLIST
index d5aae1ec331..f4c9205e1c1 100644
--- a/sysutils/cfengine2/PLIST
+++ b/sysutils/cfengine2/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.10 2007/02/07 00:03:28 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2007/12/09 22:45:14 rhaen Exp $
+lib/libcfengine.a
+lib/libcfengine.la
 man/man8/cfagent.8
 man/man8/cfengine.8
 man/man8/cfenvd.8
diff --git a/sysutils/cfengine2/distinfo b/sysutils/cfengine2/distinfo
index 6af65562577..8d5f32ca1e7 100644
--- a/sysutils/cfengine2/distinfo
+++ b/sysutils/cfengine2/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2007/02/07 00:03:28 wiz Exp $
+$NetBSD: distinfo,v 1.9 2007/12/09 22:45:14 rhaen Exp $
 
-SHA1 (cfengine-2.1.22.tar.gz) = 79501a4d430bc5a955b56519e0d00f62d8353229
-RMD160 (cfengine-2.1.22.tar.gz) = 9109a5156aa24e29137ff51ad1b5a0050b62eb2f
-Size (cfengine-2.1.22.tar.gz) = 3673965 bytes
+SHA1 (cfengine-2.2.3.tar.gz) = 584e451efb98bdd644568266a715507027f1e427
+RMD160 (cfengine-2.2.3.tar.gz) = e18e4b9f52f9e2dfc0cf21a9d627e6530f69abcd
+Size (cfengine-2.2.3.tar.gz) = 3932061 bytes
 SHA1 (patch-aa) = 97cb8cf6cdf200dcc7d6dab8010e7b0db5374f37
+SHA1 (patch-ab) = 1d4ad9a5889ae0c5c9bfaa7de625c0394401a7b2
diff --git a/sysutils/cfengine2/patches/patch-ab b/sysutils/cfengine2/patches/patch-ab
new file mode 100644
index 00000000000..6f89e1a3fd1
--- /dev/null
+++ b/sysutils/cfengine2/patches/patch-ab
@@ -0,0 +1,20 @@
+--- configure.orig	2007-12-01 13:42:22.000000000 +0100
++++ configure	2007-12-08 11:14:08.000000000 +0100
+@@ -25141,7 +25141,7 @@
+   return 0;
+ }
+ _ACEOF
+-for ac_lib in '' db-4 db4 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0; do
++for ac_lib in '' db4 db-4 db4 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0; do
+   if test -z "$ac_lib"; then
+     ac_res="none required"
+   else
+@@ -25273,7 +25273,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
+             if test -f "$BERKELEY_DB_DIR/lib/lib$v.so"; then
+                 BERKELEY_DB_LIB="-l$v"
+ 		break