| 1 |
commit: d657309748c91e5d9da246b434ed51916448b38a |
| 2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 7 01:29:03 2017 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 7 01:29:03 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6573097 |
| 7 |
|
| 8 |
net-misc/openssh: Make the 7.6p1 X509 patchset play nice with libressl |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
| 11 |
|
| 12 |
.../openssh/files/openssh-7.6_p1-x509-11.0-libressl.patch | 11 +++++++++++ |
| 13 |
net-misc/openssh/openssh-7.6_p1.ebuild | 1 + |
| 14 |
2 files changed, 12 insertions(+) |
| 15 |
|
| 16 |
diff --git a/net-misc/openssh/files/openssh-7.6_p1-x509-11.0-libressl.patch b/net-misc/openssh/files/openssh-7.6_p1-x509-11.0-libressl.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..b84ee64e4f7 |
| 19 |
--- /dev/null |
| 20 |
+++ b/net-misc/openssh/files/openssh-7.6_p1-x509-11.0-libressl.patch |
| 21 |
@@ -0,0 +1,11 @@ |
| 22 |
+--- a/openssh-7.6p1+x509-11.0.diff 2017-11-06 17:16:28.334140140 -0800 |
| 23 |
++++ b/openssh-7.6p1+x509-11.0.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.ebuild b/net-misc/openssh/openssh-7.6_p1.ebuild |
| 35 |
index a15c07cdc85..a932f59b746 100644 |
| 36 |
--- a/net-misc/openssh/openssh-7.6_p1.ebuild |
| 37 |
+++ b/net-misc/openssh/openssh-7.6_p1.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 |
fi |
| 45 |
save_version X509 |
Archives