Mon Apr 11 12:48:37 2016 UTC ()
Update cfengine3 to 3.7.3.

Behaviour changes:
- classesmatching(): order of classes changed
- Suppress standard services noise on SUSE

Fixes:
- Reduce verbosity of yum package module
- Reduce verbosity of apt_get package module
- Upgrade dependencies to latest patch versions.
  Upgraded libraries:
  - curl 7.47.0
  - libxml2 2.9.3
  - LMDB 0.9.18
  - MySQL 5.1.72
  - OpenLDAP 2.4.44
  - OpenSSL 1.0.2g
  - PCRE 8.38
  - PostgreSQL 9.3.11
  - Redis 2.8.24
  - rsync 3.1.2
  PHP was kept at 5.6.17 because of problems with the 5.6.19 version.
- parse def.json vars, classes in C
- Namespaced classes can now be specified on the command line.
- getvalues() will now return a list also for data containers,
  and will descend recursively into the containers.
- @if minimum_version now correctly ignores lines starting with '@'
- Fix definition of classes from augments file
- Don't follow symbolic links when copying extended attributes.
- Fix ps options for FreeBSD to check processes only in current
  host and not in jails
- Fix cf-serverd error messages with classic protocol clients
- The isvariable() function call now correctly accepts all
  array variables when specified inline. Previously it would not
  accept certain special characters, even though they could be
  specified indirectly by using a variable to hold it.
- Show errors regarding failure to copy extended attributes
  when doing a local file copy. Errors could happen when copying
  across two different mount points where the support for extended
  attributes is different between the mount points.
- Fix bad option nlwp to vzps on Proxmox / OpenVZ.
- Fix file descriptor leak when there are network errors.
- Fix a regression which would sometimes cause "Permission
  denied" errors on files inside directories with very restricted
  permissions.
- Check for empty server response in RemoteDirList after
  decryption
- Allow def.json up to 5MB instead of 4K.
- Add guard for binary upgrade during bootstrap
- Fix HP-UX specific bug that caused a lot of log output to
  disappear.
- Fix a bug which sometimes caused package promises to be
  skipped with "XX Another cf-agent seems to have done this since
  I started" messages in the log, most notably in long running
  cf-agent runs (longer than one minute).
- Define (bootstrap|failsafe)_mode during update.cf when triggerd
  from failsafe.cf
- Fix two cases where action_policy warn still produces errors
- Fix classes being set because of hash collision in the
  implementation.
- fix build failure on FreeBSD 7.1
- Installing packages containing version numbers using yum
  now works correctly.


(fhajny)
diff -r1.16 -r1.17 pkgsrc/sysutils/cfengine3/Makefile
diff -r1.9 -r1.10 pkgsrc/sysutils/cfengine3/distinfo
cvs diff -r1.16 -r1.17 pkgsrc/sysutils/cfengine3/Makefile (switch to unified diff)

