From a7a8045f418eea1659c1eb8440b5f21ff1dcee68 Mon Sep 17 00:00:00 2001 From: Cy Schubert Date: Thu, 21 May 2020 04:17:31 +0000 Subject: [PATCH] Update to the latest cfengine github commits. --- sysutils/cfengine-devel/Makefile | 6 +++--- sysutils/cfengine-devel/distinfo | 10 +++++----- .../files/patch-libntech_libutils_definitions.h | 11 +++++++++++ sysutils/cfengine-devel/pkg-plist | 2 +- sysutils/cfengine-masterfiles-devel/Makefile | 4 ++-- sysutils/cfengine-masterfiles-devel/distinfo | 6 +++--- sysutils/cfengine-masterfiles-devel/pkg-plist | 8 -------- 7 files changed, 25 insertions(+), 22 deletions(-) create mode 100644 sysutils/cfengine-devel/files/patch-libntech_libutils_definitions.h diff --git a/sysutils/cfengine-devel/Makefile b/sysutils/cfengine-devel/Makefile index 2188dea45063..da4206f187d6 100644 --- a/sysutils/cfengine-devel/Makefile +++ b/sysutils/cfengine-devel/Makefile @@ -5,9 +5,9 @@ PORTNAME= cfengine PORTVERSION= 3.${CFENGINE_COMMIT_DATE} CATEGORIES= sysutils PKGNAMESUFFIX= -devel -CFENGINE_HASH= 2f737077c -LIBNTECH_HASH= 2295208 -CFENGINE_COMMIT_DATE= 2020.04.14 +CFENGINE_HASH= b240cd4db +LIBNTECH_HASH= 0943bb5 +CFENGINE_COMMIT_DATE= 2020.05.19 MAINTAINER= cy@FreeBSD.org # gjb@FreeBSD.org is also committer for this port diff --git a/sysutils/cfengine-devel/distinfo b/sysutils/cfengine-devel/distinfo index 899a3cb1309c..c231eacd0bec 100644 --- a/sysutils/cfengine-devel/distinfo +++ b/sysutils/cfengine-devel/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1586882822 -SHA256 (cfengine-core-3.2020.04.14-2f737077c_GH0.tar.gz) = 09a7db4a1d0a685a327c40221095ed54c3ba013dff6d80c5f8cc33367609e869 -SIZE (cfengine-core-3.2020.04.14-2f737077c_GH0.tar.gz) = 2210261 -SHA256 (cfengine-libntech-2295208_GH0.tar.gz) = e223dd6accc1f97fc34e5b968ab266412dd1ef973dbce4a2e12823c7a29526e2 -SIZE (cfengine-libntech-2295208_GH0.tar.gz) = 361878 +TIMESTAMP = 1590021987 +SHA256 (cfengine-core-3.2020.05.19-b240cd4db_GH0.tar.gz) = c27df5d0deab10ebf2ab38b0431fceb5cf07ba00dace7b187b23f438d40257f2 +SIZE (cfengine-core-3.2020.05.19-b240cd4db_GH0.tar.gz) = 2217838 +SHA256 (cfengine-libntech-0943bb5_GH0.tar.gz) = 5f697c9ed4359f62d1c9f093557b64756c80a769e811a07c75e7a4f932b66ec0 +SIZE (cfengine-libntech-0943bb5_GH0.tar.gz) = 362912 diff --git a/sysutils/cfengine-devel/files/patch-libntech_libutils_definitions.h b/sysutils/cfengine-devel/files/patch-libntech_libutils_definitions.h new file mode 100644 index 000000000000..376d071fb42b --- /dev/null +++ b/sysutils/cfengine-devel/files/patch-libntech_libutils_definitions.h @@ -0,0 +1,11 @@ +--- libntech/libutils/definitions.h.orig 2020-05-19 08:05:50.000000000 -0700 ++++ libntech/libutils/definitions.h 2020-05-20 19:48:00.299686000 -0700 +@@ -58,7 +58,7 @@ + *****************************************************************************/ + #ifdef __FreeBSD__ + # define CF_SYSTEM_GROUP "wheel" +-#elseif __Solaris__ ++#elif __Solaris__ + # define CF_SYSTEM_GROUP "sys" + #else + # define CF_SYSTEM_GROUP "root" diff --git a/sysutils/cfengine-devel/pkg-plist b/sysutils/cfengine-devel/pkg-plist index 1b481e55aa72..6d6f1b48e407 100644 --- a/sysutils/cfengine-devel/pkg-plist +++ b/sysutils/cfengine-devel/pkg-plist @@ -2,11 +2,11 @@ bin/cf-agent bin/cf-check bin/cf-execd bin/cf-key -bin/cf-keycrypt bin/cf-monitord bin/cf-net bin/cf-promises bin/cf-runagent +bin/cf-secret bin/cf-serverd bin/cf-upgrade bin/rpmvercmp diff --git a/sysutils/cfengine-masterfiles-devel/Makefile b/sysutils/cfengine-masterfiles-devel/Makefile index e01a8c20990c..4e6ef00acef9 100644 --- a/sysutils/cfengine-masterfiles-devel/Makefile +++ b/sysutils/cfengine-masterfiles-devel/Makefile @@ -5,8 +5,8 @@ PORTNAME= cfengine-masterfiles PORTVERSION= 3.${CFENGINE_COMMIT_DATE} CATEGORIES= sysutils PKGNAMESUFFIX= -devel -HASH= d66c7493 -CFENGINE_COMMIT_DATE= 2020.04.14 +HASH= b0b3b4e2 +CFENGINE_COMMIT_DATE= 2020.05.15 MAINTAINER= cy@FreeBSD.org # gjb@FreeBSD.org is also committer for this port diff --git a/sysutils/cfengine-masterfiles-devel/distinfo b/sysutils/cfengine-masterfiles-devel/distinfo index 0c6c8655f3d4..948efcbe4dae 100644 --- a/sysutils/cfengine-masterfiles-devel/distinfo +++ b/sysutils/cfengine-masterfiles-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1586883511 -SHA256 (cfengine-masterfiles-3.2020.04.14-d66c7493_GH0.tar.gz) = 58e83b74b0ab4e031f7b7efddbe99816f5c167bd7fd59d3432551a0bd38297c6 -SIZE (cfengine-masterfiles-3.2020.04.14-d66c7493_GH0.tar.gz) = 432014 +TIMESTAMP = 1590021980 +SHA256 (cfengine-masterfiles-3.2020.05.15-b0b3b4e2_GH0.tar.gz) = 960da53490e81de56e74c14eee50c7991136bb44361b5c91f3daa28c74631556 +SIZE (cfengine-masterfiles-3.2020.05.15-b0b3b4e2_GH0.tar.gz) = 432140 diff --git a/sysutils/cfengine-masterfiles-devel/pkg-plist b/sysutils/cfengine-masterfiles-devel/pkg-plist index ebdbb115fba0..a89118297e1e 100644 --- a/sysutils/cfengine-masterfiles-devel/pkg-plist +++ b/sysutils/cfengine-masterfiles-devel/pkg-plist @@ -90,11 +90,3 @@ %%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 -%%EXAMPLESDIR%%/modules/packages/nimclient -%%EXAMPLESDIR%%/modules/packages/pkg -%%EXAMPLESDIR%%/modules/packages/pkgsrc -%%EXAMPLESDIR%%/modules/packages/slackpkg -%%EXAMPLESDIR%%/modules/packages/yum -%%EXAMPLESDIR%%/modules/packages/zypper