net-misc/openssh: Drop libressl patch for new X509 patch

Package-Manager: Portage-2.3.24, Repoman-2.3.6

diff --git a/net-misc/openssh/files/openssh-7.6_p1-x509-11.2-libressl.patch b/net-misc/openssh/files/openssh-7.6_p1-x509-11.2-libressl.patch
deleted file mode 100644 (file)
index 17bc41e..0000000
--- a/net-misc/openssh/files/openssh-7.6_p1-x509-11.2-libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/openssh-7.6p1+x509-11.2.diff     2017-11-06 17:16:28.334140140 -0800
-+++ b/openssh-7.6p1+x509-11.2.diff     2017-11-06 17:16:55.338223563 -0800
-@@ -54732,7 +54732,7 @@
- +int/*bool*/ ssh_x509store_addlocations(const X509StoreOptions *locations);
- +
- +typedef char SSHXSTOREPATH;
--+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- +DECLARE_STACK_OF(SSHXSTOREPATH)
- +# define sk_SSHXSTOREPATH_new_null() SKM_sk_new_null(SSHXSTOREPATH)
- +# define sk_SSHXSTOREPATH_num(st)    SKM_sk_num(SSHXSTOREPATH, (st))

diff --git a/net-misc/openssh/openssh-7.6_p1-r4.ebuild b/net-misc/openssh/openssh-7.6_p1-r4.ebuild
index ae151823f6062a1d6f8c329b4775c6fba9847d30..01600c378d297f540b0ed6f0d2572b140402a0a7 100644 (file)
--- a/net-misc/openssh/openssh-7.6_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-7.6_p1-r4.ebuild
@@ -118,7 +118,6 @@ src_prepare() {
                if use hpn ; then
                        pushd "${WORKDIR}" >/dev/null
                        eapply "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch
-                       eapply "${FILESDIR}"/${P}-x509-${X509_VER}-libressl.patch
                        popd >/dev/null
                        save_version X509
                fi