From nobody Sun Feb 05 16:05:13 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P8vP635dgz3kXtP; Sun, 5 Feb 2023 16:05:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P8vP60lqjz3jVh; Sun, 5 Feb 2023 16:05:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675613114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Go1C+UHPSrPXv8Fgg14zAEOUkSH3j5YPh+zadPnYWyA=; b=IFZbCsKDVYIO5uuv+FxeT+O1qc6h4JyR5seSNCBsK+q+LIz0jfDhiu1WVcbuZo4Ea08QC7 PuD/S8GfZkjl5wVjJj28SVNo/BicSzQsLQkfXj3agprHqBIV1I0sf/lACQCFtu846stjPd LpE/BBwxDXQuzsEvBt5HKy8TRp/vWzj3oHhxzTcbvBTZorkqZa0rkAI/w591hTpOO550L0 HpMpZi3kZ+7CEET4BbCOZVdnABzjtz83JwJNhKwRv2MfJ8+h6MNeGRsUETvwL0+tUY00lW OtlpIN+6LhHhFBNs4W5BJnn/QwrZ2PfdDFEIbcoi4VUe8xbOguzJ7UGqzDYCIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675613114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Go1C+UHPSrPXv8Fgg14zAEOUkSH3j5YPh+zadPnYWyA=; b=CinVFJb+emuF5yHGkUPybQH0irkW2EbZWNLI7vlYp3j4/XuH4gQU2cTzxxcdzNtlF7nmJD P5/RXViPH/yVYyiSRhr6lT3paZwKbokaYoCr1GOagiJ/3nYPX5kPN//L3u3nxyB9etqmoI PsiOfPj7zSMqwNMDNHFJd0Tcvvz/o6t7f/p938Lfw2tf1IZEajy1QhRns57S6eq6f3NJVk DsWhlJeUTgCajnZLRgZrNYTRXZ0/NCyuNf1YqjKS+w7ybJoxogAcl6hlwGbkdjEEjI3auA m+e0ka1qTMli0665oDNL0GDK+nV6d1aMWl2+qoWNopb2FJDp4YS1zSyl8y+L3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675613114; a=rsa-sha256; cv=none; b=abuA9FmVJpK0gKMRJg5L5iEojHWt1XvGy3X8GFPgznDx+UK6b5DTjtMaIsyfUtQWVjZkSg KtXFvYrRLLZStYElxHuzJQIaWQjK6daD8r89J/kkNlgMTXBlyd9K7YgjWlh1HoYlFtdm2D oIcs7FngVTfONufBUEWROmdDEP0YCYJElYvNhnNLpqRQJDFIL/L7wTYuX5+xJc70pIgc2f 8A/3ODyJiR47CxilG6uy/gz2PGj78Uque/6+4OaWGPUfeXm2Z1E5d4k6mLsmRn/n9a4cVh 2gOvQ7H9vIsB65bdQZn7iHQBkd1BZBtrlj+jx63p4ggRsGasdnYZAmzMbI1Udw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P8vP56zMlz11PT; Sun, 5 Feb 2023 16:05:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 315G5Dp1058505; Sun, 5 Feb 2023 16:05:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 315G5DfI058504; Sun, 5 Feb 2023 16:05:13 GMT (envelope-from git) Date: Sun, 5 Feb 2023 16:05:13 GMT Message-Id: <202302051605.315G5DfI058504@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 9b4522cb7997 - main - sysutils/puppet7: Fix build with rubygem-concurrent-ruby 1.2.0+ List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b4522cb7997070282339d841af44ee8e57ae798 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b4522cb7997070282339d841af44ee8e57ae798 commit 9b4522cb7997070282339d841af44ee8e57ae798 Author: Po-Chuan Hsieh AuthorDate: 2023-02-05 15:29:48 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-02-05 15:50:15 +0000 sysutils/puppet7: Fix build with rubygem-concurrent-ruby 1.2.0+ - Bump PORTREVISION for package change Use ThreadLocalVar instead of RubyThreadLocalVar which was removed in 1.2.0. RubyThreadLocalVar is a private class and an implementation detail. Reference: https://github.com/ruby-concurrency/concurrent-ruby/pull/988 https://github.com/ruby-concurrency/concurrent-ruby/issues/986 https://github.com/puppetlabs/puppet/commit/9182bc3dd2576f409a6d01fb5c08d392670e90a2 --- sysutils/puppet7/Makefile | 1 + sysutils/puppet7/files/patch-lib_puppet_thread__local.rb | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/sysutils/puppet7/Makefile b/sysutils/puppet7/Makefile index 4955ed07e372..8e5ec09c17e7 100644 --- a/sysutils/puppet7/Makefile +++ b/sysutils/puppet7/Makefile @@ -1,5 +1,6 @@ PORTNAME= puppet PORTVERSION= 7.21.0 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://forge.puppet.com/v3/files/:forge PKGNAMESUFFIX= 7 diff --git a/sysutils/puppet7/files/patch-lib_puppet_thread__local.rb b/sysutils/puppet7/files/patch-lib_puppet_thread__local.rb new file mode 100644 index 000000000000..25f7f1614577 --- /dev/null +++ b/sysutils/puppet7/files/patch-lib_puppet_thread__local.rb @@ -0,0 +1,13 @@ +Reference: https://github.com/ruby-concurrency/concurrent-ruby/pull/988 + https://github.com/ruby-concurrency/concurrent-ruby/issues/986 + https://github.com/puppetlabs/puppet/commit/9182bc3dd2576f409a6d01fb5c08d392670e90a2 + +--- lib/puppet/thread_local.rb.orig 2022-12-02 03:58:03 UTC ++++ lib/puppet/thread_local.rb +@@ -3,5 +3,5 @@ require 'concurrent' + # We want to use the pure Ruby implementation even on JRuby. If we use the Java + # implementation of ThreadLocal, we end up leaking references to JRuby instances + # and preventing them from being garbage collected. +-class Puppet::ThreadLocal < Concurrent::RubyThreadLocalVar ++class Puppet::ThreadLocal < Concurrent::ThreadLocalVar + end