From nobody Fri Mar 24 22:24:44 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 4PjxbK1WtYz41DPD; Fri, 24 Mar 2023 22:24:45 +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 4PjxbJ6j0Nz3rTx; Fri, 24 Mar 2023 22:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679696684; 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=aDC78X6NK97ievdZ0embDjwwq12LaiszIu2vC/xk9eY=; b=vUDl85bVzCSKvprZar8Tu8jiHYmX2pAGgtwI08IpACSyNeQ/d8vij7Kg37BQOWiprfjKg0 LT2IxsB7OKlRvsUndzHInhioGbRj9/9IV4RFkpYSkv1Zc3+JWxoUuVhy1OCb1eQg1AjPa5 gPs2LL9W3VSbI3lN6Ul4MnCepVhPwTMqJFzTEPEuz4JnoIcLtFsLLkYmoRD97PnZT4dj5M BXblA58/AB9Hmfq29K+pexOwMFqTDLIJWA0zjsVefVhPm7jDp+wUXHkewmplGPuJiBh1O1 7nZ7sHWnIFOtgxPwEbCGhox0TFvXKbchtwBzCwzGtLjoSTdqNpTYTNHqAqPTqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679696684; 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=aDC78X6NK97ievdZ0embDjwwq12LaiszIu2vC/xk9eY=; b=tmIBKM/QxFOULbcpqawaTmtNMo1N03iBEEW1ZVC5isZgS+/JoLIxeGcVbn0uLqKOR9zJvv PlSh5IivTrsMhmE6MiBbv9WICtLlmHjXMSlM9GhYAC78RdTndJmcIlz1pUnOkaQBxGaiQK sFcjuJp/zAb26/3rnEdS64TqqmBiE2bMGe3kzhGxZO2WAr/BCEI5S0Q0DxLX9ZIwdDQMqL PLJn8Dy5nhvv43JZg4Nq9Tj7cqakH0UdfKjd86EGGk2i1o4ZVKx0shkXx6w/SO4rGz032o soSeOOw6ADNPhRkVz8lM4E54+wKz5nh/WiM79k0cNCY8yNoR3VWOGkbEIubUoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679696684; a=rsa-sha256; cv=none; b=Vzy+VMrPyAuVIuKG38NIxpHLCi/mpmx9Q8Zv/Ywimu09t3IeOeNtUrKpYwWV1ZtCL9bx8c ICPmf2dvrNHIkRqCR6Svm7abWgOk9o7RIsZRUmlsXfJUHkyCmHtc61PxrLM2VXWTUQgenm bU5bz1pqGiI0V+zgHodT2j5CBZjgcMPHdMyChihB1lDabMsW3eYbKiqjf1l+cLjTYeXu7k 3glTo/Ab9zh4tkjRd3zqRPSy4bjzPjpM/6z1w3pw/mlFhFa3XimQdMZb+M3u3qvTvL1MW/ mLUL5obQKJwVvNgGX5o1C+apqH0e6Es5ECjmytPoBt0rWpv726jQnlVDSUuDDg== 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 4PjxbJ5YmpzbQB; Fri, 24 Mar 2023 22:24:44 +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 32OMOibZ037237; Fri, 24 Mar 2023 22:24:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32OMOiY7037236; Fri, 24 Mar 2023 22:24:44 GMT (envelope-from git) Date: Fri, 24 Mar 2023 22:24:44 GMT Message-Id: <202303242224.32OMOiY7037236@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: ba885e567f3c - main - sysutils/puppet7: Switch back to older concurrent-ruby 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: romain X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba885e567f3c01af8af2f245abe7479e351153dc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=ba885e567f3c01af8af2f245abe7479e351153dc commit ba885e567f3c01af8af2f245abe7479e351153dc Author: Romain Tartière AuthorDate: 2023-03-24 20:49:21 +0000 Commit: Romain Tartière CommitDate: 2023-03-24 22:24:10 +0000 sysutils/puppet7: Switch back to older concurrent-ruby This revert 9b4522cb7997070282339d841af44ee8e57ae798 and update the dependency on concurrent-ruby to use version 1.1. With hat: puppet --- sysutils/puppet7/Makefile | 3 ++- sysutils/puppet7/files/patch-lib_puppet_thread__local.rb | 13 ------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/sysutils/puppet7/Makefile b/sysutils/puppet7/Makefile index 926db74da1fc..c133e8c67be1 100644 --- a/sysutils/puppet7/Makefile +++ b/sysutils/puppet7/Makefile @@ -1,5 +1,6 @@ PORTNAME= puppet PORTVERSION= 7.23.0 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://forge.puppet.com/v3/files/:forge PKGNAMESUFFIX= 7 @@ -11,7 +12,7 @@ WWW= https://puppet.com/docs/puppet/latest/puppet_index.html LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -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-hiera>=3.2.1:sysutils/rubygem-hiera \ diff --git a/sysutils/puppet7/files/patch-lib_puppet_thread__local.rb b/sysutils/puppet7/files/patch-lib_puppet_thread__local.rb deleted file mode 100644 index 25f7f1614577..000000000000 --- a/sysutils/puppet7/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-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