main/lynx: fix SSL support

Fixes #7859
This commit is contained in:
Sören Tempel 2018-05-20 11:27:00 +02:00
parent f66ad3104a
commit ddae464717
2 changed files with 25 additions and 4 deletions

View File

@ -5,7 +5,7 @@ pkgname=lynx
pkgver=2.8.8_p2 pkgver=2.8.8_p2
_relver=${pkgver/_p/rel.} _relver=${pkgver/_p/rel.}
_v=${_relver%rel.*} _v=${_relver%rel.*}
pkgrel=6 pkgrel=7
pkgdesc="Cross-platform text-based browser" pkgdesc="Cross-platform text-based browser"
url="http://lynx.invisible-island.net/" url="http://lynx.invisible-island.net/"
arch="all" arch="all"
@ -15,7 +15,8 @@ makedepends="libressl-dev gettext zlib-dev glib-dev perl ncurses-dev"
install="" install=""
subpackages="$pkgname-doc" subpackages="$pkgname-doc"
source="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_relver}.tar.bz2 source="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_relver}.tar.bz2
ncurses.patch" ncurses.patch
libressl.patch"
builddir="$srcdir"/${pkgname}${_v//./-} builddir="$srcdir"/${pkgname}${_v//./-}
build() { build() {
@ -29,7 +30,7 @@ build() {
--infodir=/usr/share/info \ --infodir=/usr/share/info \
--localstatedir=/var \ --localstatedir=/var \
--enable-ipv6 \ --enable-ipv6 \
|| return 1 --with-ssl
make helpdir=/usr/share/doc/lynx/help \ make helpdir=/usr/share/doc/lynx/help \
docdir=/usr/share/doc/lynx docdir=/usr/share/doc/lynx
} }
@ -47,4 +48,5 @@ package() {
} }
sha512sums="a475fb7b79641ddd7c20861e16d3d71ccb1a5ae33247cce0b9e73690dd664ebf129964c026bc33b0f082a7585e5a6acae9afc9a65f308e19b49fa0a8bebc0362 lynx2.8.8rel.2.tar.bz2 sha512sums="a475fb7b79641ddd7c20861e16d3d71ccb1a5ae33247cce0b9e73690dd664ebf129964c026bc33b0f082a7585e5a6acae9afc9a65f308e19b49fa0a8bebc0362 lynx2.8.8rel.2.tar.bz2
cb5336b3528d2d52dc3414e908ffa8c01bea9c0d111d542259308d673ee7dd93814a6281ba7d0b31c96b4d1276726ec3806e29e3be287d0bc257a401826bdc3f ncurses.patch" cb5336b3528d2d52dc3414e908ffa8c01bea9c0d111d542259308d673ee7dd93814a6281ba7d0b31c96b4d1276726ec3806e29e3be287d0bc257a401826bdc3f ncurses.patch
e67413579c486a89dcd19bd8c3d8e719f9e2ac754e2466d4af1a5c32bc804358d7f11cf0313d4759b4ce330c0442a1f9edad6c63b90cdd4a321cc83b4d8a324b libressl.patch"

19
main/lynx/libressl.patch Normal file
View File

@ -0,0 +1,19 @@
Patch to fix SSL support with LibreSSL.
Taken from https://invisible-mirror.net/archives/lynx/patches/lynx2.8.9dev.17.patch.gz
See also: https://bugs.alpinelinux.org/issues/7859
diff -upr lynx2-8-8.orig/WWW/Library/Implementation/HTTP.c lynx2-8-8/WWW/Library/Implementation/HTTP.c
--- lynx2-8-8.orig/WWW/Library/Implementation/HTTP.c 2018-05-20 11:28:09.464968615 +0200
+++ lynx2-8-8/WWW/Library/Implementation/HTTP.c 2018-05-20 11:28:19.171665560 +0200
@@ -720,7 +720,7 @@ static int HTLoadHTTP(const char *arg,
#elif SSLEAY_VERSION_NUMBER >= 0x0900
#ifndef USE_NSS_COMPAT_INCL
if (!try_tls) {
- handle->options |= SSL_OP_NO_TLSv1;
+ SSL_set_options(handle, SSL_OP_NO_TLSv1);
#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
} else {
int ret = (int) SSL_set_tlsext_host_name(handle, ssl_host);
Only in lynx2-8-8/WWW/Library/Implementation: HTTP.c.orig