cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to ruby 2.1.8, fixing CVE-2015-7551

Browse Source 
Bump lib minor due to added function.  Drop a couple of patches
included upstream.
This commit is contained in:
jeremy 2015-12-18 17:39:25 +00:00
parent 4018a21cb9
commit 2ad76640df
4 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lang/ruby/2.1/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2015/08/22 15:13:41 jeremy Exp $
# $OpenBSD: Makefile,v 1.17 2015/12/18 17:39:25 jeremy Exp $
BROKEN-mips64 = miniruby spins on rbconfig.rb
@ -7,11 +7,11 @@ COMMENT-gdbm = gdbm interface for ruby
COMMENT-tk = tk interface for ruby
COMMENT-ri_docs = ri documentation files for ruby
VERSION = 2.1.7
VERSION = 2.1.8
RUBYLIBREV = 2.1
DISTNAME = ruby-${VERSION}
SHARED_LIBS = ruby21 1.1
SHARED_LIBS = ruby21 1.2
PKGNAME-main = ruby-${VERSION}
PKGNAME-gdbm = ruby21-gdbm-${VERSION}
PKGNAME-tk = ruby21-tk-${VERSION}

4
lang/ruby/2.1/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ruby-2.1.7.tar.gz) = 9ZwVlqw5zH5gEm59NpjBn0gvBAYGdP3+ASThdSum3YE=
SIZE (ruby-2.1.7.tar.gz) = 15151458
SHA256 (ruby-2.1.8.tar.gz) = r9gyuNXssuPhR37GqUCP35iY7nPkxd8XorLLNr0cNV0=
SIZE (ruby-2.1.8.tar.gz) = 15154017

13
lang/ruby/2.1/patches/patch-ext_openssl_extconf_rb
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-ext_openssl_extconf_rb,v 1.1 2015/08/27 15:55:04 kili Exp $
--- ext/openssl/extconf.rb.orig Mon Oct 28 07:32:24 2013
+++ ext/openssl/extconf.rb Thu Aug 27 17:21:59 2015
@@ -103,6 +103,9 @@ have_func("OPENSSL_cleanse")
have_func("SSLv2_method")
have_func("SSLv2_server_method")
have_func("SSLv2_client_method")
+have_func("SSLv3_method")
+have_func("SSLv3_server_method")
+have_func("SSLv3_client_method")
have_func("TLSv1_1_method")
have_func("TLSv1_1_server_method")
have_func("TLSv1_1_client_method")

16
lang/ruby/2.1/patches/patch-ext_openssl_ossl_ssl_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-ext_openssl_ossl_ssl_c,v 1.1 2015/08/27 15:55:04 kili Exp $
--- ext/openssl/ossl_ssl.c.orig Mon Jan 27 08:47:11 2014
+++ ext/openssl/ossl_ssl.c Thu Aug 27 17:22:10 2015
@@ -134,9 +134,12 @@ struct {
OSSL_SSL_METHOD_ENTRY(SSLv2_server),
OSSL_SSL_METHOD_ENTRY(SSLv2_client),
#endif
+#if defined(HAVE_SSLV3_METHOD) && defined(HAVE_SSLV3_SERVER_METHOD) && \
+ defined(HAVE_SSLV3_CLIENT_METHOD)
OSSL_SSL_METHOD_ENTRY(SSLv3),
OSSL_SSL_METHOD_ENTRY(SSLv3_server),
OSSL_SSL_METHOD_ENTRY(SSLv3_client),
+#endif
OSSL_SSL_METHOD_ENTRY(SSLv23),
OSSL_SSL_METHOD_ENTRY(SSLv23_server),
OSSL_SSL_METHOD_ENTRY(SSLv23_client),