Update 3.10.1 --> 3.10.3

6 files changed, 13 insertions, 162 deletions

diff --git a/sysutils/cfengine-masterfiles310/Makefile b/sysutils/cfengine-masterfiles310/Makefile
index 77aac927f376..5ff57f5d5fa6 100644
--- a/sysutils/cfengine-masterfiles310/Makefile
+++ b/sysutils/cfengine-masterfiles310/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cfengine-masterfiles
-PORTVERSION=	3.10.1
-PORTREVISION=	1
+PORTVERSION=	3.10.3
 CATEGORIES=	sysutils
 MASTER_SITES=	https://cfengine-package-repos.s3.amazonaws.com/tarballs/
 
diff --git a/sysutils/cfengine-masterfiles310/distinfo b/sysutils/cfengine-masterfiles310/distinfo
index fa497da26384..7a29d8892923 100644
--- a/sysutils/cfengine-masterfiles310/distinfo
+++ b/sysutils/cfengine-masterfiles310/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490817701
-SHA256 (cfengine-masterfiles-3.10.1.tar.gz) = c4b0ff856d9af1cc62559b0ca4a7d39548442b13167a294637ed65cd5a811900
-SIZE (cfengine-masterfiles-3.10.1.tar.gz) = 453722
+TIMESTAMP = 1521590747
+SHA256 (cfengine-masterfiles-3.10.3.tar.gz) = faf2954011c67b23deb635dd3c0bace06d40fa9171901ebc51d642149b85a532
+SIZE (cfengine-masterfiles-3.10.3.tar.gz) = 487071
diff --git a/sysutils/cfengine-masterfiles310/pkg-plist b/sysutils/cfengine-masterfiles310/pkg-plist
index 5435aa0d9d1a..ef9323f05249 100644
--- a/sysutils/cfengine-masterfiles310/pkg-plist
+++ b/sysutils/cfengine-masterfiles310/pkg-plist
@@ -46,6 +46,7 @@
 %%EXAMPLESDIR%%/masterfiles/controls/reports.cf
 %%EXAMPLESDIR%%/masterfiles/controls/update_def.cf
 %%EXAMPLESDIR%%/masterfiles/controls/update_def_inputs.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/aix.cf
 %%EXAMPLESDIR%%/masterfiles/inventory/any.cf
 %%EXAMPLESDIR%%/masterfiles/inventory/debian.cf
 %%EXAMPLESDIR%%/masterfiles/inventory/freebsd.cf
@@ -108,6 +109,7 @@
 %%EXAMPLESDIR%%/masterfiles/services/autorun/hello.cf
 %%EXAMPLESDIR%%/masterfiles/services/main.cf
 %%EXAMPLESDIR%%/masterfiles/sketches/meta/api-runfile.cf
+%%EXAMPLESDIR%%/masterfiles/standalone_self_upgrade.cf
 %%EXAMPLESDIR%%/masterfiles/templates/cf-apache.service.mustache
 %%EXAMPLESDIR%%/masterfiles/templates/cf-consumer.service.mustache
 %%EXAMPLESDIR%%/masterfiles/templates/cf-execd.service.mustache
@@ -120,6 +122,8 @@
 %%EXAMPLESDIR%%/masterfiles/templates/cfengine3.service.mustache
 %%EXAMPLESDIR%%/masterfiles/templates/cfengine_watchdog.mustache
 %%EXAMPLESDIR%%/masterfiles/templates/host_info_report.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/json_multiline.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/json_serial.mustache
 %%EXAMPLESDIR%%/masterfiles/update.cf
 %%EXAMPLESDIR%%/modules/packages/apt_get
 %%EXAMPLESDIR%%/modules/packages/freebsd_ports
@@ -127,3 +131,4 @@
 %%EXAMPLESDIR%%/modules/packages/pkg
 %%EXAMPLESDIR%%/modules/packages/pkgsrc
 %%EXAMPLESDIR%%/modules/packages/yum
+%%EXAMPLESDIR%%/modules/packages/zypper
diff --git a/sysutils/cfengine310/Makefile b/sysutils/cfengine310/Makefile
index 421167a13703..d03b5eae47db 100644
--- a/sysutils/cfengine310/Makefile
+++ b/sysutils/cfengine310/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cfengine
-PORTVERSION=	3.10.1
+PORTVERSION=	3.10.3
 CATEGORIES=	sysutils
 MASTER_SITES=	https://s3.amazonaws.com/cfengine-package-repos/tarballs/
 
