From d40ddfa4cc784f8719c48c11e73a71362db76039 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 8 Mar 2019 04:49:51 +0000
Subject: system/ruby: [CVE] secbump, modernise

---
 system/ruby/APKBUILD | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'system/ruby/APKBUILD')

diff --git a/system/ruby/APKBUILD b/system/ruby/APKBUILD
index 18d9bf8d8..7f949cc04 100644
--- a/system/ruby/APKBUILD
+++ b/system/ruby/APKBUILD
@@ -24,11 +24,18 @@
 #   2.5.3-r0:
 #     - CVE-2018-16395
 #     - CVE-2018-16396
+#   2.5.3-r2:
+#     - CVE-2019-8320
+#     - CVE-2019-8321
+#     - CVE-2019-8322
+#     - CVE-2019-8323
+#     - CVE-2019-8324
+#     - CVE-2019-8325
 #
 pkgname=ruby
 pkgver=2.5.3
 _abiver="${pkgver%.*}.0"
-pkgrel=1
+pkgrel=2
 pkgdesc="An object-oriented language for quick and easy programming"
 url="https://www.ruby-lang.org/"
 arch="all"
@@ -61,7 +68,9 @@ subpackages="$pkgname-doc $pkgname-dev
 source="https://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/$pkgname-$pkgver.tar.xz
 	rubygems-avoid-platform-specific-gems.patch
 	test_insns-lower-recursion-depth.patch
-	fix-get_main_stack.patch"
+	fix-get_main_stack.patch
+	ruby-2.5.3-rubygems-v2.patch
+	"
 replaces="ruby-gems"
 
 _gemdir="/usr/lib/ruby/gems/$_abiver"
@@ -83,14 +92,10 @@ done
 
 prepare() {
 	default_prepare
-
-	cd "$builddir"
 	autoconf
 }
 
 build() {
-	cd "$builddir"
-
 	# -fomit-frame-pointer makes ruby segfault, see gentoo bug #150413
 	# In many places aliasing rules are broken; play it safe
 	# as it's risky with newer compilers to leave it as it is.
@@ -111,7 +116,7 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--with-sitedir='/usr/local/lib/site_ruby' \
+		--with-sitedir="/usr/local/lib/site_ruby" \
 		--with-search-path="/usr/lib/site_ruby/\$(ruby_ver)/$_arch-linux" \
 		--enable-pthread \
 		--disable-rpath \
@@ -121,13 +126,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install
 
 	install -m 644 -D COPYING \
@@ -317,4 +319,5 @@ _mvgem() {
 sha512sums="6dcae0e8d0bacdb2cbde636e2030596308b5af53f2eb85d3adccb67b02e6f8f9751e8117d12f8484829fdd9d995f6e327f701d9b433bcf94f1f59d13a1fd7518  ruby-2.5.3.tar.xz
 cfdc5ea3b2e2ea69c51f38e8e2180cb1dc27008ca55cc6301f142ebafdbab31c3379b3b6bba9ff543153876dd98ed2ad194df3255b7ea77a62e931c935f80538  rubygems-avoid-platform-specific-gems.patch
 814fe6359505b70d8ff680adf22f20a74b4dbd3fecc9a63a6c2456ee9824257815929917b6df5394ed069a6869511b8c6dce5b95b4acbbb7867c1f3a975a0150  test_insns-lower-recursion-depth.patch
-8d730f02f76e53799f1c220eb23e3d2305940bb31216a7ab1e42d3256149c0721c7d173cdbfe505023b1af2f5cb3faa233dcc1b5d560fa8f980c17c2d29a9d81  fix-get_main_stack.patch"
+8d730f02f76e53799f1c220eb23e3d2305940bb31216a7ab1e42d3256149c0721c7d173cdbfe505023b1af2f5cb3faa233dcc1b5d560fa8f980c17c2d29a9d81  fix-get_main_stack.patch
+4f374a8bce1f5137e155d79aa06086d25c3be45f90d8dbebc9f4ee2fb71dd5fe4a3bc1f7b922e784cbb9054f575155c1ad921062b762eb372306dabe9ff7951e  ruby-2.5.3-rubygems-v2.patch"
-- 
cgit v1.2.3-70-g09d2