squid: Update to 4.6

Remove upstreamed patch.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2019-04-21 15:12:04 -07:00
parent 51199dee15
commit f7e7ee5ff3
3 changed files with 4 additions and 15 deletions
+1 -1
View File
@@ -10,7 +10,7 @@ Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>
--- 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
@@ -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;