From nobody Tue Apr 18 16:09:08 2023 X-Original-To: dev-commits-ports-branches@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 4Q184P3CQWz45JF2; Tue, 18 Apr 2023 16:09:09 +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 4Q184P186dz3xdZ; Tue, 18 Apr 2023 16:09:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681834149; 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=pVRhRgA0rXyiczCiK80X3tQMLWDLyZ5QuLl8iA2L79A=; b=BYRC+j0qjbh8bCnc9B3iwCQCFwctT1tzCGG0KJQd9Puth107LbveCUN9QNIWWVbrfvoKUi aqMvPG5iuokdJaoYjRHcUroWxDp3mW08ks3GTLBfFIghn4ZkNlchWyp9PHQXPGZ9mpdWiz FwJVHY9EyX1Yks3FiNHWgNV2uamNUDwZunfxwJnNJaX/Ju08QWuQFSDZ9suKc5WJmio6dg UWwhVS8yQXMCrnwBIvZGFCbdmHLOUYdEsL8GxsMau8MqGHqMUzlIhyaZoCCudjhHkWBaV2 ZkKsTTpuB7QLcgA/ZvOi26w8CjIPfu5N4YFOJn03tCRC/OsUZR6BfLlYB7kGFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681834149; 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=pVRhRgA0rXyiczCiK80X3tQMLWDLyZ5QuLl8iA2L79A=; b=wElj2vKtP+yiimhYfd42gCOqMhUrOvEMufBYBGb/tsaBbmj3g4HbwPkEkG2XKgeoXsTfp/ sud9F1js95hrpMwvYHOzFKiQpnj8Duz9k3N15U+EvptuWEAl87i1yAqNM1Lb5nhlmARze0 RGbPLZE5W2T+kdbqMrP12NbafrpvYQhcrcpVgHj1PHi6UlLNXLUIEXhy3VNUimyjED86jy i1L8syYabIVB4K5k5C0SYrTMD6KTcRV7LWIakU3CARuIB/sEA8kpayEHn6y5pHyh6FJoAQ Y4tGYo3j0CbFt1AmczP8QbqM3Xebaerjw5ANJ7OqFccmQ8e4mc6xdyhsWZDG8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681834149; a=rsa-sha256; cv=none; b=oiifk39B9cMbgQ8tF6dP18kULb2zNl2aIz574qkF5hecvZldLxBb+oXpbAuaqJPe8kVcJB Ml4Lw9wRqy5VY89elN1EgbjzJsWCCXkSZTAsOf8OtglXnrVVP/ssv7GlSiVWTrmKIf8M+u jE1cu8Uq5QPEITFnMxHghBSt1YNVBxwEaJ6YY+sIK0h+RHpo5cDfqkeWBLLNFKdFV/8wWJ EDmcMxMXMSoTex4SNZE9PaOqgHpLMTQgGlIhqGKYhcDU5wUDxtqFj5bXZ/j8SSVeNwf121 xPS7RPeJ9g2G2HWeDlsirIEKzOrVwKDXREcrSqFaIP+AP3wgurKy8BOo8tvfRQ== 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 4Q184N5fDyzJJ5; Tue, 18 Apr 2023 16:09:08 +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 33IG986f078860; Tue, 18 Apr 2023 16:09:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33IG98r5078859; Tue, 18 Apr 2023 16:09:08 GMT (envelope-from git) Date: Tue, 18 Apr 2023 16:09:08 GMT Message-Id: <202304181609.33IG98r5078859@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 9577d2a21294 - 2023Q2 - lang/ruby31: Update to 3.1.4 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q2 X-Git-Reftype: branch X-Git-Commit: 9577d2a212940512d3c239771bb668bb37229fd0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=9577d2a212940512d3c239771bb668bb37229fd0 commit 9577d2a212940512d3c239771bb668bb37229fd0 Author: Yasuhiro Kimura AuthorDate: 2023-04-18 12:31:07 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-04-18 16:08:44 +0000 lang/ruby31: Update to 3.1.4 Changes: https://www.ruby-lang.org/en/news/2023/03/30/ruby-3-1-4-released/ PR: 270557 Exp-run by: antoine Security: 9b60bba1-cf18-11ed-bd44-080027f5fec9 Security: 6bd2773c-cf1a-11ed-bd44-080027f5fec9 (cherry picked from commit 560e5d91cd95734cea19013b2e4857432c545e94) --- Mk/Uses/ruby.mk | 4 ++-- lang/ruby31/distinfo | 6 +++--- lang/ruby31/files/patch-mkmf-pkg-config | 25 ------------------------- lang/ruby31/files/patch-tool_rbinstall.rb | 11 +++++++---- lang/ruby31/pkg-plist | 6 ++++++ 5 files changed, 18 insertions(+), 34 deletions(-) diff --git a/Mk/Uses/ruby.mk b/Mk/Uses/ruby.mk index 585725c12692..bb4f5a5f971d 100644 --- a/Mk/Uses/ruby.mk +++ b/Mk/Uses/ruby.mk @@ -161,8 +161,8 @@ RUBY_PORTREVISION= 0 # # Ruby 3.1 # -RUBY_DISTVERSION= 3.1.3 -RUBY_PORTREVISION= 2 +RUBY_DISTVERSION= 3.1.4 +RUBY_PORTREVISION= 0 . elif ${RUBY_VER} == 3.2 # diff --git a/lang/ruby31/distinfo b/lang/ruby31/distinfo index 9e8eb012b397..41be02864cf8 100644 --- a/lang/ruby31/distinfo +++ b/lang/ruby31/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1669322575 -SHA256 (ruby/ruby-3.1.3.tar.xz) = 4ee161939826bcdfdafa757cf8e293a7f14e357f62be7144f040335cc8c7371a -SIZE (ruby/ruby-3.1.3.tar.xz) = 15300224 +TIMESTAMP = 1680203228 +SHA256 (ruby/ruby-3.1.4.tar.xz) = 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f +SIZE (ruby/ruby-3.1.4.tar.xz) = 15316604 diff --git a/lang/ruby31/files/patch-mkmf-pkg-config b/lang/ruby31/files/patch-mkmf-pkg-config deleted file mode 100644 index f966b82eadb1..000000000000 --- a/lang/ruby31/files/patch-mkmf-pkg-config +++ /dev/null @@ -1,25 +0,0 @@ -From 613fca01486e47dee9364a2fd86b5f5e77fe23c8 Mon Sep 17 00:00:00 2001 -From: Nobuyoshi Nakada -Date: Wed, 7 Dec 2022 22:14:44 +0900 -Subject: [PATCH] [Bug #19189] Fallback to the default "pkg-config" - ---- - lib/mkmf.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git lib/mkmf.rb lib/mkmf.rb -index e94733c635..0fbc1cc2e5 100644 ---- lib/mkmf.rb -+++ lib/mkmf.rb -@@ -1866,7 +1866,7 @@ def pkg_config(pkg, *options) - if pkgconfig = with_config("#{pkg}-config") and find_executable0(pkgconfig) - # if and only if package specific config command is given - elsif ($PKGCONFIG ||= -- (pkgconfig = with_config("pkg-config", RbConfig::CONFIG["PKG_CONFIG"])) && -+ (pkgconfig = with_config("pkg-config") {config_string("PKG_CONFIG") || "pkg-config"}) && - find_executable0(pkgconfig) && pkgconfig) and - xsystem([*envs, $PKGCONFIG, "--exists", pkg]) - # default to pkg-config command --- -2.39.1 - diff --git a/lang/ruby31/files/patch-tool_rbinstall.rb b/lang/ruby31/files/patch-tool_rbinstall.rb index 6be5e4ad0fc0..5d25f0ff501e 100644 --- a/lang/ruby31/files/patch-tool_rbinstall.rb +++ b/lang/ruby31/files/patch-tool_rbinstall.rb @@ -1,6 +1,6 @@ ---- tool/rbinstall.rb.orig 2022-11-24 10:20:31 UTC +--- tool/rbinstall.rb.orig 2023-03-30 10:53:51 UTC +++ tool/rbinstall.rb -@@ -930,170 +930,6 @@ end +@@ -930,173 +930,6 @@ end # :startdoc: @@ -119,9 +119,12 @@ - next if /^\s*(?:#|$)/ =~ name - next unless /^(\S+)\s+(\S+).*/ =~ name - gem_name = "#$1-#$2" -- path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec" +- # Try to find the gemspec file for C ext gems +- # ex .bundle/gems/debug-1.7.1/debug-1.7.1.gemspec +- # This gemspec keep the original dependencies +- path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec" - unless File.exist?(path) -- path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec" +- path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec" - next unless File.exist?(path) - end - spec = load_gemspec(path, "#{srcdir}/.bundle/gems/#{gem_name}") diff --git a/lang/ruby31/pkg-plist b/lang/ruby31/pkg-plist index 3cd32542975b..3f34529365dd 100644 --- a/lang/ruby31/pkg-plist +++ b/lang/ruby31/pkg-plist @@ -12453,6 +12453,8 @@ man/man1/ruby%%RUBY_SUFFIX%%.1.gz %%RDOC%%%%RUBY_RIDIR%%/URI/Generic/component-c.ri %%RDOC%%%%RUBY_RIDIR%%/URI/Generic/component-i.ri %%RDOC%%%%RUBY_RIDIR%%/URI/Generic/component_ary-i.ri +%%RDOC%%%%RUBY_RIDIR%%/URI/Generic/decoded_password-i.ri +%%RDOC%%%%RUBY_RIDIR%%/URI/Generic/decoded_user-i.ri %%RDOC%%%%RUBY_RIDIR%%/URI/Generic/default_port-c.ri %%RDOC%%%%RUBY_RIDIR%%/URI/Generic/default_port-i.ri %%RDOC%%%%RUBY_RIDIR%%/URI/Generic/eql%3f-i.ri @@ -12590,9 +12592,13 @@ man/man1/ruby%%RUBY_SUFFIX%%.1.gz %%RDOC%%%%RUBY_RIDIR%%/URI/WS/cdesc-WS.ri %%RDOC%%%%RUBY_RIDIR%%/URI/WS/request_uri-i.ri %%RDOC%%%%RUBY_RIDIR%%/URI/WSS/cdesc-WSS.ri +%%RDOC%%%%RUBY_RIDIR%%/URI/_decode_uri_component-c.ri +%%RDOC%%%%RUBY_RIDIR%%/URI/_encode_uri_component-c.ri %%RDOC%%%%RUBY_RIDIR%%/URI/cdesc-URI.ri +%%RDOC%%%%RUBY_RIDIR%%/URI/decode_uri_component-c.ri %%RDOC%%%%RUBY_RIDIR%%/URI/decode_www_form-c.ri %%RDOC%%%%RUBY_RIDIR%%/URI/decode_www_form_component-c.ri +%%RDOC%%%%RUBY_RIDIR%%/URI/encode_uri_component-c.ri %%RDOC%%%%RUBY_RIDIR%%/URI/encode_www_form-c.ri %%RDOC%%%%RUBY_RIDIR%%/URI/encode_www_form_component-c.ri %%RDOC%%%%RUBY_RIDIR%%/URI/extract-c.ri