3.1.4 (Bugfix and Stability release)

        Some urgent patches to 3.1.3.
        Class validation parse bug fixed.
        Global zone handling error for solaris fixed.
        Package architectures handled correctly (bug #456).
        Reading and writing of key name "root-.pub" eliminated (bug #442, #453).
        cf-serverd crash because of race condition on SERVER_KEYSEEN fixed.
        Lock purging to avoid remnant complexity explosion (bug #430).
        Some copyright notices added that got lost.

3.1.3   (Stability release)
        Major memory leaks in cf-monitord, cf-execd, cf-serverd fixed (bug #427).
        The daemons now show no growth even with very complex policies.
        cf-serverd crash due to race condition in DeleteScope() fixed (bug #406).
        Added 30 second timeout on recv() on Linux.
        package_noverify_returncode implemented (bug #256).
        A flexible mechanism for setting classes based on return codes of
        commands has been introduced. Allows for setting promise kept,
        repaired or failed based on any return codes. This is currently
        implemented for commands-promises, package-manager commands and
        transformer in files. In classes body, see attributes
        kept_returncodes, repaired_returncodes, failed_returncodes (bug
        #248, #329).
        New function ip2host - reverse DNS lookup (bug #146).

3.1.2   (Scalability/efficiency release)
        Big efficiency improvements by caching output from
        cf-promises. Can also be used for much more efficent policy
        deployment (only pull if changed).
        Caching state of ps command for greater efficiency. Reloaded for each bundle.
        Index class lookup improves efficiency of class evaluation for huge configurations.
        Fixed issue where certain promiser strings got corrupted.
        Minor memory access issues fixed.
        Iterator bug introduced in 3.1.0 fixed

3.1.1   (Bugfix release)
        Memory leaks in server tracked down and fixed.
        List expansion bug (one list items not executed) fixed.
        Security issue introduced by change of runcommand shell policy fixed.
        If users defined a runcommand for cf-runagent/cf-serverd communication,
	possible to execute commands.
        cf-key -s command for showing key hash/IP address identity pairs

3.1.0
        Change in storage of public keys. Cfengine now hashes the public key and uses this
        as the keyname. Keys will be converted automatically.
        The old dynamic addresses lists are deprecated.
        Caching of dns and key information for greater server speed.
        Change in last-seen format reflects the public key usage.
        New package policy addupdate - installs package if not there and
        updates it otherwise.
        Support for package_changes => "bulk" in file repository as well.
        New special function readstringarrayidx, similar to readstringarray,
        but uses integer indeces. Very useful if first row elements are
        not good identifiers (e.g. contains spaces, non-unique, etc.).
        Change two log formats to use time() instead of date()
        - filechanges
        - total compliance
        Change from using md5 to sha256 as default digest for commercial version,
        community retains md5 for compat.
        Commands not returning 0 in commands-promises are flagged
        as repair_failed.
        Adjustable timeout on connect(). Defaults to 10 seconds, adjustable
        with default_timeout in agent control.
        Redesign of the knowledge map infrastructure.
        Now possible to use variables to call methods, e.g
        methods:
          "name $(list)" usebundle => $(list)("abc");
        See reference manual notes
        Changes to normal ordering to optimize execution.
        Increased stability by always initializing Attribute and Promise
        structures.
        When running cf-promises in dry-run mode (-n), the user does not need
        to put binaries in WORKDIR/bin. For example, non-privileged users can verify root
        policies.
        Source control revision added in version string if run in verbose mode
        (e.g. "cf-promises -vV"). This needs some refining, uses revision of a header now.
        New semantics in return values of list functions. Null values are now allowed
        and there is no iteration over empty lists. The value "cf_null" is reserved for
        use as a null iterator.

3.0.5p1
        Showing paths allowed/denied access to when cf-serverd is run in verbose mode.
        Bug in server fixed for dynamic addresses.
        File handle closure bugfix - too many open databases.
        Seg fault in mount files fix.
        Twin used in cf-execd without checking.
        Check_root set wrong directory permissions at source not destination.
        Error message degraded in body definition.
        Undefined body not warned as error.
        Various build enahncements.
        Package_list_update called only once per manager, and fixed crash.
        Version number bug in packages.

3.0.5
        Encryption problems fixed - client key buffer was uninitialized.
        Classes-promisers are now automatically canonified when class
        strings are defined, to simplifying the use of variables in classes.
        New scalars sys.cf_version and sys.nova_version that hold Cfengine version information.
        Attribute package_delete_convention added, to allow customizable
        package name in delete command during update.
        package_list_update_ifelapsed limit added.
        Private variable $(firstrepo) is available in package_name_convention
        and package_delete_convention in order to expand the full path to
        a package, which is required by some managers.
        Some of the threading code is rewritten and made more robust. This includes
        synchronizing access to the lastseen database from the server.
        Bad initialization of BSD flags fixed
        Multiple variable expansion issues in control fixed for server and agent
        Allow ignore_missing_bundles to affect methods: bundles too
        Run agent trust dialogue fixed
        Bug in CPU monitoring, increasing time scale caused linear decay
        of CPU measurement.
        Bug in Setuid log storage, fix.
        Hooks added for new Nova virtualization promises.
        Multithreading mutex failed to collide during cfservd leading to dropped authentication under heavy load.

3.0.4
        Class cancellation in promises to create better class feedback,
        allows emulation of switch/case semantics etc
        Value of SA measurement promises
        Special function getenv() which returns the contents of an
        environment variable (on all platforms).
        New function translatepath for generic Windows
        New function escape() to escape literals as regular expressions (like SQL)
        New function host2ip for caching IP address lookup
        New function regextract for setting variables with backreferences
        New variables for the components $(sys.cf_agent), $(sys.cf_know) etc
        pointing to the binaries.
        More robust integrated database implementation; closing all
        handles when receiving signals, self-healing on corruption.
        Package installation on localhost without a manager like yum completed,
        multiple repositories searched, and universal methods.
        Numerous bugfixes

3.0.3
        sha256 .. new hashes in openssl included in syntax tree.
        End of line autocropping in readfile (hopefully intelligent)
        hashmatch function incorrectly implemented -
         old debugging code left behind. Fix.
        sys.crontab variable
        Unknown user is now interpretated as "same user",
        so that we give cfengine a chance to fix
        Unregistered addresses no longer report "(Non registered IP)",
        but return as the address itself when doing reverse lookups.

(Sorry for the long commit message)

6 files changed, 110 insertions, 16 deletions

diff --git a/sysutils/cfengine3/Makefile b/sysutils/cfengine3/Makefile
index 8d6022a9549..2b355d5fe34 100644
--- a/sysutils/cfengine3/Makefile
+++ b/sysutils/cfengine3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2010/11/08 07:36:39 pettai Exp $
+# $NetBSD: Makefile,v 1.3 2011/02/06 18:44:23 pettai Exp $
 #
 
-DISTNAME=	cfengine-3.0.2
+DISTNAME=	cfengine-3.1.4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.cfengine.org/tarballs/
 
@@ -27,13 +27,13 @@ BUILDLINK_TRANSFORM+=l:db:db4
 EGDIR=			${PREFIX}/share/examples/cfengine
 SYSCONFDIR=		${PKG_SYSCONFDIR}/cfengine
 
+CONF_FILES+=		${EGDIR}/inputs/cfengine_stdlib.cf ${SYSCONFDIR}/cfengine_stdlib.cf
 CONF_FILES+=		${EGDIR}/inputs/failsafe.cf ${SYSCONFDIR}/failsafe.cf
-CONF_FILES+=		${EGDIR}/inputs/library.cf ${SYSCONFDIR}/library.cf
 CONF_FILES+=		${EGDIR}/inputs/promises.cf ${SYSCONFDIR}/promises.cf
 CONF_FILES+=		${EGDIR}/inputs/site.cf ${SYSCONFDIR}/site.cf
 CONF_FILES+=		${EGDIR}/inputs/update.cf ${SYSCONFDIR}/update.cf
 
-RCD_SCRIPTS=		cfserverd cfagent
+RCD_SCRIPTS=		cfserverd cfexecd cfmonitord
 
 INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS} sysconfdir=${SYSCONFDIR:Q} inputsdir=${EGDIR:Q}/inputs
 
diff --git a/sysutils/cfengine3/PLIST b/sysutils/cfengine3/PLIST
index 2881319ed0c..3b325ad909b 100644
--- a/sysutils/cfengine3/PLIST
+++ b/sysutils/cfengine3/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2010/11/08 07:36:39 pettai Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/02/06 18:44:23 pettai Exp $
 lib/libpromises.la
 man/man8/cf-agent.8
 man/man8/cf-execd.8
+man/man8/cf-hub.8
 man/man8/cf-key.8
 man/man8/cf-know.8
 man/man8/cf-monitord.8
@@ -11,6 +12,7 @@ man/man8/cf-runagent.8
 man/man8/cf-serverd.8
 sbin/cf-agent
 sbin/cf-execd
+sbin/cf-hub
 sbin/cf-key
 sbin/cf-know
 sbin/cf-monitord
@@ -22,12 +24,18 @@ share/doc/cfengine/ChangeLog
 share/doc/cfengine/INSTALL
 share/doc/cfengine/NEWS
 share/doc/cfengine/README
+share/doc/cfengine/active_directory.cf
+share/doc/cfengine/app_baseline.cf
+share/doc/cfengine/cfengine_stdlib.cf
 share/doc/cfengine/promise_knowledge.cf
-share/doc/cfengine/unit-env.cf
+share/doc/cfengine/unit_abort.cf
 share/doc/cfengine/unit_accessed_before.cf
 share/doc/cfengine/unit_accumulated_time.cf
 share/doc/cfengine/unit_acl.cf
 share/doc/cfengine/unit_acl_generic.cf
+share/doc/cfengine/unit_acl_secret.cf
+share/doc/cfengine/unit_activedirectory_listusers.cf
+share/doc/cfengine/unit_activedirectory_showuser.cf
 share/doc/cfengine/unit_ago.cf
 share/doc/cfengine/unit_arrays.cf
 share/doc/cfengine/unit_backreferences_files.cf
@@ -45,30 +53,41 @@ share/doc/cfengine/unit_compare.cf
 share/doc/cfengine/unit_control_expand.cf
 share/doc/cfengine/unit_controlclasses.cf
 share/doc/cfengine/unit_copy.cf
+share/doc/cfengine/unit_copy_classes.cf
 share/doc/cfengine/unit_copy_edit.cf
 share/doc/cfengine/unit_copylinks.cf
+share/doc/cfengine/unit_countclassesmatching.cf
+share/doc/cfengine/unit_countlinesmatching.cf
 share/doc/cfengine/unit_create_filedir.cf
 share/doc/cfengine/unit_createdb.cf
 share/doc/cfengine/unit_customize_by_named_list.cf
 share/doc/cfengine/unit_definitions.cf
 share/doc/cfengine/unit_deletelines.cf
 share/doc/cfengine/unit_disable_and_rotate_files.cf
+share/doc/cfengine/unit_diskfree.cf
 share/doc/cfengine/unit_dollar.cf
 share/doc/cfengine/unit_edit_column_files.cf
 share/doc/cfengine/unit_edit_comment_lines.cf
 share/doc/cfengine/unit_edit_deletenotmatch.cf
+share/doc/cfengine/unit_edit_insert_fuzzylines.cf
 share/doc/cfengine/unit_edit_insert_lines.cf
 share/doc/cfengine/unit_edit_insert_lines_silly.cf
+share/doc/cfengine/unit_edit_passwd_file.cf
 share/doc/cfengine/unit_edit_replace_string.cf
 share/doc/cfengine/unit_edit_sectioned_file.cf
 share/doc/cfengine/unit_edit_setvar.cf
 share/doc/cfengine/unit_edit_triggerclass.cf
+share/doc/cfengine/unit_env.cf
+share/doc/cfengine/unit_environment.cf
+share/doc/cfengine/unit_environment_simple.cf
 share/doc/cfengine/unit_epimenides.cf
+share/doc/cfengine/unit_escape.cf
 share/doc/cfengine/unit_exec_args.cf
 share/doc/cfengine/unit_exec_in_sequence.cf
 share/doc/cfengine/unit_execd.cf
 share/doc/cfengine/unit_execresult.cf
 share/doc/cfengine/unit_expand.cf
+share/doc/cfengine/unit_failedcommand.cf
 share/doc/cfengine/unit_failsafe.cf
 share/doc/cfengine/unit_file_change_detection.cf
 share/doc/cfengine/unit_file_owner_list_template.cf
@@ -77,19 +96,30 @@ share/doc/cfengine/unit_filenames.cf
 share/doc/cfengine/unit_fileperms.cf
 share/doc/cfengine/unit_filesexist.cf
 share/doc/cfengine/unit_filesexist2.cf
+share/doc/cfengine/unit_filesize.cf
 share/doc/cfengine/unit_fix_names.cf
+share/doc/cfengine/unit_getenv.cf
+share/doc/cfengine/unit_getfields.cf
 share/doc/cfengine/unit_getgid.cf
 share/doc/cfengine/unit_getindices.cf
+share/doc/cfengine/unit_getindixes.cf
 share/doc/cfengine/unit_getregistry.cf
 share/doc/cfengine/unit_getuid.cf
+share/doc/cfengine/unit_getusers.cf
 share/doc/cfengine/unit_global_list_expansion.cf
 share/doc/cfengine/unit_global_list_expansion_2.cf
+share/doc/cfengine/unit_grep.cf
 share/doc/cfengine/unit_groupexists.cf
 share/doc/cfengine/unit_hash.cf
 share/doc/cfengine/unit_hashcomment.cf
 share/doc/cfengine/unit_hashmatch.cf
+share/doc/cfengine/unit_hashuncomment.cf
 share/doc/cfengine/unit_helloworld.cf
+share/doc/cfengine/unit_host2ip.cf
 share/doc/cfengine/unit_hostrange.cf
+share/doc/cfengine/unit_hostsseen.cf
+share/doc/cfengine/unit_hub.cf
+share/doc/cfengine/unit_id.cf
 share/doc/cfengine/unit_insert_users.cf
 share/doc/cfengine/unit_intarray.cf
 share/doc/cfengine/unit_iprange.cf
@@ -100,6 +130,7 @@ share/doc/cfengine/unit_isnewerthan.cf
 share/doc/cfengine/unit_isplain.cf
 share/doc/cfengine/unit_isvariable.cf
 share/doc/cfengine/unit_iteration.cf
+share/doc/cfengine/unit_join.cf
 share/doc/cfengine/unit_knowledge_driver.cf
 share/doc/cfengine/unit_knowledge_txt.cf
 share/doc/cfengine/unit_lastnode.cf
@@ -109,20 +140,27 @@ share/doc/cfengine/unit_literal_server.cf
 share/doc/cfengine/unit_locate_files_and_compress.cf
 share/doc/cfengine/unit_log_private.cf
 share/doc/cfengine/unit_loops.cf
+share/doc/cfengine/unit_measure_log.cf
 share/doc/cfengine/unit_measurements.cf
+share/doc/cfengine/unit_menu.cf
 share/doc/cfengine/unit_method.cf
 share/doc/cfengine/unit_method_validate.cf
 share/doc/cfengine/unit_module_exec.cf
 share/doc/cfengine/unit_module_exec_2.cf
 share/doc/cfengine/unit_monitord.cf
 share/doc/cfengine/unit_mount_fs.cf
+share/doc/cfengine/unit_multipassvars.cf
 share/doc/cfengine/unit_neighbourhood_watch.cf
 share/doc/cfengine/unit_null_config.cf
 share/doc/cfengine/unit_occurrences.cf
 share/doc/cfengine/unit_ordering.cf
 share/doc/cfengine/unit_package_apt.cf
+share/doc/cfengine/unit_package_freebsd.cf
 share/doc/cfengine/unit_package_hash.cf
+share/doc/cfengine/unit_package_msi_file.cf
+share/doc/cfengine/unit_package_msi_version.cf
 share/doc/cfengine/unit_package_rpm.cf
+share/doc/cfengine/unit_package_solaris.cf
 share/doc/cfengine/unit_package_yum.cf
 share/doc/cfengine/unit_package_zypper.cf
 share/doc/cfengine/unit_parallel_exec.cf
@@ -133,16 +171,26 @@ share/doc/cfengine/unit_postfix.cf
 share/doc/cfengine/unit_process_kill.cf
 share/doc/cfengine/unit_process_matching.cf
 share/doc/cfengine/unit_process_matching2.cf
+share/doc/cfengine/unit_process_matching3.cf
 share/doc/cfengine/unit_process_signalling.cf
+share/doc/cfengine/unit_product.cf
 share/doc/cfengine/unit_promises.cf
 share/doc/cfengine/unit_readlist.cf
 share/doc/cfengine/unit_readtcp.cf
+share/doc/cfengine/unit_reg_multiline.cf
 share/doc/cfengine/unit_regarray.cf
+share/doc/cfengine/unit_regex_win.cf
+share/doc/cfengine/unit_regextract.cf
 share/doc/cfengine/unit_registry.cf
+share/doc/cfengine/unit_registry_cache.cf
 share/doc/cfengine/unit_regline.cf
 share/doc/cfengine/unit_reglist.cf
+share/doc/cfengine/unit_remoteclasses.cf
 share/doc/cfengine/unit_remove_deadlinks.cf
 share/doc/cfengine/unit_rename.cf
+share/doc/cfengine/unit_repairedcommand.cf
+share/doc/cfengine/unit_report_custom.cf
+share/doc/cfengine/unit_report_diffs.cf
 share/doc/cfengine/unit_report_state.cf
 share/doc/cfengine/unit_reporting.cf
 share/doc/cfengine/unit_reporttofile.cf
@@ -157,28 +205,45 @@ share/doc/cfengine/unit_server_copy_localhost.cf
 share/doc/cfengine/unit_server_copy_purge.cf
 share/doc/cfengine/unit_server_copy_remote.cf
 share/doc/cfengine/unit_server_flatcopy_localhost.cf
+share/doc/cfengine/unit_service_disable.cf
+share/doc/cfengine/unit_service_start.cf
 share/doc/cfengine/unit_setuidlog.cf
+share/doc/cfengine/unit_setvar.cf
+share/doc/cfengine/unit_software_dist.cf
 share/doc/cfengine/unit_splitstring.cf
 share/doc/cfengine/unit_sql.cf
 share/doc/cfengine/unit_storage.cf
 share/doc/cfengine/unit_strcmp.cf
 share/doc/cfengine/unit_stringarray.cf
+share/doc/cfengine/unit_switchcase.cf
 share/doc/cfengine/unit_syslog.cf
+share/doc/cfengine/unit_syslog2.cf
 share/doc/cfengine/unit_template.cf
+share/doc/cfengine/unit_template2.cf
+share/doc/cfengine/unit_test_environment.cf
 share/doc/cfengine/unit_tidy_all_files.cf
+share/doc/cfengine/unit_translatepath.cf
 share/doc/cfengine/unit_update.cf
 share/doc/cfengine/unit_user_edit.cf
 share/doc/cfengine/unit_user_edit_method.cf
 share/doc/cfengine/unit_userexists.cf
 share/doc/cfengine/unit_varclass.cf
+share/doc/cfengine/unit_varexpansion.cf
+share/doc/cfengine/unit_varnet.cf
 share/doc/cfengine/unit_vars.cf
 share/doc/cfengine/unit_warnifline.cf
 share/doc/cfengine/unit_webserver.cf
+share/doc/cfengine/unit_zenoss.cf
+share/doc/cfengine/win_emergency.cf
+share/doc/cfengine/win_registry.cf
+share/doc/cfengine/win_schedule.cf
+share/doc/cfengine/win_services.cf
+share/examples/cfengine/inputs/cfengine_stdlib.cf
 share/examples/cfengine/inputs/failsafe.cf
-share/examples/cfengine/inputs/library.cf
 share/examples/cfengine/inputs/promises.cf
 share/examples/cfengine/inputs/site.cf
 share/examples/cfengine/inputs/update.cf
-share/examples/rc.d/cfagent
+share/examples/rc.d/cfexecd
+share/examples/rc.d/cfmonitord
 share/examples/rc.d/cfserverd
 @pkgdir etc/cfengine
diff --git a/sysutils/cfengine3/distinfo b/sysutils/cfengine3/distinfo
index b2447c2a8c8..507fb4e2395 100644
--- a/sysutils/cfengine3/distinfo
+++ b/sysutils/cfengine3/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2010/11/08 07:36:39 pettai Exp $
+$NetBSD: distinfo,v 1.3 2011/02/06 18:44:23 pettai Exp $
 
-SHA1 (cfengine-3.0.2.tar.gz) = 705bf0fa8032b495d67592b28f3c11784e619020
-RMD160 (cfengine-3.0.2.tar.gz) = 8de5dcd4d96ad76d159b412252528d08a6c9590b
-Size (cfengine-3.0.2.tar.gz) = 2078775 bytes
+SHA1 (cfengine-3.1.4.tar.gz) = 8879f375e0c0208620660d0d49f52bb814934fd9
+RMD160 (cfengine-3.1.4.tar.gz) = 75be7bed44718dd4f45ddccd235a46563391eecf
+Size (cfengine-3.1.4.tar.gz) = 1599876 bytes
+SHA1 (patch-aa) = 9482191b0f69f5b32037c635ac13cee412454e8c
diff --git a/sysutils/cfengine3/files/cfagent.sh b/sysutils/cfengine3/files/cfexecd.sh
index ae3f4389335..60fa0c078e5 100644
--- a/sysutils/cfengine3/files/cfagent.sh
+++ b/sysutils/cfengine3/files/cfexecd.sh
@@ -1,14 +1,14 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: cfagent.sh,v 1.1.1.1 2010/11/05 13:57:21 pettai Exp $
+# $NetBSD: cfexecd.sh,v 1.1 2011/02/06 18:44:23 pettai Exp $
 
-# PROVIDE: cfagent
+# PROVIDE: cfexecd
 
 . /etc/rc.subr
 
-name="cfagent"
+name="cfexecd"
 rcvar=$name
-command="@PREFIX@/sbin/cf-agent"
+command="@PREFIX@/sbin/cf-execd"
 required_files="/var/cfengine/inputs/promises.cf"
 
 load_rc_config $name
diff --git a/sysutils/cfengine3/files/cfmonitord.sh b/sysutils/cfengine3/files/cfmonitord.sh
new file mode 100644
index 00000000000..3f3cce3505d
--- /dev/null
+++ b/sysutils/cfengine3/files/cfmonitord.sh
@@ -0,0 +1,15 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: cfmonitord.sh,v 1.1 2011/02/06 18:44:23 pettai Exp $
+
+# PROVIDE: cfmonitord
+
+. /etc/rc.subr
+
+name="cfmonitord"
+rcvar=$name
+command="@PREFIX@/sbin/cf-monitord"
+required_files="/var/cfengine/inputs/promises.cf"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/sysutils/cfengine3/patches/patch-aa b/sysutils/cfengine3/patches/patch-aa
new file mode 100644
index 00000000000..7bae2da868f
--- /dev/null
+++ b/sysutils/cfengine3/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2011/02/06 18:44:24 pettai Exp $
+
+--- configure.orig	2011-02-04 11:08:13.000000000 +0100
++++ configure	2011-02-04 11:08:32.000000000 +0100
+@@ -12708,7 +12708,7 @@
+   withval=$with_constellation;
+ fi
+ 
+-if test "x$with_constellation" == "xyes"; then :
++if test "x$with_constellation" = "xyes"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lcfconstellation" >&5
+ $as_echo_n "checking for main in -lcfconstellation... " >&6; }
+ if test "${ac_cv_lib_cfconstellation_main+set}" = set; then :