diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2018-05-20 11:27:00 +0200 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2018-05-20 11:33:04 +0200 |
| commit | ddae464717ccaea853d91c0c44fa8f7df07ed7bb (patch) | |
| tree | af7af85f4305d666c23543ef0374126b26873fc9 /main/lynx | |
| parent | f66ad3104ada47d2fbbc45344fbc5b4be9886779 (diff) | |
| download | aports-ddae464717ccaea853d91c0c44fa8f7df07ed7bb.tar.bz2 aports-ddae464717ccaea853d91c0c44fa8f7df07ed7bb.tar.xz | |
main/lynx: fix SSL support
Fixes #7859
Diffstat (limited to 'main/lynx')
| -rw-r--r-- | main/lynx/APKBUILD | 10 | ||||
| -rw-r--r-- | main/lynx/libressl.patch | 19 |
2 files changed, 25 insertions, 4 deletions
diff --git a/main/lynx/APKBUILD b/main/lynx/APKBUILD index d13ac21f34..d0417baafc 100644 --- a/main/lynx/APKBUILD +++ b/main/lynx/APKBUILD @@ -5,7 +5,7 @@ pkgname=lynx pkgver=2.8.8_p2 _relver=${pkgver/_p/rel.} _v=${_relver%rel.*} -pkgrel=6 +pkgrel=7 pkgdesc="Cross-platform text-based browser" url="http://lynx.invisible-island.net/" arch="all" @@ -15,7 +15,8 @@ makedepends="libressl-dev gettext zlib-dev glib-dev perl ncurses-dev" install="" subpackages="$pkgname-doc" source="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_relver}.tar.bz2 - ncurses.patch" + ncurses.patch + libressl.patch" builddir="$srcdir"/${pkgname}${_v//./-} build() { @@ -29,7 +30,7 @@ build() { --infodir=/usr/share/info \ --localstatedir=/var \ --enable-ipv6 \ - || return 1 + --with-ssl make helpdir=/usr/share/doc/lynx/help \ docdir=/usr/share/doc/lynx } @@ -47,4 +48,5 @@ package() { } sha512sums="a475fb7b79641ddd7c20861e16d3d71ccb1a5ae33247cce0b9e73690dd664ebf129964c026bc33b0f082a7585e5a6acae9afc9a65f308e19b49fa0a8bebc0362 lynx2.8.8rel.2.tar.bz2 -cb5336b3528d2d52dc3414e908ffa8c01bea9c0d111d542259308d673ee7dd93814a6281ba7d0b31c96b4d1276726ec3806e29e3be287d0bc257a401826bdc3f ncurses.patch" +cb5336b3528d2d52dc3414e908ffa8c01bea9c0d111d542259308d673ee7dd93814a6281ba7d0b31c96b4d1276726ec3806e29e3be287d0bc257a401826bdc3f ncurses.patch +e67413579c486a89dcd19bd8c3d8e719f9e2ac754e2466d4af1a5c32bc804358d7f11cf0313d4759b4ce330c0442a1f9edad6c63b90cdd4a321cc83b4d8a324b libressl.patch" diff --git a/main/lynx/libressl.patch b/main/lynx/libressl.patch new file mode 100644 index 0000000000..5b173b0c74 --- /dev/null +++ b/main/lynx/libressl.patch @@ -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 |