1 |
commit: 324f88fc8ab4826980042078580e0f0fab644ca2 |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 31 18:48:42 2018 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 31 18:48:42 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=324f88fc |
7 |
|
8 |
net-misc/openssh: Forward port libressl patch to 7.6_p1-r3 |
9 |
|
10 |
Package-Manager: Portage-2.3.20, Repoman-2.3.6 |
11 |
|
12 |
.../openssh/files/openssh-7.6_p1-x509-11.1-libressl.patch | 11 +++++++++++ |
13 |
net-misc/openssh/openssh-7.6_p1-r3.ebuild | 1 + |
14 |
2 files changed, 12 insertions(+) |
15 |
|
16 |
diff --git a/net-misc/openssh/files/openssh-7.6_p1-x509-11.1-libressl.patch b/net-misc/openssh/files/openssh-7.6_p1-x509-11.1-libressl.patch |
17 |
new file mode 100644 |
18 |
index 00000000000..c3b6b4d61a3 |
19 |
--- /dev/null |
20 |
+++ b/net-misc/openssh/files/openssh-7.6_p1-x509-11.1-libressl.patch |
21 |
@@ -0,0 +1,11 @@ |
22 |
+--- a/openssh-7.6p1+x509-11.1.diff 2017-11-06 17:16:28.334140140 -0800 |
23 |
++++ b/openssh-7.6p1+x509-11.1.diff 2017-11-06 17:16:55.338223563 -0800 |
24 |
+@@ -54732,7 +54732,7 @@ |
25 |
+ +int/*bool*/ ssh_x509store_addlocations(const X509StoreOptions *locations); |
26 |
+ + |
27 |
+ +typedef char SSHXSTOREPATH; |
28 |
+-+#if OPENSSL_VERSION_NUMBER < 0x10100000L |
29 |
+++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
30 |
+ +DECLARE_STACK_OF(SSHXSTOREPATH) |
31 |
+ +# define sk_SSHXSTOREPATH_new_null() SKM_sk_new_null(SSHXSTOREPATH) |
32 |
+ +# define sk_SSHXSTOREPATH_num(st) SKM_sk_num(SSHXSTOREPATH, (st)) |
33 |
|
34 |
diff --git a/net-misc/openssh/openssh-7.6_p1-r3.ebuild b/net-misc/openssh/openssh-7.6_p1-r3.ebuild |
35 |
index 0fb4aa2b639..131e6e1da0d 100644 |
36 |
--- a/net-misc/openssh/openssh-7.6_p1-r3.ebuild |
37 |
+++ b/net-misc/openssh/openssh-7.6_p1-r3.ebuild |
38 |
@@ -118,6 +118,7 @@ src_prepare() { |
39 |
if use hpn ; then |
40 |
pushd "${WORKDIR}" >/dev/null |
41 |
eapply "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch |
42 |
+ eapply "${FILESDIR}"/${P}-x509-${X509_VER}-libressl.patch |
43 |
popd >/dev/null |
44 |
save_version X509 |
45 |
fi |