From 85eb6f94aa4659410cb5a4d17312d9d0161af85a Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 8 Jun 2020 20:09:09 +1000
Subject: [PATCH] ruby: disable stack-protector

---
 dev-lang/ruby/patches/ruby-2.7.0.patchset | 35 +++++++++++++++++++----
 dev-lang/ruby/ruby-2.7.0.recipe           |  2 +-
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/dev-lang/ruby/patches/ruby-2.7.0.patchset b/dev-lang/ruby/patches/ruby-2.7.0.patchset
index 4853db1ff..30021b998 100644
--- a/dev-lang/ruby/patches/ruby-2.7.0.patchset
+++ b/dev-lang/ruby/patches/ruby-2.7.0.patchset
@@ -1,4 +1,4 @@
-From b48ccadf943b0dde5e1166555e0d058edc028aaa Mon Sep 17 00:00:00 2001
+From 279155468a862f4d358d01c5b8a084b40a700d4b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Sun, 5 May 2019 11:57:46 +0200
 Subject: We don't allow unsetting O_NONBLOCK or O_NDELAY on packaged FS
@@ -22,10 +22,10 @@ index 7903f58..0a17782 100644
  #else
  # define MODE_TO_LOAD (O_RDONLY)
 -- 
-2.24.1
+2.26.0
 
 
-From f9761d73a43fc9ac6d76f20115379a69725c7df1 Mon Sep 17 00:00:00 2001
+From 6351154529c5e1da2ad33f6ab43544ce3953075c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Sun, 5 May 2019 15:35:20 +0200
 Subject: Test fix for Haiku
@@ -55,10 +55,10 @@ index 57ded49..8a33200 100644
    libc_so = ARGV[0] if ARGV[0] && ARGV[0][0] == ?/
    libm_so = ARGV[1] if ARGV[1] && ARGV[1][0] == ?/
 -- 
-2.24.1
+2.26.0
 
 
-From cdb9ed2975540492117e11c20eb8d5573dfca087 Mon Sep 17 00:00:00 2001
+From b584031112ad887a1cb4a38e4a6d0b4c0e28e306 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Wed, 25 Dec 2019 19:53:24 +0100
 Subject: Add Haiku to the context support list
@@ -79,5 +79,28 @@ index f1ed36b..fc28564 100644
              rb_cv_coroutine=ucontext
          ]
 -- 
-2.24.1
+2.26.0
+
+
+From d85ec87013b5e80ded7ae235b6c2b23b95406989 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Mon, 8 Jun 2020 19:42:51 +1000
+Subject: Disable stack-protector
+
+
+diff --git a/configure.ac b/configure.ac
+index fc28564..624f99d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -587,7 +587,7 @@ AS_IF([test "$GCC" = yes], [
+ 
+     # -fstack-protector
+     AS_CASE(["$target_os"],
+-    [mingw*], [
++    [mingw*|haiku*], [
+ 	stack_protector=no
+     ])
+     AS_IF([test -z "${stack_protector+set}"], [
+-- 
+2.26.0
 
diff --git a/dev-lang/ruby/ruby-2.7.0.recipe b/dev-lang/ruby/ruby-2.7.0.recipe
index 537ff09de..eb82df79a 100644
--- a/dev-lang/ruby/ruby-2.7.0.recipe
+++ b/dev-lang/ruby/ruby-2.7.0.recipe
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 COPYRIGHT="1993-2019 Yukihiro Matsumoto"
 LICENSE="Ruby
 	BSD (3-clause)"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://cache.ruby-lang.org/pub/ruby/${portVersion%.*}/ruby-$portVersion.tar.xz"
 CHECKSUM_SHA256="27d350a52a02b53034ca0794efe518667d558f152656c2baaf08f3d0c8b02343"
 PATCHES="ruby-$portVersion.patchset"