From 0e4b4f66a2f71a7f319379d3120f14e3a7dc0d63 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 6 Jan 2019 21:02:59 -0800 Subject: [PATCH] squid: Fix compilation without OpenSSL ENGINE support OpenSSL 1.1 includes the header but support has to be checked in another way. Signed-off-by: Rosen Penev --- net/squid/Makefile | 2 +- net/squid/patches/010-openssl-engine.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 net/squid/patches/010-openssl-engine.patch diff --git a/net/squid/Makefile b/net/squid/Makefile index 19c5786ab2..4433d0668e 100644 --- a/net/squid/Makefile +++ b/net/squid/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=squid PKG_VERSION:=4.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-2.0 PKG_MAINTAINER:=Marko Ratkaj diff --git a/net/squid/patches/010-openssl-engine.patch b/net/squid/patches/010-openssl-engine.patch new file mode 100644 index 0000000000..e7f97eec5f --- /dev/null +++ b/net/squid/patches/010-openssl-engine.patch @@ -0,0 +1,11 @@ +--- a/src/ssl/support.cc ++++ b/src/ssl/support.cc +@@ -485,7 +485,7 @@ Ssl::Initialize(void) + + SQUID_OPENSSL_init_ssl(); + +-#if HAVE_OPENSSL_ENGINE_H ++#ifndef OPENSSL_NO_ENGINE + if (::Config.SSL.ssl_engine) { + ENGINE_load_builtin_engines(); + ENGINE *e;