From nobody Fri Jun 16 18:35:51 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 4QjSXR58Bjz4fTf7; Fri, 16 Jun 2023 18:35:51 +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 4QjSXR4c1sz3sKs; Fri, 16 Jun 2023 18:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686940551; 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=C3altYwhOHXsiOEyQjNJxrDIPpEqI5dXW7kUscN54W0=; b=WRqSG1tKmnC9xZIp/VBwSpzh04Q7/MUeS+rmeRH5aR+w0RQoEYoCkV0/jDWjKu3IXKRN+y j7n1aQIo4QgGlDKjWtfxS01TK+l/5T1jiQ97ggUqAAJSTRctpySCkzdgq3Enps3TfnjMay ia98J7F/3WxhTL7fPQ4TrLQGOX4Ac3jiZsZN7vCfzAeTMBrJ+0vNj4anpxXBnXTzp9WfvF JHeFXBOBkQZqSg4RnspkQ4wMQreGD2GgZXnTjZPBQBAJd0sPgQ5AvOERAwIiHxojcxb/Ja X0E1hn/aUiDQiRpW1Oc0jZ5iWCQ5Ti/Ahip5MIwRBBC3hK85jbdUDr/UMNmhIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686940551; 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=C3altYwhOHXsiOEyQjNJxrDIPpEqI5dXW7kUscN54W0=; b=vXbOywih+lLpPfdOy6WTGmv9i9wUOnO3Cmm1+lO/81xMz2jxbK6sJXAe17lgloi2Qamy1R vMhBOTvCGEZcnl1hPk/ItNF/9po1Pz4gmLi5P6Qa3t4VRFVdBF7WdoYT10qGzETote6QEE q5sffi4IjcjqyfWW3oXfTtSBQhlLFucZgqy+oLo8+9C2z1SPZsnzmf2oLOc71fpmerTxMD 9+BtCAwSXf2Ov+t8O/4vMVXkl0R9qaJQzu9cIIVVrsYLDpMX5KmQT7xGB5LBoY3SHD6lqd xyyvRw/LLIG5+LcbO9PytolyBZi0+WWfQ46Yii6j1n1BBqZMp8QEfwPe7GHjZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686940551; a=rsa-sha256; cv=none; b=V1TQ26scq5k2vIM2VW8srqHSsBtZgZ/ZEbjy60zN2ONLhFMJpHSsHdlw/pWJQZT61jTiBM hTZ3cDclYQMGO4Lws7RAzRh8SXQ9Ls3WtHb86yYDB4Ks0/74GiMdl3WfEoWOpJYdYYf1+U XTu8zckImhaL5Cj8gtngjCrjTcbWVR5tZH/WcU50YUpU/tDs+xa7+9uaYkmhWLh0usxnU0 1+cB6bM9Pfw7Fiid1ZGZinQoOyrYt73828vtebRZL3dKKf7rm5XNVFCO+1a16yUZerYdaZ awiPfMckP5wPRvUVWMP7dpuV5gnfkHXv4AWXnzTAlRxRm3MR//YIprd4f1YBxQ== 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 4QjSXR3gN1zf8n; Fri, 16 Jun 2023 18:35:51 +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 35GIZp9M055780; Fri, 16 Jun 2023 18:35:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35GIZpOM055779; Fri, 16 Jun 2023 18:35:51 GMT (envelope-from git) Date: Fri, 16 Jun 2023 18:35:51 GMT Message-Id: <202306161835.35GIZpOM055779@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: 6e57fabaf4b5 - main - sysutils/puppet7: Update to 7.25.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: romain X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e57fabaf4b5434d6630ea03cd17e3be8b31d7ce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=6e57fabaf4b5434d6630ea03cd17e3be8b31d7ce commit 6e57fabaf4b5434d6630ea03cd17e3be8b31d7ce Author: Romain Tartière AuthorDate: 2023-06-14 03:29:59 +0000 Commit: Romain Tartière CommitDate: 2023-06-16 18:35:02 +0000 sysutils/puppet7: Update to 7.25.0 Release notes: https://www.puppet.com/docs/puppet/7/release_notes_puppet.html#release_notes_puppet_x-7-25-0 With hat: puppet --- sysutils/puppet7/Makefile | 6 +++--- sysutils/puppet7/distinfo | 6 +++--- sysutils/puppet7/files/patch-lib_puppet_settings.rb | 10 ---------- sysutils/puppet7/files/patch-lib_puppet_thread__local.rb | 7 ------- 4 files changed, 6 insertions(+), 23 deletions(-) diff --git a/sysutils/puppet7/Makefile b/sysutils/puppet7/Makefile index fe3577ced63e..396761454af3 100644 --- a/sysutils/puppet7/Makefile +++ b/sysutils/puppet7/Makefile @@ -1,5 +1,5 @@ PORTNAME= puppet -PORTVERSION= 7.24.0 +PORTVERSION= 7.25.0 CATEGORIES= sysutils MASTER_SITES= https://forge.puppet.com/v3/files/:forge PKGNAMESUFFIX= 7 @@ -11,7 +11,7 @@ WWW= https://puppet.com/docs/puppet/latest/puppet_index.html LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-concurrent-ruby11>1.0:devel/rubygem-concurrent-ruby11 \ +RUN_DEPENDS= rubygem-concurrent-ruby>1.0:devel/rubygem-concurrent-ruby \ rubygem-deep_merge>1.0:devel/rubygem-deep_merge \ rubygem-fast_gettext>=2.1:devel/rubygem-fast_gettext \ rubygem-hiera>=3.2.1:sysutils/rubygem-hiera \ @@ -53,7 +53,7 @@ CFACTER_BUILD_DEPENDS= facter>=3.0:sysutils/facter CFACTER_RUN_DEPENDS= facter>=3.0:sysutils/facter # Get versions from -# https://github.com/puppetlabs/puppet-agent/tree/main/configs/components +# https://github.com/puppetlabs/puppet-agent/tree/7.x/configs/components FORGE_MODULES= augeas_core=1.3.0 \ cron_core=1.2.0 \ host_core=1.2.0 \ diff --git a/sysutils/puppet7/distinfo b/sysutils/puppet7/distinfo index e285a7b3aa2b..c3b26d0e2c62 100644 --- a/sysutils/puppet7/distinfo +++ b/sysutils/puppet7/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1680986746 +TIMESTAMP = 1686611908 SHA256 (puppetlabs-augeas_core-1.3.0.tar.gz) = be41ae163f5dc94021ce03c2a0032a23275b4378af3c917befc12af14a4b3b69 SIZE (puppetlabs-augeas_core-1.3.0.tar.gz) = 25837 SHA256 (puppetlabs-cron_core-1.2.0.tar.gz) = e74247784d8cf6b27811b98f3ad782952d0005e4e012abb367d3492c51f264a2 @@ -19,5 +19,5 @@ SHA256 (puppetlabs-zfs_core-1.4.0.tar.gz) = fcdf3440d5cf5e76a2ae452fc8eb6b8a5897 SIZE (puppetlabs-zfs_core-1.4.0.tar.gz) = 18834 SHA256 (puppetlabs-zone_core-1.1.0.tar.gz) = 9d8241938e56145ce15827415e5c6b74002407b4548c12b5ef165423adfc725b SIZE (puppetlabs-zone_core-1.1.0.tar.gz) = 20637 -SHA256 (puppetlabs-puppet-7.24.0_GH0.tar.gz) = 860e74a59dc7a7b34a10fd1f28e992c48be938e35f9e72270f5bddaba6dc106b -SIZE (puppetlabs-puppet-7.24.0_GH0.tar.gz) = 3268471 +SHA256 (puppetlabs-puppet-7.25.0_GH0.tar.gz) = 8ace13070a08979ed580457d462a01347f371f88fe1ab28a8d8e8044cdf46ca1 +SIZE (puppetlabs-puppet-7.25.0_GH0.tar.gz) = 3269318 diff --git a/sysutils/puppet7/files/patch-lib_puppet_settings.rb b/sysutils/puppet7/files/patch-lib_puppet_settings.rb deleted file mode 100644 index 333f545c291f..000000000000 --- a/sysutils/puppet7/files/patch-lib_puppet_settings.rb +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/puppet/settings.rb.orig 2023-04-08 20:42:13 UTC -+++ lib/puppet/settings.rb -@@ -4,6 +4,7 @@ require_relative '../puppet/util/watched_file' - require_relative '../puppet/util/command_line/puppet_option_parser' - require 'forwardable' - require 'fileutils' -+gem 'concurrent-ruby', '< 1.2.0' - require 'concurrent' - - # The class for handling configuration files. 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 8a2598647e42..000000000000 --- a/sysutils/puppet7/files/patch-lib_puppet_thread__local.rb +++ /dev/null @@ -1,7 +0,0 @@ ---- lib/puppet/thread_local.rb.orig 2023-04-08 20:42:06 UTC -+++ lib/puppet/thread_local.rb -@@ -1,3 +1,4 @@ -+gem 'concurrent-ruby', '< 1.2.0' - require 'concurrent' - - # We want to use the pure Ruby implementation even on JRuby. If we use the Java