Commit 06a353f2 authored by Natanael Copa's avatar Natanael Copa

main/elinks: rebuild against libressl

parent 8511daaf
......@@ -3,22 +3,23 @@
pkgname=elinks
pkgver=0.13
_ver=${pkgver/_/}
pkgrel=1
pkgrel=2
pkgdesc="a text mode web browser"
url="http://elinks.or.cz/"
arch="all"
license="GPL"
depends=
makedepends="bzip2-dev zlib-dev openssl-dev expat-dev gettext-dev"
makedepends="bzip2-dev zlib-dev libressl-dev expat-dev gettext-dev"
install=
subpackages="$pkgname-doc $pkgname-lang"
source="http://dev.alpinelinux.org/archive/elinks/elinks-$pkgver.tar.bz2
musl-va_copy.patch"
musl-va_copy.patch
ssl-Make-RAND_egd-optional.patch"
_builddir="$srcdir"/elinks-0.13-20150624
builddir="$srcdir"/elinks-0.13-20150624
prepare() {
cd "$_builddir"
cd "$builddir"
for i in $source; do
case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
......@@ -28,7 +29,7 @@ prepare() {
}
build() {
cd "$_builddir"
cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
......@@ -42,7 +43,7 @@ build() {
}
package() {
cd "$_builddir"
cd "$builddir"
make DESTDIR="$pkgdir" install || return 1
rm -rf "$pkgdir"/usr/lib/charset.alias
rmdir -p "$pkgdir"/usr/lib 2>/dev/null
......@@ -51,8 +52,11 @@ package() {
}
md5sums="b377364a3f467056dcc25c7e973cd031 elinks-0.13.tar.bz2
8e7c2deee72e1832adab563ba04214da musl-va_copy.patch"
8e7c2deee72e1832adab563ba04214da musl-va_copy.patch
7107384670ce67a50e70d9d2b46cbb08 ssl-Make-RAND_egd-optional.patch"
sha256sums="865493187f678a949c2e35fbd302bdc99fbcd9cce253392135928d6db351f705 elinks-0.13.tar.bz2
8beba82169662655aa075b9453334a14c87580282a1e5472fe89393b8b923020 musl-va_copy.patch"
8beba82169662655aa075b9453334a14c87580282a1e5472fe89393b8b923020 musl-va_copy.patch
2f1f563efcf7ad4a848cb67fd519aa00e320c3e7642c88bf6505859d4e1a31ab ssl-Make-RAND_egd-optional.patch"
sha512sums="9dd7fb674ab914fccaf64b889f6fe3431f95abe1ae76f1df6155fbc89623ec921a4de5f30e896e94c77161c4b4638a29ec19b8e1fe4cbdebdc4666be024f8ed9 elinks-0.13.tar.bz2
56378b4744783e8a07c5e92f3f75cdb7edf7b26881eb033789d71612c3971b3a3c5ada5f02ec422391242cbceb64ff31a2be68298608ed6448c37056d6dedf40 musl-va_copy.patch"
56378b4744783e8a07c5e92f3f75cdb7edf7b26881eb033789d71612c3971b3a3c5ada5f02ec422391242cbceb64ff31a2be68298608ed6448c37056d6dedf40 musl-va_copy.patch
df3254ff429540cca66849e03cd6245bd3e82897225ba3bfea9a41ab222c0041e60c61784a9fd6f819b360b6168b6375a5455a97786ab656b24a8e1b4b96bda3 ssl-Make-RAND_egd-optional.patch"
From 4357901b04ed582df55873532c6c22e671512af3 Mon Sep 17 00:00:00 2001
From: Kylie McClain <somasis@exherbo.org>
Date: Tue, 29 Dec 2015 15:11:52 -0500
Subject: [PATCH] ssl: Make RAND_egd optional
Fixes compilation with LibreSSL.
---
src/network/ssl/ssl.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/network/ssl/ssl.c b/src/network/ssl/ssl.c
index 693ac37..5ed5754 100644
--- a/src/network/ssl/ssl.c
+++ b/src/network/ssl/ssl.c
@@ -84,11 +84,16 @@ init_openssl(struct module *module)
* cannot initialize the PRNG and so every attempt to use SSL fails.
* It's actually an OpenSSL FAQ, and according to them, it's up to the
* application coders to seed the RNG. -- William Yodlowsky */
- if (RAND_egd(RAND_file_name(f_randfile, sizeof(f_randfile))) < 0) {
+ RAND_file_name(f_randfile, sizeof(f_randfile));
+#ifdef HAVE_RAND_EGD
+ if (RAND_egd(f_randfile) < 0) {
/* Not an EGD, so read and write to it */
+#endif
if (RAND_load_file(f_randfile, -1))
RAND_write_file(f_randfile);
+#ifdef HAVE_RAND_EGD
}
+#endif
SSLeay_add_ssl_algorithms();
context = SSL_CTX_new(SSLv23_client_method());
--
2.6.4
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment