aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLluixhi Scura <lluixhi@gmail.com>2015-01-06 11:12:48 -0800
committerLluixhi Scura <lluixhi@gmail.com>2015-01-06 11:25:29 -0800
commit1feed20493c8c5681a3b112617372f7c4b9daa49 (patch)
treeb42a9050f897ee986ad2ab16d3884e9fa572f0c2 /www-client
parentapp-crypt/qca-ossl: import and fix wrt #39 (diff)
downloadlibressl-1feed20493c8c5681a3b112617372f7c4b9daa49.tar.gz
libressl-1feed20493c8c5681a3b112617372f7c4b9daa49.tar.bz2
libressl-1feed20493c8c5681a3b112617372f7c4b9daa49.zip
Revert Fixing Links for LibreSSL 2.1.2
(It wasn't really needed, and probably causes #37)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/links/files/links-libressl-2.1.2.patch34
-rw-r--r--www-client/links/links-2.8-r1.ebuild3
2 files changed, 1 insertions, 36 deletions
diff --git a/www-client/links/files/links-libressl-2.1.2.patch b/www-client/links/files/links-libressl-2.1.2.patch
deleted file mode 100644
index 9bb275a..0000000
--- a/www-client/links/files/links-libressl-2.1.2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Naur links-2.8.orig/configure.in links-2.8/configure.in
---- links-2.8.orig/configure.in 2013-09-16 17:11:46.000000000 -0700
-+++ links-2.8/configure.in 2014-12-21 15:29:11.706749792 -0800
-@@ -779,7 +779,8 @@
- AC_MSG_CHECKING([for OpenSSL])
- CPPFLAGS="$CPPFLAGS_XX $OPENSSL_CFLAGS"
- LIBS="$OPENSSL_LIBS $LIBS_XX"
-- AC_TRY_LINK([#include <openssl/ssl.h>], [SSLeay_add_ssl_algorithms()], cf_result=openssl, cf_result=no)
-+ AC_TRY_LINK([#include <stdint.h>
-+ #include <openssl/ssl.h>], [SSLeay_add_ssl_algorithms()], cf_result=openssl, cf_result=no)
- AC_MSG_RESULT($cf_result)
- fi
- fi
-@@ -798,7 +799,8 @@
- LIBS="-lssl -lcrypto $LIBS_XX"
- CPPFLAGS="$CPPFLAGS_XX"
- fi
-- AC_TRY_LINK([#include <openssl/ssl.h>], [SSLeay_add_ssl_algorithms()], cf_result=openssl, cf_result=no)
-+ AC_TRY_LINK([#include <stdint.h>
-+ #include <openssl/ssl.h>], [SSLeay_add_ssl_algorithms()], cf_result=openssl, cf_result=no)
- fi
- done
- AC_MSG_RESULT($cf_result)
-diff -Naur links-2.8.orig/links.h links-2.8/links.h
---- links-2.8.orig/links.h 2013-09-16 17:11:46.000000000 -0700
-+++ links-2.8/links.h 2014-12-21 15:19:12.070065258 -0800
-@@ -193,6 +193,7 @@
- #if defined(OPENVMS) && defined(__VAX)
- #define OPENSSL_NO_SHA512
- #endif
-+#include <stdint.h>
- #include <openssl/ssl.h>
- #include <openssl/rand.h>
- #endif
diff --git a/www-client/links/links-2.8-r1.ebuild b/www-client/links/links-2.8-r1.ebuild
index 6fdf5e7..8442488 100644
--- a/www-client/links/links-2.8-r1.ebuild
+++ b/www-client/links/links-2.8-r1.ebuild
@@ -57,8 +57,7 @@ REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
src_prepare() {
- epatch "${FILESDIR}/${PN}-libressl.diff"
- epatch "${FILESDIR}/${PN}-libressl-2.1.2.patch"
+ epatch "${FILESDIR}/links-libressl.diff"
epatch "${WORKDIR}"/debian/patches/verify-ssl-certs-510417.diff
if use unicode; then