diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-01-06 23:23:49 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-01-06 23:25:11 +0100 |
| commit | fb41b7041147788262101e6e2a41582c18721782 (patch) | |
| tree | fbc87ce11bf0e1a2e0b505434920a64b519ee318 /community | |
| parent | 7b46d2bec79c0f51bc68b9754a887a1f8815b6eb (diff) | |
| download | aports-fb41b7041147788262101e6e2a41582c18721782.tar.bz2 aports-fb41b7041147788262101e6e2a41582c18721782.tar.xz | |
community/ruby2.1: fix error on libressl
Diffstat (limited to 'community')
| -rw-r--r-- | community/ruby2.1/APKBUILD | 14 | ||||
| -rw-r--r-- | community/ruby2.1/libressl.patch | 40 |
2 files changed, 49 insertions, 5 deletions
diff --git a/community/ruby2.1/APKBUILD b/community/ruby2.1/APKBUILD index 0c9667bf0f..6130172ca6 100644 --- a/community/ruby2.1/APKBUILD +++ b/community/ruby2.1/APKBUILD @@ -6,7 +6,7 @@ _majorver=${pkgname#ruby} pkgver="$_majorver.10" _pkgver=${pkgver/_/-} _abiver="$_majorver.0" -pkgrel=1 +pkgrel=2 pkgdesc="An object-oriented language for quick and easy programming" url="http://www.ruby-lang.org/en/" arch="all" @@ -19,7 +19,8 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-irb::noarch $pkgname-io-console:io_console $pkgname-minitest::noarch $pkgname-json $pkgname-libs " -source="ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/$_pkgname-$_pkgver.tar.bz2" +source="ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/$_pkgname-$_pkgver.tar.bz2 + libressl.patch" options="!fhs" builddir="$srcdir/$_pkgname-$_pkgver" @@ -174,6 +175,9 @@ _mvgem() { done } -md5sums="5155c624807ff2418a9e9f15202954d0 ruby-2.1.10.tar.bz2" -sha256sums="a74675578a9a801ac25eb7152bef3023432d6267f875b198eb9cd6944a5bf4f1 ruby-2.1.10.tar.bz2" -sha512sums="4b7213695416876e4de3cbce912f61ac89db052c74f0daa8424477991cfc49b07300e960177ff576b634a97ee8afef3c5aded5d5806329dbd01d0ce7b42b9b63 ruby-2.1.10.tar.bz2" +md5sums="5155c624807ff2418a9e9f15202954d0 ruby-2.1.10.tar.bz2 +cc59ea987caa211a8f664fc58c94e0c2 libressl.patch" +sha256sums="a74675578a9a801ac25eb7152bef3023432d6267f875b198eb9cd6944a5bf4f1 ruby-2.1.10.tar.bz2 +a8b740102616c1041331cd7c5eb56ecf64a253ccd02fc31ca4a3bcf76cf499e5 libressl.patch" +sha512sums="4b7213695416876e4de3cbce912f61ac89db052c74f0daa8424477991cfc49b07300e960177ff576b634a97ee8afef3c5aded5d5806329dbd01d0ce7b42b9b63 ruby-2.1.10.tar.bz2 +183601253b23c29246a4901d2fb939df07be64320ffafc282191f9d2ddfeff7ab621c69debd59fcde7df038bac1ccc1aecb5da9cc8e6da50cf29b087e6264ba7 libressl.patch" diff --git a/community/ruby2.1/libressl.patch b/community/ruby2.1/libressl.patch new file mode 100644 index 0000000000..43e7fc42ec --- /dev/null +++ b/community/ruby2.1/libressl.patch @@ -0,0 +1,40 @@ +Source: https://github.com/gentoo/libressl/blob/776060f4bc3418dbba6be5aec1a76cd2ec84476e/dev-lang/ruby/files/ruby-conditional-randegd.patch +--- a/ext/openssl/extconf.rb ++++ b/ext/openssl/extconf.rb +@@ -87,6 +87,7 @@ + have_func("PEM_def_callback") + have_func("PKCS5_PBKDF2_HMAC") + have_func("PKCS5_PBKDF2_HMAC_SHA1") ++have_func("RAND_egd") + have_func("X509V3_set_nconf") + have_func("X509V3_EXT_nconf_nid") + have_func("X509_CRL_add0_revoked") +--- a/ext/openssl/ossl_rand.c ++++ b/ext/openssl/ossl_rand.c +@@ -125,6 +125,7 @@ + return str; + } + ++#ifdef HAVE_RAND_EGD + /* + * call-seq: + * egd(filename) -> true +@@ -158,6 +159,7 @@ + } + return Qtrue; + } ++#endif /* HAVE_RAND_EGD */ + + /* + * call-seq: +@@ -195,8 +197,10 @@ + DEFMETH(mRandom, "write_random_file", ossl_rand_write_file, 1); + DEFMETH(mRandom, "random_bytes", ossl_rand_bytes, 1); + DEFMETH(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1); ++#ifdef HAVE_RAND_EGD + DEFMETH(mRandom, "egd", ossl_rand_egd, 1); + DEFMETH(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2); ++#endif /* HAVE_RAND_EGD */ + DEFMETH(mRandom, "status?", ossl_rand_status, 0) + } + |