| 1 |
commit: 76c59c377a3f2cef432012075ebd9b2cec80102c |
| 2 |
Author: Stefan Strogin <steils <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 1 11:17:51 2019 +0000 |
| 4 |
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 1 11:57:37 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76c59c37 |
| 7 |
|
| 8 |
net-libs/libssh: add patch for LibreSSL |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/688974 |
| 11 |
Package-Manager: Portage-2.3.67, Repoman-2.3.16 |
| 12 |
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> |
| 13 |
|
| 14 |
net-libs/libssh/files/libssh-0.9.0-libressl.patch | 33 +++++++++++++++++++++++ |
| 15 |
net-libs/libssh/libssh-0.9.0.ebuild | 5 +++- |
| 16 |
net-libs/libssh/libssh-9999.ebuild | 5 +++- |
| 17 |
3 files changed, 41 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-libs/libssh/files/libssh-0.9.0-libressl.patch b/net-libs/libssh/files/libssh-0.9.0-libressl.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..355e832308e |
| 22 |
--- /dev/null |
| 23 |
+++ b/net-libs/libssh/files/libssh-0.9.0-libressl.patch |
| 24 |
@@ -0,0 +1,33 @@ |
| 25 |
+From 08bdd5b26388f92867ab03e36d73e32481faed88 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Stefan Strogin <steils@g.o> |
| 27 |
+Date: Mon, 1 Jul 2019 13:35:09 +0300 |
| 28 |
+Subject: [PATCH] libcrypto: fix compilation with LibreSSL |
| 29 |
+ |
| 30 |
+LibreSSL does not support FIPS, so do not check it. |
| 31 |
+ |
| 32 |
+Signed-off-by: Stefan Strogin <steils@g.o> |
| 33 |
+Upstream-Status: Submitted |
| 34 |
+[https://www.libssh.org/archive/libssh/2019-07/0000000.html] |
| 35 |
+--- |
| 36 |
+ include/libssh/libcrypto.h | 4 ++++ |
| 37 |
+ 1 file changed, 4 insertions(+) |
| 38 |
+ |
| 39 |
+diff --git a/include/libssh/libcrypto.h b/include/libssh/libcrypto.h |
| 40 |
+index 541912b5..1a1df635 100644 |
| 41 |
+--- a/include/libssh/libcrypto.h |
| 42 |
++++ b/include/libssh/libcrypto.h |
| 43 |
+@@ -112,7 +112,11 @@ typedef BN_CTX* bignum_CTX; |
| 44 |
+ |
| 45 |
+ |
| 46 |
+ /* Returns true if the OpenSSL is operating in FIPS mode */ |
| 47 |
++#ifndef LIBRESSL_VERSION_NUMBER |
| 48 |
+ #define ssh_fips_mode() (FIPS_mode() != 0) |
| 49 |
++#else |
| 50 |
++#define ssh_fips_mode() false |
| 51 |
++#endif |
| 52 |
+ |
| 53 |
+ #endif /* HAVE_LIBCRYPTO */ |
| 54 |
+ |
| 55 |
+-- |
| 56 |
+2.22.0 |
| 57 |
+ |
| 58 |
|
| 59 |
diff --git a/net-libs/libssh/libssh-0.9.0.ebuild b/net-libs/libssh/libssh-0.9.0.ebuild |
| 60 |
index 19777b48ff3..14ceb5386a6 100644 |
| 61 |
--- a/net-libs/libssh/libssh-0.9.0.ebuild |
| 62 |
+++ b/net-libs/libssh/libssh-0.9.0.ebuild |
| 63 |
@@ -42,7 +42,10 @@ DEPEND="${RDEPEND} |
| 64 |
|
| 65 |
DOCS=( AUTHORS README ChangeLog ) |
| 66 |
|
| 67 |
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" ) |
| 68 |
+PATCHES=( |
| 69 |
+ "${FILESDIR}/${PN}-0.8.0-tests.patch" |
| 70 |
+ "${FILESDIR}/${PN}-0.9.0-libressl.patch" |
| 71 |
+) |
| 72 |
|
| 73 |
src_prepare() { |
| 74 |
cmake-utils_src_prepare |
| 75 |
|
| 76 |
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild |
| 77 |
index 19777b48ff3..14ceb5386a6 100644 |
| 78 |
--- a/net-libs/libssh/libssh-9999.ebuild |
| 79 |
+++ b/net-libs/libssh/libssh-9999.ebuild |
| 80 |
@@ -42,7 +42,10 @@ DEPEND="${RDEPEND} |
| 81 |
|
| 82 |
DOCS=( AUTHORS README ChangeLog ) |
| 83 |
|
| 84 |
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" ) |
| 85 |
+PATCHES=( |
| 86 |
+ "${FILESDIR}/${PN}-0.8.0-tests.patch" |
| 87 |
+ "${FILESDIR}/${PN}-0.9.0-libressl.patch" |
| 88 |
+) |
| 89 |
|
| 90 |
src_prepare() { |
| 91 |
cmake-utils_src_prepare |
Archives