sysutils/puppet8: Update to 8.4.0

Release notes: https://www.puppet.com/docs/puppet/8/release_notes_puppet.html#release_notes_puppet_x-8-4-0 With hat: puppet
freebsd · Jan 24, 2024 · c52a6bc · c52a6bc
1 parent 9acafb1
commit c52a6bc
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 52 deletions.
diff --git a/sysutils/puppet8/Makefile b/sysutils/puppet8/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	puppet
-PORTVERSION=	8.3.1
+PORTVERSION=	8.4.0
 CATEGORIES=	sysutils
 MASTER_SITES=   https://forge.puppet.com/v3/files/:forge
 PKGNAMESUFFIX=	8
@@ -45,14 +45,14 @@ OPTIONS_DEFINE=		DOCS EXAMPLES
 # Get versions from
 # https://github.com/puppetlabs/puppet-agent/tree/main/configs/components
 # for f in configs/components/module-puppetlabs-*.json; do echo ${${f#*/module-puppetlabs-}%.json}=${${$(jq .ref $f)#*/v}%\"}; done
-FORGE_MODULES=	augeas_core=1.3.0 \
-		cron_core=1.2.0 \
+FORGE_MODULES=	augeas_core=1.4.0 \
+		cron_core=1.2.1 \
 		host_core=1.2.0 \
 		mount_core=1.2.0 \
-		scheduled_task=3.1.1 \
+		scheduled_task=3.2.0 \
 		selinux_core=1.3.0 \
 		sshkeys_core=2.4.0 \
-		yumrepo_core=1.2.0 \
+		yumrepo_core=2.0.0 \
 		zfs_core=1.4.0 \
 		zone_core=1.1.0
 

diff --git a/sysutils/puppet8/distinfo b/sysutils/puppet8/distinfo
@@ -1,23 +1,23 @@
-TIMESTAMP = 1699213574
-SHA256 (puppetlabs-augeas_core-1.3.0.tar.gz) = be41ae163f5dc94021ce03c2a0032a23275b4378af3c917befc12af14a4b3b69
-SIZE (puppetlabs-augeas_core-1.3.0.tar.gz) = 25837
-SHA256 (puppetlabs-cron_core-1.2.0.tar.gz) = e74247784d8cf6b27811b98f3ad782952d0005e4e012abb367d3492c51f264a2
-SIZE (puppetlabs-cron_core-1.2.0.tar.gz) = 24594
+TIMESTAMP = 1705780241
+SHA256 (puppetlabs-augeas_core-1.4.0.tar.gz) = 037be878ff36959cdf4fdab935d71e5f679757ce11b19dc912da8d0698415617
+SIZE (puppetlabs-augeas_core-1.4.0.tar.gz) = 23368
+SHA256 (puppetlabs-cron_core-1.2.1.tar.gz) = 09ed75d8141b6b3cd28add91c1de9803ff1a353e2f504112cec53ad209dbdd4b
+SIZE (puppetlabs-cron_core-1.2.1.tar.gz) = 24007
 SHA256 (puppetlabs-host_core-1.2.0.tar.gz) = a45d7fed47ae1c707fabaec9a1d6da4d8e2fd23bcfb998e6406b4c8e2eed056e
 SIZE (puppetlabs-host_core-1.2.0.tar.gz) = 14471
 SHA256 (puppetlabs-mount_core-1.2.0.tar.gz) = ed437a07e9457fac21e1c87e53b44b7cf4f98c4d5e509dd5ffdea6c5dd96c6ee
 SIZE (puppetlabs-mount_core-1.2.0.tar.gz) = 21556
-SHA256 (puppetlabs-scheduled_task-3.1.1.tar.gz) = d1993b1b41b63f224594ad6fe84c92449fbf2a96afee6f8cd604562c57e76e05
-SIZE (puppetlabs-scheduled_task-3.1.1.tar.gz) = 45065
+SHA256 (puppetlabs-scheduled_task-3.2.0.tar.gz) = 9f0ba59b55caadeb658ba2d5cc51f0a76136d4bb5fffe008bbd5c911b42ac43f
+SIZE (puppetlabs-scheduled_task-3.2.0.tar.gz) = 44882
 SHA256 (puppetlabs-selinux_core-1.3.0.tar.gz) = 593ad4cc9d311528b6be0fdaa6ce08bf46acb21ff0d035ef3c6f2e548c43433d
 SIZE (puppetlabs-selinux_core-1.3.0.tar.gz) = 16456
 SHA256 (puppetlabs-sshkeys_core-2.4.0.tar.gz) = 033eb694359974ce1d9154526f42a01c2bc64abbcd4f587a5f25dff03135171b
 SIZE (puppetlabs-sshkeys_core-2.4.0.tar.gz) = 20091