--- pkgsrc/sysutils/cfengine3/Makefile 2016/03/05 11:29:28 1.16
+++ pkgsrc/sysutils/cfengine3/Makefile 2016/04/11 12:48:37 1.17
@@ -1,109 +1,108 @@ @@ -1,109 +1,108 @@
1# $NetBSD: Makefile,v 1.16 2016/03/05 11:29:28 jperkin Exp $ 1# $NetBSD: Makefile,v 1.17 2016/04/11 12:48:37 fhajny Exp $
2# 2#
3 3
4DISTNAME= cfengine-3.7.2 4DISTNAME= cfengine-3.7.3
5PKGREVISION= 1 
6CATEGORIES= sysutils 5CATEGORIES= sysutils
7MASTER_SITES= http://cfengine-package-repos.s3.amazonaws.com/tarballs/ 6MASTER_SITES= http://cfengine-package-repos.s3.amazonaws.com/tarballs/
8 7
9MAINTAINER= pettai@NetBSD.org 8MAINTAINER= pettai@NetBSD.org
10HOMEPAGE= http://cfengine.com/pages/community 9HOMEPAGE= http://cfengine.com/pages/community
11COMMENT= Tool for automating system administration 10COMMENT= Tool for automating system administration
12LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
13 12
14USE_LANGUAGES= c c++ c99 13USE_LANGUAGES= c c++ c99
15USE_LIBTOOL= yes 14USE_LIBTOOL= yes
16USE_TOOLS+= gmake pax 15USE_TOOLS+= gmake pax
17 16
18.include "options.mk" 17.include "options.mk"
19 18
20DISTFILES= ${DEFAULT_DISTFILES} 19DISTFILES= ${DEFAULT_DISTFILES}
21DISTFILES+= cfengine-masterfiles-${PKGVERSION_NOREV}.tar.gz 20DISTFILES+= cfengine-masterfiles-${PKGVERSION_NOREV}.tar.gz
22 21
23GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
24CONFIGURE_ARGS+= --enable-fhs 23CONFIGURE_ARGS+= --enable-fhs
25CONFIGURE_ARGS+= --docdir=${DOCDIR} 24CONFIGURE_ARGS+= --docdir=${DOCDIR}
26CONFIGURE_ARGS+= --datadir=${CFENGINE_DIR:Q} 25CONFIGURE_ARGS+= --datadir=${CFENGINE_DIR:Q}
27CONFIGURE_ARGS+= --with-masterdir=${PKG_SYSCONFDIR:Q} 26CONFIGURE_ARGS+= --with-masterdir=${PKG_SYSCONFDIR:Q}
28CONFIGURE_ARGS+= --with-sysconfdir=${PKG_SYSCONFDIR:Q} 27CONFIGURE_ARGS+= --with-sysconfdir=${PKG_SYSCONFDIR:Q}
29CONFIGURE_ARGS+= --with-workdir=${CFENGINE_DIR:Q} 28CONFIGURE_ARGS+= --with-workdir=${CFENGINE_DIR:Q}
30CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl:Q} 29CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl:Q}
31CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre:Q} 30CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre:Q}
32 31
33CONFIGURE_DIRS+= . ${WRKDIR}/cfengine-masterfiles-${PKGVERSION_NOREV} 32CONFIGURE_DIRS+= . ${WRKDIR}/cfengine-masterfiles-${PKGVERSION_NOREV}
34 33
35BUILD_DEFS+= VARBASE CFENGINE_DIR 34BUILD_DEFS+= VARBASE CFENGINE_DIR
36FILES_SUBST+= CFENGINE_DIR=${CFENGINE_DIR} 35FILES_SUBST+= CFENGINE_DIR=${CFENGINE_DIR}
37 36
38.include "../../mk/bsd.prefs.mk" 37.include "../../mk/bsd.prefs.mk"
39 38
40CFENGINE_DIR?= ${VARBASE}/cfengine 39CFENGINE_DIR?= ${VARBASE}/cfengine
41DOCDIR= ${PREFIX}/share/doc/${PKGBASE} 40DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
42EGDIR= ${PREFIX}/share/examples/${PKGBASE} 41EGDIR= ${PREFIX}/share/examples/${PKGBASE}
43PKG_SYSCONFSUBDIR= cfengine 42PKG_SYSCONFSUBDIR= cfengine
44 43
45# Regenerate masterfiles list with 'make update-masterfiles' 44# Regenerate masterfiles list with 'make update-masterfiles'
46.include "Makefile.cf" 45.include "Makefile.cf"
47 46
48.for file in ${CFILES} 47.for file in ${CFILES}
49CONF_FILES+= ${EGDIR}/CoreBase/${file} ${PKG_SYSCONFDIR}/${file} 48CONF_FILES+= ${EGDIR}/CoreBase/${file} ${PKG_SYSCONFDIR}/${file}
50.endfor 49.endfor
51 50
52RCD_SCRIPTS= cfserverd cfexecd cfmonitord 51RCD_SCRIPTS= cfserverd cfexecd cfmonitord
53SMF_INSTANCES= ${RCD_SCRIPTS} 52SMF_INSTANCES= ${RCD_SCRIPTS}
54 53
55INSTALLATION_DIRS+= ${PKGMANDIR}/man8 54INSTALLATION_DIRS+= ${PKGMANDIR}/man8
56INSTALL_MAKE_FLAGS+= examplesdir=${EGDIR} projlibdir=${PREFIX}/lib 55INSTALL_MAKE_FLAGS+= examplesdir=${EGDIR} projlibdir=${PREFIX}/lib
57INSTALL_MAKE_FLAGS+= masterfilesdir=${EGDIR}/CoreBase 56INSTALL_MAKE_FLAGS+= masterfilesdir=${EGDIR}/CoreBase
58INSTALL_MAKE_FLAGS+= package_modulesdir=${EGDIR}/CoreBase/modules/packages 57INSTALL_MAKE_FLAGS+= package_modulesdir=${EGDIR}/CoreBase/modules/packages
59INSTALL_MAKE_FLAGS+= dist_package_modules_SCRIPTS="apt_get pkgsrc yum" 58INSTALL_MAKE_FLAGS+= dist_package_modules_SCRIPTS="apt_get pkgsrc yum"
60 59
61MAKE_DIRS= ${CFENGINE_DIR} 60MAKE_DIRS= ${CFENGINE_DIR}
62MAKE_DIRS+= ${PKG_SYSCONFDIR}/cfe_internal/core/deprecated 61MAKE_DIRS+= ${PKG_SYSCONFDIR}/cfe_internal/core/deprecated
63MAKE_DIRS+= ${PKG_SYSCONFDIR}/cfe_internal/update 62MAKE_DIRS+= ${PKG_SYSCONFDIR}/cfe_internal/update
64MAKE_DIRS+= ${PKG_SYSCONFDIR}/cfe_internal/enterprise/ha 63MAKE_DIRS+= ${PKG_SYSCONFDIR}/cfe_internal/enterprise/ha
65MAKE_DIRS+= ${PKG_SYSCONFDIR}/controls/3.5 64MAKE_DIRS+= ${PKG_SYSCONFDIR}/controls/3.5
66MAKE_DIRS+= ${PKG_SYSCONFDIR}/controls/3.6 65MAKE_DIRS+= ${PKG_SYSCONFDIR}/controls/3.6
67MAKE_DIRS+= ${PKG_SYSCONFDIR}/controls/3.7 66MAKE_DIRS+= ${PKG_SYSCONFDIR}/controls/3.7
68MAKE_DIRS+= ${PKG_SYSCONFDIR}/inventory 67MAKE_DIRS+= ${PKG_SYSCONFDIR}/inventory
69MAKE_DIRS+= ${PKG_SYSCONFDIR}/lib/3.5 68MAKE_DIRS+= ${PKG_SYSCONFDIR}/lib/3.5
70MAKE_DIRS+= ${PKG_SYSCONFDIR}/lib/3.6 69MAKE_DIRS+= ${PKG_SYSCONFDIR}/lib/3.6
71MAKE_DIRS+= ${PKG_SYSCONFDIR}/lib/3.7 70MAKE_DIRS+= ${PKG_SYSCONFDIR}/lib/3.7
72MAKE_DIRS+= ${PKG_SYSCONFDIR}/modules/packages 71MAKE_DIRS+= ${PKG_SYSCONFDIR}/modules/packages
73MAKE_DIRS+= ${PKG_SYSCONFDIR}/services/autorun 72MAKE_DIRS+= ${PKG_SYSCONFDIR}/services/autorun
74MAKE_DIRS+= ${PKG_SYSCONFDIR}/sketches/meta 73MAKE_DIRS+= ${PKG_SYSCONFDIR}/sketches/meta
75MAKE_DIRS+= ${PKG_SYSCONFDIR}/templates 74MAKE_DIRS+= ${PKG_SYSCONFDIR}/templates
76 75
77SUBST_CLASSES+= path 76SUBST_CLASSES+= path
78SUBST_MESSAGE.path= Fixing default paths 77SUBST_MESSAGE.path= Fixing default paths
79SUBST_STAGE.path= pre-configure 78SUBST_STAGE.path= pre-configure
80SUBST_FILES.path= ${WRKDIR}/cfengine-masterfiles-${PKGVERSION_NOREV}/modules/packages/pkgsrc 79SUBST_FILES.path= ${WRKDIR}/cfengine-masterfiles-${PKGVERSION_NOREV}/modules/packages/pkgsrc
81SUBST_VARS.path= MACHINE_ARCH PKG_SYSCONFBASE PREFIX 80SUBST_VARS.path= MACHINE_ARCH PKG_SYSCONFBASE PREFIX
82 81
83# This can be removed once this module is released in 3.8. 82# This can be removed once this module is released in 3.8.
84post-extract: 83post-extract:
85 ${INSTALL_SCRIPT} files/pkgsrc \ 84 ${INSTALL_SCRIPT} files/pkgsrc \
86 ${WRKDIR}/cfengine-masterfiles-${PKGVERSION_NOREV}/modules/packages/pkgsrc 85 ${WRKDIR}/cfengine-masterfiles-${PKGVERSION_NOREV}/modules/packages/pkgsrc
87 86
88update-masterfiles: configure 87update-masterfiles: configure
89 (${ECHO} '# $$''NetBSD''$$'; \ 88 (${ECHO} '# $$''NetBSD''$$'; \
90 ${ECHO} '# Generated by "make update-masterfiles", post-configure'; \ 89 ${ECHO} '# Generated by "make update-masterfiles", post-configure'; \
91 ${ECHO}; \ 90 ${ECHO}; \
92 cd ${WRKDIR}/cfengine-masterfiles-${PKGVERSION_NOREV} && (\ 91 cd ${WRKDIR}/cfengine-masterfiles-${PKGVERSION_NOREV} && (\
93 ${FIND} cfe_internal controls inventory lib services sketches/meta update -name '*.cf'; \ 92 ${FIND} cfe_internal controls inventory lib services sketches/meta update -name '*.cf'; \
94 ${FIND} templates -name '*.mustache'; \ 93 ${FIND} templates -name '*.mustache'; \
95 ${FIND} modules -type f | grep -v Makefile \ 94 ${FIND} modules -type f | grep -v Makefile \
96 ) | ${SORT} | ${SED} -e 's|^|CFILES+=|') \ 95 ) | ${SORT} | ${SED} -e 's|^|CFILES+=|') \
97 > ${.CURDIR}/../../sysutils/cfengine3/Makefile.cf 96 > ${.CURDIR}/../../sysutils/cfengine3/Makefile.cf
98 97
99post-install: 98post-install:
100 for cf in cf-agent cf-execd cf-key cf-monitord cf-promises cf-runagent cf-serverd ; \ 99 for cf in cf-agent cf-execd cf-key cf-monitord cf-promises cf-runagent cf-serverd ; \
101 do LD_LIBRARY_PATH=${DESTDIR}${PREFIX}/lib ${DESTDIR}${PREFIX}/sbin/$$cf -M \ 100 do LD_LIBRARY_PATH=${DESTDIR}${PREFIX}/lib ${DESTDIR}${PREFIX}/sbin/$$cf -M \
102 > ${DESTDIR}/${PREFIX}/${PKGMANDIR}/man8/$$cf.8 ; \ 101 > ${DESTDIR}/${PREFIX}/${PKGMANDIR}/man8/$$cf.8 ; \
103 done 102 done
104 103
105.include "../../devel/pcre/buildlink3.mk" 104.include "../../devel/pcre/buildlink3.mk"
106.include "../../security/openssl/buildlink3.mk" 105.include "../../security/openssl/buildlink3.mk"
107.include "../../textproc/libxml2/buildlink3.mk" 106.include "../../textproc/libxml2/buildlink3.mk"
108.include "../../mk/pthread.buildlink3.mk" 107.include "../../mk/pthread.buildlink3.mk"
109.include "../../mk/bsd.pkg.mk" 108.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/sysutils/cfengine3/distinfo (switch to unified diff)

