From c75c14c0c333327ef7048a70b2ca39ba0622aec0 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Fri, 25 Dec 2015 17:28:34 +0100 Subject: [PATCH] ruby: update to 2.3.0. --- common/shlibs | 2 +- srcpkgs/ruby/patches/libressl.patch | 42 ----------------------------- srcpkgs/ruby/template | 10 +++---- 3 files changed, 6 insertions(+), 48 deletions(-) delete mode 100644 srcpkgs/ruby/patches/libressl.patch diff --git a/common/shlibs b/common/shlibs index 6f42e46c147..e5ec9b29202 100644 --- a/common/shlibs +++ b/common/shlibs @@ -462,7 +462,7 @@ libSDL_ttf-2.0.so.0 SDL_ttf-2.0.9_1 libparted.so.2 libparted-3.1_1 libparted-fs-resize.so.0 libparted-3.1_1 libntfs-3g.so.86 ntfs-3g-2015.3.14_1 -libruby.so.2.2 ruby-2.2.0_1 +libruby.so.2.3 ruby-2.3.0_1 libxenctrl.so.4.6 xen-libs-4.6_1 libxenguest.so.4.6 xen-libs-4.6_1 libxlutil.so.4.6 xen-libs-4.6_1 diff --git a/srcpkgs/ruby/patches/libressl.patch b/srcpkgs/ruby/patches/libressl.patch deleted file mode 100644 index e13b3ec2e14..00000000000 --- a/srcpkgs/ruby/patches/libressl.patch +++ /dev/null @@ -1,42 +0,0 @@ -LibreSSL does not provide RAND_egd, drop wrappers for it. - ---- ext/openssl/extconf.rb 2014-07-21 16:12:51.350690031 +0200 -+++ ext/openssl/extconf.rb 2014-07-21 16:13:29.806691406 +0200 -@@ -150,6 +150,7 @@ - have_struct_member("X509_ATTRIBUTE", "single", "openssl/x509.h") - have_macro("OPENSSL_FIPS", ['openssl/opensslconf.h']) && $defs.push("-DHAVE_OPENSSL_FIPS") - have_macro("EVP_CTRL_GCM_GET_TAG", ['openssl/evp.h']) && $defs.push("-DHAVE_AUTHENTICATED_ENCRYPTION") -+have_func("RAND_egd") - - Logging::message "=== Checking done. ===\n" - -diff -ur /tmp/openssl/ossl_rand.c openssl/ossl_rand.c ---- ext/openssl/ossl_rand.c 2014-07-21 16:12:51.350690031 +0200 -+++ ext/openssl/ossl_rand.c 2014-07-21 16:16:58.322698863 +0200 -@@ -148,6 +148,7 @@ - return str; - } - -+#if defined(HAVE_RAND_EGD_METHOD) - /* - * call-seq: - * egd(filename) -> true -@@ -186,6 +187,7 @@ - } - return Qtrue; - } -+#endif - - /* - * call-seq: -@@ -219,8 +221,10 @@ - rb_define_module_function(mRandom, "write_random_file", ossl_rand_write_file, 1); - rb_define_module_function(mRandom, "random_bytes", ossl_rand_bytes, 1); - rb_define_module_function(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1); -+#if defined(HAVE_RAND_EGD_METHOD) - rb_define_module_function(mRandom, "egd", ossl_rand_egd, 1); - rb_define_module_function(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2); -+#endif - rb_define_module_function(mRandom, "status?", ossl_rand_status, 0); - } - diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template index 02f6a2f0cb3..6264553db0e 100644 --- a/srcpkgs/ruby/template +++ b/srcpkgs/ruby/template @@ -1,9 +1,9 @@ # Template build file for 'ruby'. -_ruby_abiver=2.2.0 +_ruby_abiver=2.3.0 pkgname=ruby -version=2.2.4 -revision=2 +version=2.3.0 +revision=1 build_style=gnu-configure configure_args="--enable-shared --disable-rpath DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config" @@ -12,8 +12,8 @@ short_desc="Ruby programming language" homepage="http://www.ruby-lang.org/en/" maintainer="Juan RP " license="BSD" -distfiles="ftp://ftp.ruby-lang.org/pub/ruby/2.2/${pkgname}-${version}.tar.bz2" -checksum=31203696adbfdda6f2874a2de31f7c5a1f3bcb6628f4d1a241de21b158cd5c76 +distfiles="ftp://ftp.ruby-lang.org/pub/ruby/${version%.*}/${pkgname}-${version}.tar.bz2" +checksum=ec7579eaba2e4c402a089dbc86c98e5f1f62507880fd800b9b34ca30166bfa5e hostmakedepends="pkg-config bison groff doxygen graphviz" makedepends="zlib-devel readline-devel libffi-devel libressl-devel