From 05b8b0e0af1d72e51a3ee61522941bf7605cd01c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 Jul 2020 14:05:23 +0100 Subject: gentoo resync : 04.07.2020 --- .../files/libvncserver-0.9.12-libgcrypt.patch | 40 ---------------------- 1 file changed, 40 deletions(-) delete mode 100644 net-libs/libvncserver/files/libvncserver-0.9.12-libgcrypt.patch (limited to 'net-libs/libvncserver/files/libvncserver-0.9.12-libgcrypt.patch') diff --git a/net-libs/libvncserver/files/libvncserver-0.9.12-libgcrypt.patch b/net-libs/libvncserver/files/libvncserver-0.9.12-libgcrypt.patch deleted file mode 100644 index a0313562ff1b..000000000000 --- a/net-libs/libvncserver/files/libvncserver-0.9.12-libgcrypt.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 57be637006a95091119f7a49b4232e461116520f Mon Sep 17 00:00:00 2001 -From: Alexander Tsoy -Date: Sat, 25 May 2019 02:02:47 +0300 -Subject: [PATCH] crypto: rfbcrypto_gnutls is actually libgcrypt-based - -Long time ago gnutls used libgcrypt as a cryptographic backend. Perhaps -that was what caused the confusion. ---- - CMakeLists.txt | 9 ++++----- - common/{rfbcrypto_gnutls.c => rfbcrypto_libgcrypt.c} | 0 - 2 files changed, 4 insertions(+), 5 deletions(-) - rename common/{rfbcrypto_gnutls.c => rfbcrypto_libgcrypt.c} (100%) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b9ca4ba..0d3b4dc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -226,11 +226,10 @@ if(SYSTEMD_FOUND) - endif(SYSTEMD_FOUND) - - if(LIBVNCSERVER_HAVE_SYS_UIO_H) -- if(GNUTLS_FOUND) -- message(STATUS "Building crypto with GnuTLS") -- set(CRYPTO_LIBRARIES ${GNUTLS_LIBRARIES}) -- set(CRYPTO_SOURCES ${COMMON_DIR}/rfbcrypto_gnutls) -- include_directories(${GNUTLS_INCLUDE_DIR}) -+ if(WITH_GCRYPT AND LIBGCRYPT_LIBRARIES) -+ message(STATUS "Building crypto with Libgcrypt") -+ set(CRYPTO_LIBRARIES ${LIBGCRYPT_LIBRARIES}) -+ set(CRYPTO_SOURCES ${COMMON_DIR}/rfbcrypto_libgcrypt) - elseif(OPENSSL_FOUND) - message(STATUS "Building crypto with OpenSSL") - set(CRYPTO_LIBRARIES ${OPENSSL_LIBRARIES}) -diff --git a/common/rfbcrypto_gnutls.c b/common/rfbcrypto_libgcrypt.c -similarity index 100% -rename from common/rfbcrypto_gnutls.c -rename to common/rfbcrypto_libgcrypt.c --- -2.21.0 - -- cgit v1.2.3