summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Strogin <stefan.strogin@gmail.com>2018-12-12 02:01:04 +0200
committerAaron Bauman <bman@gentoo.org>2019-02-16 13:28:23 -0500
commit24d747741061e9a86d4d56b953f55577ddd2e55f (patch)
tree2e19f862e052cb9eb35fabcb8cfe1b6f4965d866 /net-wireless
parentdev-python/m2crypto: add LibreSSL support (diff)
downloadgentoo-24d747741061e9a86d4d56b953f55577ddd2e55f.tar.gz
gentoo-24d747741061e9a86d4d56b953f55577ddd2e55f.tar.bz2
gentoo-24d747741061e9a86d4d56b953f55577ddd2e55f.zip
net-wireless/crda: fix build with LibreSSL
Closes: https://bugs.gentoo.org/669596 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/10617 Signed-off-by: Aaron Bauman <bman@gentoo.org>
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/crda/crda-3.18-r3.ebuild (renamed from net-wireless/crda/crda-3.18-r2.ebuild)3
-rw-r--r--net-wireless/crda/files/crda-3.18-libressl.patch11
2 files changed, 13 insertions, 1 deletions
diff --git a/net-wireless/crda/crda-3.18-r2.ebuild b/net-wireless/crda/crda-3.18-r3.ebuild
index c8ed53fe48e1..231bcd48e075 100644
--- a/net-wireless/crda/crda-3.18-r2.ebuild
+++ b/net-wireless/crda/crda-3.18-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -38,6 +38,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.18-cflags.patch
"${FILESDIR}"/${PN}-3.18-libreg-link.patch #542436
"${FILESDIR}"/${PN}-3.18-openssl-1.1.0-compatibility.patch #652428
+ "${FILESDIR}"/${PN}-3.18-libressl.patch
)
src_prepare() {
diff --git a/net-wireless/crda/files/crda-3.18-libressl.patch b/net-wireless/crda/files/crda-3.18-libressl.patch
new file mode 100644
index 000000000000..817f2e0328cc
--- /dev/null
+++ b/net-wireless/crda/files/crda-3.18-libressl.patch
@@ -0,0 +1,11 @@
+--- crda-3.18/reglib.c 2018-10-26 12:39:19.128083735 +1100
++++ crda-3.18.a/reglib.c 2018-10-26 12:42:39.737916626 +1100
+@@ -111,7 +111,7 @@ int reglib_verify_db_signature(uint8_t *
+ goto out;
+ }
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+ rsa->e = rsa_e;
+ rsa->n = rsa_n;
+ #else