Browse Source

Merge pull request #8745 from neheb/squ

squid: Update to 4.6
lilik-openwrt-22.03
Rosen Penev 6 years ago
committed by GitHub
parent
commit
ed4def810e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 15 deletions
  1. +3
    -3
      net/squid/Makefile
  2. +1
    -1
      net/squid/patches/001-cross_compile.patch
  3. +0
    -11
      net/squid/patches/010-openssl-engine.patch

+ 3
- 3
net/squid/Makefile View File

@ -8,8 +8,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=squid
PKG_VERSION:=4.4
PKG_RELEASE:=3
PKG_VERSION:=4.6
PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0
PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
@ -18,7 +18,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://www3.us.squid-cache.org/Versions/v4/ \
http://www2.pl.squid-cache.org/Versions/v4/ \
http://www.squid-cache.org/Versions/v4/
PKG_HASH:=4905e6da7f5574d2583ba36f398bb062a12d51e70d67035078b6e85b09e9ee82
PKG_HASH:=015bade5d3a4905142c4c605df5c4216471e3d8338079955e0e44b0ae0303d41
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1


+ 1
- 1
net/squid/patches/001-cross_compile.patch 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


+ 0
- 11
net/squid/patches/010-openssl-engine.patch View File

@ -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;

Loading…
Cancel
Save