-SHA256 (puppetlabs-yumrepo_core-1.2.0.tar.gz) = 6fd02331be8267165e75c4eb00030a88be4401fe8d4eeea45365cc270140f44a
-SIZE (puppetlabs-yumrepo_core-1.2.0.tar.gz) = 19704
+SHA256 (puppetlabs-yumrepo_core-2.0.0.tar.gz) = c9ca5a82c0d77df69f02f194a0aa038dd8e93333d7350cf017f095badda244a5
+SIZE (puppetlabs-yumrepo_core-2.0.0.tar.gz) = 18984
 SHA256 (puppetlabs-zfs_core-1.4.0.tar.gz) = fcdf3440d5cf5e76a2ae452fc8eb6b8a589721e7c5a8832c2984e60f1962d5fa
 SIZE (puppetlabs-zfs_core-1.4.0.tar.gz) = 18834
 SHA256 (puppetlabs-zone_core-1.1.0.tar.gz) = 9d8241938e56145ce15827415e5c6b74002407b4548c12b5ef165423adfc725b
 SIZE (puppetlabs-zone_core-1.1.0.tar.gz) = 20637
-SHA256 (puppetlabs-puppet-8.3.1_GH0.tar.gz) = 4dda86ead01d8aaaea5709a7f5a5fa266a00bbc347abaa0832ded9b4ec2c272b
-SIZE (puppetlabs-puppet-8.3.1_GH0.tar.gz) = 3327640
+SHA256 (puppetlabs-puppet-8.4.0_GH0.tar.gz) = cef07ed28541c8f10e81b222812e66d7213193373f1d028ba8aaee51e1dc53bd
+SIZE (puppetlabs-puppet-8.4.0_GH0.tar.gz) = 3325313
diff --git a/sysutils/puppet8/files/patch-lib_puppet_provider_service_daemontools.rb b/sysutils/puppet8/files/patch-lib_puppet_provider_service_daemontools.rb
@@ -1,15 +1,15 @@
---- lib/puppet/provider/service/daemontools.rb.orig	2023-03-27 22:00:42 UTC
+--- lib/puppet/provider/service/daemontools.rb.orig	2023-12-21 23:41:03 UTC
 +++ lib/puppet/provider/service/daemontools.rb
-@@ -39,7 +39,7 @@ Puppet::Type.type(:service).provide :daemontools, :par
+@@ -41,7 +41,7 @@ Puppet::Type.type(:service).provide :daemontools, :par
 
    EOT
 
--  commands :svc  => "/usr/bin/svc", :svstat => "/usr/bin/svstat"
-+  commands :svc  => "%%PREFIX%%/bin/svc", :svstat => "%%PREFIX%%/bin/svstat"
+-  commands :svc => "/usr/bin/svc", :svstat => "/usr/bin/svstat"
++  commands :svc => "%%PREFIX%%/bin/svc", :svstat => "%%PREFIX%%/bin/svstat"
 
    class << self
      attr_writer :defpath
-@@ -86,7 +86,7 @@ Puppet::Type.type(:service).provide :daemontools, :par
+@@ -88,7 +88,7 @@ Puppet::Type.type(:service).provide :daemontools, :par
    # find the service dir on this node
    def servicedir
      unless @servicedir

diff --git a/sysutils/puppet8/pkg-plist b/sysutils/puppet8/pkg-plist
@@ -1,11 +1,10 @@
 bin/puppet
 %%ETCDIR%%/puppet.conf-dist
 %%ETCDIR%%/vendor_modules/augeas_core/.github/workflows/auto_release.yml
-%%ETCDIR%%/vendor_modules/augeas_core/.github/workflows/dispatch_unit_tests_with_nightly_puppet_gem.yaml
+%%ETCDIR%%/vendor_modules/augeas_core/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml
 %%ETCDIR%%/vendor_modules/augeas_core/.github/workflows/release.yml
 %%ETCDIR%%/vendor_modules/augeas_core/.github/workflows/static_code_analysis.yaml
-%%ETCDIR%%/vendor_modules/augeas_core/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml
-%%ETCDIR%%/vendor_modules/augeas_core/.github/workflows/unit_tests_with_released_puppet_gem.yaml
+%%ETCDIR%%/vendor_modules/augeas_core/.github/workflows/unit_tests.yaml
 %%ETCDIR%%/vendor_modules/augeas_core/CHANGELOG.md
 %%ETCDIR%%/vendor_modules/augeas_core/CODEOWNERS
 %%ETCDIR%%/vendor_modules/augeas_core/LICENSE
@@ -23,10 +22,10 @@ bin/puppet
 %%ETCDIR%%/vendor_modules/augeas_core/readmes/README_ja_JP.md
 %%ETCDIR%%/vendor_modules/cron_core/.github/workflows/auto_release.yml
 %%ETCDIR%%/vendor_modules/cron_core/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml
+%%ETCDIR%%/vendor_modules/cron_core/.github/workflows/jira.yml
 %%ETCDIR%%/vendor_modules/cron_core/.github/workflows/release.yml
 %%ETCDIR%%/vendor_modules/cron_core/.github/workflows/static_code_analysis.yaml
-%%ETCDIR%%/vendor_modules/cron_core/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml
-%%ETCDIR%%/vendor_modules/cron_core/.github/workflows/unit_tests_with_released_puppet_gem.yaml
+%%ETCDIR%%/vendor_modules/cron_core/.github/workflows/unit_tests.yaml
 %%ETCDIR%%/vendor_modules/cron_core/CHANGELOG.md
 %%ETCDIR%%/vendor_modules/cron_core/CODEOWNERS
 %%ETCDIR%%/vendor_modules/cron_core/LICENSE
