From nobody Wed Dec 08 23:32:19 2021 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 8256D18D6E27; Wed, 8 Dec 2021 23:32:20 +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 4J8YNh0vptz4hFW; Wed, 8 Dec 2021 23:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 EE9891C2DA; Wed, 8 Dec 2021 23:32:19 +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 1B8NWJZr097751; Wed, 8 Dec 2021 23:32:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B8NWJRZ097750; Wed, 8 Dec 2021 23:32:19 GMT (envelope-from git) Date: Wed, 8 Dec 2021 23:32:19 GMT Message-Id: <202112082332.1B8NWJRZ097750@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yasuhiro Kimura Subject: git: 631a72ed53b9 - 2021Q4 - lang/ruby27: Update to 2.7.5 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: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 631a72ed53b94de1911a64acd37e0174927e587a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639006340; 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=yH3UVRaGdgPOYQT95kQhqbZ2dHT/PhqgwsUSsRqnrdw=; b=nzUijz2M96kLvkknIzeqStgB9fcQ3XN+VQIJm0i+fuaQh2rI7OBXl5AUrRJoSl7e2a7OKZ jHQq1jEe1L+7HMm/my4BWi9cseMfOdm2juhM0lULdAODjT50jmmmkGCZ7s0bNafW2a+oo7 Emdp0GmfqdQfK4MEsB21Qap3Ct6VSnobvnajaeGGEUfTGpljledZ21N6pIGG1/iSLX1oe8 XOpeYsHuVOI4L84SmXKMilC8NQRO+CE8/E3DKrV6YR5GHeZ8MtvYnmzjCUFcUSwH9ta51n U0Tv5Ri9IqlaC0gzmxg2RXLgb5+D9VCczOB+7GcuzivXAdAWoLz1mbO2TvjFWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639006340; a=rsa-sha256; cv=none; b=HrN+C+wMkLcmK51Cje2kPrDClerXFSRNYU8gvPzp5KiQiG5wdsMZgWG9LI3TWlTuEIyIsY k5GphIqUvJzqLkZg/z6/OXQlo/a70DCfnKaXCYVDQQ12J5nCgHYMLR4EEJIEUJj4Z2ctAY I/nhIZJ6GuLd8K8iI8hzua5k2WVt9eQGpJ8QLRIYpcH1V9Ay6Xj3W3Rtj24n41WfN6jj/i O1n0dPMSv0IIZ4bAKSLmDa0vwltUFB3jmTEzQfZtdFc7xOIJMK3ngYVKHh6kXCuFAuOKh0 BglWsJCzlprhJGk1ibGweAaxNbXtr6SWhT2ulCvkEwZr+EEGgUW90NBxyjK39g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=631a72ed53b94de1911a64acd37e0174927e587a commit 631a72ed53b94de1911a64acd37e0174927e587a Author: Yasuhiro Kimura AuthorDate: 2021-11-24 18:11:13 +0000 Commit: Yasuhiro Kimura CommitDate: 2021-12-08 23:28:12 +0000 lang/ruby27: Update to 2.7.5 ReleaseNotes: https://www.ruby-lang.org/en/news/2021/11/24/ruby-2-7-5-released/ PR: 260030 Exp-run by: antoine Approved by: maintainer timeout (> 2 weeks) Security: CVE-2021-41816 Security: CVE-2021-41817 Security: CVE-2021-41819 MFH: 2021Q4 (cherry picked from commit 2883204dd3c0b2b07fdf5cdaba87be83e1ff19a7) --- Mk/bsd.ruby.mk | 2 +- lang/ruby27/distinfo | 6 +++--- lang/ruby27/files/patch-include_ruby_ruby.h | 29 ----------------------------- lang/ruby27/pkg-plist | 8 -------- 4 files changed, 4 insertions(+), 41 deletions(-) diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 827f94f20f20..b93aac615602 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -144,7 +144,7 @@ RUBY26= "" # PLIST_SUB helpers # # Ruby 2.7 # -RUBY_VERSION= 2.7.4 +RUBY_VERSION= 2.7.5 RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 RUBY27= "" # PLIST_SUB helpers diff --git a/lang/ruby27/distinfo b/lang/ruby27/distinfo index ff4f31053662..26e8984cba32 100644 --- a/lang/ruby27/distinfo +++ b/lang/ruby27/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1625854090 -SHA256 (ruby/ruby-2.7.4.tar.xz) = 2a80824e0ad6100826b69b9890bf55cfc4cf2b61a1e1330fccbcb30c46cef8d7 -SIZE (ruby/ruby-2.7.4.tar.xz) = 12067588 +TIMESTAMP = 1637774590 +SHA256 (ruby/ruby-2.7.5.tar.xz) = d216d95190eaacf3bf165303747b02ff13f10b6cfab67a9031b502a49512b516 +SIZE (ruby/ruby-2.7.5.tar.xz) = 12072980 diff --git a/lang/ruby27/files/patch-include_ruby_ruby.h b/lang/ruby27/files/patch-include_ruby_ruby.h deleted file mode 100644 index 1cbe0ed4a699..000000000000 --- a/lang/ruby27/files/patch-include_ruby_ruby.h +++ /dev/null @@ -1,29 +0,0 @@ ---- include/ruby/ruby.h.orig 2021-04-05 12:39:38 UTC -+++ include/ruby/ruby.h -@@ -1828,12 +1828,14 @@ VALUE rb_sym2str(VALUE); - VALUE rb_to_symbol(VALUE name); - VALUE rb_check_symbol(volatile VALUE *namep); - --#define RUBY_CONST_ID_CACHE(result, str) \ -- { \ -+#define RUBY_CONST_ID_CACHE_NB(result, str) \ - static ID rb_intern_id_cache; \ - if (!rb_intern_id_cache) \ - rb_intern_id_cache = rb_intern2((str), (long)strlen(str)); \ -- result rb_intern_id_cache; \ -+ result rb_intern_id_cache; -+#define RUBY_CONST_ID_CACHE(result, str) \ -+ { \ -+ RUBY_CONST_ID_CACHE_NB(result, str) \ - } - #define RUBY_CONST_ID(var, str) \ - do RUBY_CONST_ID_CACHE((var) =, (str)) while (0) -@@ -1844,7 +1846,7 @@ VALUE rb_check_symbol(volatile VALUE *namep); - * since gcc-2.7.2.3 at least. */ - #define rb_intern(str) \ - (__builtin_constant_p(str) ? \ -- __extension__ (RUBY_CONST_ID_CACHE((ID), (str))) : \ -+ __extension__ ({RUBY_CONST_ID_CACHE_NB((ID), (str))}) : \ - rb_intern(str)) - #define rb_intern_const(str) \ - (__builtin_constant_p(str) ? \ diff --git a/lang/ruby27/pkg-plist b/lang/ruby27/pkg-plist index 0c19c44cf329..96d009ee6df9 100644 --- a/lang/ruby27/pkg-plist +++ b/lang/ruby27/pkg-plist @@ -204,14 +204,6 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% %%RUBY_LIBDIR%%/drb/unix.rb %%RUBY_LIBDIR%%/drb/weakidconv.rb %%RUBY_LIBDIR%%/erb.rb -%%RUBY_LIBDIR%%/exe/bundle -%%RUBY_LIBDIR%%/exe/bundler -%%RUBY_LIBDIR%%/exe/irb -%%RUBY_LIBDIR%%/exe/racc -%%RUBY_LIBDIR%%/exe/racc2y -%%RUBY_LIBDIR%%/exe/rdoc -%%RUBY_LIBDIR%%/exe/ri -%%RUBY_LIBDIR%%/exe/y2racc %%RUBY_LIBDIR%%/expect.rb %%RUBY_LIBDIR%%/fiddle.rb %%RUBY_LIBDIR%%/fiddle/closure.rb