diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/elinks/APKBUILD | 41 | ||||
| -rw-r--r-- | main/elinks/elinks-0.12pre6-openssl11.patch | 73 | ||||
| -rw-r--r-- | main/elinks/musl-va_copy.patch | 18 | ||||
| -rw-r--r-- | main/elinks/ssl-Make-RAND_egd-optional.patch | 35 |
4 files changed, 16 insertions, 151 deletions
diff --git a/main/elinks/APKBUILD b/main/elinks/APKBUILD index 647e33b3689..3488fcf679d 100644 --- a/main/elinks/APKBUILD +++ b/main/elinks/APKBUILD @@ -1,32 +1,23 @@ +# Contributor: Dmitry Zakharchenko <dmitz@disroot.org> # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=elinks -pkgver=0.13 -_ver=${pkgver/_/} -pkgrel=8 -pkgdesc="a text mode web browser" +pkgver=0.14.3 +pkgrel=0 +pkgdesc="Advanced and well-established feature-rich text mode web browser" url="http://elinks.or.cz/" arch="all" -license="GPL" -depends= -makedepends="bzip2-dev zlib-dev openssl1.1-compat-dev expat-dev gettext-dev" -install= +license="GPL-2.0" +makedepends="automake autoconf zlib-dev bzip2-dev openssl-dev expat-dev gettext-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://dev.alpinelinux.org/archive/elinks/elinks-$pkgver.tar.bz2 - musl-va_copy.patch - ssl-Make-RAND_egd-optional.patch - elinks-0.12pre6-openssl11.patch - " - -builddir="$srcdir"/elinks-0.13-20150624 +source="$pkgname-$pkgver.tgz::https://github.com/rkd77/elinks/archive/v$pkgver.tar.gz" prepare() { default_prepare - update_config_sub + autoreconf -fi } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -34,20 +25,20 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ - --without-included-gettext + --without-included-gettext \ + --enable-256-colors \ + --enable-html-highlight \ + --with-zlib make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - rm -rf "$pkgdir"/usr/lib/charset.alias - rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true + rm "$pkgdir"/usr/lib/charset.alias #fix conflict with gettext rm "$pkgdir"/usr/share/locale/locale.alias } -sha512sums="9dd7fb674ab914fccaf64b889f6fe3431f95abe1ae76f1df6155fbc89623ec921a4de5f30e896e94c77161c4b4638a29ec19b8e1fe4cbdebdc4666be024f8ed9 elinks-0.13.tar.bz2 -56378b4744783e8a07c5e92f3f75cdb7edf7b26881eb033789d71612c3971b3a3c5ada5f02ec422391242cbceb64ff31a2be68298608ed6448c37056d6dedf40 musl-va_copy.patch -df3254ff429540cca66849e03cd6245bd3e82897225ba3bfea9a41ab222c0041e60c61784a9fd6f819b360b6168b6375a5455a97786ab656b24a8e1b4b96bda3 ssl-Make-RAND_egd-optional.patch -85e7a4e560a87ba641a04e3fce918cd0a2b52bd13b162f15950e4bb7d19a511f984d0891e3df1784cc8bb77a53f6c7ed6ffe56d7707d6b32a6676e21725893b9 elinks-0.12pre6-openssl11.patch" +sha512sums=" +50ad8c0d826cac52ba79d55d23fb5e996c4b470558419baf2fc2c6715f0aa61ef91e5e6328f40317c03b2c5815beae110ea964a7fcca28904a238d0c3408d7e9 elinks-0.14.3.tgz +" diff --git a/main/elinks/elinks-0.12pre6-openssl11.patch b/main/elinks/elinks-0.12pre6-openssl11.patch deleted file mode 100644 index 29c4ef6bcb1..00000000000 --- a/main/elinks/elinks-0.12pre6-openssl11.patch +++ /dev/null @@ -1,73 +0,0 @@ -From d83c0edf4c6ae42359ff856d7a879ecba5769595 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka <kdudka@redhat.com> -Date: Fri, 17 Feb 2017 16:51:41 +0100 -Subject: [PATCH 1/2] fix compatibility with OpenSSL 1.1 - ---- - src/network/ssl/socket.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/network/ssl/socket.c b/src/network/ssl/socket.c -index c9e2be4..467fc48 100644 ---- a/src/network/ssl/socket.c -+++ b/src/network/ssl/socket.c -@@ -83,7 +83,7 @@ static void - ssl_set_no_tls(struct socket *socket) - { - #ifdef CONFIG_OPENSSL -- ((ssl_t *) socket->ssl)->options |= SSL_OP_NO_TLSv1; -+ SSL_set_options((ssl_t *) socket->ssl, SSL_OP_NO_TLSv1); - #elif defined(CONFIG_GNUTLS) - { - /* GnuTLS does not support SSLv2 because it is "insecure". -@@ -419,7 +419,7 @@ ssl_connect(struct socket *socket) - (SSL *) socket->ssl, - client_cert); - #else -- SSL_CTX *ctx = ((SSL *) socket->ssl)->ctx; -+ SSL_CTX *ctx = SSL_get_SSL_CTX((SSL *) socket->ssl); - - SSL_CTX_use_certificate_chain_file(ctx, client_cert); - SSL_CTX_use_PrivateKey_file(ctx, client_cert, --- -2.7.4 - - -From ec952cc5b79973bee73fcfc813159d40c22b7228 Mon Sep 17 00:00:00 2001 -From: Tomas Mraz <tmraz@fedoraproject.org> -Date: Fri, 17 Feb 2017 16:44:11 +0100 -Subject: [PATCH 2/2] drop disablement of TLS1.0 on second attempt to connect - -It would not work correctly anyway and the code does not build -with OpenSSL-1.1.0. ---- - src/network/ssl/socket.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/network/ssl/socket.c b/src/network/ssl/socket.c -index 467fc48..b981c1e 100644 ---- a/src/network/ssl/socket.c -+++ b/src/network/ssl/socket.c -@@ -82,6 +82,11 @@ - static void - ssl_set_no_tls(struct socket *socket) - { -+#if 0 -+/* This implements the insecure renegotiation, which should not be used. -+ * The code also would not work on current Fedora (>= Fedora 23) anyway, -+ * because it would just switch off TLS 1.0 keeping TLS 1.1 and 1.2 enabled. -+ */ - #ifdef CONFIG_OPENSSL - SSL_set_options((ssl_t *) socket->ssl, SSL_OP_NO_TLSv1); - #elif defined(CONFIG_GNUTLS) -@@ -96,6 +101,7 @@ ssl_set_no_tls(struct socket *socket) - gnutls_protocol_set_priority(*(ssl_t *) socket->ssl, protocol_priority); - } - #endif -+#endif - } - - #ifdef USE_OPENSSL --- -2.7.4 - diff --git a/main/elinks/musl-va_copy.patch b/main/elinks/musl-va_copy.patch deleted file mode 100644 index 5074d1e2033..00000000000 --- a/main/elinks/musl-va_copy.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- ./src/util/snprintf.h.orig -+++ ./src/util/snprintf.h -@@ -12,10 +12,14 @@ - /* XXX: This is not quite the best place for it, perhaps. But do we have - * a better one now? --pasky */ - #ifndef VA_COPY -+#ifdef va_copy -+#define VA_COPY va_copy -+#else - #ifdef HAVE_VA_COPY - #define VA_COPY(dest, src) __va_copy(dest, src) - #else - #define VA_COPY(dest, src) (dest) = (src) -+#endif - #endif - #endif - - diff --git a/main/elinks/ssl-Make-RAND_egd-optional.patch b/main/elinks/ssl-Make-RAND_egd-optional.patch deleted file mode 100644 index aa56928fe7a..00000000000 --- a/main/elinks/ssl-Make-RAND_egd-optional.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 - |