diff options
author | fhajny <fhajny> | 2015-04-07 08:43:35 +0000 |
---|---|---|
committer | fhajny <fhajny> | 2015-04-07 08:43:35 +0000 |
commit | 9c933a9c5e663ea2df131a062be7225735fdc3c2 (patch) | |
tree | f3331d93334bbd67912ca2658fb3b3d9a3406b16 /sysutils | |
parent | 011c16b5c4a9ca82ec19fde29e63e4525c8cf383 (diff) | |
download | pkgsrc-9c933a9c5e663ea2df131a062be7225735fdc3c2.tar.gz |
Update sysutils/cfengine3 to 3.6.5. Add lmdb support option.
Upstream changelog follows.
3.6.5
Features:
- Introduced "systemd" hard class.
- Added paths to dtrace, zfs and zpool on FreeBSD in masterfiles.
Bug fixes:
- Fixed build error on certain RHEL5 and SLES10 setups.
- Fixed a bug which caused dangling symlinks not to be removed.
- Fixed data_readstringarrayidx function not preserving the order of the
array it's producing.
- Fixed a bug which sometimes caused CFEngine to kill the wrong daemon
if both the host and a container inside the host were running
CFEngine.
- Made sure the rm_rf_depth bundle also deletes the base directory.
- Fixed monitord reporting wrongly on open ports.
- Skip adding the class when its name is longer than 1024 characters.
Fixed core dump when the name is too large.
- Fixed detection of stopped process on Solaris.
- Fixed infinite loop plus a couple more minor
bugs in edit_xml promises.
3.6.4
Features:
- Introduced users promises support on HP-UX platform.
- Introduced process promises support on HP-UX platform.
Bug fixes:
- Fixed bug on FreeBSD which sometimes led to the wrong process being killed
- Fixed package version comparison sometimes failing with rpm package manager
- Fixed a bug in users promises which would sometimes set the wrong
password hash if the user would also be unlocked at the same time.
- Fixed a bug on AIX which would occationally kill the wrong process.
- Improved error message for functions that require an absolute path.
- Fixed some spelling errors in examples.
- Fixed error in out-of-tree builds when building cf-upgrade.
- Fixed a bug which would make cf-agent exit with an error if it was
built with a custom log directory, and that directory did not exist.
- Fixed ordering of evaluating promises when depends_on is used.
- Skip non-empty directories silently when recursively deleting.
- Fix memory exhaustion with list larger than 4994 items.
- Fix cf-execd segfault on IP address detection
- Fix hard class detection of RHEL6 ComputeNode
3.6.3
New features:
- support for HP-UX 11.23 and later
- experimental support for Red Hat Enterprise Linux 7
Bug fixes:
- fix getindices on multi-dimensional arrays
- fix mustache template method to run in dryrun mode
- set mailto and mailfrom settings for execd in def.cf
- fix conflation of multi-index entries in arrays
- fix promise locking when transferring using update.cf
- update JSON parser to return an error on truncation
- fix sys.hardware_addresses not expanded
- fix opening database txn /var/cfengine/cf_lastseen.lmdb:
MDB_READERS_FULL when running cf-keys --show-hosts
- fix segfault (Null pointer dereference) when select_end in
delete_lines never matches
- fix max_file_size => "0" not disabling or allowing any size
- fix ifvarclass, with iteration over list, failing when deleting
files with time condition
- fix classes defined with "or" constraint are never set if any value
doesn't evaluate to a scalar
- update "mailfrom" default in default policy
- fix logrotate ambiguity of filename
- fix parsing JSON files
- reduce write count activity to /var partition
- fix files delete attribute incorrectly triggering promise_kept
- update services bundle output related to chkconfig when run in
inform mode.
- fix Solaris serverd tests
- fix broken bechaviour of merging arrays with readstringarray
- fix ifelapsed bug with bundle nesting
- fix handling cf_null in bundlesequence
- fix maparray reading whole input array when using subarray
- fix directories being randomly changed to files
- update defaults promise type to work with classes
- systemd integration in services promises
- fix touch attribute ignoring action = warn_only
- fix 4KB string limit in functions readfile, string_downcase,
string_head, string_reverse, string_length, string_tail,
string_upcase
3.6.2
Bug fixes:
- don't regenerate software_packages.csv every time
- improve verbose message for package_list_command
- fix missing log output on AIX
- assorted fixes to dirname() esp on Windows
- fix package manager detection
- fix build issues on FreeBSD
- allow copying of dead symbolic links
- preserve order in readstringarrayidx
- fix passing of unexpanded variable references to arrays
- use entries for new {admin,deny}_{ips,hostnames} constraints in
the relevant legacy lists
- cope with ps's numeric fields overflowing to the right
- interpret failing function calls in ifvarclass as class not set
- remove unexpanded lists when extending lists
- infer start-time of a process from elapsed when needed
- fix input range definition for laterthan() function
- don't add trailing delimiter when join()'ing lists ending with a
null-value
- 9999999999 (ten 9s) or higher has been historically used as an upper
bound in CFEngine code and policy but because of overflow on 32-bit
platforms it caused problems with big numbers. Fixed in two ways:
first change all existing policy uses to 999999999 (nine 9s instead
of eleven 9s), second fix the C code to not wrap-around in case of
overflow, but use the LONG_MAX value
- cf-serverd and other daemons no longer reload their configuration
every minute if CFEngine is built with an inputs directory outside
of the work directory (not the default).
3.6.1
New features:
- Introduced Solaris and AIX support into the 3.6 series, with many associated
build and bug fixes.
Changes:
- Short-circuit evaluation of classes promises if class is already set
- fix to assume all non-specified return codes are failed in commands
promises
- cf-serverd logs reconfiguration message to NOTICE (was INFO) so that it's
always logged in syslog
Bug fixes:
- File monitoring has been completely rewritten (changes attribute in files
promise), which eliminates many bugs, particularly regarding files that
are deleted. Upgrading will keep all monitoring data, but downgrading again
will reinitialize the DB, so all files will be reported as if they were new.
- $(this.promiser) expands in files promises for 'transformer',
'edit_template', 'copy_from.source', 'file_select.exec_program', 'classes'
and 'action' bodies
- 'body changes' notifies about disappeared files in file monitoring
- Set not-kept classes when files or commands promise should be repaired,
but is warn-only
- Fixed CFEngine template producing a zero-sized file
- Add 0-9 A-Z _ to allowed context of module protocol
- Extend ps command column width on Solaris and filter on zone
rather than adding it to the ps output.
- Fixed strftime() function on Solaris when called with certain specifiers.
- Fixed users promise bug regarding password hashes in a NIS/NSS setup.
- Fixed $(sys.uptime), $(sys.systime) and $(sys.sysday) in AIX.
#5148, #5206)
- Fixed processes_select complaining about "Unacceptable model uncertainty
examining processes"
- ps command for linux has been changed to cope with big rss values
- Address ps -axo shift on FreeBSD 10 and later
- methods and services promises respect action_policy => "warn"
- LMDB should no longer deadlock if an agent is killed on the hub while
holding the DB lock. Note that the change only affects binary packages
shipped by CFEngine, since the upstream LMDB project has not yet integrated
the change.
3.6.0
Changes:
- Changes to logging output
- add process name and pid in syslog message (GitHub #789)
- cf-serverd logging levels are now more standardised:
- INFO logs only failures
- VERBOSE logs successful requests as well
- DEBUG logs actual protocol traffic.
- cf-serverd now logs the relevant client IP address on
each message.
- Logging contexts to local database (cf_classes.tcdb) has been deprecated.
- 'usebundle' promisees are logged for all the bundle promises
- output from 'reports' promises has nothing prefixed except 'R: '
- a log line with stack path is generated when the promise type evaluated
changes
- LMDB (symas.com/mdb) is the default database for local data storage : use
version 0.9.9 or later. cf-agent --self-diagnostics (-x) is only
implemented for TCDB, not for LMDB
- port argument in readtcp() and selectservers() may be a
service name (e.g. "http", "pop3").
- Enable source file in agent copy_from promises to be a relative path.
- file "changes" reporting now reports with log level "notice", instead
of "error".
- process_results default to AND'ing of set attributes if not specified
- interface is now canonified in sys.hardware_mac[interface] to align with
sys.ipv4[interface]
- cf-promises no longer errors on missing bodies when run without
--full-check (-c)
- Linux flavor "SUSE" now correctly spelled with all uppercase in variables
and class names. The "suse" lowercase version is also
provided for convenience.
- $(this.promise_filename) and $(..._dirname) variables are now absolute
paths.
- including the same file multiple times in 'body control inputs' is
not an error
- portnumber in body copy_from now supports service names like "cfengine",
"pop3" etc, check /etc/services for more.
- The failsafe.cf policy, run on bootstrap and in some other
unusual cases, has been extracted from C code into libpromises/failsafe.cf
- masterfiles
- cf_promises_validated is now in JSON format
- timestamp key is timestamp (sec since unix epoch) of last time validated
- the masterfiles now come from https://github.com/cfengine/masterfiles
and are not in the core repository
- cf-serverd calls cf-agent with -Dcfruncommand when executing cf-runagent
requests
Mark as removed: promise_notkept_log_include, promise_notkept_log_exclude,
promise_repaired_log_include, promise_repaired_log_exclude, classes_include,
classes_exclude, variables_include, variables_exclude attributes from
report_data_select body (syntax is valid but not functional). They have been
replaced by the following attributes: promise_handle_include,
promise_handle_exclude, metatags_include, metatags_exclude.
New features:
- New promise type "users" for managing local user accounts.
- TLS authentication and fully encrypted network protocol.
Additions specific to the new type of connections:
- New attribute "allowlegacyconnects" in body server control,
which enables serving policy via non-latest cfengine protocol,
to the given list of hosts. If the option is absent, it
defaults to allow all hosts. To refuse non-TLS connections,
specify an empty list.
- New attribute "protocol_version" in body copy_from, and body
common control, which defines the preferred protocol for
outgoing connections.. Allowed values at the moment: "0" or
"undefined", "classic" or "1", "latest" or "2". By leaving the
copy_from option as undefined the common control option is
used, and if both are undefined then classic protocol is used
by default.
- The new networking protocol uses TLS for authentication,
after which all dialog is encrypted within the established
TLS session. cf-serverd is still able to speak the legacy
protocol with old agents.
- The 'skipverify' option in 'body server control' is
deprecated and only left for compatibility; it does
nothing
- cf-serverd does not hang up the connection if some request
fails, so that the client can add more requests.
- For the connections using the new protocol, all of the
paths in bundle server access_rules now differentiate
between a directory and a file using the trailing
slash. If the path exists then this is auto-detected and
trailing slash appended automatically. You have to append
a trailing slash manually to an inexistent or symbolic
path (e.g. "/path/to/$(connection.ip)/") to force
recursive access.
- New in 'access' promises for 'bundle server access_rules'
- Attributes "admit_ips", "admit_hostnames", "admit_keys",
"deny_ips", "deny_hostnames", "deny_keys"
- "admit_keys" and "deny_keys" add the new functionality
of controlling access according to host identity,
regardless of the connecting IP.
- For these new attributes, regular expressions
are not allowed, only CIDR notation for "admit/deny_ips", exact
"SHA=..." strings for "admit/deny_keys", and exact hostnames
(e.g. "cfengine.com") or subdomains (starting with dot,
e.g. ".cfengine.com") for "admit/deny"_hostnames. Same rules
apply to 'deny_*' attributes.
- These new constraints and the paths in access_rules, can contain
special variables "$(connection.ip)", "$(connection.hostname)",
"$(connection.key)", which are expanded dynamically for every
received connection.
- For connections using the new protocol, "admit" and "deny"
constraints in bundle server access_rules are being phased
out, preferred attributes are now "admit_ips", "deny_ips",
"admit_hostnames", "deny_hostnames", "admit_keys",
"deny_keys".
- New "shortcut" attribute in bundle server access_rules used to
dynamically expand non-absolute request paths.
- masterfiles
- standard library split: lib/3.5 (compatibility) and lib/3.6
(mainline)
- many standard library bundles and bodies, especially packages-
and file-related, were revised and fixed
- supports both Community and Enterprise
- new 'inventory/' structure to provide OS, dmidecode, LSB, etc.
system inventory (configured mainly in def.cf)
- cf_promises_release_id contains the policy release ID which is
the GIT HEAD SHA if available or hash of tree
- a bunch'o'bundles to make starting with CFEngine easier:
- file-related: file_mustache, file_mustache_jsonstring, file_tidy,
dir_sync, file_copy, file_link, file_hardlink, file_empty, file_make
- packages-related: package_absent, package_present, package_latest,
package_specific_present, package_specific_absent,
package_specific_latest, package_specific
- XML-related: xml_insert_tree_nopath, xml_insert_tree, xml_set_value,
xml_set_attribute
- VCS-related: git_init, git_add, git_checkout,
git_checkout_new_branch, git_clean, git_stash, git_stash_and_clean,
git_commit, git
- process-related: process_kill
- other: cmerge, url_ping, logrotate, prunedir
- New command line options for agent binaries
- New options to cf-promises
- '--show-classes' and '--show-vars'
- '--eval-functions' controls whether cf-promises should evaluate
functions
- Colorized output for agent binaries with command line option '--color'
(auto-enabled if you set CFENGINE_COLOR=1)
- New language features
- New variable type 'data' for handling of structured data (ie JSON),
including supporting functions:
- 'data_readstringarray' - read a delimited file into a data map
- 'data_readstringarrayidx' - read a delimited file into a data array
- 'datastate' - create a data variable with currently set classes
and variables
- 'datatype' - determine the type of the top element of a container
- 'format' - %S can be used to serialize 'data' containers into
a string
- 'mergedata' - merge two data containers, slists/ilists/rlists,
or "classic" arrays into a data container
- 'parsejson' - create a data container from a JSON string
- 'readjson' - create a data container from a file that contains JSON
- 'storejson' - serialize a data container into a string
- Most functions operating on lists can also operate on data containers
- pass a data container to a bundle with the @(container) notation
- the module protocol accepts JSON for data containers with
the '%' sigil
- Tagging of classes and variables allows annotating of language
construct with meta data; supporting functionality:
- The module protocol in 'commands' promises has been extended
to allow setting of tags of created variables and classes,
and the context of created variables
- 'getclassmetatags' - returns list of meta tags for a class
- 'getvariablemetatags' - returns list of meta tags for a variable
- 'body file control' has an 'inputs' attribute to include library files
and other dependencies
- bundlesequences can be built with bundlesmatching() based on bundle
name and tags
- New attributes in existing promise types and bodies
- New option 'preserve_all_lines' for insert_type in insert_lines promises
- Caching of expensive system functions to avoid multiple executions of
execresult() etc, can be controlled via cache_system_functions
attribute in body common control
- New option 'mailsubject' in body executor control allows defining
the subject in emails sent by CFEngine
- Support for Mustache templates in 'files' promises; use
'template_method' and 'template_data' attributes. Without
'template_data' specified, uses datastate().
- New and improved functions
- 'bundlesmatching' - returns list of defined bundles matching
a regex and tags
- 'canonifyuniquely' - converts a string into a unique, legal class name
- 'classesmatching' - returns list of set classes matching a regex
and tags
- 'eval' - evaluates mathematical expressions; knows SI k, m, g
quantifiers, e.g. "100k"
- 'findfiles' - list files matching a search pattern; use "**" for
recursive searches
- 'makerule' - evaluates whether a target file needs to be rebuilt
from sources
- 'max', 'min' - returns maximum and minimum of the numbers in
a container or list (sorted by a 'sort' method)
- 'mean' - returns the mean of the numbers in a container or list
- 'nth' - learned to look up by key in a data container holding a map
- 'packagesmatching' - returns a filtered list of installed packages.
- 'readfile' - learned to read system files of unknown size like those
in /proc
- 'sort' - can sort lexicographically, numerically (int or real), by IP,
or by MAC
- 'string_downcase', 'string_upcase' - returns the lower-/upper-case
version of a string
- 'string_head', 'string_tail' - returns the beginning/end of a string
- 'string_length' - returns the length of a string
- 'string_reverse' - reverses a string
- 'string_split' - improved implementation, deprecates 'splitstring'
- 'variablesmatching' - returns a list of variables matching a regex
and tags
- 'variance' - returns the variance of numbers in a list or container
- New hard classes
- Introduced alias 'policy_server' for context 'am_policy_hub'
(the latter will be deprecated)
- all the time-based classes have GMT equivalents
- New variables
- 'sys.bindir' - the location of the CFEngine binaries
- 'sys.failsafe_policy_path' - the location of the failsafe policy file
- 'sys.inputdir' - the directory where CFEngine searches for policy files
- 'sys.key_digest' - the digest of the host's cryptographic key
- 'sys.libdir', 'sys.local_libdir' - the location of the CFEngine libraries
- 'sys.logdir' - the directory where the CFEngine log files are saved
- 'sys.masterdir' - the location of masterfiles on the policy server
- 'sys.piddir' - the directory where the daemon pid files are saved
- 'sys.sysday' - the number of days since the beginning of the UNIX epoch
- 'sys.systime' - the number of seconds since the beginning of the UNIX epoch
- 'sys.update_policy_path' - the name of the update policy file
- 'sys.uptime' - the number of minutes the host has been online
- 'this.promise_dirname' - the name of the file in which the current promise
is defined
- 'this.promiser_uid' - the ID of the user running cf-agent
- 'this.promiser_gid' - the group ID of the user running cf-agent
- 'this.promiser_ppid' - the ID of the parent process running cf-agent
Deprecations:
- 'splitstring' - deprecated by 'string_split'
- 'track_value'
- 'skipverify'
Bug fixes: for a complete list of fixed bugs, see https://cfengine.com/dev
- various fixes in evaluation and variable resolution
- Improve performance of list iteration
- Removed limitation of input length to internal buffer sizes
- directories ending with "/" are not ignored
- lsdir() always return a list now, never a scalar
- 'abortclasses' fixed to work in common bundles and other cases
- namespaced 'edit_line' bundles now work
- lists are interpolated in correct order
- cf-serverd reloads policies properly when they change
- lots of leaks (memory and file descriptor) fixed
3.5.3
Changes:
- Improved security checks of symlink ownership. A symlink created by a user
pointing to resources owned by a different user will no longer be followed.
- Changed the way package versions are compared in package promises.
In previous versions the comparison was inconsistent. This has been fixed,
but may also lead to behavior changes in certain cases.
Bug fixes:
- fix cf-monitord crash due to incorrect array initialization
- fix cf-serverd stat()'ing the file tree every second
- correctly populate sys.hardware_addresses variable
- add support for Debian's GNU/kfreebsd to build system
- fix possible stack corruption in guest_environments promises
- work-around hostname trunctation in HP-UX's uname
- fix body copy purging of empty directories
- make discovery and loading of avahi libraries more robust
- compile and packaging fixes for HP-UX, AIX and Solaris
- fix fatal error in lsdir() when directory doesn't exist
- fix epoch calculation for stime inrange calculation
3.5.2
Bug fixes:
- fix delayed abortclasses checking
- fix maplist arguments bug
- fix segfaults in cf-pomises
- fix build on Solaris 10/SmartOS
- sanitize characters from /etc/issue in sys.flavor for Debian
- Fix segfault when dealing with files or data > 4K
- Don't truncate keys to 126 characters in getindices
- files created via log_* actions now have mode 600
- fix wrong log message when a promise is ignored due to 'ifvarclass'
not matching
- fix lifetime of persistent classes
- fix segfault when process_select body had no process_result attribute
Default to AND'ed expression of all specified attributes
- include system message in output when acl promises fail
- fix invocation of standard_services bundle and corresponding promise
compliance
3.5.1
Changes:
- file changes are logged with log level Notice, not Error
- the CFEngine Standard Library in masterfiles/libraries is now split into
promise-type specific policy files, and lives in a version-specific
directory. This should have no impact on current code, but allows more
granular include of needed stdlib elements
Bug fixes:
- fix recursive copying of files
- respect classes in templates
- fix timestamps on Windows
- fix non-root cf-agent flooding syslog
- fix email flood from cf-execd due to timestamps in agent output
- Preserve security context when editing or copying local files
- fix path for sys.crontab on redhat systems
- prevent incorrect "insert_lines promise uses the same select_line_matching
anchor" warning
- Fix regression of setting VIPADDRESS to 127.0.0.1
- Fix "changes" promise not receiving status when file is missing
- Fix symlinks being destroyed when editing them
- Fix missing "promise kept" status for the last line in a file
3.5.0
New features:
- classes promises now take an optional scope constraint.
- new built-in functions: every, none, some, nth, sublist, uniq, filter
- every
- none
- some
- nth
- sublist
- uniq
- filter
- classesmatching
- strftime
- filestat
- ifelse
- maparray
- format
- cf-promises flag --parse-tree is replaced by --policy-output-format=,
requiring the
user to specify the output format (none, cf, json)
- cf-promises allows partial check of policy (without body common control)
without integrity check; --full-check enforces integrity check
- agent binaries support JSON input format (.json file as generated by
cf-promises)
- cf-key: new options --trust-key/-t and --print-digest/-p
- Class "failsafe_fallback" is defined in failsafe.cf when main policy
contains errors and failsafe is run because of this
- add scope attribute for body classes
- Better diagnostics of parsing errors
- Error messages from parser now show the context of error
- new cf-agent option: --self-diagnostics
- new output format, and --legacy-output
- warnings for cf-promises.
- Enable zeroconf-discovery of policy hubs for automatic bootstrapping
if Avahi is present
- Support for sys.cpus on more platforms than Linux & HPUX
Changes:
- parser no longer allows ',' after promiser or promisee. must be either
';' or lval
- Make parser output in GCC compatible format the only supported format
(remove --gcc-brief-format flag)
- Silence license warnings in Enterprise Free25 installations
- action_policy => "warn" causes not_kept classes to be set on promise
needing repair.
- command line option version (-V) now prints a shorter parsable version
without graphic
- implicit execution of server and common bundles taking arguments is
skipped in cf-serverd.
- WARNING: option --policy-server removed, require option to --bootstrap
instead
- process promises don't log if processes are out of range unless you
run in verbose mode
- reports promises are now allowed in any context
- cf-report has been removed
- cf-execd: --once implies --no-fork
- Version info removed from mail subject in the emails sent by cf-execd.
The subject will only contain "[fqname/ipaddress]" instead of
"communnity/nova [fqname/ipaddress]"
Please change your email filters accordingly if necessary.
- "outputs" promise type is retired. Their semantics was not clear, and
the functionality
is better suited for control body setting, not a promise.
- Tokyo Cabinet databases are now automatically checked for
correctness during opening. It should prevent a number of issues
with corrupted TC databases causing binaries to hang.
- Improved ACL handling on Windows, which led to some syntax changes.
We now consistently use the term "default" to describe ACLs that can be
inherited by child objects. These keywords have received new names:
acl_directory_inherit -> acl_default
specify_inherit_aces -> specify_default_aces
The old keywords are deprecated, but still valid. In addition, a new keyword
"acl_inherit" controls inheritance behavior on Windows. This feature does
not exist on Unix platforms.
- Networking code is moved from libpromises to its own library,
libcfnet. Work has begun on making the API more sane and thread-safe.
Lots of legacy code was removed.
- Add getaddrinfo() replacement in libcompat (borrowed from PostgreSQL).
- Replace old deprecated and non thread-safe resolver calls with
getaddrinfo() and getnameinfo().
- Hostname2IPString(), IPString2Hostname() are now thread-safe, and are
returning error when resolution fails.
- Running cf-execd --once now implies --no-fork, and also does not wait
for splaytime to pass.
- execresult(), returnszero() and commands promises no longer requires
the first word word to be an absolute path when using the shell.
- commands promises useshell attribute now accepts "noshell" and "useshell"
values. Boolean values are accepted but deprecated.
- returnszero() now correctly sets the class name in this scenario:
"commandfailed" not => returnszero("/bin/nosuchcommand", "noshell");
Bugfixes:
- bundles are allowed to be empty
- Fixed '.' and '-' not being accepted by a commands module.
- Correct parsing of list variables by a command module.
- Fixed issue with package management and warn.
- Fixed JSON crash.
- Improved error checking when using fgets().
- Fixed error message when deleting nonexistent files.
- Honor warn-only when purging from local directory.
- Make sure "restart" and "reload" are recognized keywords in packages.
- Allocate memory dynamically to avoid out-of-buffer or out-of-hash
situations
- fix edit_xml update of existing attributes
- use failsafe policy from compile-time specified workdir
- ifvarclass checked from classes promises in common bundles
- do not wait for splaytime when executing only once
- disable xml editing functionality when libxml2 doesn't provide necessary APIs
- Out-of-tree builds should work again, fixed a bunch of related bugs.
- Fixed race condition in file editing.
- Fixed memory leak in cf-serverd and others
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/cfengine3/INSTALL | 9 | ||||
-rw-r--r-- | sysutils/cfengine3/Makefile | 37 | ||||
-rw-r--r-- | sysutils/cfengine3/Makefile.cf | 90 | ||||
-rw-r--r-- | sysutils/cfengine3/PLIST | 654 | ||||
-rw-r--r-- | sysutils/cfengine3/distinfo | 15 | ||||
-rw-r--r-- | sysutils/cfengine3/options.mk | 11 | ||||
-rw-r--r-- | sysutils/cfengine3/patches/patch-ext_Makefile.in | 12 | ||||
-rw-r--r-- | sysutils/cfengine3/patches/patch-libenv_unix_iface.c | 15 | ||||
-rw-r--r-- | sysutils/cfengine3/patches/patch-src_unix.c | 15 |
9 files changed, 556 insertions, 302 deletions
diff --git a/sysutils/cfengine3/INSTALL b/sysutils/cfengine3/INSTALL index 1d8763a3d99..35c50b1c0b1 100644 --- a/sysutils/cfengine3/INSTALL +++ b/sysutils/cfengine3/INSTALL @@ -1,8 +1,11 @@ -# $NetBSD: INSTALL,v 1.2 2013/02/17 16:15:42 fhajny Exp $ +# $NetBSD: INSTALL,v 1.3 2015/04/07 08:43:35 fhajny Exp $ case ${STAGE} in POST-INSTALL) - ${LN} -sf @PKG_SYSCONFDIR@ @CFENGINE_DIR@/inputs - ${LN} -sf @PREFIX@/sbin @CFENGINE_DIR@/bin + ${LN} -sf @PKG_SYSCONFDIR@ @CFENGINE_DIR@/masterfiles + mkdir -p @CFENGINE_DIR@/bin/ + ${LN} -sf @PREFIX@/sbin/cf-* @CFENGINE_DIR@/bin/ @PREFIX@/sbin/cf-key + # Make sure inputs is ready to go. + cp -r /var/cfengine/masterfiles/* /var/cfengine/inputs esac diff --git a/sysutils/cfengine3/Makefile b/sysutils/cfengine3/Makefile index 54f2939c59e..a29a4cc5483 100644 --- a/sysutils/cfengine3/Makefile +++ b/sysutils/cfengine3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2014/10/29 11:03:31 pettai Exp $ +# $NetBSD: Makefile,v 1.13 2015/04/07 08:43:35 fhajny Exp $ # -DISTNAME= cfengine-3.4.5 +DISTNAME= cfengine-3.6.5 CATEGORIES= sysutils MASTER_SITES= http://cfengine.package-repos.s3.amazonaws.com/tarballs/ @@ -16,10 +16,14 @@ USE_TOOLS+= gmake .include "options.mk" +DISTFILES= ${DEFAULT_DISTFILES} +DISTFILES+= masterfiles-${PKGVERSION_NOREV}.tar.gz + GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-fhs CONFIGURE_ARGS+= --docdir=${DOCDIR} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} +CONFIGURE_ARGS+= --with-masterdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --with-sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-workdir=${CFENGINE_DIR:Q} CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl:Q} CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre:Q} @@ -27,16 +31,15 @@ CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre:Q} BUILD_DEFS+= VARBASE CFENGINE_DIR FILES_SUBST+= CFENGINE_DIR=${CFENGINE_DIR} +.include "../../mk/bsd.prefs.mk" + CFENGINE_DIR?= ${VARBASE}/cfengine DOCDIR= ${PREFIX}/share/doc/${PKGBASE} EGDIR= ${PREFIX}/share/examples/${PKGBASE} PKG_SYSCONFSUBDIR= cfengine -CFILES= cf-sketch-runfile.cf def.cf promises.cf -CFILES+= controls/cf_agent.cf controls/cf_execd.cf -CFILES+= controls/cf_monitord.cf controls/cf_report.cf -CFILES+= controls/cf_runagent.cf controls/cf_serverd.cf -CFILES+= libraries/cfengine_stdlib.cf services/init_msg.cf +# Regenerate masterfiles list with 'make update-masterfiles' +.include "Makefile.cf" .for file in ${CFILES} CONF_FILES+= ${EGDIR}/CoreBase/${file} ${PKG_SYSCONFDIR}/${file} @@ -44,12 +47,28 @@ CONF_FILES+= ${EGDIR}/CoreBase/${file} ${PKG_SYSCONFDIR}/${file} RCD_SCRIPTS= cfserverd cfexecd cfmonitord -INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} sysconfdir=${PKG_SYSCONFDIR} docdir=${DOCDIR} examplesdir=${EGDIR} masterfilesdir=${EGDIR}/CoreBase projlibdir=${PREFIX}/lib +INSTALLATION_DIRS+= ${PKGMANDIR}/man8 +INSTALL_MAKE_FLAGS+= examplesdir=${EGDIR} projlibdir=${PREFIX}/lib MAKE_DIRS= ${CFENGINE_DIR} MAKE_DIRS+= ${PKG_SYSCONFDIR}/controls ${PKG_SYSCONFDIR}/libraries MAKE_DIRS+= ${PKG_SYSCONFDIR}/services +update-masterfiles: + (${ECHO} '# $$NetBSD: Makefile,v 1.13 2015/04/07 08:43:35 fhajny Exp $$'; \ + ${ECHO} '# Generated by "${MAKE:Q} update-masterfiles", post-extract'; \ + ${ECHO}; \ + cd ${WRKDIR}/masterfiles && ${FIND} * -type f | ${SORT} | \ + ${SED} -e 's|^|CFILES+=|') \ + > ${.CURDIR}/../../sysutils/cfengine3/Makefile.cf + +post-install: + cp -r ${WRKDIR}/masterfiles ${DESTDIR}/${PREFIX}/share/examples/cfengine/CoreBase + for cf in cf-agent cf-execd cf-key cf-monitord cf-promises cf-runagent cf-serverd ; \ + do \ + LD_LIBRARY_PATH=${DESTDIR}${PREFIX}/lib ${DESTDIR}${PREFIX}/sbin/$$cf -M > ${DESTDIR}/${PREFIX}/${PKGMANDIR}/man8/$$cf.8 ; \ + done + .include "../../devel/pcre/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/sysutils/cfengine3/Makefile.cf b/sysutils/cfengine3/Makefile.cf new file mode 100644 index 00000000000..e84626faf84 --- /dev/null +++ b/sysutils/cfengine3/Makefile.cf @@ -0,0 +1,90 @@ +# $NetBSD: Makefile.cf,v 1.1 2015/04/07 08:43:35 fhajny Exp $ +# This file is generated by "/opt/local/bin/bmake update-masterfiles", post-extract + +CFILES+=cfe_internal/CFE_cfengine.cf +CFILES+=cfe_internal/CFE_hub_specific.cf +CFILES+=cfe_internal/CFE_knowledge.cf +CFILES+=cfe_internal/cfengine_processes.cf +CFILES+=cfe_internal/ha/ha.cf +CFILES+=cfe_internal/ha/ha_def.cf +CFILES+=cfe_internal/host_info_report.cf +CFILES+=controls/3.4/cf_serverd.cf +CFILES+=controls/cf_agent.cf +CFILES+=controls/cf_execd.cf +CFILES+=controls/cf_hub.cf +CFILES+=controls/cf_monitord.cf +CFILES+=controls/cf_runagent.cf +CFILES+=controls/cf_serverd.cf +CFILES+=def.cf +CFILES+=inventory/any.cf +CFILES+=inventory/debian.cf +CFILES+=inventory/generic.cf +CFILES+=inventory/linux.cf +CFILES+=inventory/lsb.cf +CFILES+=inventory/macos.cf +CFILES+=inventory/os.cf +CFILES+=inventory/redhat.cf +CFILES+=inventory/suse.cf +CFILES+=inventory/windows.cf +CFILES+=lib/3.5/bundles.cf +CFILES+=lib/3.5/cfe_internal.cf +CFILES+=lib/3.5/commands.cf +CFILES+=lib/3.5/common.cf +CFILES+=lib/3.5/databases.cf +CFILES+=lib/3.5/feature.cf +CFILES+=lib/3.5/files.cf +CFILES+=lib/3.5/guest_environments.cf +CFILES+=lib/3.5/monitor.cf +CFILES+=lib/3.5/packages.cf +CFILES+=lib/3.5/paths.cf +CFILES+=lib/3.5/processes.cf +CFILES+=lib/3.5/reports.cf +CFILES+=lib/3.5/services.cf +CFILES+=lib/3.5/storage.cf +CFILES+=lib/3.6/bundles.cf +CFILES+=lib/3.6/cfe_internal.cf +CFILES+=lib/3.6/cfengine_enterprise_hub_ha.cf +CFILES+=lib/3.6/commands.cf +CFILES+=lib/3.6/common.cf +CFILES+=lib/3.6/databases.cf +CFILES+=lib/3.6/edit_xml.cf +CFILES+=lib/3.6/examples.cf +CFILES+=lib/3.6/feature.cf +CFILES+=lib/3.6/files.cf +CFILES+=lib/3.6/guest_environments.cf +CFILES+=lib/3.6/monitor.cf +CFILES+=lib/3.6/packages.cf +CFILES+=lib/3.6/paths.cf +CFILES+=lib/3.6/processes.cf +CFILES+=lib/3.6/reports.cf +CFILES+=lib/3.6/services.cf +CFILES+=lib/3.6/stdlib.cf +CFILES+=lib/3.6/storage.cf +CFILES+=lib/3.6/users.cf +CFILES+=lib/3.6/vcs.cf +CFILES+=promises.cf +CFILES+=services/CVE_2015_0235/def.cf +CFILES+=services/CVE_2015_0235/policy/CVE_2015_0235_inventory.cf +CFILES+=services/autorun.cf +CFILES+=services/autorun/hello.cf +CFILES+=services/file_change.cf +CFILES+=services/linux_kernel/def.cf +CFILES+=services/linux_kernel/examples/promises.cf +CFILES+=services/linux_kernel/policy/linux_kernel_params_inventory.cf +CFILES+=services/sysctl/def.cf +CFILES+=services/sysctl/policy/example_sysctl_data_from_policy.cf +CFILES+=services/sysctl/policy/sysctl_conf_selective_present.cf +CFILES+=services/sysctl/test.cf +CFILES+=services/yum/def.cf +CFILES+=services/yum/policy/yum_inventory.cf +CFILES+=services/yum/policy/yum_inventory_yum_info_yum.cf +CFILES+=services/yum/policy/yum_inventory_yum_repolist.cf +CFILES+=sketches/meta/api-runfile.cf +CFILES+=templates/host_info_report.mustache +CFILES+=update.cf +CFILES+=update/cfe_internal_dc_workflow.cf +CFILES+=update/cfe_internal_local_git_remote.cf +CFILES+=update/cfe_internal_update_from_repository.cf +CFILES+=update/update_bins.cf +CFILES+=update/update_policy.cf +CFILES+=update/update_processes.cf diff --git a/sysutils/cfengine3/PLIST b/sysutils/cfengine3/PLIST index d7aa4a87d1f..0c910f4e8fd 100644 --- a/sysutils/cfengine3/PLIST +++ b/sysutils/cfengine3/PLIST @@ -1,11 +1,10 @@ -@comment $NetBSD: PLIST,v 1.6 2014/03/11 14:05:15 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.7 2015/04/07 08:43:35 fhajny Exp $ lib/libpromises.la man/man8/cf-agent.8 man/man8/cf-execd.8 man/man8/cf-key.8 man/man8/cf-monitord.8 man/man8/cf-promises.8 -man/man8/cf-report.8 man/man8/cf-runagent.8 man/man8/cf-serverd.8 sbin/cf-agent @@ -13,285 +12,422 @@ sbin/cf-execd sbin/cf-key sbin/cf-monitord sbin/cf-promises -sbin/cf-report sbin/cf-runagent sbin/cf-serverd +sbin/cf-upgrade share/doc/cfengine/ChangeLog -share/doc/cfengine/README -share/examples/cfengine/CoreBase/cf-sketch-runfile.cf +share/doc/cfengine/README.md +share/examples/cfengine/CoreBase/cfe_internal/CFE_cfengine.cf +share/examples/cfengine/CoreBase/cfe_internal/CFE_hub_specific.cf +share/examples/cfengine/CoreBase/cfe_internal/CFE_knowledge.cf +share/examples/cfengine/CoreBase/cfe_internal/cfengine_processes.cf +share/examples/cfengine/CoreBase/cfe_internal/ha/ha.cf +share/examples/cfengine/CoreBase/cfe_internal/ha/ha_def.cf +share/examples/cfengine/CoreBase/cfe_internal/host_info_report.cf +share/examples/cfengine/CoreBase/controls/3.4/cf_serverd.cf share/examples/cfengine/CoreBase/controls/cf_agent.cf share/examples/cfengine/CoreBase/controls/cf_execd.cf +share/examples/cfengine/CoreBase/controls/cf_hub.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/cfengine_stdlib.cf +share/examples/cfengine/CoreBase/inventory/any.cf +share/examples/cfengine/CoreBase/inventory/debian.cf +share/examples/cfengine/CoreBase/inventory/generic.cf +share/examples/cfengine/CoreBase/inventory/linux.cf +share/examples/cfengine/CoreBase/inventory/lsb.cf +share/examples/cfengine/CoreBase/inventory/macos.cf +share/examples/cfengine/CoreBase/inventory/os.cf +share/examples/cfengine/CoreBase/inventory/redhat.cf +share/examples/cfengine/CoreBase/inventory/suse.cf +share/examples/cfengine/CoreBase/inventory/windows.cf +share/examples/cfengine/CoreBase/lib/3.5/bundles.cf +share/examples/cfengine/CoreBase/lib/3.5/cfe_internal.cf +share/examples/cfengine/CoreBase/lib/3.5/commands.cf +share/examples/cfengine/CoreBase/lib/3.5/common.cf +share/examples/cfengine/CoreBase/lib/3.5/databases.cf +share/examples/cfengine/CoreBase/lib/3.5/feature.cf +share/examples/cfengine/CoreBase/lib/3.5/files.cf +share/examples/cfengine/CoreBase/lib/3.5/guest_environments.cf +share/examples/cfengine/CoreBase/lib/3.5/monitor.cf +share/examples/cfengine/CoreBase/lib/3.5/packages.cf +share/examples/cfengine/CoreBase/lib/3.5/paths.cf +share/examples/cfengine/CoreBase/lib/3.5/processes.cf +share/examples/cfengine/CoreBase/lib/3.5/reports.cf +share/examples/cfengine/CoreBase/lib/3.5/services.cf +share/examples/cfengine/CoreBase/lib/3.5/storage.cf +share/examples/cfengine/CoreBase/lib/3.6/bundles.cf +share/examples/cfengine/CoreBase/lib/3.6/cfe_internal.cf +share/examples/cfengine/CoreBase/lib/3.6/cfengine_enterprise_hub_ha.cf +share/examples/cfengine/CoreBase/lib/3.6/commands.cf +share/examples/cfengine/CoreBase/lib/3.6/common.cf +share/examples/cfengine/CoreBase/lib/3.6/databases.cf +share/examples/cfengine/CoreBase/lib/3.6/edit_xml.cf +share/examples/cfengine/CoreBase/lib/3.6/examples.cf +share/examples/cfengine/CoreBase/lib/3.6/feature.cf +share/examples/cfengine/CoreBase/lib/3.6/files.cf +share/examples/cfengine/CoreBase/lib/3.6/guest_environments.cf +share/examples/cfengine/CoreBase/lib/3.6/monitor.cf +share/examples/cfengine/CoreBase/lib/3.6/packages.cf +share/examples/cfengine/CoreBase/lib/3.6/paths.cf +share/examples/cfengine/CoreBase/lib/3.6/processes.cf +share/examples/cfengine/CoreBase/lib/3.6/reports.cf +share/examples/cfengine/CoreBase/lib/3.6/services.cf +share/examples/cfengine/CoreBase/lib/3.6/stdlib.cf +share/examples/cfengine/CoreBase/lib/3.6/storage.cf +share/examples/cfengine/CoreBase/lib/3.6/users.cf +share/examples/cfengine/CoreBase/lib/3.6/vcs.cf share/examples/cfengine/CoreBase/promises.cf -share/examples/cfengine/CoreBase/services/init_msg.cf +share/examples/cfengine/CoreBase/services/CVE_2015_0235/def.cf +share/examples/cfengine/CoreBase/services/CVE_2015_0235/policy/CVE_2015_0235_inventory.cf +share/examples/cfengine/CoreBase/services/autorun.cf +share/examples/cfengine/CoreBase/services/autorun/hello.cf +share/examples/cfengine/CoreBase/services/file_change.cf +share/examples/cfengine/CoreBase/services/linux_kernel/def.cf +share/examples/cfengine/CoreBase/services/linux_kernel/examples/promises.cf +share/examples/cfengine/CoreBase/services/linux_kernel/policy/linux_kernel_params_inventory.cf +share/examples/cfengine/CoreBase/services/sysctl/def.cf +share/examples/cfengine/CoreBase/services/sysctl/policy/example_sysctl_data_from_policy.cf +share/examples/cfengine/CoreBase/services/sysctl/policy/sysctl_conf_selective_present.cf +share/examples/cfengine/CoreBase/services/sysctl/test.cf +share/examples/cfengine/CoreBase/services/yum/def.cf +share/examples/cfengine/CoreBase/services/yum/policy/yum_inventory.cf +share/examples/cfengine/CoreBase/services/yum/policy/yum_inventory_yum_info_yum.cf +share/examples/cfengine/CoreBase/services/yum/policy/yum_inventory_yum_repolist.cf +share/examples/cfengine/CoreBase/sketches/meta/api-runfile.cf +share/examples/cfengine/CoreBase/templates/host_info_report.mustache share/examples/cfengine/CoreBase/update.cf +share/examples/cfengine/CoreBase/update/cfe_internal_dc_workflow.cf +share/examples/cfengine/CoreBase/update/cfe_internal_local_git_remote.cf +share/examples/cfengine/CoreBase/update/cfe_internal_update_from_repository.cf +share/examples/cfengine/CoreBase/update/update_bins.cf +share/examples/cfengine/CoreBase/update/update_policy.cf +share/examples/cfengine/CoreBase/update/update_processes.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/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_readstringarray.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/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_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/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/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/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_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 diff --git a/sysutils/cfengine3/distinfo b/sysutils/cfengine3/distinfo index 635ca7cd8da..1e00c865a6d 100644 --- a/sysutils/cfengine3/distinfo +++ b/sysutils/cfengine3/distinfo @@ -1,7 +1,10 @@ -$NetBSD: distinfo,v 1.6 2014/10/29 11:03:31 pettai Exp $ +$NetBSD: distinfo,v 1.7 2015/04/07 08:43:35 fhajny Exp $ -SHA1 (cfengine-3.4.5.tar.gz) = 5adf3b9377afcdd211efd2255c2cea777cb54949 -RMD160 (cfengine-3.4.5.tar.gz) = 044561c7811119a553f2e85eaf42531fcf4f69cd -Size (cfengine-3.4.5.tar.gz) = 4671628 bytes -SHA1 (patch-ext_Makefile.in) = 63d2c3ef7d94a11a98177d2dd3c2820662bc06f9 -SHA1 (patch-src_unix.c) = 5b64998d5f9d7d3d158aa1384c134fac686865f3 +SHA1 (cfengine-3.6.5.tar.gz) = 7329ab681bf39e4a607003f56df56fe0c6226406 +RMD160 (cfengine-3.6.5.tar.gz) = 323d047f8dffc37924d82e4dbcd4d75172b41ea6 +Size (cfengine-3.6.5.tar.gz) = 2011114 bytes +SHA1 (masterfiles-3.6.5.tar.gz) = f23e8e61ccef9b25a59ca6230406fba36d6b52ac +RMD160 (masterfiles-3.6.5.tar.gz) = 538ec2192de35489110d101a7644d3a9262ccd51 +Size (masterfiles-3.6.5.tar.gz) = 128384 bytes +SHA1 (patch-ext_Makefile.in) = 2a231187b2e3f237cd856d990bca9f2472817074 +SHA1 (patch-libenv_unix_iface.c) = f6fbb791be6283cd84a70674c58b166dac6b7c41 diff --git a/sysutils/cfengine3/options.mk b/sysutils/cfengine3/options.mk index 9f2db913ddd..7fb15863bf6 100644 --- a/sysutils/cfengine3/options.mk +++ b/sysutils/cfengine3/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.1 2013/02/17 16:15:42 fhajny Exp $ +# $NetBSD: options.mk,v 1.2 2015/04/07 08:43:35 fhajny Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.cfengine3 PKG_OPTIONS_REQUIRED_GROUPS= db -PKG_OPTIONS_GROUP.db= qdbm tokyocabinet +PKG_OPTIONS_GROUP.db= qdbm tokyocabinet lmdb PKG_SUPPORTED_OPTIONS= qdbm tokyocabinet mysql pgsql PKG_SUGGESTED_OPTIONS= tokyocabinet @@ -25,8 +25,11 @@ CONFIGURE_ARGS+= --with-postgresql=${PGSQL_PREFIX} CONFIGURE_ARGS+= --without-postgresql .endif -### QDBM *or* Tokyo Cabinet support -.if !empty(PKG_OPTIONS:Mqdbm) +### LMDB *or* QDBM *or* Tokyo Cabinet support +.if !empty(PKG_OPTIONS:Mlmdb) +CONFIGURE_ARGS+= --with-lmdb=${BUILDLINK_PREFIX.lmdb} +.include "../../databases/lmdb/buildlink3.mk" +.elif !empty(PKG_OPTIONS:Mqdbm) CONFIGURE_ARGS+= --with-qdbm=${BUILDLINK_PREFIX.qdbm} .include "../../databases/qdbm/buildlink3.mk" .elif !empty(PKG_OPTIONS:Mtokyocabinet) diff --git a/sysutils/cfengine3/patches/patch-ext_Makefile.in b/sysutils/cfengine3/patches/patch-ext_Makefile.in index 6d76c9a580d..3b2e15feb36 100644 --- a/sysutils/cfengine3/patches/patch-ext_Makefile.in +++ b/sysutils/cfengine3/patches/patch-ext_Makefile.in @@ -1,14 +1,14 @@ -$NetBSD: patch-ext_Makefile.in,v 1.1 2013/02/17 16:15:42 fhajny Exp $ +$NetBSD: patch-ext_Makefile.in,v 1.2 2015/04/07 08:43:35 fhajny Exp $ No use for rpmvercmp. ---- ext/Makefile.in.orig 2013-01-11 12:54:49.000000000 +0000 -+++ ext/Makefile.in 2013-02-16 12:23:25.950062742 +0000 -@@ -35,7 +35,6 @@ POST_UNINSTALL = : +--- ext/Makefile.in.orig 2015-04-03 10:59:08.525934907 +0000 ++++ ext/Makefile.in +@@ -79,7 +79,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -sbin_PROGRAMS = rpmvercmp$(EXEEXT) subdir = ext - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp diff --git a/sysutils/cfengine3/patches/patch-libenv_unix_iface.c b/sysutils/cfengine3/patches/patch-libenv_unix_iface.c new file mode 100644 index 00000000000..a7a8ea172c4 --- /dev/null +++ b/sysutils/cfengine3/patches/patch-libenv_unix_iface.c @@ -0,0 +1,15 @@ +$NetBSD: patch-libenv_unix_iface.c,v 1.1 2015/04/07 08:43:35 fhajny Exp $ + +Ignore HAVE_STRUCT_SOCKADDR_SA_LEN on NetBSD, behavior different. + +--- libenv/unix_iface.c.orig 2015-03-12 20:21:31.000000000 +0000 ++++ libenv/unix_iface.c +@@ -52,7 +52,7 @@ + + #ifndef __MINGW32__ + +-# ifdef HAVE_STRUCT_SOCKADDR_SA_LEN ++# if defined(HAVE_STRUCT_SOCKADDR_SA_LEN) && !defined(__NetBSD__) + # ifdef _SIZEOF_ADDR_IFREQ + # define SIZEOF_IFREQ(x) _SIZEOF_ADDR_IFREQ(x) + # else diff --git a/sysutils/cfengine3/patches/patch-src_unix.c b/sysutils/cfengine3/patches/patch-src_unix.c deleted file mode 100644 index 28fd1604b41..00000000000 --- a/sysutils/cfengine3/patches/patch-src_unix.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_unix.c,v 1.1 2013/02/17 16:15:42 fhajny Exp $ - -Ignore HAVE_STRUCT_SOCKADDR_SA_LEN on NetBSD. - ---- src/unix.c.orig 2013-01-11 12:54:39.000000000 +0000 -+++ src/unix.c 2013-02-16 11:10:41.263683099 +0000 -@@ -49,7 +49,7 @@ - - #ifndef MINGW - --# ifdef HAVE_STRUCT_SOCKADDR_SA_LEN -+# if defined(HAVE_STRUCT_SOCKADDR_SA_LEN) && !defined(__NetBSD__) - # ifdef _SIZEOF_ADDR_IFREQ - # define SIZEOF_IFREQ(x) _SIZEOF_ADDR_IFREQ(x) - # else |