Date: Thu, 04 Jun 2026 01:40:18 +0000 From: Romain Tar=?utf-8?Q?ti=C3=A8re?= <romain@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 84aa677457fd - main - sysutils/rubygem-choria-mcorpc-support: Fix with latest Ruby Message-ID: <6a20d782.27eda.2d25de78@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=84aa677457fdfe220ed4ee373940ad9013591de9 commit 84aa677457fdfe220ed4ee373940ad9013591de9 Author: Romain Tartière <romain@FreeBSD.org> AuthorDate: 2026-06-04 01:34:03 +0000 Commit: Romain Tartière <romain@FreeBSD.org> CommitDate: 2026-06-04 01:39:52 +0000 sysutils/rubygem-choria-mcorpc-support: Fix with latest Ruby While here remove explicit dependency on sysutils/choria. This gem is now a run-time dependency of OpenBolt, but choria itself is not required for using OpenBolt. So do not install choria as a dependency of this gem automatically to avoid downloading large dependencies when unneeded. With hat: puppet --- sysutils/rubygem-choria-mcorpc-support/Makefile | 4 +-- .../files/patch-lib_mcollective_monkey__patches.rb | 33 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/sysutils/rubygem-choria-mcorpc-support/Makefile b/sysutils/rubygem-choria-mcorpc-support/Makefile index ca5712ce0e52..7dc0de2e35fa 100644 --- a/sysutils/rubygem-choria-mcorpc-support/Makefile +++ b/sysutils/rubygem-choria-mcorpc-support/Makefile @@ -1,5 +1,6 @@ PORTNAME= choria-mcorpc-support DISTVERSION= 2.26.5 +PORTREVISION= 1 CATEGORIES= sysutils rubygems MASTER_SITES= RG @@ -11,8 +12,7 @@ LICENSE= APACHE20 USES= gem -RUN_DEPENDS= choria>=0.20.1:sysutils/choria \ - rubygem-nats-pure>=0.6<0.8.0:net/rubygem-nats-pure \ +RUN_DEPENDS= rubygem-nats-pure>=0.6<0.8.0:net/rubygem-nats-pure \ rubygem-systemu>=2.6.4<3:devel/rubygem-systemu NO_ARCH= yes diff --git a/sysutils/rubygem-choria-mcorpc-support/files/patch-lib_mcollective_monkey__patches.rb b/sysutils/rubygem-choria-mcorpc-support/files/patch-lib_mcollective_monkey__patches.rb new file mode 100644 index 000000000000..d230c147b228 --- /dev/null +++ b/sysutils/rubygem-choria-mcorpc-support/files/patch-lib_mcollective_monkey__patches.rb @@ -0,0 +1,33 @@ +--- lib/mcollective/monkey_patches.rb.orig 2026-06-03 23:37:51 UTC ++++ lib/mcollective/monkey_patches.rb +@@ -130,30 +130,3 @@ end + end + end + end +- +-# Reject all SSLv2 ciphers and all SSLv2 or SSLv3 handshakes by default +-require "openssl" +-class OpenSSL::SSL::SSLContext # rubocop:disable Style/ClassAndModuleChildren +- if DEFAULT_PARAMS[:options] +- DEFAULT_PARAMS[:options] |= OpenSSL::SSL::OP_NO_SSLv2 | OpenSSL::SSL::OP_NO_SSLv3 +- else +- DEFAULT_PARAMS[:options] = OpenSSL::SSL::OP_NO_SSLv2 | OpenSSL::SSL::OP_NO_SSLv3 +- end +- +- # ruby 1.8.5 doesn't define this constant, but has it on by default +- DEFAULT_PARAMS[:options] |= OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS if defined?(OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS) +- +- DEFAULT_PARAMS[:ciphers] << ":!SSLv2" if DEFAULT_PARAMS[:ciphers] +- +- alias __mcollective_original_initialize initialize +- private :__mcollective_original_initialize +- +- def initialize(*args) +- __mcollective_original_initialize(*args) +- params = { +- :options => DEFAULT_PARAMS[:options], +- :ciphers => DEFAULT_PARAMS[:ciphers] +- } +- set_params(params) +- end +-endhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a20d782.27eda.2d25de78>