aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Palmen <zirias@FreeBSD.org>2022-11-05 07:29:30 +0000
committerFelix Palmen <zirias@FreeBSD.org>2022-11-24 11:12:04 +0000
commit742d2cce37f9b3cbbe80452fa572a75a1fe441d5 (patch)
treefaf9815372fdbf36b126f8c4398c17940c290daa
parentd264d6648ccebb6d6734081e0693f086cbab0200 (diff)
downloadports-742d2cce37f9b3cbbe80452fa572a75a1fe441d5.tar.gz
ports-742d2cce37f9b3cbbe80452fa572a75a1fe441d5.zip
security/libssh2: Import upstream libressl-3.5 fix
Backport upstream commit instead of using own local patch. Also bump port revision, it will change the binary when built with libressl. Approved by: sbz (maintainer, timeout), tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D37278
-rw-r--r--security/libssh2/Makefile1
-rw-r--r--security/libssh2/files/patch-src_openssl.c12
-rw-r--r--security/libssh2/files/patch-src_openssl.h11
3 files changed, 9 insertions, 15 deletions
diff --git a/security/libssh2/Makefile b/security/libssh2/Makefile
index 9c113be1c278..53396fd8b69b 100644
--- a/security/libssh2/Makefile
+++ b/security/libssh2/Makefile
@@ -1,5 +1,6 @@
PORTNAME= libssh2
PORTVERSION= 1.10.0
+PORTREVISION= 1
PORTEPOCH= 3
CATEGORIES= security devel
MASTER_SITES= https://www.libssh2.org/download/ \
diff --git a/security/libssh2/files/patch-src_openssl.c b/security/libssh2/files/patch-src_openssl.c
deleted file mode 100644
index 3e167ab08da8..000000000000
--- a/security/libssh2/files/patch-src_openssl.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/openssl.c.orig 2022-10-17 08:20:24 UTC
-+++ src/openssl.c
-@@ -653,8 +653,7 @@ _libssh2_EVP_aes_256_ctr(void)
-
- void _libssh2_openssl_crypto_init(void)
- {
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
-- !defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
- #ifndef OPENSSL_NO_ENGINE
- ENGINE_load_builtin_engines();
- ENGINE_register_all_complete();
diff --git a/security/libssh2/files/patch-src_openssl.h b/security/libssh2/files/patch-src_openssl.h
index 0bbca531c2c7..efde2680c54d 100644
--- a/security/libssh2/files/patch-src_openssl.h
+++ b/security/libssh2/files/patch-src_openssl.h
@@ -1,12 +1,17 @@
---- src/openssl.h.orig 2022-10-17 08:18:24 UTC
+Backported from upstream commit
+<https://github.com/libssh2/libssh2/commit/b952674f>
+
+--- src/openssl.h.orig 2021-05-14 21:36:06 UTC
+++ src/openssl.h
-@@ -57,8 +57,7 @@
+@@ -57,8 +57,9 @@
#include <openssl/pem.h>
#include <openssl/rand.h>
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
- !defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && \
++ !defined(LIBRESSL_VERSION_NUMBER)) || \
++ LIBRESSL_VERSION_NUMBER >= 0x3050000fL
# define HAVE_OPAQUE_STRUCTS 1
#endif