From bd4aeefe33e63f613512604e47bfca7b2187697d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Nov 2019 16:06:58 +0000 Subject: gentoo resync : 03.11.2019 --- .../files/libssh2-1.8.0-libgcrypt-prefix.patch | 30 ---------- .../files/libssh2-1.8.0-openssl11-memleak.patch | 23 ------- .../libssh2/files/libssh2-1.8.0-openssl11.patch | 70 ---------------------- 3 files changed, 123 deletions(-) delete mode 100644 net-libs/libssh2/files/libssh2-1.8.0-libgcrypt-prefix.patch delete mode 100644 net-libs/libssh2/files/libssh2-1.8.0-openssl11-memleak.patch delete mode 100644 net-libs/libssh2/files/libssh2-1.8.0-openssl11.patch (limited to 'net-libs/libssh2/files') diff --git a/net-libs/libssh2/files/libssh2-1.8.0-libgcrypt-prefix.patch b/net-libs/libssh2/files/libssh2-1.8.0-libgcrypt-prefix.patch deleted file mode 100644 index 10065626fe2b..000000000000 --- a/net-libs/libssh2/files/libssh2-1.8.0-libgcrypt-prefix.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -412,9 +412,9 @@ AC_DEFUN([LIBSSH2_CHECKFOR_GCRYPT], [ - - old_LDFLAGS=$LDFLAGS - old_CFLAGS=$CFLAGS -- if test -n "$use_libgcrypt" && test "$use_libgcrypt" != "no"; then -- LDFLAGS="$LDFLAGS -L$use_libgcrypt/lib" -- CFLAGS="$CFLAGS -I$use_libgcrypt/include" -+ if test -n "$with_libgcrypt_prefix" && test "$use_libgcrypt" != "no"; then -+ LDFLAGS="$LDFLAGS -L$with_libgcrypt_prefix/lib" -+ CFLAGS="$CFLAGS -I$with_libgcrypt_prefix/include" - fi - AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [ - #include ---- a/configure -+++ b/configure -@@ -14250,9 +14235,9 @@ - - old_LDFLAGS=$LDFLAGS - old_CFLAGS=$CFLAGS -- if test -n "$use_libgcrypt" && test "$use_libgcrypt" != "no"; then -- LDFLAGS="$LDFLAGS -L$use_libgcrypt/lib" -- CFLAGS="$CFLAGS -I$use_libgcrypt/include" -+ if test -n "$with_libgcrypt_prefix" && test "$use_libgcrypt" != "no"; then -+ LDFLAGS="$LDFLAGS -L$with_libgcrypt_prefix/lib" -+ CFLAGS="$CFLAGS -I$with_libgcrypt_prefix/include" - fi - - diff --git a/net-libs/libssh2/files/libssh2-1.8.0-openssl11-memleak.patch b/net-libs/libssh2/files/libssh2-1.8.0-openssl11-memleak.patch deleted file mode 100644 index d7d41f976cc8..000000000000 --- a/net-libs/libssh2/files/libssh2-1.8.0-openssl11-memleak.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 97518ca8bda91ce12c503197a98fa71690cb67f9 Mon Sep 17 00:00:00 2001 -From: Will Cosgrove -Date: Fri, 12 May 2017 16:34:26 -0700 -Subject: [PATCH] Fix memory leak of crypt_ctx->h using openSSL 1.1+ (#177) - -Need to use EVP_CIPHER_CTX_free instead of EVP_CIPHER_CTX_reset. ---- - src/openssl.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/openssl.h b/src/openssl.h -index 6aa12192..2bd80b96 100644 ---- a/src/openssl.h -+++ b/src/openssl.h -@@ -267,7 +267,7 @@ int _libssh2_md5_init(libssh2_md5_ctx *ctx); - #define _libssh2_cipher_3des EVP_des_ede3_cbc - - #ifdef HAVE_OPAQUE_STRUCTS --#define _libssh2_cipher_dtor(ctx) EVP_CIPHER_CTX_reset(*(ctx)) -+#define _libssh2_cipher_dtor(ctx) EVP_CIPHER_CTX_free(*(ctx)) - #else - #define _libssh2_cipher_dtor(ctx) EVP_CIPHER_CTX_cleanup(ctx) - #endif diff --git a/net-libs/libssh2/files/libssh2-1.8.0-openssl11.patch b/net-libs/libssh2/files/libssh2-1.8.0-openssl11.patch deleted file mode 100644 index 0824dd061762..000000000000 --- a/net-libs/libssh2/files/libssh2-1.8.0-openssl11.patch +++ /dev/null @@ -1,70 +0,0 @@ -From c423b543ca45d6caca7b94763bf65ff79d07e811 Mon Sep 17 00:00:00 2001 -From: Marcel Raad -Date: Wed, 24 May 2017 19:21:22 +0200 -Subject: [PATCH] openssl: fix build with OpenSSL 1.1 API (#176) - -When building with OPENSSL_API_COMPAT=0x10100000L, OpenSSL_add_all_algorithms -and OpenSSL_add_all_ciphers don't exist. The corresponding functionality is -handled automatically with OpenSSL 1.1. ---- - src/openssl.c | 4 ++++ - src/openssl.h | 6 ++++++ - 2 files changed, 10 insertions(+) - -diff --git a/src/openssl.c b/src/openssl.c -index f10f2921..25cef082 100644 ---- a/src/openssl.c -+++ b/src/openssl.c -@@ -1056,6 +1056,7 @@ _libssh2_pub_priv_keyfile(LIBSSH2_SESSION *session, - "Unable to extract public key from private key " - "file: Unable to open private key file"); - } -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - if (!EVP_get_cipherbyname("des")) { - /* If this cipher isn't loaded it's a pretty good indication that none - * are. I have *NO DOUBT* that there's a better way to deal with this -@@ -1064,6 +1065,7 @@ _libssh2_pub_priv_keyfile(LIBSSH2_SESSION *session, - */ - OpenSSL_add_all_ciphers(); - } -+#endif - BIO_reset(bp); - pk = PEM_read_bio_PrivateKey(bp, NULL, NULL, (void*)passphrase); - BIO_free(bp); -@@ -1132,6 +1134,7 @@ _libssh2_pub_priv_keyfilememory(LIBSSH2_SESSION *session, - if (!bp) { - return -1; - } -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - if (!EVP_get_cipherbyname("des")) { - /* If this cipher isn't loaded it's a pretty good indication that none - * are. I have *NO DOUBT* that there's a better way to deal with this -@@ -1140,6 +1143,7 @@ _libssh2_pub_priv_keyfilememory(LIBSSH2_SESSION *session, - */ - OpenSSL_add_all_ciphers(); - } -+#endif - BIO_reset(bp); - pk = PEM_read_bio_PrivateKey(bp, NULL, NULL, (void*)passphrase); - BIO_free(bp); -diff --git a/src/openssl.h b/src/openssl.h -index 2bd80b96..d8874286 100644 ---- a/src/openssl.h -+++ b/src/openssl.h -@@ -226,10 +226,16 @@ int _libssh2_md5_init(libssh2_md5_ctx *ctx); - #define libssh2_hmac_cleanup(ctx) HMAC_cleanup(ctx) - #endif - -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#define libssh2_crypto_init() \ -+ ENGINE_load_builtin_engines(); \ -+ ENGINE_register_all_complete() -+#else - #define libssh2_crypto_init() \ - OpenSSL_add_all_algorithms(); \ - ENGINE_load_builtin_engines(); \ - ENGINE_register_all_complete() -+#endif - - #define libssh2_crypto_exit() - -- cgit v1.2.3