From 494ce7118ad0631e319c687c32a096157c9162ec Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 5 Jan 2019 23:34:20 -0800 Subject: [PATCH] vpnc: Updated deprecated patch to include OpenSSL 1.1 Patch was only for 1.0.2. This adds 1.1 support. Signed-off-by: Rosen Penev --- net/vpnc/Makefile | 3 +-- net/vpnc/patches/110-openssl-deprecated.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/net/vpnc/Makefile b/net/vpnc/Makefile index 6d8516d37..ea7eb595d 100644 --- a/net/vpnc/Makefile +++ b/net/vpnc/Makefile @@ -10,14 +10,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vpnc PKG_REV:=550 PKG_VERSION:=0.5.3.r$(PKG_REV) -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://svn.unix-ag.uni-kl.de/vpnc/trunk/ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_PROTO:=svn -PKG_MIRROR_HASH:=f95e2ac4e7e55c06553e0fed016a908b0f2695cee988bc70c9994c03e2f588c4 PKG_MAINTAINER:=Daniel Gimpelevich PKG_LICENSE:=VARIOUS diff --git a/net/vpnc/patches/110-openssl-deprecated.patch b/net/vpnc/patches/110-openssl-deprecated.patch index c3d87ee7a..190bc839a 100644 --- a/net/vpnc/patches/110-openssl-deprecated.patch +++ b/net/vpnc/patches/110-openssl-deprecated.patch @@ -8,3 +8,16 @@ #include "config.h" #include "sysdep.h" #include "crypto.h" +@@ -35,10 +36,12 @@ crypto_ctx *crypto_ctx_new(crypto_error **error) + return NULL; + } + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + OpenSSL_add_all_ciphers(); + OpenSSL_add_all_digests(); + OpenSSL_add_all_algorithms(); + ERR_load_crypto_strings(); ++#endif + + memset(ctx, 0, sizeof(crypto_ctx)); + ctx->stack = sk_X509_new_null();