diff --git a/sysutils/cfengine310/distinfo b/sysutils/cfengine310/distinfo
index f983e730b0ab..738358c93dca 100644
--- a/sysutils/cfengine310/distinfo
+++ b/sysutils/cfengine310/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490815614
-SHA256 (cfengine-3.10.1.tar.gz) = 0abb7e91d667a4f339b61e105dc66c583fa98e0217c6fc7fcf8a73300badca98
-SIZE (cfengine-3.10.1.tar.gz) = 2362381
+TIMESTAMP = 1521576492
+SHA256 (cfengine-3.10.3.tar.gz) = 8e4d8921d378155c4f6aa64641e43b500a9fe21b02ad7d45da12ba7e216825d9
+SIZE (cfengine-3.10.3.tar.gz) = 2371839
diff --git a/sysutils/cfengine310/files/patch-libenv_sysinfo.c b/sysutils/cfengine310/files/patch-libenv_sysinfo.c
deleted file mode 100644
index 541a4adbcbcf..000000000000
--- a/sysutils/cfengine310/files/patch-libenv_sysinfo.c
+++ /dev/null
@@ -1,153 +0,0 @@
---- libenv/sysinfo.c.orig	2016-07-28 21:25:33 UTC
-+++ libenv/sysinfo.c
-@@ -168,15 +168,16 @@ static int MiscOS(EvalContext *ctx);
- static void OpenVZ_Detect(EvalContext *ctx);
- 
- 
--#ifdef XEN_CPUID_SUPPORT
--static void Xen_Cpuid(uint32_t idx, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx);
--static int Xen_Hv_Check(void);
--#endif
- 
- static bool ReadLine(const char *filename, char *buf, int bufsize);
- static FILE *ReadFirstLine(const char *filename, char *buf, int bufsize);
- #endif
- 
-+#ifdef XEN_CPUID_SUPPORT
-+static void Xen_Cpuid(uint32_t idx, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx);
-+static bool Xen_Hv_Check(void);
-+#endif
-+
- static void GetCPUInfo(EvalContext *ctx);
- 
- static const char *const CLASSATTRIBUTES[][3] =
-@@ -1146,14 +1147,6 @@ static void OSClasses(EvalContext *ctx)
-         OpenVZ_Detect(ctx);
-     }
- 
--#ifdef XEN_CPUID_SUPPORT
--    else if (Xen_Hv_Check())
--    {
--        Log(LOG_LEVEL_VERBOSE, "This appears to be a xen hv system.");
--        EvalContextClassPutHard(ctx, "xen", "inventory,attribute_name=Virtual host,source=agent");
--        EvalContextClassPutHard(ctx, "xen_domu_hv", "source=agent");
--    }
--#endif
- 
- #else
- 
-@@ -1195,6 +1188,15 @@ static void OSClasses(EvalContext *ctx)
- 
- #endif
- 
-+#ifdef XEN_CPUID_SUPPORT
-+    if (Xen_Hv_Check())
-+    {
-+        Log(LOG_LEVEL_VERBOSE, "This appears to be a xen hv system.");
-+        EvalContextClassPutHard(ctx, "xen", "inventory,attribute_name=Virtual host,source=agent");
-+        EvalContextClassPutHard(ctx, "xen_domu_hv", "source=agent");
-+    }
-+#endif
-+
-     GetCPUInfo(ctx);
- 
- #ifdef __CYGWIN__
-@@ -2518,49 +2520,6 @@ static void OpenVZ_Detect(EvalContext *c
- 
- /******************************************************************/
- 
--#ifdef XEN_CPUID_SUPPORT
--
--/* borrowed from Xen source/tools/libxc/xc_cpuid_x86.c */
--
--static void Xen_Cpuid(uint32_t idx, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx)
--{
--    asm(
--           /* %ebx register need to be saved before usage and restored thereafter
--            * for PIC-compliant code on i386 */
--# ifdef __i386__
--           "push %%ebx; cpuid; mov %%ebx,%1; pop %%ebx"
--# else
--           "push %%rbx; cpuid; mov %%ebx,%1; pop %%rbx"
--# endif
--  : "=a"(*eax), "=r"(*ebx), "=c"(*ecx), "=d"(*edx):"0"(idx), "2"(0));
--}
--
--/******************************************************************/
--
--static int Xen_Hv_Check(void)
--{
--    uint32_t eax;
--    union
--    {
--        uint32_t u[3];
--        char s[13];
--    } sig = {{0}};
--
--    Xen_Cpuid(0x40000000, &eax, &sig.u[0], &sig.u[1], &sig.u[2]);
--
--    if (strcmp("XenVMMXenVMM", sig.s) || (eax < 0x40000002))
--    {
--        return 0;
--    }
--
--    Xen_Cpuid(0x40000001, &eax, &sig.u[0], &sig.u[1], &sig.u[2]);
--    return 1;
--}
--
--#endif
--
--/******************************************************************/
--
- static bool ReadLine(const char *filename, char *buf, int bufsize)
- {
-     FILE *fp = ReadFirstLine(filename, buf, bufsize);
-@@ -2597,6 +2556,48 @@ static FILE *ReadFirstLine(const char *f
- }
- #endif /* __linux__ */
- 
-+/******************************************************************/
-+
-+#ifdef XEN_CPUID_SUPPORT
-+
-+/* borrowed from Xen source/tools/libxc/xc_cpuid_x86.c */
-+
-+static void Xen_Cpuid(uint32_t idx, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx)
-+{
-+    asm(
-+           /* %ebx register need to be saved before usage and restored thereafter
-+            * for PIC-compliant code on i386 */
-+# ifdef __i386__
-+           "push %%ebx; cpuid; mov %%ebx,%1; pop %%ebx"
-+# else
-+           "push %%rbx; cpuid; mov %%ebx,%1; pop %%rbx"
-+# endif
-+  : "=a"(*eax), "=r"(*ebx), "=c"(*ecx), "=d"(*edx):"0"(idx), "2"(0));
-+}
-+
-+/******************************************************************/
-+
-+static bool Xen_Hv_Check(void)
-+{
-+    uint32_t eax, base;
-+    union
-+    {
-+        uint32_t u[3];
-+        char s[13];
-+    } sig = {{0}};
-+
-+    for (base = 0x40000000; base < 0x40010000; base += 0x100)
-+    {
-+        Xen_Cpuid(base, &eax, &sig.u[0], &sig.u[1], &sig.u[2]);
-+        if (strcmp("XenVMMXenVMM", sig.s) == 0 && eax >= (base + 2))
-+            return true;
-+    }
-+
-+    return false;
-+}
-+#endif /* XEN_CPUID_SUPPORT */
-+
-+
- static void GetCPUInfo(EvalContext *ctx)
- {
- #if defined(MINGW) || defined(NT)