@@ -88,11 +87,11 @@ bin/puppet
 %%ETCDIR%%/vendor_modules/mount_core/readmes/README_ja_JP.md
 %%ETCDIR%%/vendor_modules/scheduled_task/.github/workflows/auto_release.yml
 %%ETCDIR%%/vendor_modules/scheduled_task/.github/workflows/labeller.yml
+%%ETCDIR%%/vendor_modules/scheduled_task/.github/workflows/mend.yml
 %%ETCDIR%%/vendor_modules/scheduled_task/.github/workflows/nightly.yml
 %%ETCDIR%%/vendor_modules/scheduled_task/.github/workflows/pr_test.yml
 %%ETCDIR%%/vendor_modules/scheduled_task/.github/workflows/release.yml
 %%ETCDIR%%/vendor_modules/scheduled_task/.github/workflows/spec.yml
-%%ETCDIR%%/vendor_modules/scheduled_task/.github/workflows/stale.yml
 %%ETCDIR%%/vendor_modules/scheduled_task/.gitpod.Dockerfile
 %%ETCDIR%%/vendor_modules/scheduled_task/.gitpod.yml
 %%ETCDIR%%/vendor_modules/scheduled_task/.pmtignore
@@ -168,8 +167,7 @@ bin/puppet
 %%ETCDIR%%/vendor_modules/yumrepo_core/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml
 %%ETCDIR%%/vendor_modules/yumrepo_core/.github/workflows/release.yml
 %%ETCDIR%%/vendor_modules/yumrepo_core/.github/workflows/static_code_analysis.yaml
-%%ETCDIR%%/vendor_modules/yumrepo_core/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml
-%%ETCDIR%%/vendor_modules/yumrepo_core/.github/workflows/unit_tests_with_released_puppet_gem.yaml
+%%ETCDIR%%/vendor_modules/yumrepo_core/.github/workflows/unit_tests.yaml
 %%ETCDIR%%/vendor_modules/yumrepo_core/CHANGELOG.md
 %%ETCDIR%%/vendor_modules/yumrepo_core/CODEOWNERS
 %%ETCDIR%%/vendor_modules/yumrepo_core/LICENSE
@@ -235,29 +233,29 @@ lib/ruby/gems/%%RUBY_VER%%/specifications/puppet-%%PORTVERSION%%.gemspec
 %%RUBY_SITELIBDIR%%/hiera_puppet.rb
 %%RUBY_SITELIBDIR%%/puppet_pal.rb
 %%RUBY_SITELIBDIR%%/puppet_x.rb
-man/man5/puppet.conf.5.gz
-man/man8/puppet-agent.8.gz
-man/man8/puppet-apply.8.gz
-man/man8/puppet-catalog.8.gz
-man/man8/puppet-config.8.gz
-man/man8/puppet-describe.8.gz
-man/man8/puppet-device.8.gz
-man/man8/puppet-doc.8.gz
-man/man8/puppet-epp.8.gz
-man/man8/puppet-facts.8.gz
-man/man8/puppet-filebucket.8.gz
-man/man8/puppet-generate.8.gz
-man/man8/puppet-help.8.gz
-man/man8/puppet-lookup.8.gz
-man/man8/puppet-module.8.gz
-man/man8/puppet-node.8.gz
-man/man8/puppet-parser.8.gz
-man/man8/puppet-plugin.8.gz
-man/man8/puppet-report.8.gz
-man/man8/puppet-resource.8.gz
-man/man8/puppet-script.8.gz
-man/man8/puppet-ssl.8.gz
-man/man8/puppet.8.gz
+share/man/man5/puppet.conf.5.gz
+share/man/man8/puppet-agent.8.gz
+share/man/man8/puppet-apply.8.gz
+share/man/man8/puppet-catalog.8.gz
+share/man/man8/puppet-config.8.gz
+share/man/man8/puppet-describe.8.gz
+share/man/man8/puppet-device.8.gz
+share/man/man8/puppet-doc.8.gz
+share/man/man8/puppet-epp.8.gz
+share/man/man8/puppet-facts.8.gz
+share/man/man8/puppet-filebucket.8.gz
+share/man/man8/puppet-generate.8.gz
+share/man/man8/puppet-help.8.gz
+share/man/man8/puppet-lookup.8.gz
+share/man/man8/puppet-module.8.gz
+share/man/man8/puppet-node.8.gz
+share/man/man8/puppet-parser.8.gz
+share/man/man8/puppet-plugin.8.gz
+share/man/man8/puppet-report.8.gz
+share/man/man8/puppet-resource.8.gz
+share/man/man8/puppet-script.8.gz
+share/man/man8/puppet-ssl.8.gz
+share/man/man8/puppet.8.gz
 @dir(puppet,puppet,) %%ETCDIR%%/manifests
 @dir(puppet,puppet,) %%ETCDIR%%/modules
 @dir(puppet,puppet,) /var/puppet