--- pkgsrc/sysutils/cfengine3/distinfo 2015/12/08 17:15:21 1.9
+++ pkgsrc/sysutils/cfengine3/distinfo 2016/04/11 12:48:37 1.10
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.9 2015/12/08 17:15:21 fhajny Exp $ 1$NetBSD: distinfo,v 1.10 2016/04/11 12:48:37 fhajny Exp $
2 2
3SHA1 (cfengine-3.7.2.tar.gz) = 9f454db3ce9c86c6c230bfd5bba534970ada7893 3SHA1 (cfengine-3.7.3.tar.gz) = a732d0ef60213b352602cb7d690fc06376b7ae02
4RMD160 (cfengine-3.7.2.tar.gz) = 83d48c484e3a8132fa0bf331402aa8305dab125c 4RMD160 (cfengine-3.7.3.tar.gz) = 6d482b17916e4ddaaa32dee914865cedec3b3231
5SHA512 (cfengine-3.7.2.tar.gz) = 8b4d0dac81cb3734489e3e1d60a034c3074d710f35a6c2ab35cffe9c066a63c3214b062ef4116ff3ef46461c8ce53ebb02c6513cb49f9edf2c9a81f4679066e6 5SHA512 (cfengine-3.7.3.tar.gz) = 28d02db5b81d05e257d5653b7bc306f31b9b9c5460cf381b16142e4f640ad8ff88aea58902db79a0460084c57ef257917ac324b1ac1b3777e3c4a4d4dac5f5c1
6Size (cfengine-3.7.2.tar.gz) = 2114764 bytes 6Size (cfengine-3.7.3.tar.gz) = 2124667 bytes
7SHA1 (cfengine-masterfiles-3.7.2.tar.gz) = 8b00f9e81815890220d7e8ad5209cdf1fc04b07d 7SHA1 (cfengine-masterfiles-3.7.3.tar.gz) = d2426074720f496ac87e2f86bbd8f4f8aa15c5ae
8RMD160 (cfengine-masterfiles-3.7.2.tar.gz) = 2f67dd56f8b82575c799a1d9a83b44bd67d3bc38 8RMD160 (cfengine-masterfiles-3.7.3.tar.gz) = 2c61521fd622182a654f5cb4d0ed51243bc950fb
9SHA512 (cfengine-masterfiles-3.7.2.tar.gz) = e2a6ceba4db90e6b2cd4f30fc2c276012660aca8a76fbd5bbc3debd8e6226cd5f8f270f5936b38e1ccd36cee706fd697bfde5c96739bde38d8c11f4ef3f0f86b 9SHA512 (cfengine-masterfiles-3.7.3.tar.gz) = 27bd25b2eac3e2d1f74952685055f307da61f5371531481f1c56cb124addc8373f2c1f529d566824b327b92c056d2529fda35190110e18ccc0d368bbbee4cb2f
10Size (cfengine-masterfiles-3.7.2.tar.gz) = 449943 bytes 10Size (cfengine-masterfiles-3.7.3.tar.gz) = 451097 bytes
11SHA1 (patch-ext_Makefile.in) = b0f8c773b3351c949fe33028a3122c5673d8778d 11SHA1 (patch-ext_Makefile.in) = b0f8c773b3351c949fe33028a3122c5673d8778d