jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ruby: update to 2.2.0.

Browse source
This commit is contained in:
Christian Neukirchen 2014-12-25 14:52:00 +01:00
parent 94a1ff537d
commit 04817bf514
3 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/shlibs
View file

@ -444,7 +444,7 @@ libSDL_ttf-2.0.so.0 SDL_ttf-2.0.9_1
libparted.so.2 libparted-3.1_1 libparted.so.2 libparted-3.1_1
libparted-fs-resize.so.0 libparted-3.1_1 libparted-fs-resize.so.0 libparted-3.1_1
libntfs-3g.so.85 ntfs-3g-2014.2.15_1 libntfs-3g.so.85 ntfs-3g-2014.2.15_1
libruby.so.2.1 ruby-2.1.2_1 libruby.so.2.2 ruby-2.2.0_1
libxenctrl.so.4.4 xen-libs-4.4_1<4.5 libxenctrl.so.4.4 xen-libs-4.4_1<4.5
libxenguest.so.4.4 xen-libs-4.4_1<4.5 libxenguest.so.4.4 xen-libs-4.4_1<4.5
libxlutil.so.4.3 xen-libs-4.3_1 libxlutil.so.4.3 xen-libs-4.3_1

18
srcpkgs/ruby/patches/libressl.patch
View file

@ -13,7 +13,7 @@ LibreSSL does not provide RAND_egd, drop wrappers for it.
diff -ur /tmp/openssl/ossl_rand.c openssl/ossl_rand.c 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:12:51.350690031 +0200
+++ ext/openssl/ossl_rand.c 2014-07-21 16:16:58.322698863 +0200 +++ ext/openssl/ossl_rand.c 2014-07-21 16:16:58.322698863 +0200
@@ -125,6 +125,7 @@ @@ -148,6 +148,7 @@
return str; return str;
} }
@ -21,7 +21,7 @@ diff -ur /tmp/openssl/ossl_rand.c openssl/ossl_rand.c
/* /*
* call-seq: * call-seq:
* egd(filename) -> true * egd(filename) -> true
@@ -158,6 +159,7 @@ @@ -186,6 +187,7 @@
} }
return Qtrue; return Qtrue;
} }
@ -29,14 +29,14 @@ diff -ur /tmp/openssl/ossl_rand.c openssl/ossl_rand.c
/* /*
* call-seq: * call-seq:
@@ -195,8 +197,10 @@ @@ -219,8 +221,10 @@
DEFMETH(mRandom, "write_random_file", ossl_rand_write_file, 1); rb_define_module_function(mRandom, "write_random_file", ossl_rand_write_file, 1);
DEFMETH(mRandom, "random_bytes", ossl_rand_bytes, 1); rb_define_module_function(mRandom, "random_bytes", ossl_rand_bytes, 1);
DEFMETH(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1); rb_define_module_function(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1);
+#if defined(HAVE_RAND_EGD_METHOD) +#if defined(HAVE_RAND_EGD_METHOD)
DEFMETH(mRandom, "egd", ossl_rand_egd, 1); rb_define_module_function(mRandom, "egd", ossl_rand_egd, 1);
DEFMETH(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2); rb_define_module_function(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2);
+#endif +#endif
DEFMETH(mRandom, "status?", ossl_rand_status, 0) rb_define_module_function(mRandom, "status?", ossl_rand_status, 0);
} }

11
srcpkgs/ruby/template
View file

@ -1,18 +1,19 @@
# Template build file for 'ruby'. # Template build file for 'ruby'.
_ruby_abiver=2.1.0 _ruby_abiver=2.2.0
pkgname=ruby pkgname=ruby
version=2.1.5 version=2.2.0
revision=2 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-shared --disable-rpath configure_args="--enable-shared --disable-rpath
DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config" DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
make_build_args="all capi"
short_desc="Ruby programming language" short_desc="Ruby programming language"
homepage="http://www.ruby-lang.org/en/" homepage="http://www.ruby-lang.org/en/"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD" license="BSD"
distfiles="ftp://ftp.ruby-lang.org/pub/ruby/2.1/${pkgname}-${version}.tar.bz2" distfiles="ftp://ftp.ruby-lang.org/pub/ruby/2.2/${pkgname}-${version}.tar.bz2"
checksum=0241b40f1c731cb177994a50b854fb7f18d4ad04dcefc18acc60af73046fb0a9 checksum=1c031137999f832f86be366a71155113675b72420830ce432b777a0ff4942955
hostmakedepends="pkg-config bison groff doxygen graphviz" hostmakedepends="pkg-config bison groff doxygen graphviz"
makedepends="zlib-devel readline-devel>=6.3 libffi-devel libressl-devel makedepends="zlib-devel readline-devel>=6.3 libffi-devel libressl-devel