From nobody Fri Mar 24 22:24:43 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 4PjxbH5jRTz41D4y; Fri, 24 Mar 2023 22:24:43 +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 4PjxbH5FNYz3r9T; Fri, 24 Mar 2023 22:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679696683; 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=Mv/LITbKQTpC9EMbDsPoktBZ0lCLHPLvLaTOS2L21xU=; b=b5WZE9y9MJybPts2anjxrFBgGvSPteQKQVWuXfewf3xr50O8H/HyYKBC69iVuFzRnCbZmR TGkIfqX8wVZkxSbmpOIZdY1K3rjLEzafmAoXM0KxBQONJY1K5zftMu6YJ0dq000tYwPoVD hzedU7srUYQ3t9nAWmjGKuJ5w5IGefsw/dbZ0iF6CuOZyH4g9I2MqF3OTNqEna4ZkF5lxg wh7G+E8K6HBhlFfhvFiAcXtRtf8S9qBCUlJNgcL6YBB1KEOlCtjYPJMrlrDXUH0b0VLKyX yrrhEljDBMRENoPfpHASMIoUnkJLFzx5H34s9hznrvNaV8tQYO5YT5Wul+hToQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679696683; 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=Mv/LITbKQTpC9EMbDsPoktBZ0lCLHPLvLaTOS2L21xU=; b=oxj/MvCWPT/VyenrkwBPh94cnFxzRX9mOv59oST6VjsS9qnS45/IlBqeiXlc0gssQl6A8+ XCifIFucN8YQsPMWqPr6HyPMd9zYsRSs7zo+LbzURO2W/wEFpO0liDk+x0YvQjUNDvHwQD 82gv0oitV/T+NVduNY2XQ7GTIRXI+zMv2NErUuXjN8vKb+cp26stzx4W8GCwUx+hPSatte Rz5ZxWuxanvVU7Exn+DprJBMhzrgCw/GlCiPs7CneTEn6wUPAF2DghzGu68hqXSd5xr7tR sAm0jRHwafnMpRChJ1tVlxJRk6BA8HTX5ZcGgTWF6mxDBjZQs7AGzMKVBYCM5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679696683; a=rsa-sha256; cv=none; b=bzl1huBWqazUKw+vHoUMd3Ojen5cMco+C9W60Cc1scDGIeOfMStfrxw3OhYxTxb3zdveH9 rs8JzcU3dYBQ3C+8rBsQ8dUmrmzlYWWWtlrC9ZaOoo3pTdaotWWmkSR7ZUVjXkIv/igEdS Rhc4lgNnNIYZwr6PoZVqIyZPhXKJxRlDbVsoYFYojwB5YfrojcborWPNvJBMWYM8xOAo48 jkDijsBd/8Jyykfz3W9Q1B9Gw7HyvZ/QXGNngW62QwxOb1DKLx9/5D4xVLcO/08sXmB0EG S+c4DKPTVK8Co/GOl76mKogGieh2uKGLjXBALsWJ395Ja9pndqo/WhIytw5J6g== 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 4PjxbH4Kx6zbQN; Fri, 24 Mar 2023 22:24:43 +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 32OMOhj0037213; Fri, 24 Mar 2023 22:24:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32OMOhnI037212; Fri, 24 Mar 2023 22:24:43 GMT (envelope-from git) Date: Fri, 24 Mar 2023 22:24:43 GMT Message-Id: <202303242224.32OMOhnI037212@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Romain=20Tarti=C3=A8re?= Subject: git: 266e23fd78ac - main - sysutils/puppet6: Switch back to older concurrent-ruby 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: romain X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 266e23fd78acb1d2a4285a4419982c89ad025748 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=266e23fd78acb1d2a4285a4419982c89ad025748 commit 266e23fd78acb1d2a4285a4419982c89ad025748 Author: Romain Tartière AuthorDate: 2023-03-24 20:47:24 +0000 Commit: Romain Tartière CommitDate: 2023-03-24 22:24:07 +0000 sysutils/puppet6: Switch back to older concurrent-ruby This revert 347b5b85e274420b07a8ed58ef8dc1640d9fa69e and update the dependency on concurrent-ruby to use version 1.1. With hat: puppet --- sysutils/puppet6/Makefile | 4 ++-- sysutils/puppet6/files/patch-lib_puppet_thread__local.rb | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/sysutils/puppet6/Makefile b/sysutils/puppet6/Makefile index 8b118ef4fe47..e2a28a6c9fea 100644 --- a/sysutils/puppet6/Makefile +++ b/sysutils/puppet6/Makefile @@ -1,6 +1,6 @@ PORTNAME= puppet PORTVERSION= 6.28.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= https://forge.puppet.com/v3/files/:forge PKGNAMESUFFIX= 6 @@ -17,7 +17,7 @@ EXPIRATION_DATE=2023-06-01 BROKEN_RUBY30= yes BROKEN_RUBY31= yes -RUN_DEPENDS= rubygem-concurrent-ruby>=1.0:devel/rubygem-concurrent-ruby \ +RUN_DEPENDS= rubygem-concurrent-ruby11>=1.0:devel/rubygem-concurrent-ruby11 \ rubygem-deep_merge>=1.0:devel/rubygem-deep_merge \ rubygem-fast_gettext1>=1.1:devel/rubygem-fast_gettext1 \ rubygem-ffi>=1.9.24:devel/rubygem-ffi \ diff --git a/sysutils/puppet6/files/patch-lib_puppet_thread__local.rb b/sysutils/puppet6/files/patch-lib_puppet_thread__local.rb deleted file mode 100644 index 0966f4b86576..000000000000 --- a/sysutils/puppet6/files/patch-lib_puppet_thread__local.rb +++ /dev/null @@ -1,13 +0,0 @@ -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