New diff 2016-01-19 11:51 GMT-02:00 Stuart Henderson <st...@openbsd.org>:
> On 2016/01/19 00:26, Rodrigo Mosconi wrote: > > Follow the cvs diff > > > > 2016-01-19 0:15 GMT-02:00 Stuart Henderson <st...@openbsd.org>: > > > > On 2016/01/18 23:54, Rodrigo Mosconi wrote: > > > Hi! > > > > > > This updates sysutils/cfengine to 3.7.3. > > > > > > The users promise is not enabled, because it require some PAM > > interface. I > > > didn`t looked what need, and if has a "PAM wrapper" > > > > > > Comments, OK? > > > > Please send a cvs diff. You can use "cvs add" and "cvs rm" against > > an > > anoncvs mirror to add/remove files, then "cvs diff -uNp". > > > > > > > > > ? patches/patch-libpromises_evalfunction_c > > ? patches/patch-libpromises_processes_select_c > > These need to be "cvs add"ed. Comments in-line from reading the diff: > > > Index: Makefile > > =================================================================== > > RCS file: /cvs/ports/sysutils/cfengine/Makefile,v > > retrieving revision 1.53 > > diff -u -p -u -p -r1.53 Makefile > > --- Makefile 29 Nov 2015 15:50:20 -0000 1.53 > > +++ Makefile 19 Jan 2016 02:25:35 -0000 > > @@ -2,8 +2,7 @@ > > > > COMMENT = GNU system administration tool for networks > > > > -DISTNAME = cfengine-3.4.5 > > -REVISION = 7 > > +DISTNAME = cfengine-3.7.2 > > > > SHARED_LIBS += promises 0.0 # 1.0 > > CATEGORIES = sysutils > > @@ -14,16 +13,18 @@ MAINTAINER = Rodrigo Mosconi <openbsd@mo > > # GPLv3 only > > PERMIT_PACKAGE_CDROM = Yes > > > > -MASTER_SITES = > https://s3.amazonaws.com/cfengine.package-repos/tarballs/ > > +MASTER_SITES = > https://cfengine-package-repos.s3.amazonaws.com/tarballs/ > > > > CFENGINE_BASE = /var/cfengine > > CFENGINE_EXAMPLES = ${PREFIX}/share/examples/cfengine > > SUBST_VARS += CFENGINE_BASE CFENGINE_EXAMPLES > > > > -FLAVORS = pgsql > > +PSEUDO_FLAVORS = fhs > > This changes file locations doesn't it? If so it is not going to be > a pseudo flavour as it is going to affect the package. I do not think > we should go there. > > > +FLAVORS = pgsql mysql xml yaml virt > > I don't think adding all of these flavours is a good idea. > Database support makes sense, but for the others, decide if > they're important enough, if so then include them, otherwise > skip them. OpenBSD ports is totally aimed at building packages, > we don't really cater for end-user tweaks like FreeBSD ports > does. Apart from anything else, this adds dozens of combinations > of flavours to test (even just getting the WANTLIB correct for > the various options is going to be annoying), and we're > unlikely to build packages for the exact combination that > any given user wants. > > This is a different case to things like PHP and Asterisk, > where there are various dependencies but they create separate > packages containing just a dlopen() module, rather than > completely separate builds. > > > FLAVOR ?= > > > > WANTLIB = c crypto m pcre pthread qdbm z > > +SEPARATE_BUILD = Yes > > CONFIGURE_STYLE = gnu > > USE_GMAKE = Yes > > MODULES = converters/libiconv > > @@ -34,9 +35,7 @@ CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE > > CONFIGURE_ARGS = --with-openssl=/usr \ > > --with-pcre \ > > --with-qdbm \ > > - --without-libxml2 \ > > - --without-libvirt \ > > - --enable-fhs \ > > + --without-libacl \ > > --with-workdir=${CFENGINE_BASE} > > MAKE_FLAGS += examplesdir="${CFENGINE_EXAMPLES}" \ > > masterfilesdir="${CFENGINE_EXAMPLES}/CoreBase" > > @@ -57,6 +56,36 @@ LIB_DEPENDS += databases/mariadb > > CONFIGURE_ARGS += --without-mysql > > .endif > > > > +.if ${FLAVOR:Mxml} > > +WANTLIB += xml2 > > +CONFIGURE_ARGS += --with-libxml2 > > +LIB_DEPENDS += textproc/libxml > > +.else > > +CONFIGURE_ARGS += --without-libxml2 > > +.endif > > + > > +.if ${FLAVOR:Myaml} > > +WANTLIB += yaml > > +CONFIGURE_ARGS += --with-libyaml > > +LIB_DEPENDS += devel/libyaml > > +.else > > +CONFIGURE_ARGS += --without-libyaml > > +.endif > > + > > +.if ${FLAVOR:Mvirt} > > +WANTLIB += virt > > +CONFIGURE_ARGS += --with-libvirt > > +LIB_DEPENDS += sysutils/libvirt > > +.else > > +CONFIGURE_ARGS += --without-libvirt > > +.endif > > + > > +.if ${FLAVOR:Mfhs} > > +CONFIGURE_ARGS += --enable-fhs > > +.else > > +CONFIGURE_ARGS += --disable-fhs > > +.endif > > + > > # tests not yet working > > NO_TEST = Yes > > # also note some formatting errors with manpages (e.g. "You can think > > @@ -70,7 +99,8 @@ post-extract: > > > > post-install: > > ${INSTALL_PROGRAM_DIR} ${WRKINST}${CFENGINE_BASE}/bin > > -.for i in cf-agent cf-execd cf-key cf-monitord cf-promises cf-report > cf-runagent cf-serverd > > +.for i in cf-agent cf-execd cf-key cf-monitord cf-promises cf-report \ > > + cf-runagent cf-serverd > > ln -s ${TRUEPREFIX}/sbin/$i ${WRKINST}${CFENGINE_BASE}/bin/ > > .endfor > > > > Index: distinfo > > =================================================================== > > RCS file: /cvs/ports/sysutils/cfengine/distinfo,v > > retrieving revision 1.14 > > diff -u -p -u -p -r1.14 distinfo > > --- distinfo 20 Sep 2013 13:02:50 -0000 1.14 > > +++ distinfo 19 Jan 2016 02:25:35 -0000 > > @@ -1,2 +1,2 @@ > > -SHA256 (cfengine-3.4.5.tar.gz) = > VCgIufUy531m3KGeg73B+ZXX0AZrlAo5vdXbmnFoABE= > > -SIZE (cfengine-3.4.5.tar.gz) = 4671628 > > +SHA256 (cfengine-3.7.2.tar.gz) = > qtmuJghkrL3yqkQcIINlRg+ajsqlNhi720ZeN670reU= > > +SIZE (cfengine-3.7.2.tar.gz) = 2114764 > > Index: pkg/PLIST > > =================================================================== > > RCS file: /cvs/ports/sysutils/cfengine/pkg/PLIST,v > > retrieving revision 1.13 > > diff -u -p -u -p -r1.13 PLIST > > --- pkg/PLIST 1 May 2013 21:09:23 -0000 1.13 > > +++ pkg/PLIST 19 Jan 2016 02:25:36 -0000 > > @@ -1,330 +1,359 @@ > > -@comment $OpenBSD: PLIST,v 1.13 2013/05/01 21:09:23 sthen Exp $ > > -lib/cfengine/ > > -lib/cfengine/libpromises.la > > -@lib lib/cfengine/libpromises.so.${LIBpromises_VERSION} > > -@man man/man8/cf-agent.8 > > -@man man/man8/cf-execd.8 > > -@man man/man8/cf-key.8 > > -@man man/man8/cf-monitord.8 > > -@man man/man8/cf-promises.8 > > -@man man/man8/cf-report.8 > > -@man man/man8/cf-runagent.8 > > -@man man/man8/cf-serverd.8 > > -@bin sbin/cf-agent > > -@bin sbin/cf-execd > > -@bin sbin/cf-key > > -@bin sbin/cf-monitord > > -@bin sbin/cf-promises > > -@bin sbin/cf-report > > -@bin sbin/cf-runagent > > -@bin sbin/cf-serverd > > +@comment $OpenBSD$ > > +@bin bin/cf-agent > > +@bin bin/cf-execd > > +@bin bin/cf-key > > +@bin bin/cf-monitord > > +@bin bin/cf-promises > > +@bin bin/cf-runagent > > +@bin bin/cf-serverd > > +@bin bin/cf-upgrade > > +lib/libpromises.a > > +lib/libpromises.la > > +@lib lib/libpromises.so.${LIBpromises_VERSION} > > share/doc/cfengine/ > > share/doc/cfengine/ChangeLog > > -share/doc/cfengine/README > > +share/doc/cfengine/README.md > > share/doc/pkg-readmes/${FULLPKGNAME} > > share/examples/cfengine/ > > -share/examples/cfengine/CoreBase/ > > -share/examples/cfengine/CoreBase/cf-sketch-runfile.cf > > -share/examples/cfengine/CoreBase/controls/ > > -share/examples/cfengine/CoreBase/controls/cf_agent.cf > > -share/examples/cfengine/CoreBase/controls/cf_execd.cf > > -share/examples/cfengine/CoreBase/controls/cf_monitord.cf > > -share/examples/cfengine/CoreBase/controls/cf_report.cf > > -share/examples/cfengine/CoreBase/controls/cf_runagent.cf > > -share/examples/cfengine/CoreBase/controls/cf_serverd.cf > > -share/examples/cfengine/CoreBase/def.cf > > -share/examples/cfengine/CoreBase/libraries/ > > -share/examples/cfengine/CoreBase/libraries/cfengine_stdlib.cf > > -share/examples/cfengine/CoreBase/promises.cf > > -share/examples/cfengine/CoreBase/services/ > > -share/examples/cfengine/CoreBase/services/init_msg.cf > > -share/examples/cfengine/CoreBase/update.cf > > +share/examples/cfengine/abort.cf > > +share/examples/cfengine/accessed_before.cf > > +share/examples/cfengine/accessedbefore.cf > > +share/examples/cfengine/accumulated_time.cf > > +share/examples/cfengine/acl.cf > > +share/examples/cfengine/acl_generic.cf > > +share/examples/cfengine/acl_ntfs.cf > > +share/examples/cfengine/acl_secret.cf > > share/examples/cfengine/active_directory.cf > > +share/examples/cfengine/activedirectory_listusers.cf > > +share/examples/cfengine/activedirectory_showuser.cf > > +share/examples/cfengine/ago.cf > > share/examples/cfengine/app_baseline.cf > > +share/examples/cfengine/appgroups.cf > > +share/examples/cfengine/arrays.cf > > +share/examples/cfengine/backreferences_files.cf > > +share/examples/cfengine/badpromise.cf > > +share/examples/cfengine/badtype.cf > > +share/examples/cfengine/bsdflags.cf > > +share/examples/cfengine/bundle_return_values.cf > > +share/examples/cfengine/bundlesmatching.cf > > +share/examples/cfengine/bundlestate.cf > > +share/examples/cfengine/canonify.cf > > +share/examples/cfengine/cf2_integration.cf > > +share/examples/cfengine/change_detect.cf > > +share/examples/cfengine/changedbefore.cf > > +share/examples/cfengine/chdir.cf > > +share/examples/cfengine/classes_global.cf > > +share/examples/cfengine/classesmatching.cf > > +share/examples/cfengine/classmatch.cf > > +share/examples/cfengine/classvar_convergence.cf > > +share/examples/cfengine/commands.cf > > +share/examples/cfengine/compare.cf > > +share/examples/cfengine/container_iteration.cf > > +share/examples/cfengine/container_key_iteration.cf > > +share/examples/cfengine/control_expand.cf > > +share/examples/cfengine/controlclasses.cf > > +share/examples/cfengine/copy.cf > > +share/examples/cfengine/copy_classes.cf > > +share/examples/cfengine/copy_copbl.cf > > +share/examples/cfengine/copy_edit.cf > > +share/examples/cfengine/copydir_copbl.cf > > +share/examples/cfengine/copylinks.cf > > +share/examples/cfengine/countclassesmatching.cf > > +share/examples/cfengine/countlinesmatching.cf > > +share/examples/cfengine/create_filedir.cf > > +share/examples/cfengine/createdb.cf > > +share/examples/cfengine/customize_by_named_list.cf > > +share/examples/cfengine/data_expand.cf > > +share/examples/cfengine/data_readstringarray.cf > > +share/examples/cfengine/data_regextract.cf > > +share/examples/cfengine/datastate.cf > > +share/examples/cfengine/defaults.cf > > +share/examples/cfengine/defaults2.cf > > +share/examples/cfengine/defaults3.cf > > +share/examples/cfengine/definitions.cf > > +share/examples/cfengine/deletelines.cf > > +share/examples/cfengine/depends_on.cf > > +share/examples/cfengine/depends_on2.cf > > +share/examples/cfengine/difference.cf > > +share/examples/cfengine/dirname.cf > > +share/examples/cfengine/disable.cf > > +share/examples/cfengine/disable_and_rotate_files.cf > > +share/examples/cfengine/diskfree.cf > > +share/examples/cfengine/dollar.cf > > +share/examples/cfengine/edit_column_files.cf > > +share/examples/cfengine/edit_comment_lines.cf > > +share/examples/cfengine/edit_deletenotmatch.cf > > +share/examples/cfengine/edit_insert_fuzzylines.cf > > +share/examples/cfengine/edit_insert_lines.cf > > +share/examples/cfengine/edit_insert_lines_silly.cf > > +share/examples/cfengine/edit_passwd_file.cf > > +share/examples/cfengine/edit_passwd_file_basic.cf > > +share/examples/cfengine/edit_replace_string.cf > > +share/examples/cfengine/edit_sectioned_file.cf > > +share/examples/cfengine/edit_setvar.cf > > +share/examples/cfengine/edit_template.cf > > +share/examples/cfengine/edit_triggerclass.cf > > +share/examples/cfengine/edit_xml.cf > > +share/examples/cfengine/ensure_line_present_prepend_append.cf > > +share/examples/cfengine/env.cf > > +share/examples/cfengine/epimenides.cf > > +share/examples/cfengine/escape.cf > > +share/examples/cfengine/eval.cf > > +share/examples/cfengine/every.cf > > +share/examples/cfengine/exec_args.cf > > +share/examples/cfengine/exec_in_sequence.cf > > +share/examples/cfengine/execd.cf > > +share/examples/cfengine/execresult.cf > > +share/examples/cfengine/expand.cf > > +share/examples/cfengine/failedcommand.cf > > +share/examples/cfengine/failsafe.cf > > +share/examples/cfengine/file_change_detection.cf > > +share/examples/cfengine/file_hash.cf > > +share/examples/cfengine/file_owner_list_template.cf > > +share/examples/cfengine/fileexists.cf > > +share/examples/cfengine/filenames.cf > > +share/examples/cfengine/fileperms.cf > > +share/examples/cfengine/filesexist.cf > > +share/examples/cfengine/filesexist2.cf > > +share/examples/cfengine/filesize.cf > > +share/examples/cfengine/filestat.cf > > +share/examples/cfengine/filter.cf > > +share/examples/cfengine/findfiles.cf > > +share/examples/cfengine/fix_names.cf > > +share/examples/cfengine/format.cf > > +share/examples/cfengine/getclassmetatags.cf > > +share/examples/cfengine/getenv.cf > > +share/examples/cfengine/getfields.cf > > +share/examples/cfengine/getgid.cf > > +share/examples/cfengine/getindices.cf > > +share/examples/cfengine/getindices_and_values.cf > > +share/examples/cfengine/getmacaddress.cf > > +share/examples/cfengine/getregistry.cf > > +share/examples/cfengine/getuid.cf > > +share/examples/cfengine/getusers.cf > > +share/examples/cfengine/getvalues.cf > > +share/examples/cfengine/getvariablemetatags.cf > > +share/examples/cfengine/global_list_expansion.cf > > +share/examples/cfengine/global_list_expansion_2.cf > > +share/examples/cfengine/grep.cf > > +share/examples/cfengine/groupexists.cf > > share/examples/cfengine/guest_environment_kvm.cf > > +share/examples/cfengine/hash.cf > > +share/examples/cfengine/hashcomment.cf > > +share/examples/cfengine/hashmatch.cf > > +share/examples/cfengine/hashuncomment.cf > > +share/examples/cfengine/helloworld.cf > > +share/examples/cfengine/host2ip.cf > > +share/examples/cfengine/hostrange.cf > > +share/examples/cfengine/hostsseen.cf > > share/examples/cfengine/hostswithclass.cf > > +share/examples/cfengine/hub.cf > > +share/examples/cfengine/id.cf > > +share/examples/cfengine/inherit.cf > > +share/examples/cfengine/insert_users.cf > > +share/examples/cfengine/intarray.cf > > +share/examples/cfengine/intersection.cf > > +share/examples/cfengine/inventory_cpu.cf > > +share/examples/cfengine/ip2host.cf > > +share/examples/cfengine/iprange.cf > > +share/examples/cfengine/irange.cf > > +share/examples/cfengine/isdir.cf > > +share/examples/cfengine/isexecutable.cf > > +share/examples/cfengine/isgreaterthan.cf > > +share/examples/cfengine/islessthan.cf > > +share/examples/cfengine/islink.cf > > +share/examples/cfengine/isnewerthan.cf > > +share/examples/cfengine/isplain.cf > > +share/examples/cfengine/isvariable.cf > > +share/examples/cfengine/iteration.cf > > +share/examples/cfengine/join.cf > > +share/examples/cfengine/knowledge_driver.cf > > +share/examples/cfengine/knowledge_txt.cf > > +share/examples/cfengine/lastnode.cf > > +share/examples/cfengine/ldap.cf > > +share/examples/cfengine/length.cf > > +share/examples/cfengine/linking.cf > > +share/examples/cfengine/literal_server.cf > > +share/examples/cfengine/locate_files_and_compress.cf > > +share/examples/cfengine/log_private.cf > > +share/examples/cfengine/loops.cf > > +share/examples/cfengine/lsdir.cf > > +share/examples/cfengine/maparray.cf > > +share/examples/cfengine/mapdata.cf > > +share/examples/cfengine/maplist.cf > > +share/examples/cfengine/max-min-mean-variance.cf > > +share/examples/cfengine/measure_log.cf > > +share/examples/cfengine/measurements.cf > > +share/examples/cfengine/menu.cf > > +share/examples/cfengine/mergedata.cf > > +share/examples/cfengine/meta.cf > > +share/examples/cfengine/method.cf > > +share/examples/cfengine/method_polymorph.cf > > +share/examples/cfengine/method_validate.cf > > +share/examples/cfengine/method_var.cf > > +share/examples/cfengine/method_var2.cf > > +share/examples/cfengine/module_exec.cf > > +share/examples/cfengine/module_exec_2.cf > > +share/examples/cfengine/monitord.cf > > share/examples/cfengine/motd.cf > > +share/examples/cfengine/mount_fs.cf > > +share/examples/cfengine/multipassvars.cf > > +share/examples/cfengine/namespace.cf > > +share/examples/cfengine/namespace1.cf > > +share/examples/cfengine/namespace2.cf > > +share/examples/cfengine/namespace3.cf > > +share/examples/cfengine/namespace_class1.cf > > +share/examples/cfengine/namespace_classes.cf > > +share/examples/cfengine/namespace_var_meta.cf > > +share/examples/cfengine/namespace_var_meta2.cf > > +share/examples/cfengine/neighbourhood_watch.cf > > +share/examples/cfengine/none.cf > > +share/examples/cfengine/nth.cf > > +share/examples/cfengine/null_config.cf > > +share/examples/cfengine/occurrences.cf > > +share/examples/cfengine/orchestrate_chain1.cf > > +share/examples/cfengine/orchestrate_chain2.cf > > +share/examples/cfengine/orchestrate_delay_trigger.cf > > +share/examples/cfengine/orchestrate_dominoes1.cf > > +share/examples/cfengine/orchestrate_dominoes2.cf > > +share/examples/cfengine/orchestrate_dragon.cf > > +share/examples/cfengine/orchestrate_dragon_load_balancer.cf > > +share/examples/cfengine/orchestrate_n_of_m.cf > > +share/examples/cfengine/orchestration_hostlist.cf > > +share/examples/cfengine/ordering.cf > > +share/examples/cfengine/package_apt.cf > > +share/examples/cfengine/package_bundles.cf > > +share/examples/cfengine/package_freebsd.cf > > +share/examples/cfengine/package_latest.cf > > +share/examples/cfengine/package_msi_file.cf > > +share/examples/cfengine/package_msi_version.cf > > +share/examples/cfengine/package_rpm.cf > > +share/examples/cfengine/package_solaris.cf > > share/examples/cfengine/package_windows_feature.cf > > +share/examples/cfengine/package_yum.cf > > +share/examples/cfengine/package_zypper.cf > > +share/examples/cfengine/packagesmatching.cf > > +share/examples/cfengine/parallel_exec.cf > > +share/examples/cfengine/parseintrealstringarray.cf > > +share/examples/cfengine/parsestringarray.cf > > +share/examples/cfengine/parsestringarrayidx.cf > > +share/examples/cfengine/pathtype.cf > > +share/examples/cfengine/pattern_and_edit.cf > > +share/examples/cfengine/peerleader.cf > > +share/examples/cfengine/peerleaders.cf > > +share/examples/cfengine/peers.cf > > +share/examples/cfengine/postfix.cf > > +share/examples/cfengine/process_kill.cf > > +share/examples/cfengine/process_matching.cf > > +share/examples/cfengine/process_matching2.cf > > +share/examples/cfengine/process_matching3.cf > > +share/examples/cfengine/process_restart.cf > > +share/examples/cfengine/process_restart_basic.cf > > +share/examples/cfengine/process_signalling.cf > > +share/examples/cfengine/product.cf > > share/examples/cfengine/promise_knowledge.cf > > +share/examples/cfengine/promises.cf > > +share/examples/cfengine/randomint.cf > > +share/examples/cfengine/readcsv.cf > > +share/examples/cfengine/readdata.cf > > +share/examples/cfengine/readfile.cf > > +share/examples/cfengine/readintrealstringlist.cf > > +share/examples/cfengine/readlist.cf > > +share/examples/cfengine/readtcp.cf > > +share/examples/cfengine/reg_multiline.cf > > +share/examples/cfengine/regarray.cf > > +share/examples/cfengine/regcmp.cf > > +share/examples/cfengine/regex_win.cf > > +share/examples/cfengine/regextract.cf > > +share/examples/cfengine/registry.cf > > +share/examples/cfengine/registry_cache.cf > > +share/examples/cfengine/registryvalue.cf > > +share/examples/cfengine/regline.cf > > +share/examples/cfengine/reglist.cf > > +share/examples/cfengine/remake_outputs.pl > > +share/examples/cfengine/remoteclasses.cf > > +share/examples/cfengine/remoteclasses2.cf > > +share/examples/cfengine/remotescalar.cf > > +share/examples/cfengine/remove_deadlinks.cf > > +share/examples/cfengine/rename.cf > > +share/examples/cfengine/repairedcommand.cf > > +share/examples/cfengine/report_custom.cf > > +share/examples/cfengine/report_diffs.cf > > +share/examples/cfengine/report_state.cf > > +share/examples/cfengine/reporting.cf > > +share/examples/cfengine/reporttofile.cf > > +share/examples/cfengine/resolveconf.cf > > +share/examples/cfengine/returnszero.cf > > +share/examples/cfengine/reverse.cf > > +share/examples/cfengine/root_passwd.cf > > +share/examples/cfengine/select_class.cf > > +share/examples/cfengine/select_mode.cf > > +share/examples/cfengine/select_region.cf > > +share/examples/cfengine/select_size.cf > > +share/examples/cfengine/selectservers.cf > > +share/examples/cfengine/server_callback.cf > > +share/examples/cfengine/server_copy_localhost.cf > > +share/examples/cfengine/server_copy_purge.cf > > +share/examples/cfengine/server_copy_remote.cf > > +share/examples/cfengine/server_flatcopy_localhost.cf > > share/examples/cfengine/service_catalogue.cf > > share/examples/cfengine/service_catalogue_separate.cf > > +share/examples/cfengine/service_disable.cf > > +share/examples/cfengine/service_start.cf > > +share/examples/cfengine/services_concept.cf > > +share/examples/cfengine/services_win.cf > > +share/examples/cfengine/setuidlog.cf > > +share/examples/cfengine/setvar.cf > > +share/examples/cfengine/shuffle.cf > > +share/examples/cfengine/software_dist.cf > > +share/examples/cfengine/software_update_version_yum.cf > > +share/examples/cfengine/some.cf > > +share/examples/cfengine/sort.cf > > +share/examples/cfengine/splitstring.cf > > share/examples/cfengine/sql_table_structure.cf > > -share/examples/cfengine/unit_abort.cf > > -share/examples/cfengine/unit_accessed_before.cf > > -share/examples/cfengine/unit_accumulated_time.cf > > -share/examples/cfengine/unit_acl.cf > > -share/examples/cfengine/unit_acl_generic.cf > > -share/examples/cfengine/unit_acl_ntfs.cf > > -share/examples/cfengine/unit_acl_secret.cf > > -share/examples/cfengine/unit_activedirectory_listusers.cf > > -share/examples/cfengine/unit_activedirectory_showuser.cf > > -share/examples/cfengine/unit_ago.cf > > -share/examples/cfengine/unit_arrays.cf > > -share/examples/cfengine/unit_backreferences_files.cf > > -share/examples/cfengine/unit_badpromise.cf > > -share/examples/cfengine/unit_badtype.cf > > -share/examples/cfengine/unit_bsdflags.cf > > -share/examples/cfengine/unit_bundle_return_values.cf > > -share/examples/cfengine/unit_cf2_integration.cf > > -share/examples/cfengine/unit_change_detect.cf > > -share/examples/cfengine/unit_changedbefore.cf > > -share/examples/cfengine/unit_chdir.cf > > -share/examples/cfengine/unit_classes_global.cf > > -share/examples/cfengine/unit_classmatch.cf > > -share/examples/cfengine/unit_classvar_convergence.cf > > -share/examples/cfengine/unit_commands.cf > > -share/examples/cfengine/unit_compare.cf > > -share/examples/cfengine/unit_control_expand.cf > > -share/examples/cfengine/unit_controlclasses.cf > > -share/examples/cfengine/unit_copy.cf > > -share/examples/cfengine/unit_copy_classes.cf > > -share/examples/cfengine/unit_copy_copbl.cf > > -share/examples/cfengine/unit_copy_edit.cf > > -share/examples/cfengine/unit_copydir_copbl.cf > > -share/examples/cfengine/unit_copylinks.cf > > -share/examples/cfengine/unit_countclassesmatching.cf > > -share/examples/cfengine/unit_countlinesmatching.cf > > -share/examples/cfengine/unit_create_filedir.cf > > -share/examples/cfengine/unit_createdb.cf > > -share/examples/cfengine/unit_customize_by_named_list.cf > > -share/examples/cfengine/unit_defaults.cf > > -share/examples/cfengine/unit_defaults2.cf > > -share/examples/cfengine/unit_defaults3.cf > > -share/examples/cfengine/unit_definitions.cf > > -share/examples/cfengine/unit_deletelines.cf > > -share/examples/cfengine/unit_depends_on.cf > > -share/examples/cfengine/unit_depends_on2.cf > > -share/examples/cfengine/unit_disable.cf > > -share/examples/cfengine/unit_disable_and_rotate_files.cf > > -share/examples/cfengine/unit_diskfree.cf > > -share/examples/cfengine/unit_dollar.cf > > -share/examples/cfengine/unit_edit_column_files.cf > > -share/examples/cfengine/unit_edit_comment_lines.cf > > -share/examples/cfengine/unit_edit_deletenotmatch.cf > > -share/examples/cfengine/unit_edit_insert_fuzzylines.cf > > -share/examples/cfengine/unit_edit_insert_lines.cf > > -share/examples/cfengine/unit_edit_insert_lines_silly.cf > > -share/examples/cfengine/unit_edit_passwd_file.cf > > -share/examples/cfengine/unit_edit_passwd_file_basic.cf > > -share/examples/cfengine/unit_edit_replace_string.cf > > -share/examples/cfengine/unit_edit_sectioned_file.cf > > -share/examples/cfengine/unit_edit_setvar.cf > > -share/examples/cfengine/unit_edit_template.cf > > -share/examples/cfengine/unit_edit_triggerclass.cf > > -share/examples/cfengine/unit_env.cf > > -share/examples/cfengine/unit_epimenides.cf > > -share/examples/cfengine/unit_escape.cf > > -share/examples/cfengine/unit_exec_args.cf > > -share/examples/cfengine/unit_exec_in_sequence.cf > > -share/examples/cfengine/unit_execd.cf > > -share/examples/cfengine/unit_execresult.cf > > -share/examples/cfengine/unit_expand.cf > > -share/examples/cfengine/unit_failedcommand.cf > > -share/examples/cfengine/unit_failsafe.cf > > -share/examples/cfengine/unit_file_change_detection.cf > > -share/examples/cfengine/unit_file_owner_list_template.cf > > -share/examples/cfengine/unit_fileexists.cf > > -share/examples/cfengine/unit_filenames.cf > > -share/examples/cfengine/unit_fileperms.cf > > -share/examples/cfengine/unit_filesexist.cf > > -share/examples/cfengine/unit_filesexist2.cf > > -share/examples/cfengine/unit_filesize.cf > > -share/examples/cfengine/unit_fix_names.cf > > -share/examples/cfengine/unit_getenv.cf > > -share/examples/cfengine/unit_getfields.cf > > -share/examples/cfengine/unit_getgid.cf > > -share/examples/cfengine/unit_getindices.cf > > -share/examples/cfengine/unit_getindices_and_values.cf > > -share/examples/cfengine/unit_getmacaddress.cf > > -share/examples/cfengine/unit_getregistry.cf > > -share/examples/cfengine/unit_getuid.cf > > -share/examples/cfengine/unit_getusers.cf > > -share/examples/cfengine/unit_global_list_expansion.cf > > -share/examples/cfengine/unit_global_list_expansion_2.cf > > -share/examples/cfengine/unit_grep.cf > > -share/examples/cfengine/unit_groupexists.cf > > -share/examples/cfengine/unit_hash.cf > > -share/examples/cfengine/unit_hashcomment.cf > > -share/examples/cfengine/unit_hashmatch.cf > > -share/examples/cfengine/unit_hashuncomment.cf > > -share/examples/cfengine/unit_helloworld.cf > > -share/examples/cfengine/unit_host2ip.cf > > -share/examples/cfengine/unit_hostrange.cf > > -share/examples/cfengine/unit_hostsseen.cf > > -share/examples/cfengine/unit_hub.cf > > -share/examples/cfengine/unit_id.cf > > -share/examples/cfengine/unit_inherit.cf > > -share/examples/cfengine/unit_insert_users.cf > > -share/examples/cfengine/unit_intarray.cf > > -share/examples/cfengine/unit_inventory_cpu.cf > > -share/examples/cfengine/unit_iprange.cf > > -share/examples/cfengine/unit_irange.cf > > -share/examples/cfengine/unit_isdir.cf > > -share/examples/cfengine/unit_islink.cf > > -share/examples/cfengine/unit_isnewerthan.cf > > -share/examples/cfengine/unit_isplain.cf > > -share/examples/cfengine/unit_isvariable.cf > > -share/examples/cfengine/unit_iteration.cf > > -share/examples/cfengine/unit_join.cf > > -share/examples/cfengine/unit_knowledge_driver.cf > > -share/examples/cfengine/unit_knowledge_txt.cf > > -share/examples/cfengine/unit_lastnode.cf > > -share/examples/cfengine/unit_ldap.cf > > -share/examples/cfengine/unit_linking.cf > > -share/examples/cfengine/unit_literal_server.cf > > -share/examples/cfengine/unit_locate_files_and_compress.cf > > -share/examples/cfengine/unit_log_private.cf > > -share/examples/cfengine/unit_loops.cf > > -share/examples/cfengine/unit_lsdir.cf > > -share/examples/cfengine/unit_maplist.cf > > -share/examples/cfengine/unit_measure_log.cf > > -share/examples/cfengine/unit_measurements.cf > > -share/examples/cfengine/unit_menu.cf > > -share/examples/cfengine/unit_meta.cf > > -share/examples/cfengine/unit_method.cf > > -share/examples/cfengine/unit_method_polymorph.cf > > -share/examples/cfengine/unit_method_validate.cf > > -share/examples/cfengine/unit_method_var.cf > > -share/examples/cfengine/unit_method_var2.cf > > -share/examples/cfengine/unit_module_exec.cf > > -share/examples/cfengine/unit_module_exec_2.cf > > -share/examples/cfengine/unit_monitord.cf > > -share/examples/cfengine/unit_mount_fs.cf > > -share/examples/cfengine/unit_multipassvars.cf > > -share/examples/cfengine/unit_namespace.cf > > -share/examples/cfengine/unit_namespace1.cf > > -share/examples/cfengine/unit_namespace2.cf > > -share/examples/cfengine/unit_namespace3.cf > > -share/examples/cfengine/unit_namespace_class1.cf > > -share/examples/cfengine/unit_namespace_classes.cf > > -share/examples/cfengine/unit_namespace_var_meta.cf > > -share/examples/cfengine/unit_namespace_var_meta2.cf > > -share/examples/cfengine/unit_neighbourhood_watch.cf > > -share/examples/cfengine/unit_null_config.cf > > -share/examples/cfengine/unit_occurrences.cf > > -share/examples/cfengine/unit_orchestrate_chain1.cf > > -share/examples/cfengine/unit_orchestrate_chain2.cf > > -share/examples/cfengine/unit_orchestrate_dominoes1.cf > > -share/examples/cfengine/unit_orchestrate_dominoes2.cf > > -share/examples/cfengine/unit_orchestrate_dragon.cf > > -share/examples/cfengine/unit_orchestrate_dragon_load_balancer.cf > > -share/examples/cfengine/unit_orchestrate_n_of_m.cf > > -share/examples/cfengine/unit_orchestration_hostlist.cf > > -share/examples/cfengine/unit_ordering.cf > > -share/examples/cfengine/unit_package_apt.cf > > -share/examples/cfengine/unit_package_freebsd.cf > > -share/examples/cfengine/unit_package_latest.cf > > -share/examples/cfengine/unit_package_msi_file.cf > > -share/examples/cfengine/unit_package_msi_version.cf > > -share/examples/cfengine/unit_package_rpm.cf > > -share/examples/cfengine/unit_package_solaris.cf > > -share/examples/cfengine/unit_package_yum.cf > > -share/examples/cfengine/unit_package_zypper.cf > > -share/examples/cfengine/unit_parallel_exec.cf > > -share/examples/cfengine/unit_parsestringarray.cf > > -share/examples/cfengine/unit_pathtype.cf > > -share/examples/cfengine/unit_pattern_and_edit.cf > > -share/examples/cfengine/unit_peers.cf > > -share/examples/cfengine/unit_postfix.cf > > -share/examples/cfengine/unit_process_kill.cf > > -share/examples/cfengine/unit_process_matching.cf > > -share/examples/cfengine/unit_process_matching2.cf > > -share/examples/cfengine/unit_process_matching3.cf > > -share/examples/cfengine/unit_process_restart.cf > > -share/examples/cfengine/unit_process_restart_basic.cf > > -share/examples/cfengine/unit_process_signalling.cf > > -share/examples/cfengine/unit_product.cf > > -share/examples/cfengine/unit_promises.cf > > -share/examples/cfengine/unit_readlist.cf > > -share/examples/cfengine/unit_readtcp.cf > > -share/examples/cfengine/unit_reg_multiline.cf > > -share/examples/cfengine/unit_regarray.cf > > -share/examples/cfengine/unit_regex_win.cf > > -share/examples/cfengine/unit_regextract.cf > > -share/examples/cfengine/unit_registry.cf > > -share/examples/cfengine/unit_registry_cache.cf > > -share/examples/cfengine/unit_regline.cf > > -share/examples/cfengine/unit_reglist.cf > > -share/examples/cfengine/unit_remoteclasses.cf > > -share/examples/cfengine/unit_remoteclasses2.cf > > -share/examples/cfengine/unit_remotescalar.cf > > -share/examples/cfengine/unit_remove_deadlinks.cf > > -share/examples/cfengine/unit_rename.cf > > -share/examples/cfengine/unit_repairedcommand.cf > > -share/examples/cfengine/unit_report_custom.cf > > -share/examples/cfengine/unit_report_diffs.cf > > -share/examples/cfengine/unit_report_state.cf > > -share/examples/cfengine/unit_reporting.cf > > -share/examples/cfengine/unit_reporttofile.cf > > -share/examples/cfengine/unit_resolveconf.cf > > -share/examples/cfengine/unit_returnszero.cf > > -share/examples/cfengine/unit_root_passwd.cf > > -share/examples/cfengine/unit_select_class.cf > > -share/examples/cfengine/unit_select_mode.cf > > -share/examples/cfengine/unit_select_region.cf > > -share/examples/cfengine/unit_select_size.cf > > -share/examples/cfengine/unit_selectservers.cf > > -share/examples/cfengine/unit_server_callback.cf > > -share/examples/cfengine/unit_server_copy_localhost.cf > > -share/examples/cfengine/unit_server_copy_purge.cf > > -share/examples/cfengine/unit_server_copy_remote.cf > > -share/examples/cfengine/unit_server_flatcopy_localhost.cf > > -share/examples/cfengine/unit_service_disable.cf > > -share/examples/cfengine/unit_service_start.cf > > -share/examples/cfengine/unit_services_concept.cf > > -share/examples/cfengine/unit_services_win.cf > > -share/examples/cfengine/unit_setuidlog.cf > > -share/examples/cfengine/unit_setvar.cf > > -share/examples/cfengine/unit_software_dist.cf > > -share/examples/cfengine/unit_software_update_version_yum.cf > > -share/examples/cfengine/unit_splitstring.cf > > -share/examples/cfengine/unit_storage.cf > > -share/examples/cfengine/unit_strcmp.cf > > -share/examples/cfengine/unit_stringarray.cf > > -share/examples/cfengine/unit_switchcase.cf > > -share/examples/cfengine/unit_syslog.cf > > -share/examples/cfengine/unit_syslog2.cf > > -share/examples/cfengine/unit_template.cf > > -share/examples/cfengine/unit_template2.cf > > -share/examples/cfengine/unit_test_environment.cf > > -share/examples/cfengine/unit_tidy_all_files.cf > > -share/examples/cfengine/unit_translatepath.cf > > -share/examples/cfengine/unit_update.cf > > -share/examples/cfengine/unit_user_edit.cf > > -share/examples/cfengine/unit_user_edit_method.cf > > -share/examples/cfengine/unit_userexists.cf > > -share/examples/cfengine/unit_varclass.cf > > -share/examples/cfengine/unit_varexpansion.cf > > -share/examples/cfengine/unit_varnet.cf > > -share/examples/cfengine/unit_vars.cf > > -share/examples/cfengine/unit_warnifline.cf > > -share/examples/cfengine/unit_webserver.cf > > -share/examples/cfengine/unit_zenoss.cf > > +share/examples/cfengine/storage.cf > > +share/examples/cfengine/strcmp.cf > > +share/examples/cfengine/strftime.cf > > +share/examples/cfengine/string_downcase.cf > > +share/examples/cfengine/string_head.cf > > +share/examples/cfengine/string_length.cf > > +share/examples/cfengine/string_mustache.cf > > +share/examples/cfengine/string_reverse.cf > > +share/examples/cfengine/string_split.cf > > +share/examples/cfengine/string_tail.cf > > +share/examples/cfengine/string_upcase.cf > > +share/examples/cfengine/stringarray.cf > > +share/examples/cfengine/sublist.cf > > +share/examples/cfengine/sum.cf > > +share/examples/cfengine/switchcase.cf > > +share/examples/cfengine/syslog.cf > > +share/examples/cfengine/syslog2.cf > > +share/examples/cfengine/template.cf > > +share/examples/cfengine/template2.cf > > +share/examples/cfengine/test_environment.cf > > +share/examples/cfengine/tidy_all_files.cf > > +share/examples/cfengine/translatepath.cf > > +share/examples/cfengine/unique.cf > > +share/examples/cfengine/unpack_method_calls.cf > > +share/examples/cfengine/update.cf > > +share/examples/cfengine/user_edit.cf > > +share/examples/cfengine/user_edit_method.cf > > +share/examples/cfengine/userexists.cf > > +share/examples/cfengine/users_type.cf > > +share/examples/cfengine/varclass.cf > > +share/examples/cfengine/varexpansion.cf > > +share/examples/cfengine/variablesmatching.cf > > +share/examples/cfengine/varnet.cf > > +share/examples/cfengine/vars.cf > > +share/examples/cfengine/warnifline.cf > > +share/examples/cfengine/webserver.cf > > share/examples/cfengine/win_dns_client.cf > > share/examples/cfengine/win_emergency.cf > > share/examples/cfengine/win_registry.cf > > share/examples/cfengine/win_schedule.cf > > +share/examples/cfengine/zenoss.cf > > +@sample /var/cfengine > > @rcscript ${RCDIR}/cf_execd > > @rcscript ${RCDIR}/cf_monitord > > @rcscript ${RCDIR}/cf_serverd > > @rcscript ${RCDIR}/cfengine > > -@cwd ${CFENGINE_BASE} > > This CFENGINE_BASE stuff was carefully worked out to follow > cfengine's install location recommendations. Have those changed > since 3.4.5? > > > -bin/ > > -bin/cf-agent > > -bin/cf-execd > > -bin/cf-key > > -bin/cf-monitord > > -bin/cf-promises > > -bin/cf-report > > -bin/cf-runagent > > -bin/cf-serverd > > -@mode 0750 > > -@sample ${CFENGINE_BASE}/ > > -@mode 0700 > > -@sample ${CFENGINE_BASE}/inputs/ > > -@sample ${CFENGINE_BASE}/masterfiles/ > > -@sample ${CFENGINE_BASE}/modules/ > > -@sample ${CFENGINE_BASE}/outputs/ > > -@sample ${CFENGINE_BASE}/ppkeys/ > > -@mode > > -@extraunexec rm -rf ${CFENGINE_BASE}/* > >
Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/cfengine/Makefile,v retrieving revision 1.53 diff -u -p -u -p -r1.53 Makefile --- Makefile 29 Nov 2015 15:50:20 -0000 1.53 +++ Makefile 20 Jan 2016 14:55:52 -0000 @@ -2,8 +2,7 @@ COMMENT = GNU system administration tool for networks -DISTNAME = cfengine-3.4.5 -REVISION = 7 +DISTNAME = cfengine-3.7.2 SHARED_LIBS += promises 0.0 # 1.0 CATEGORIES = sysutils @@ -14,29 +13,34 @@ MAINTAINER = Rodrigo Mosconi <openbsd@mo # GPLv3 only PERMIT_PACKAGE_CDROM = Yes -MASTER_SITES = https://s3.amazonaws.com/cfengine.package-repos/tarballs/ +MASTER_SITES = https://cfengine-package-repos.s3.amazonaws.com/tarballs/ CFENGINE_BASE = /var/cfengine CFENGINE_EXAMPLES = ${PREFIX}/share/examples/cfengine SUBST_VARS += CFENGINE_BASE CFENGINE_EXAMPLES -FLAVORS = pgsql +FLAVORS = pgsql mysql FLAVOR ?= -WANTLIB = c crypto m pcre pthread qdbm z +WANTLIB = c crypto m pthread z +WANTLIB += xml2 pcre tokyocabinet +SEPARATE_BUILD = Yes CONFIGURE_STYLE = gnu USE_GMAKE = Yes MODULES = converters/libiconv -LIB_DEPENDS = databases/qdbm \ +LIB_DEPENDS = databases/tokyocabinet \ + textproc/libxml \ devel/pcre CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS = --with-openssl=/usr \ --with-pcre \ - --with-qdbm \ - --without-libxml2 \ + --with-tokyocabinet \ + --without-libacl \ --without-libvirt \ - --enable-fhs \ + --with-libxml2 \ + --without-libyaml \ + --disable-fhs \ --with-workdir=${CFENGINE_BASE} MAKE_FLAGS += examplesdir="${CFENGINE_EXAMPLES}" \ masterfilesdir="${CFENGINE_EXAMPLES}/CoreBase" @@ -57,6 +61,7 @@ LIB_DEPENDS += databases/mariadb CONFIGURE_ARGS += --without-mysql .endif + # tests not yet working NO_TEST = Yes # also note some formatting errors with manpages (e.g. "You can think @@ -70,8 +75,9 @@ post-extract: post-install: ${INSTALL_PROGRAM_DIR} ${WRKINST}${CFENGINE_BASE}/bin -.for i in cf-agent cf-execd cf-key cf-monitord cf-promises cf-report cf-runagent cf-serverd - ln -s ${TRUEPREFIX}/sbin/$i ${WRKINST}${CFENGINE_BASE}/bin/ +.for i in cf-agent cf-execd cf-key cf-monitord cf-promises cf-upgrade \ + cf-runagent cf-serverd + ln -s ${TRUEPREFIX}/bin/$i ${WRKINST}${CFENGINE_BASE}/bin/ .endfor .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/sysutils/cfengine/distinfo,v retrieving revision 1.14 diff -u -p -u -p -r1.14 distinfo --- distinfo 20 Sep 2013 13:02:50 -0000 1.14 +++ distinfo 20 Jan 2016 14:55:52 -0000 @@ -1,2 +1,2 @@ -SHA256 (cfengine-3.4.5.tar.gz) = VCgIufUy531m3KGeg73B+ZXX0AZrlAo5vdXbmnFoABE= -SIZE (cfengine-3.4.5.tar.gz) = 4671628 +SHA256 (cfengine-3.7.2.tar.gz) = qtmuJghkrL3yqkQcIINlRg+ajsqlNhi720ZeN670reU= +SIZE (cfengine-3.7.2.tar.gz) = 2114764 Index: patches/patch-cf-agent_verify_files_c =================================================================== RCS file: patches/patch-cf-agent_verify_files_c diff -N patches/patch-cf-agent_verify_files_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-cf-agent_verify_files_c 20 Jan 2016 14:55:52 -0000 @@ -0,0 +1,18 @@ +$OpenBSD$ +--- cf-agent/verify_files.c.orig Wed Jan 20 00:29:13 2016 ++++ cf-agent/verify_files.c Wed Jan 20 00:32:12 2016 +@@ -680,12 +680,12 @@ PromiseResult ScheduleEditOperation(EvalContext *ctx, + if ((vp = PromiseGetConstraintAsRval(pp, "edit_line", RVAL_TYPE_FNCALL))) + { + fp = (FnCall *) vp; +- strcpy(edit_bundle_name, fp->name); ++ strlcpy(edit_bundle_name, fp->name, CF_BUFSIZE); + args = fp->args; + } + else if ((vp = PromiseGetConstraintAsRval(pp, "edit_line", RVAL_TYPE_SCALAR))) + { +- strcpy(edit_bundle_name, (char *) vp); ++ strlcpy(edit_bundle_name, (char *) vp, CF_BUFSIZE); + args = NULL; + } + else Index: patches/patch-cf-agent_verify_files_utils_c =================================================================== RCS file: patches/patch-cf-agent_verify_files_utils_c diff -N patches/patch-cf-agent_verify_files_utils_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-cf-agent_verify_files_utils_c 20 Jan 2016 14:55:53 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- cf-agent/verify_files_utils.c.orig Wed Jan 20 00:37:39 2016 ++++ cf-agent/verify_files_utils.c Wed Jan 20 00:37:57 2016 +@@ -1384,7 +1384,7 @@ bool CopyRegularFile(EvalContext *ctx, const char *sou + if (attr.copy.backup == BACKUP_OPTION_TIMESTAMP) + { + stampnow = time((time_t *) NULL); +- snprintf(stamp, CF_BUFSIZE - 1, "_%lu_%s", CFSTARTTIME, CanonifyName(ctime(&stampnow))); ++ snprintf(stamp, CF_BUFSIZE - 1, "_%lld_%s", CFSTARTTIME, CanonifyName(ctime(&stampnow))); + + if (!JoinSuffix(backup, stamp)) + { Index: patches/patch-cf-execd_cf-execd_c =================================================================== RCS file: patches/patch-cf-execd_cf-execd_c diff -N patches/patch-cf-execd_cf-execd_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-cf-execd_cf-execd_c 20 Jan 2016 14:55:53 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- cf-execd/cf-execd.c.orig Wed Jan 20 01:40:30 2016 ++++ cf-execd/cf-execd.c Wed Jan 20 01:42:49 2016 +@@ -568,7 +568,7 @@ static bool ScheduleRun(EvalContext *ctx, Policy **pol + + EvalContextClear(ctx); + +- strcpy(VDOMAIN, "undefined.domain"); ++ strlcpy(VDOMAIN, "undefined.domain", sizeof(VDOMAIN)); + + PolicyDestroy(*policy); + *policy = NULL; Index: patches/patch-cf-upgrade_log_c =================================================================== RCS file: patches/patch-cf-upgrade_log_c diff -N patches/patch-cf-upgrade_log_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-cf-upgrade_log_c 20 Jan 2016 14:55:53 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- cf-upgrade/log.c.orig Wed Jan 20 00:13:36 2016 ++++ cf-upgrade/log.c Wed Jan 20 00:14:34 2016 +@@ -54,7 +54,7 @@ static char *prepare_message(char *format, va_list arg + strftime(timestamp, timestamp_size, "%Y/%m/%d %H:%M:%S", now_tm); + /* '[' + ']' + ' ' + '\0' */ + message = xmalloc(message_size + timestamp_size + 4); +- sprintf(message, "[%s] %s", timestamp, buffer); ++ snprintf(message, message_size, "[%s] %s", timestamp, buffer); + return message; + } + Index: patches/patch-libcompat_strchrnul_c =================================================================== RCS file: patches/patch-libcompat_strchrnul_c diff -N patches/patch-libcompat_strchrnul_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libcompat_strchrnul_c 20 Jan 2016 14:55:53 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- libcompat/strchrnul.c.orig Wed Jan 20 01:28:25 2016 ++++ libcompat/strchrnul.c Wed Jan 20 01:29:38 2016 +@@ -12,7 +12,7 @@ char *strchrnul(const char *s, int c) + + if (p == NULL) + { +- return s + strlen(s); ++ return (char *)s + strlen(s); + } + else + { Index: patches/patch-libpromises_evalfunction_c =================================================================== RCS file: patches/patch-libpromises_evalfunction_c diff -N patches/patch-libpromises_evalfunction_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libpromises_evalfunction_c 20 Jan 2016 14:55:53 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- libpromises/evalfunction.c.orig Mon Jan 18 22:52:24 2016 ++++ libpromises/evalfunction.c Mon Jan 18 22:52:49 2016 +@@ -5520,7 +5520,7 @@ static FnCallResult FnCallStrftime(ARG_UNUSED EvalCont + if (tm == NULL) + { + Log(LOG_LEVEL_WARNING, +- "Function %s, the given time stamp '%ld' was invalid. (strftime: %s)", ++ "Function %s, the given time stamp '%lld' was invalid. (strftime: %s)", + fp->name, when, GetErrorStr()); + } + else if (PortablyFormatTime(buffer, sizeof(buffer), Index: patches/patch-libpromises_processes_select_c =================================================================== RCS file: patches/patch-libpromises_processes_select_c diff -N patches/patch-libpromises_processes_select_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libpromises_processes_select_c 20 Jan 2016 14:55:53 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- libpromises/processes_select.c.orig Mon Jan 18 23:06:24 2016 ++++ libpromises/processes_select.c Mon Jan 18 23:06:52 2016 +@@ -839,7 +839,7 @@ static int SplitProcLine(const char *proc, time_t psti + line[j], ctime(&value)); + + free(line[j]); +- xasprintf(line + j, "%ld", value); ++ xasprintf(line + j, "%lld", value); + } + } + } Index: patches/patch-libutils_string_lib_c =================================================================== RCS file: patches/patch-libutils_string_lib_c diff -N patches/patch-libutils_string_lib_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libutils_string_lib_c 20 Jan 2016 14:55:53 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ +--- libutils/string_lib.c.orig Wed Jan 20 01:38:43 2016 ++++ libutils/string_lib.c Wed Jan 20 01:40:04 2016 +@@ -1023,8 +1023,8 @@ bool StringAppendAbbreviatedPromise(char *dst, const c + last_line += tail - max_fragment; + } + memcpy(abbr, src, head); +- strcpy(abbr + head, sep); +- strcat(abbr, last_line); ++ strlcpy(abbr + head, sep, sizeof(abbr)-head ); ++ strlcat(abbr, last_line, sizeof(abbr) ); + return StringAppendPromise(dst, abbr, n); + } + } Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/sysutils/cfengine/pkg/PLIST,v retrieving revision 1.13 diff -u -p -u -p -r1.13 PLIST --- pkg/PLIST 1 May 2013 21:09:23 -0000 1.13 +++ pkg/PLIST 20 Jan 2016 14:55:54 -0000 @@ -1,309 +1,358 @@ -@comment $OpenBSD: PLIST,v 1.13 2013/05/01 21:09:23 sthen Exp $ -lib/cfengine/ -lib/cfengine/libpromises.la -@lib lib/cfengine/libpromises.so.${LIBpromises_VERSION} -@man man/man8/cf-agent.8 -@man man/man8/cf-execd.8 -@man man/man8/cf-key.8 -@man man/man8/cf-monitord.8 -@man man/man8/cf-promises.8 -@man man/man8/cf-report.8 -@man man/man8/cf-runagent.8 -@man man/man8/cf-serverd.8 -@bin sbin/cf-agent -@bin sbin/cf-execd -@bin sbin/cf-key -@bin sbin/cf-monitord -@bin sbin/cf-promises -@bin sbin/cf-report -@bin sbin/cf-runagent -@bin sbin/cf-serverd +@comment $OpenBSD$ +lib/libpromises.a +lib/libpromises.la +@lib lib/libpromises.so.${LIBpromises_VERSION} +@bin bin/cf-agent +@bin bin/cf-execd +@bin bin/cf-key +@bin bin/cf-monitord +@bin bin/cf-promises +@bin bin/cf-runagent +@bin bin/cf-serverd +@bin bin/cf-upgrade share/doc/cfengine/ share/doc/cfengine/ChangeLog -share/doc/cfengine/README +share/doc/cfengine/README.md share/doc/pkg-readmes/${FULLPKGNAME} share/examples/cfengine/ -share/examples/cfengine/CoreBase/ -share/examples/cfengine/CoreBase/cf-sketch-runfile.cf -share/examples/cfengine/CoreBase/controls/ -share/examples/cfengine/CoreBase/controls/cf_agent.cf -share/examples/cfengine/CoreBase/controls/cf_execd.cf -share/examples/cfengine/CoreBase/controls/cf_monitord.cf -share/examples/cfengine/CoreBase/controls/cf_report.cf -share/examples/cfengine/CoreBase/controls/cf_runagent.cf -share/examples/cfengine/CoreBase/controls/cf_serverd.cf -share/examples/cfengine/CoreBase/def.cf -share/examples/cfengine/CoreBase/libraries/ -share/examples/cfengine/CoreBase/libraries/cfengine_stdlib.cf -share/examples/cfengine/CoreBase/promises.cf -share/examples/cfengine/CoreBase/services/ -share/examples/cfengine/CoreBase/services/init_msg.cf -share/examples/cfengine/CoreBase/update.cf +share/examples/cfengine/abort.cf +share/examples/cfengine/accessed_before.cf +share/examples/cfengine/accessedbefore.cf +share/examples/cfengine/accumulated_time.cf +share/examples/cfengine/acl.cf +share/examples/cfengine/acl_generic.cf +share/examples/cfengine/acl_ntfs.cf +share/examples/cfengine/acl_secret.cf share/examples/cfengine/active_directory.cf +share/examples/cfengine/activedirectory_listusers.cf +share/examples/cfengine/activedirectory_showuser.cf +share/examples/cfengine/ago.cf share/examples/cfengine/app_baseline.cf +share/examples/cfengine/appgroups.cf +share/examples/cfengine/arrays.cf +share/examples/cfengine/backreferences_files.cf +share/examples/cfengine/badpromise.cf +share/examples/cfengine/badtype.cf +share/examples/cfengine/bsdflags.cf +share/examples/cfengine/bundle_return_values.cf +share/examples/cfengine/bundlesmatching.cf +share/examples/cfengine/bundlestate.cf +share/examples/cfengine/canonify.cf +share/examples/cfengine/cf2_integration.cf +share/examples/cfengine/change_detect.cf +share/examples/cfengine/changedbefore.cf +share/examples/cfengine/chdir.cf +share/examples/cfengine/classes_global.cf +share/examples/cfengine/classesmatching.cf +share/examples/cfengine/classmatch.cf +share/examples/cfengine/classvar_convergence.cf +share/examples/cfengine/commands.cf +share/examples/cfengine/compare.cf +share/examples/cfengine/container_iteration.cf +share/examples/cfengine/container_key_iteration.cf +share/examples/cfengine/control_expand.cf +share/examples/cfengine/controlclasses.cf +share/examples/cfengine/copy.cf +share/examples/cfengine/copy_classes.cf +share/examples/cfengine/copy_copbl.cf +share/examples/cfengine/copy_edit.cf +share/examples/cfengine/copydir_copbl.cf +share/examples/cfengine/copylinks.cf +share/examples/cfengine/countclassesmatching.cf +share/examples/cfengine/countlinesmatching.cf +share/examples/cfengine/create_filedir.cf +share/examples/cfengine/createdb.cf +share/examples/cfengine/customize_by_named_list.cf +share/examples/cfengine/data_expand.cf +share/examples/cfengine/data_readstringarray.cf +share/examples/cfengine/data_regextract.cf +share/examples/cfengine/datastate.cf +share/examples/cfengine/defaults.cf +share/examples/cfengine/defaults2.cf +share/examples/cfengine/defaults3.cf +share/examples/cfengine/definitions.cf +share/examples/cfengine/deletelines.cf +share/examples/cfengine/depends_on.cf +share/examples/cfengine/depends_on2.cf +share/examples/cfengine/difference.cf +share/examples/cfengine/dirname.cf +share/examples/cfengine/disable.cf +share/examples/cfengine/disable_and_rotate_files.cf +share/examples/cfengine/diskfree.cf +share/examples/cfengine/dollar.cf +share/examples/cfengine/edit_column_files.cf +share/examples/cfengine/edit_comment_lines.cf +share/examples/cfengine/edit_deletenotmatch.cf +share/examples/cfengine/edit_insert_fuzzylines.cf +share/examples/cfengine/edit_insert_lines.cf +share/examples/cfengine/edit_insert_lines_silly.cf +share/examples/cfengine/edit_passwd_file.cf +share/examples/cfengine/edit_passwd_file_basic.cf +share/examples/cfengine/edit_replace_string.cf +share/examples/cfengine/edit_sectioned_file.cf +share/examples/cfengine/edit_setvar.cf +share/examples/cfengine/edit_template.cf +share/examples/cfengine/edit_triggerclass.cf +share/examples/cfengine/edit_xml.cf +share/examples/cfengine/ensure_line_present_prepend_append.cf +share/examples/cfengine/env.cf +share/examples/cfengine/epimenides.cf +share/examples/cfengine/escape.cf +share/examples/cfengine/eval.cf +share/examples/cfengine/every.cf +share/examples/cfengine/exec_args.cf +share/examples/cfengine/exec_in_sequence.cf +share/examples/cfengine/execd.cf +share/examples/cfengine/execresult.cf +share/examples/cfengine/expand.cf +share/examples/cfengine/failedcommand.cf +share/examples/cfengine/failsafe.cf +share/examples/cfengine/file_change_detection.cf +share/examples/cfengine/file_hash.cf +share/examples/cfengine/file_owner_list_template.cf +share/examples/cfengine/fileexists.cf +share/examples/cfengine/filenames.cf +share/examples/cfengine/fileperms.cf +share/examples/cfengine/filesexist.cf +share/examples/cfengine/filesexist2.cf +share/examples/cfengine/filesize.cf +share/examples/cfengine/filestat.cf +share/examples/cfengine/filter.cf +share/examples/cfengine/findfiles.cf +share/examples/cfengine/fix_names.cf +share/examples/cfengine/format.cf +share/examples/cfengine/getclassmetatags.cf +share/examples/cfengine/getenv.cf +share/examples/cfengine/getfields.cf +share/examples/cfengine/getgid.cf +share/examples/cfengine/getindices.cf +share/examples/cfengine/getindices_and_values.cf +share/examples/cfengine/getmacaddress.cf +share/examples/cfengine/getregistry.cf +share/examples/cfengine/getuid.cf +share/examples/cfengine/getusers.cf +share/examples/cfengine/getvalues.cf +share/examples/cfengine/getvariablemetatags.cf +share/examples/cfengine/global_list_expansion.cf +share/examples/cfengine/global_list_expansion_2.cf +share/examples/cfengine/grep.cf +share/examples/cfengine/groupexists.cf share/examples/cfengine/guest_environment_kvm.cf +share/examples/cfengine/hash.cf +share/examples/cfengine/hashcomment.cf +share/examples/cfengine/hashmatch.cf +share/examples/cfengine/hashuncomment.cf +share/examples/cfengine/helloworld.cf +share/examples/cfengine/host2ip.cf +share/examples/cfengine/hostrange.cf +share/examples/cfengine/hostsseen.cf share/examples/cfengine/hostswithclass.cf +share/examples/cfengine/hub.cf +share/examples/cfengine/id.cf +share/examples/cfengine/inherit.cf +share/examples/cfengine/insert_users.cf +share/examples/cfengine/intarray.cf +share/examples/cfengine/intersection.cf +share/examples/cfengine/inventory_cpu.cf +share/examples/cfengine/ip2host.cf +share/examples/cfengine/iprange.cf +share/examples/cfengine/irange.cf +share/examples/cfengine/isdir.cf +share/examples/cfengine/isexecutable.cf +share/examples/cfengine/isgreaterthan.cf +share/examples/cfengine/islessthan.cf +share/examples/cfengine/islink.cf +share/examples/cfengine/isnewerthan.cf +share/examples/cfengine/isplain.cf +share/examples/cfengine/isvariable.cf +share/examples/cfengine/iteration.cf +share/examples/cfengine/join.cf +share/examples/cfengine/knowledge_driver.cf +share/examples/cfengine/knowledge_txt.cf +share/examples/cfengine/lastnode.cf +share/examples/cfengine/ldap.cf +share/examples/cfengine/length.cf +share/examples/cfengine/linking.cf +share/examples/cfengine/literal_server.cf +share/examples/cfengine/locate_files_and_compress.cf +share/examples/cfengine/log_private.cf +share/examples/cfengine/loops.cf +share/examples/cfengine/lsdir.cf +share/examples/cfengine/maparray.cf +share/examples/cfengine/mapdata.cf +share/examples/cfengine/maplist.cf +share/examples/cfengine/max-min-mean-variance.cf +share/examples/cfengine/measure_log.cf +share/examples/cfengine/measurements.cf +share/examples/cfengine/menu.cf +share/examples/cfengine/mergedata.cf +share/examples/cfengine/meta.cf +share/examples/cfengine/method.cf +share/examples/cfengine/method_polymorph.cf +share/examples/cfengine/method_validate.cf +share/examples/cfengine/method_var.cf +share/examples/cfengine/method_var2.cf +share/examples/cfengine/module_exec.cf +share/examples/cfengine/module_exec_2.cf +share/examples/cfengine/monitord.cf share/examples/cfengine/motd.cf +share/examples/cfengine/mount_fs.cf +share/examples/cfengine/multipassvars.cf +share/examples/cfengine/namespace.cf +share/examples/cfengine/namespace1.cf +share/examples/cfengine/namespace2.cf +share/examples/cfengine/namespace3.cf +share/examples/cfengine/namespace_class1.cf +share/examples/cfengine/namespace_classes.cf +share/examples/cfengine/namespace_var_meta.cf +share/examples/cfengine/namespace_var_meta2.cf +share/examples/cfengine/neighbourhood_watch.cf +share/examples/cfengine/none.cf +share/examples/cfengine/nth.cf +share/examples/cfengine/null_config.cf +share/examples/cfengine/occurrences.cf +share/examples/cfengine/orchestrate_chain1.cf +share/examples/cfengine/orchestrate_chain2.cf +share/examples/cfengine/orchestrate_delay_trigger.cf +share/examples/cfengine/orchestrate_dominoes1.cf +share/examples/cfengine/orchestrate_dominoes2.cf +share/examples/cfengine/orchestrate_dragon.cf +share/examples/cfengine/orchestrate_dragon_load_balancer.cf +share/examples/cfengine/orchestrate_n_of_m.cf +share/examples/cfengine/orchestration_hostlist.cf +share/examples/cfengine/ordering.cf +share/examples/cfengine/package_apt.cf +share/examples/cfengine/package_bundles.cf +share/examples/cfengine/package_freebsd.cf +share/examples/cfengine/package_latest.cf +share/examples/cfengine/package_msi_file.cf +share/examples/cfengine/package_msi_version.cf +share/examples/cfengine/package_rpm.cf +share/examples/cfengine/package_solaris.cf share/examples/cfengine/package_windows_feature.cf +share/examples/cfengine/package_yum.cf +share/examples/cfengine/package_zypper.cf +share/examples/cfengine/packagesmatching.cf +share/examples/cfengine/parallel_exec.cf +share/examples/cfengine/parseintrealstringarray.cf +share/examples/cfengine/parsestringarray.cf +share/examples/cfengine/parsestringarrayidx.cf +share/examples/cfengine/pathtype.cf +share/examples/cfengine/pattern_and_edit.cf +share/examples/cfengine/peerleader.cf +share/examples/cfengine/peerleaders.cf +share/examples/cfengine/peers.cf +share/examples/cfengine/postfix.cf +share/examples/cfengine/process_kill.cf +share/examples/cfengine/process_matching.cf +share/examples/cfengine/process_matching2.cf +share/examples/cfengine/process_matching3.cf +share/examples/cfengine/process_restart.cf +share/examples/cfengine/process_restart_basic.cf +share/examples/cfengine/process_signalling.cf +share/examples/cfengine/processes_define_class_based_on_process_runtime.cf +share/examples/cfengine/product.cf share/examples/cfengine/promise_knowledge.cf +share/examples/cfengine/promises.cf +share/examples/cfengine/randomint.cf +share/examples/cfengine/readcsv.cf +share/examples/cfengine/readdata.cf +share/examples/cfengine/readfile.cf +share/examples/cfengine/readintrealstringlist.cf +share/examples/cfengine/readlist.cf +share/examples/cfengine/readtcp.cf +share/examples/cfengine/reg_multiline.cf +share/examples/cfengine/regarray.cf +share/examples/cfengine/regcmp.cf +share/examples/cfengine/regex_win.cf +share/examples/cfengine/regextract.cf +share/examples/cfengine/registry.cf +share/examples/cfengine/registry_cache.cf +share/examples/cfengine/registryvalue.cf +share/examples/cfengine/regline.cf +share/examples/cfengine/reglist.cf +share/examples/cfengine/remake_outputs.pl +share/examples/cfengine/remoteclasses.cf +share/examples/cfengine/remoteclasses2.cf +share/examples/cfengine/remotescalar.cf +share/examples/cfengine/remove_deadlinks.cf +share/examples/cfengine/rename.cf +share/examples/cfengine/repairedcommand.cf +share/examples/cfengine/report_custom.cf +share/examples/cfengine/report_diffs.cf +share/examples/cfengine/report_state.cf +share/examples/cfengine/reporting.cf +share/examples/cfengine/reporttofile.cf +share/examples/cfengine/resolveconf.cf +share/examples/cfengine/returnszero.cf +share/examples/cfengine/reverse.cf +share/examples/cfengine/root_passwd.cf +share/examples/cfengine/select_class.cf +share/examples/cfengine/select_mode.cf +share/examples/cfengine/select_region.cf +share/examples/cfengine/select_size.cf +share/examples/cfengine/selectservers.cf +share/examples/cfengine/server_callback.cf +share/examples/cfengine/server_copy_localhost.cf +share/examples/cfengine/server_copy_purge.cf +share/examples/cfengine/server_copy_remote.cf +share/examples/cfengine/server_flatcopy_localhost.cf share/examples/cfengine/service_catalogue.cf share/examples/cfengine/service_catalogue_separate.cf +share/examples/cfengine/service_disable.cf +share/examples/cfengine/service_start.cf +share/examples/cfengine/services_concept.cf +share/examples/cfengine/services_win.cf +share/examples/cfengine/setuidlog.cf +share/examples/cfengine/setvar.cf +share/examples/cfengine/shuffle.cf +share/examples/cfengine/software_dist.cf +share/examples/cfengine/software_update_version_yum.cf +share/examples/cfengine/some.cf +share/examples/cfengine/sort.cf +share/examples/cfengine/splitstring.cf share/examples/cfengine/sql_table_structure.cf -share/examples/cfengine/unit_abort.cf -share/examples/cfengine/unit_accessed_before.cf -share/examples/cfengine/unit_accumulated_time.cf -share/examples/cfengine/unit_acl.cf -share/examples/cfengine/unit_acl_generic.cf -share/examples/cfengine/unit_acl_ntfs.cf -share/examples/cfengine/unit_acl_secret.cf -share/examples/cfengine/unit_activedirectory_listusers.cf -share/examples/cfengine/unit_activedirectory_showuser.cf -share/examples/cfengine/unit_ago.cf -share/examples/cfengine/unit_arrays.cf -share/examples/cfengine/unit_backreferences_files.cf -share/examples/cfengine/unit_badpromise.cf -share/examples/cfengine/unit_badtype.cf -share/examples/cfengine/unit_bsdflags.cf -share/examples/cfengine/unit_bundle_return_values.cf -share/examples/cfengine/unit_cf2_integration.cf -share/examples/cfengine/unit_change_detect.cf -share/examples/cfengine/unit_changedbefore.cf -share/examples/cfengine/unit_chdir.cf -share/examples/cfengine/unit_classes_global.cf -share/examples/cfengine/unit_classmatch.cf -share/examples/cfengine/unit_classvar_convergence.cf -share/examples/cfengine/unit_commands.cf -share/examples/cfengine/unit_compare.cf -share/examples/cfengine/unit_control_expand.cf -share/examples/cfengine/unit_controlclasses.cf -share/examples/cfengine/unit_copy.cf -share/examples/cfengine/unit_copy_classes.cf -share/examples/cfengine/unit_copy_copbl.cf -share/examples/cfengine/unit_copy_edit.cf -share/examples/cfengine/unit_copydir_copbl.cf -share/examples/cfengine/unit_copylinks.cf -share/examples/cfengine/unit_countclassesmatching.cf -share/examples/cfengine/unit_countlinesmatching.cf -share/examples/cfengine/unit_create_filedir.cf -share/examples/cfengine/unit_createdb.cf -share/examples/cfengine/unit_customize_by_named_list.cf -share/examples/cfengine/unit_defaults.cf -share/examples/cfengine/unit_defaults2.cf -share/examples/cfengine/unit_defaults3.cf -share/examples/cfengine/unit_definitions.cf -share/examples/cfengine/unit_deletelines.cf -share/examples/cfengine/unit_depends_on.cf -share/examples/cfengine/unit_depends_on2.cf -share/examples/cfengine/unit_disable.cf -share/examples/cfengine/unit_disable_and_rotate_files.cf -share/examples/cfengine/unit_diskfree.cf -share/examples/cfengine/unit_dollar.cf -share/examples/cfengine/unit_edit_column_files.cf -share/examples/cfengine/unit_edit_comment_lines.cf -share/examples/cfengine/unit_edit_deletenotmatch.cf -share/examples/cfengine/unit_edit_insert_fuzzylines.cf -share/examples/cfengine/unit_edit_insert_lines.cf -share/examples/cfengine/unit_edit_insert_lines_silly.cf -share/examples/cfengine/unit_edit_passwd_file.cf -share/examples/cfengine/unit_edit_passwd_file_basic.cf -share/examples/cfengine/unit_edit_replace_string.cf -share/examples/cfengine/unit_edit_sectioned_file.cf -share/examples/cfengine/unit_edit_setvar.cf -share/examples/cfengine/unit_edit_template.cf -share/examples/cfengine/unit_edit_triggerclass.cf -share/examples/cfengine/unit_env.cf -share/examples/cfengine/unit_epimenides.cf -share/examples/cfengine/unit_escape.cf -share/examples/cfengine/unit_exec_args.cf -share/examples/cfengine/unit_exec_in_sequence.cf -share/examples/cfengine/unit_execd.cf -share/examples/cfengine/unit_execresult.cf -share/examples/cfengine/unit_expand.cf -share/examples/cfengine/unit_failedcommand.cf -share/examples/cfengine/unit_failsafe.cf -share/examples/cfengine/unit_file_change_detection.cf -share/examples/cfengine/unit_file_owner_list_template.cf -share/examples/cfengine/unit_fileexists.cf -share/examples/cfengine/unit_filenames.cf -share/examples/cfengine/unit_fileperms.cf -share/examples/cfengine/unit_filesexist.cf -share/examples/cfengine/unit_filesexist2.cf -share/examples/cfengine/unit_filesize.cf -share/examples/cfengine/unit_fix_names.cf -share/examples/cfengine/unit_getenv.cf -share/examples/cfengine/unit_getfields.cf -share/examples/cfengine/unit_getgid.cf -share/examples/cfengine/unit_getindices.cf -share/examples/cfengine/unit_getindices_and_values.cf -share/examples/cfengine/unit_getmacaddress.cf -share/examples/cfengine/unit_getregistry.cf -share/examples/cfengine/unit_getuid.cf -share/examples/cfengine/unit_getusers.cf -share/examples/cfengine/unit_global_list_expansion.cf -share/examples/cfengine/unit_global_list_expansion_2.cf -share/examples/cfengine/unit_grep.cf -share/examples/cfengine/unit_groupexists.cf -share/examples/cfengine/unit_hash.cf -share/examples/cfengine/unit_hashcomment.cf -share/examples/cfengine/unit_hashmatch.cf -share/examples/cfengine/unit_hashuncomment.cf -share/examples/cfengine/unit_helloworld.cf -share/examples/cfengine/unit_host2ip.cf -share/examples/cfengine/unit_hostrange.cf -share/examples/cfengine/unit_hostsseen.cf -share/examples/cfengine/unit_hub.cf -share/examples/cfengine/unit_id.cf -share/examples/cfengine/unit_inherit.cf -share/examples/cfengine/unit_insert_users.cf -share/examples/cfengine/unit_intarray.cf -share/examples/cfengine/unit_inventory_cpu.cf -share/examples/cfengine/unit_iprange.cf -share/examples/cfengine/unit_irange.cf -share/examples/cfengine/unit_isdir.cf -share/examples/cfengine/unit_islink.cf -share/examples/cfengine/unit_isnewerthan.cf -share/examples/cfengine/unit_isplain.cf -share/examples/cfengine/unit_isvariable.cf -share/examples/cfengine/unit_iteration.cf -share/examples/cfengine/unit_join.cf -share/examples/cfengine/unit_knowledge_driver.cf -share/examples/cfengine/unit_knowledge_txt.cf -share/examples/cfengine/unit_lastnode.cf -share/examples/cfengine/unit_ldap.cf -share/examples/cfengine/unit_linking.cf -share/examples/cfengine/unit_literal_server.cf -share/examples/cfengine/unit_locate_files_and_compress.cf -share/examples/cfengine/unit_log_private.cf -share/examples/cfengine/unit_loops.cf -share/examples/cfengine/unit_lsdir.cf -share/examples/cfengine/unit_maplist.cf -share/examples/cfengine/unit_measure_log.cf -share/examples/cfengine/unit_measurements.cf -share/examples/cfengine/unit_menu.cf -share/examples/cfengine/unit_meta.cf -share/examples/cfengine/unit_method.cf -share/examples/cfengine/unit_method_polymorph.cf -share/examples/cfengine/unit_method_validate.cf -share/examples/cfengine/unit_method_var.cf -share/examples/cfengine/unit_method_var2.cf -share/examples/cfengine/unit_module_exec.cf -share/examples/cfengine/unit_module_exec_2.cf -share/examples/cfengine/unit_monitord.cf -share/examples/cfengine/unit_mount_fs.cf -share/examples/cfengine/unit_multipassvars.cf -share/examples/cfengine/unit_namespace.cf -share/examples/cfengine/unit_namespace1.cf -share/examples/cfengine/unit_namespace2.cf -share/examples/cfengine/unit_namespace3.cf -share/examples/cfengine/unit_namespace_class1.cf -share/examples/cfengine/unit_namespace_classes.cf -share/examples/cfengine/unit_namespace_var_meta.cf -share/examples/cfengine/unit_namespace_var_meta2.cf -share/examples/cfengine/unit_neighbourhood_watch.cf -share/examples/cfengine/unit_null_config.cf -share/examples/cfengine/unit_occurrences.cf -share/examples/cfengine/unit_orchestrate_chain1.cf -share/examples/cfengine/unit_orchestrate_chain2.cf -share/examples/cfengine/unit_orchestrate_dominoes1.cf -share/examples/cfengine/unit_orchestrate_dominoes2.cf -share/examples/cfengine/unit_orchestrate_dragon.cf -share/examples/cfengine/unit_orchestrate_dragon_load_balancer.cf -share/examples/cfengine/unit_orchestrate_n_of_m.cf -share/examples/cfengine/unit_orchestration_hostlist.cf -share/examples/cfengine/unit_ordering.cf -share/examples/cfengine/unit_package_apt.cf -share/examples/cfengine/unit_package_freebsd.cf -share/examples/cfengine/unit_package_latest.cf -share/examples/cfengine/unit_package_msi_file.cf -share/examples/cfengine/unit_package_msi_version.cf -share/examples/cfengine/unit_package_rpm.cf -share/examples/cfengine/unit_package_solaris.cf -share/examples/cfengine/unit_package_yum.cf -share/examples/cfengine/unit_package_zypper.cf -share/examples/cfengine/unit_parallel_exec.cf -share/examples/cfengine/unit_parsestringarray.cf -share/examples/cfengine/unit_pathtype.cf -share/examples/cfengine/unit_pattern_and_edit.cf -share/examples/cfengine/unit_peers.cf -share/examples/cfengine/unit_postfix.cf -share/examples/cfengine/unit_process_kill.cf -share/examples/cfengine/unit_process_matching.cf -share/examples/cfengine/unit_process_matching2.cf -share/examples/cfengine/unit_process_matching3.cf -share/examples/cfengine/unit_process_restart.cf -share/examples/cfengine/unit_process_restart_basic.cf -share/examples/cfengine/unit_process_signalling.cf -share/examples/cfengine/unit_product.cf -share/examples/cfengine/unit_promises.cf -share/examples/cfengine/unit_readlist.cf -share/examples/cfengine/unit_readtcp.cf -share/examples/cfengine/unit_reg_multiline.cf -share/examples/cfengine/unit_regarray.cf -share/examples/cfengine/unit_regex_win.cf -share/examples/cfengine/unit_regextract.cf -share/examples/cfengine/unit_registry.cf -share/examples/cfengine/unit_registry_cache.cf -share/examples/cfengine/unit_regline.cf -share/examples/cfengine/unit_reglist.cf -share/examples/cfengine/unit_remoteclasses.cf -share/examples/cfengine/unit_remoteclasses2.cf -share/examples/cfengine/unit_remotescalar.cf -share/examples/cfengine/unit_remove_deadlinks.cf -share/examples/cfengine/unit_rename.cf -share/examples/cfengine/unit_repairedcommand.cf -share/examples/cfengine/unit_report_custom.cf -share/examples/cfengine/unit_report_diffs.cf -share/examples/cfengine/unit_report_state.cf -share/examples/cfengine/unit_reporting.cf -share/examples/cfengine/unit_reporttofile.cf -share/examples/cfengine/unit_resolveconf.cf -share/examples/cfengine/unit_returnszero.cf -share/examples/cfengine/unit_root_passwd.cf -share/examples/cfengine/unit_select_class.cf -share/examples/cfengine/unit_select_mode.cf -share/examples/cfengine/unit_select_region.cf -share/examples/cfengine/unit_select_size.cf -share/examples/cfengine/unit_selectservers.cf -share/examples/cfengine/unit_server_callback.cf -share/examples/cfengine/unit_server_copy_localhost.cf -share/examples/cfengine/unit_server_copy_purge.cf -share/examples/cfengine/unit_server_copy_remote.cf -share/examples/cfengine/unit_server_flatcopy_localhost.cf -share/examples/cfengine/unit_service_disable.cf -share/examples/cfengine/unit_service_start.cf -share/examples/cfengine/unit_services_concept.cf -share/examples/cfengine/unit_services_win.cf -share/examples/cfengine/unit_setuidlog.cf -share/examples/cfengine/unit_setvar.cf -share/examples/cfengine/unit_software_dist.cf -share/examples/cfengine/unit_software_update_version_yum.cf -share/examples/cfengine/unit_splitstring.cf -share/examples/cfengine/unit_storage.cf -share/examples/cfengine/unit_strcmp.cf -share/examples/cfengine/unit_stringarray.cf -share/examples/cfengine/unit_switchcase.cf -share/examples/cfengine/unit_syslog.cf -share/examples/cfengine/unit_syslog2.cf -share/examples/cfengine/unit_template.cf -share/examples/cfengine/unit_template2.cf -share/examples/cfengine/unit_test_environment.cf -share/examples/cfengine/unit_tidy_all_files.cf -share/examples/cfengine/unit_translatepath.cf -share/examples/cfengine/unit_update.cf -share/examples/cfengine/unit_user_edit.cf -share/examples/cfengine/unit_user_edit_method.cf -share/examples/cfengine/unit_userexists.cf -share/examples/cfengine/unit_varclass.cf -share/examples/cfengine/unit_varexpansion.cf -share/examples/cfengine/unit_varnet.cf -share/examples/cfengine/unit_vars.cf -share/examples/cfengine/unit_warnifline.cf -share/examples/cfengine/unit_webserver.cf -share/examples/cfengine/unit_zenoss.cf +share/examples/cfengine/storage.cf +share/examples/cfengine/strcmp.cf +share/examples/cfengine/strftime.cf +share/examples/cfengine/string_downcase.cf +share/examples/cfengine/string_head.cf +share/examples/cfengine/string_length.cf +share/examples/cfengine/string_mustache.cf +share/examples/cfengine/string_reverse.cf +share/examples/cfengine/string_split.cf +share/examples/cfengine/string_tail.cf +share/examples/cfengine/string_upcase.cf +share/examples/cfengine/stringarray.cf +share/examples/cfengine/sublist.cf +share/examples/cfengine/sum.cf +share/examples/cfengine/switchcase.cf +share/examples/cfengine/syslog.cf +share/examples/cfengine/syslog2.cf +share/examples/cfengine/template.cf +share/examples/cfengine/template2.cf +share/examples/cfengine/test_environment.cf +share/examples/cfengine/tidy_all_files.cf +share/examples/cfengine/translatepath.cf +share/examples/cfengine/unique.cf +share/examples/cfengine/unpack_method_calls.cf +share/examples/cfengine/update.cf +share/examples/cfengine/user_edit.cf +share/examples/cfengine/user_edit_method.cf +share/examples/cfengine/userexists.cf +share/examples/cfengine/users_type.cf +share/examples/cfengine/varclass.cf +share/examples/cfengine/varexpansion.cf +share/examples/cfengine/variablesmatching.cf +share/examples/cfengine/varnet.cf +share/examples/cfengine/vars.cf +share/examples/cfengine/warnifline.cf +share/examples/cfengine/webserver.cf share/examples/cfengine/win_dns_client.cf share/examples/cfengine/win_emergency.cf share/examples/cfengine/win_registry.cf share/examples/cfengine/win_schedule.cf +share/examples/cfengine/zenoss.cf @rcscript ${RCDIR}/cf_execd @rcscript ${RCDIR}/cf_monitord @rcscript ${RCDIR}/cf_serverd @@ -315,9 +364,9 @@ bin/cf-execd bin/cf-key bin/cf-monitord bin/cf-promises -bin/cf-report bin/cf-runagent bin/cf-serverd +bin/cf-upgrade @mode 0750 @sample ${CFENGINE_BASE}/ @mode 0700
