From nobody Wed Dec 08 23:32:18 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 0CBC918D69A9; Wed, 8 Dec 2021 23:32:19 +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 4J8YNf5gHnz4hKt; Wed, 8 Dec 2021 23:32:18 +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 A28E81C6B1; Wed, 8 Dec 2021 23:32:18 +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 1B8NWIh0097726; Wed, 8 Dec 2021 23:32:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B8NWI7x097725; Wed, 8 Dec 2021 23:32:18 GMT (envelope-from git) Date: Wed, 8 Dec 2021 23:32:18 GMT Message-Id: <202112082332.1B8NWI7x097725@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: 345e3c86fffe - 2021Q4 - lang/ruby26: Update to 2.6.9 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: 345e3c86fffe375426ac910c8b19c1bd4a58ad70 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639006338; 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=P8mm4/wTSOqloe/A22IaYNJomi0QhxsEQNWf6P9RTHo=; b=TreEbN214kIgvgIHcCevjlMiJ9PAMJ+pAWWCaeLLZ5K6dP5YJoLrGqi7DXjfftFE/o5frq 3Qj9fceQ8NXIspg7hI/VM3zVceQTYUXyNMhKFABN0p1E5fR9CCMTUgEPNd/+JJ5Csd96Im UVGCyPt43x3qziItXYd815KI0+R5kAQBx56ZACFbuFmXVr4VGefljygVADErclM6qwKkU5 SY0H8tQJtahnlJhRMhRGKAHVyjINR8jiQ/K3M6hSU2w1xt1+CQQo+U9xwBm/lFud1WrClP BwraSvhfsgq5edY308h+32ij8+uxVbnXaiNyhR7qLx9oygO512hIx9yNo0JTkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639006338; a=rsa-sha256; cv=none; b=WHkVc6mpLQKdJvLJktvNFox75Pz9jmGGfIxcaGo4wFm1ttHCH+OEnAuWb9iwiqNLm6sh2w A8xqHdeEF/HFkTnq7w3qj39jG4kqTZeEsjMItONG3KVZiOvCj/BImsNhOCiSD5JYkFD4Cs xTYxfqM3EXgGApIRU0uB2+MfwsdKZdu7QEzCIxjxSXhmtEA/QqOP6u8S8CfoLOzxwJjNRJ QviHjdeMZb11rcJG1UTwz1V3OXgscjKf6vgSvJ6ipNKBi+fiWQ0oEEstHsUGuY45UVgfHK 5R0yJ2FWq/Bv3rIsYi8e9ZHBy5pkVDA6HO3cdJDwO1ai3Y5omGbyMlihp4xPSA== 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=345e3c86fffe375426ac910c8b19c1bd4a58ad70 commit 345e3c86fffe375426ac910c8b19c1bd4a58ad70 Author: Yasuhiro Kimura AuthorDate: 2021-11-24 17:12:35 +0000 Commit: Yasuhiro Kimura CommitDate: 2021-12-08 23:28:09 +0000 lang/ruby26: Update to 2.6.9 While here, mark DEPRECATED and set EXPIRATION_DATE. RelaseNotes: https://www.ruby-lang.org/en/news/2021/11/24/ruby-2-6-9-released/ PR: 260026 Approved by: maintainer timeout (> 2 weeks) Security: CVE-2021-41817 Security: CVE-2021-41819 MFH: 2021Q4 (cherry picked from commit 9ad0cc4eeeeccbb1125e4342366cfb564ff8f6c7) --- Mk/bsd.ruby.mk | 2 +- lang/ruby26/Makefile | 3 +++ lang/ruby26/distinfo | 6 +++--- lang/ruby26/pkg-plist | 3 +++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index b933608d0f6b..827f94f20f20 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -135,7 +135,7 @@ RUBY?= ${LOCALBASE}/bin/${RUBY_NAME} # # Ruby 2.6 # -RUBY_VERSION= 2.6.8 +RUBY_VERSION= 2.6.9 RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 RUBY26= "" # PLIST_SUB helpers diff --git a/lang/ruby26/Makefile b/lang/ruby26/Makefile index 25f90997ef22..6c6b13a9ba7e 100644 --- a/lang/ruby26/Makefile +++ b/lang/ruby26/Makefile @@ -17,6 +17,9 @@ LICENSE_COMB= dual LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL LICENSE_FILE_RUBY= ${WRKSRC}/COPYING +DEPRECATED= Use newer version of Ruby. Ruby 2.6 will reach its EoL on March 31, 2022 +EXPIRATION_DATE= 2022-03-31 + # Using LIB_DEPENDS finds the libffi from gcc which causes problems BUILD_DEPENDS= libffi>=0:devel/libffi LIB_DEPENDS= libyaml.so:textproc/libyaml diff --git a/lang/ruby26/distinfo b/lang/ruby26/distinfo index 8bc31e1617d3..c68502d90984 100644 --- a/lang/ruby26/distinfo +++ b/lang/ruby26/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1625854042 -SHA256 (ruby/ruby-2.6.8.tar.xz) = 8262e4663169c85787fdc9bfbd04d9eb86eb2a4b56d7f98373a8fcaa18e593eb -SIZE (ruby/ruby-2.6.8.tar.xz) = 11599488 +TIMESTAMP = 1637768580 +SHA256 (ruby/ruby-2.6.9.tar.xz) = 6a041d82ae6e0f02ccb1465e620d94a7196489d8a13d6018a160da42ebc1eece +SIZE (ruby/ruby-2.6.9.tar.xz) = 11590064 diff --git a/lang/ruby26/pkg-plist b/lang/ruby26/pkg-plist index da56ac22fced..8309ac147a5c 100644 --- a/lang/ruby26/pkg-plist +++ b/lang/ruby26/pkg-plist @@ -1044,6 +1044,7 @@ man/man1/%%RUBY_NAME%%.1.gz %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/d59/struct4_8c_source.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/d5a/structibf__object__string.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/d5c/structtr.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/d63/structsockcred2.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/d61/structibf__object__header.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/d64/structparser__params.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/d65/structcls__struct__7byte.html @@ -1984,6 +1985,7 @@ man/man1/%%RUBY_NAME%%.1.gz %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db0/stret__large_8c.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db0/stret__large_8c_source.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db1/struct_y_y_l_t_y_p_e.html +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db3/structbitset.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db3/vm__method_8c__dep__incl.map %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db3/vm__method_8c__dep__incl.md5 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db3/vm__method_8c__dep__incl.png @@ -4559,6 +4561,7 @@ man/man1/%%RUBY_NAME%%.1.gz %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/dee/struct6_8c__incl.map %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/dee/struct6_8c__incl.md5 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/dee/struct6_8c__incl.png +%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/def/structsock__timestamp__info.html %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/df1/cls__1__1byte_8c__incl.map %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/df1/cls__1__1byte_8c__incl.md5 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/df1/cls__1__1byte_8c__incl.png