git: a8f15d8afb64 - main - sysutils/puppet8: Fix with recent dependencies

The branch main has been updated by romain:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a8f15d8afb64ae4a89662daf5f8cde0a27f50281

commit a8f15d8afb64ae4a89662daf5f8cde0a27f50281
Author:     Romain Tartière <romain@FreeBSD.org>
AuthorDate: 2025-12-31 20:27:51 +0000
Commit:     Romain Tartière <romain@FreeBSD.org>
CommitDate: 2025-12-31 20:27:51 +0000

    sysutils/puppet8: Fix with recent dependencies
    
    With hat:       puppet
---
 sysutils/puppet8/Makefile                          |  2 +-
 .../files/patch-lib_puppet_util_monkey__patches.rb | 47 ++++++++++++++++++++++
 sysutils/puppet8/files/patch-puppet.gemspec        |  9 ++++-
 3 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/sysutils/puppet8/Makefile b/sysutils/puppet8/Makefile
index 10fd5e97a0ae..e0691f84a323 100644
--- a/sysutils/puppet8/Makefile
+++ b/sysutils/puppet8/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	puppet
 PORTVERSION=	8.10.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=   https://forge.puppet.com/v3/files/:forge
 PKGNAMESUFFIX=	8
diff --git a/sysutils/puppet8/files/patch-lib_puppet_util_monkey__patches.rb b/sysutils/puppet8/files/patch-lib_puppet_util_monkey__patches.rb
new file mode 100644
index 000000000000..3abac76f868f
--- /dev/null
+++ b/sysutils/puppet8/files/patch-lib_puppet_util_monkey__patches.rb
@@ -0,0 +1,47 @@
+--- lib/puppet/util/monkey_patches.rb.orig	2025-12-27 20:44:22 UTC
++++ lib/puppet/util/monkey_patches.rb
+@@ -1,6 +1,6 @@
+ # frozen_string_literal: true
+ 
+-require_relative '../../puppet/util/platform'
++require_relative "../../puppet/util/platform"
+ 
+ module Puppet::Util::MonkeyPatches
+ end
+@@ -49,23 +49,17 @@ end
+   end
+ end
+ 
+-require_relative '../../puppet/ssl/openssl_loader'
++require_relative "../../puppet/ssl/openssl_loader"
+ unless Puppet::Util::Platform.jruby_fips?
+   class OpenSSL::SSL::SSLContext
+-    if DEFAULT_PARAMS[:options]
+-      DEFAULT_PARAMS[:options] |= OpenSSL::SSL::OP_NO_SSLv3
+-    else
+-      DEFAULT_PARAMS[:options] = OpenSSL::SSL::OP_NO_SSLv3
+-    end
+-
+-    alias __original_initialize initialize
++    alias_method :__original_initialize, :initialize
+     private :__original_initialize
+ 
+     def initialize(*args)
+       __original_initialize(*args)
+       params = {
+-        :options => DEFAULT_PARAMS[:options],
+-        :ciphers => DEFAULT_PARAMS[:ciphers],
++        options: DEFAULT_PARAMS[:options],
++        ciphers: DEFAULT_PARAMS[:ciphers]
+       }
+       set_params(params)
+     end
+@@ -75,7 +69,7 @@ if Puppet::Util::Platform.windows?
+ if Puppet::Util::Platform.windows?
+   class OpenSSL::X509::Store
+     @puppet_certs_loaded = false
+-    alias __original_set_default_paths set_default_paths
++    alias_method :__original_set_default_paths, :set_default_paths
+     def set_default_paths
+       # This can be removed once openssl integrates with windows
+       # cert store, see https://rt.openssl.org/Ticket/Display.html?id=2158
diff --git a/sysutils/puppet8/files/patch-puppet.gemspec b/sysutils/puppet8/files/patch-puppet.gemspec
index 555c880c809a..c59d6657b0ab 100644
--- a/sysutils/puppet8/files/patch-puppet.gemspec
+++ b/sysutils/puppet8/files/patch-puppet.gemspec
@@ -1,6 +1,6 @@
---- puppet.gemspec.orig	2025-07-23 00:05:26 UTC
+--- puppet.gemspec.orig	2024-10-08 21:08:03 UTC
 +++ puppet.gemspec
-@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
+@@ -23,11 +23,11 @@ Gem::Specification.new do |spec|
    spec.add_runtime_dependency('concurrent-ruby', '~> 1.0')
    spec.add_runtime_dependency('deep_merge', '~> 1.0')
    spec.add_runtime_dependency('facter', ['>= 4.3.0', '< 5'])
@@ -9,3 +9,8 @@
    spec.add_runtime_dependency('getoptlong', '~> 0.2.0')
    spec.add_runtime_dependency('locale', '~> 2.1')
    spec.add_runtime_dependency('multi_json', '~> 1.13')
+-  spec.add_runtime_dependency('puppet-resource_api', '~> 1.5')
++  spec.add_runtime_dependency('puppet-resource_api', '>= 1.5')
+   spec.add_runtime_dependency('scanf', '~> 1.0')
+   spec.add_runtime_dependency('semantic_puppet', '~> 1.0')
+