From f7e7ee5ff3cafb440465c03bd746f306d8597c4b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 21 Apr 2019 15:12:04 -0700 Subject: squid: Update to 4.6 Remove upstreamed patch. Signed-off-by: Rosen Penev --- net/squid/patches/001-cross_compile.patch | 2 +- net/squid/patches/010-openssl-engine.patch | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 net/squid/patches/010-openssl-engine.patch (limited to 'net/squid/patches') diff --git a/net/squid/patches/001-cross_compile.patch b/net/squid/patches/001-cross_compile.patch index 6b2ed9f2b..e392dba71 100644 --- a/net/squid/patches/001-cross_compile.patch +++ b/net/squid/patches/001-cross_compile.patch @@ -10,7 +10,7 @@ Signed-off-by: Marko Ratkaj --- a/src/Makefile.in +++ b/src/Makefile.in -@@ -8383,7 +8383,8 @@ +@@ -8385,7 +8385,8 @@ # cf_gen builds the configuration files. cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci diff --git a/net/squid/patches/010-openssl-engine.patch b/net/squid/patches/010-openssl-engine.patch deleted file mode 100644 index e7f97eec5..000000000 --- a/net/squid/patches/010-openssl-engine.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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; -- cgit v1.2.3