1 |
commit: 24d747741061e9a86d4d56b953f55577ddd2e55f |
2 |
Author: Stefan Strogin <stefan.strogin <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Dec 12 00:01:04 2018 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 16 18:28:23 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24d74774 |
7 |
|
8 |
net-wireless/crda: fix build with LibreSSL |
9 |
|
10 |
Closes: https://bugs.gentoo.org/669596 |
11 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
12 |
Signed-off-by: Stefan Strogin <stefan.strogin <AT> gmail.com> |
13 |
Closes: https://github.com/gentoo/gentoo/pull/10617 |
14 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
15 |
|
16 |
.../crda/{crda-3.18-r2.ebuild => crda-3.18-r3.ebuild} | 3 ++- |
17 |
net-wireless/crda/files/crda-3.18-libressl.patch | 11 +++++++++++ |
18 |
2 files changed, 13 insertions(+), 1 deletion(-) |
19 |
|
20 |
diff --git a/net-wireless/crda/crda-3.18-r2.ebuild b/net-wireless/crda/crda-3.18-r3.ebuild |
21 |
similarity index 96% |
22 |
rename from net-wireless/crda/crda-3.18-r2.ebuild |
23 |
rename to net-wireless/crda/crda-3.18-r3.ebuild |
24 |
index c8ed53fe48e..231bcd48e07 100644 |
25 |
--- a/net-wireless/crda/crda-3.18-r2.ebuild |
26 |
+++ b/net-wireless/crda/crda-3.18-r3.ebuild |
27 |
@@ -1,4 +1,4 @@ |
28 |
-# Copyright 1999-2018 Gentoo Authors |
29 |
+# Copyright 1999-2019 Gentoo Authors |
30 |
# Distributed under the terms of the GNU General Public License v2 |
31 |
|
32 |
EAPI=6 |
33 |
@@ -38,6 +38,7 @@ PATCHES=( |
34 |
"${FILESDIR}"/${PN}-3.18-cflags.patch |
35 |
"${FILESDIR}"/${PN}-3.18-libreg-link.patch #542436 |
36 |
"${FILESDIR}"/${PN}-3.18-openssl-1.1.0-compatibility.patch #652428 |
37 |
+ "${FILESDIR}"/${PN}-3.18-libressl.patch |
38 |
) |
39 |
|
40 |
src_prepare() { |
41 |
|
42 |
diff --git a/net-wireless/crda/files/crda-3.18-libressl.patch b/net-wireless/crda/files/crda-3.18-libressl.patch |
43 |
new file mode 100644 |
44 |
index 00000000000..817f2e0328c |
45 |
--- /dev/null |
46 |
+++ b/net-wireless/crda/files/crda-3.18-libressl.patch |
47 |
@@ -0,0 +1,11 @@ |
48 |
+--- crda-3.18/reglib.c 2018-10-26 12:39:19.128083735 +1100 |
49 |
++++ crda-3.18.a/reglib.c 2018-10-26 12:42:39.737916626 +1100 |
50 |
+@@ -111,7 +111,7 @@ int reglib_verify_db_signature(uint8_t * |
51 |
+ goto out; |
52 |
+ } |
53 |
+ |
54 |
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L |
55 |
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) |
56 |
+ rsa->e = rsa_e; |
57 |
+ rsa->n = rsa_n; |
58 |
+ #else |