Attachment 229705 Details for Bug 260026 – Patch file

[patch] Patch file

lang_ruby26.patch (text/plain), 3.68 KB, created by Yasuhiro Kimura on 2021-11-24 17:20:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2021-11-24 17:20:52 UTC

Size: 3.68 KB

patch

obsolete

>From b087b86876c57434132a82d58c9e8f3bab04a24f Mon Sep 17 00:00:00 2001
>From: Yasuhiro Kimura <yasu@FreeBSD.org>
>Date: Thu, 25 Nov 2021 02:12:35 +0900
>Subject: [PATCH] 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/
>Security:	CVE-2021-41817
>Security:	CVE-2021-41819
>MFH:		2021Q4
>---
> 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 c76bb856a06f..44038cf8d387 100644
>--- a/Mk/bsd.ruby.mk
>+++ b/Mk/bsd.ruby.mk
>@@ -133,7 +133,7 @@ RUBY?=			${LOCALBASE}/bin/ruby${RUBY_SUFFIX}
> #
> # 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 a4953620cbeb..c03f87245771 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 1afeb333cf0d..724ba6b8cb10 100644
>--- a/lang/ruby26/pkg-plist
>+++ b/lang/ruby26/pkg-plist
>@@ -1044,6 +1044,7 @@ man/man1/ruby%%RUBY_SUFFIX%%.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%%RUBY_SUFFIX%%.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%%RUBY_SUFFIX%%.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
>-- 
>2.34.0
>

Actions: View | Diff

Attachments on bug 260026: 229705