The newer committed version had a client locking problem.

Backing to version that works better.

3 files changed, 8 insertions, 52 deletions

diff --git a/sysutils/cfengine3/Makefile b/sysutils/cfengine3/Makefile
index 454d446c6bc..8d6022a9549 100644
--- a/sysutils/cfengine3/Makefile
+++ b/sysutils/cfengine3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/11/05 13:57:21 pettai Exp $
+# $NetBSD: Makefile,v 1.2 2010/11/08 07:36:39 pettai Exp $
 #
 
-DISTNAME=	cfengine-3.0.5p1
+DISTNAME=	cfengine-3.0.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.cfengine.org/tarballs/
 
diff --git a/sysutils/cfengine3/PLIST b/sysutils/cfengine3/PLIST
index 473bc579dec..2881319ed0c 100644
--- a/sysutils/cfengine3/PLIST
+++ b/sysutils/cfengine3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/11/05 13:57:21 pettai Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/11/08 07:36:39 pettai Exp $
 lib/libpromises.la
 man/man8/cf-agent.8
 man/man8/cf-execd.8
@@ -22,15 +22,12 @@ share/doc/cfengine/ChangeLog
 share/doc/cfengine/INSTALL
 share/doc/cfengine/NEWS
 share/doc/cfengine/README
-share/doc/cfengine/cfengine_stdlib.cf
 share/doc/cfengine/promise_knowledge.cf
+share/doc/cfengine/unit-env.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
@@ -48,35 +45,25 @@ 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
@@ -91,25 +78,18 @@ share/doc/cfengine/unit_fileperms.cf
 share/doc/cfengine/unit_filesexist.cf
 share/doc/cfengine/unit_filesexist2.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_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_hostrange.cf
-share/doc/cfengine/unit_hostsseen.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
@@ -120,7 +100,6 @@ 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
@@ -130,27 +109,20 @@ 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
@@ -161,24 +133,16 @@ 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_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_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
@@ -193,31 +157,23 @@ 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_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_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_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/examples/cfengine/inputs/failsafe.cf
 share/examples/cfengine/inputs/library.cf
 share/examples/cfengine/inputs/promises.cf
diff --git a/sysutils/cfengine3/distinfo b/sysutils/cfengine3/distinfo
index 9582cdd1b04..b2447c2a8c8 100644
--- a/sysutils/cfengine3/distinfo
+++ b/sysutils/cfengine3/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/11/05 13:57:21 pettai Exp $
+$NetBSD: distinfo,v 1.2 2010/11/08 07:36:39 pettai Exp $
 
-SHA1 (cfengine-3.0.5p1.tar.gz) = bc7cc5fbc6c9a973f2f74c45e6835934230b6d63
-RMD160 (cfengine-3.0.5p1.tar.gz) = 909ee306cdbd0e674fbdb54ddcbca66b0cc5213b
-Size (cfengine-3.0.5p1.tar.gz) = 1517992 bytes
+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