From nobody Sun Feb 5 16:05:12 2023 X-Original-To: dev-commits-ports-all@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 4P8vP508Snz3kXkr; Sun, 5 Feb 2023 16:05:13 +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 4P8vP46WXdz3jDn; Sun, 5 Feb 2023 16:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675613112; 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=luISeZuW+jtnEYrmdygZsLi7kmJG4Sb3U9jPZthJ+8k=; b=lTUFv3TrPxrsVjtuoUsqCGwLhLEMnxkzV4/JmtVhET5q0DdDTMQglJzKoW6515jdNvUT3m 6CrlUSdDNrBz/0qg3UjNaC7ElkyXpbhUPRQurgLUPw7Bt2hejVPrbgBHXVo2AhOOJz3YdC 87L4NdTlX9Ii8r69fU9uR0qMt6Ip0TYakkoaiRVEOxXzJep0+UyNPj9b26HvZQOnd6sq+3 T2+zgBsfgKKJtJaFAj2oyJ8Lb/kdmujFZUAi1gjgz+hM63t6Wn7ReO2lAkb4xJCK30H5W3 DyQGzD6JbNtTmPPLMZHrcaURt/H6CY7aweOZsl9quPiydNWxEza/u84+511QNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675613112; 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=luISeZuW+jtnEYrmdygZsLi7kmJG4Sb3U9jPZthJ+8k=; b=wcqILaHYVr26R9hn70tgtR1EtLTfW8ToLYrDfmsT8Tzqy3CZu0hj7MJjgBVHLSt68MQNVW Mvhgu/9W9Ib1gRtPBLTn5JpGlfVpNRfyv4vrMr5lw+tY5goivgPmKwL7nwkR6jELGQfsoY xbxpftDtWkILlkkxeXsqWkUSf7Pu/W+VWY6CJL36GaqnY7WLP5IM8c38WmhIqMwfL6EU7t wTDtw8IqmMYENaYiLHrwpsOR7s5F4Ro01iiNljDvtNq7D7rhWkC7qFD6jWAXGAGu6INLap lR0AbQXvBJOmfC3fMlxYqKM7jECl9O5MQyAyQTWnoSHDaW/okBVr8pv+ueNohw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675613112; a=rsa-sha256; cv=none; b=MQmaAlVEZBl82A/sgI6favrv0wsbS7ztFJVfV1TvIZVbtR9SDGRgK4uVd0iMrMedchU4Lr nIQvC7l+ans0By3+Un/57MDdIbqmBRLHvDDYAAkD9jNeo6tQ6KkpFt0sXQ2iU8vcal0uDY /uVZDIaAh2xQD0StH5SF2CvdutqMNpsnjrhkBmzHIINKKwDCrBvIE/hM8FopXO9eeLxQO/ tXihd0g69wbPV92WhEqypDKFmh+c9jI6sIcTJHsbIiFK9+l/b/AWMrNLXrsx+O2lBQYv3t w5y4Vlv4iYwDu8n5vzkqvCKM2vV8knGl68/hFqNoW0vPZ97JZrZE3khnhjIBKQ== 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 4P8vP45ZWYz11Cy; Sun, 5 Feb 2023 16:05:12 +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 315G5Cqf058481; Sun, 5 Feb 2023 16:05:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 315G5CYX058480; Sun, 5 Feb 2023 16:05:12 GMT (envelope-from git) Date: Sun, 5 Feb 2023 16:05:12 GMT Message-Id: <202302051605.315G5CYX058480@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: 347b5b85e274 - main - sysutils/puppet6: Fix build with rubygem-concurrent-ruby 1.2.0+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 347b5b85e274420b07a8ed58ef8dc1640d9fa69e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=347b5b85e274420b07a8ed58ef8dc1640d9fa69e commit 347b5b85e274420b07a8ed58ef8dc1640d9fa69e Author: Po-Chuan Hsieh AuthorDate: 2023-02-05 15:29:45 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-02-05 15:50:15 +0000 sysutils/puppet6: 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/puppet6/Makefile | 2 +- sysutils/puppet6/files/patch-lib_puppet_thread__local.rb | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/sysutils/puppet6/Makefile b/sysutils/puppet6/Makefile index 93bfa21c18d0..328dad15f882 100644 --- a/sysutils/puppet6/Makefile +++ b/sysutils/puppet6/Makefile @@ -1,6 +1,6 @@ PORTNAME= puppet PORTVERSION= 6.28.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= https://forge.puppet.com/v3/files/:forge PKGNAMESUFFIX= 6 diff --git a/sysutils/puppet6/files/patch-lib_puppet_thread__local.rb b/sysutils/puppet6/files/patch-lib_puppet_thread__local.rb new file mode 100644 index 000000000000..0966f4b86576 --- /dev/null +++ b/sysutils/puppet6/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-07-11 22:46:41 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