From 262eaa45c879c31315282ffbabdeb81f9c14d5d6 Mon Sep 17 00:00:00 2001 From: Marko Ratkaj Date: Tue, 6 Nov 2018 18:22:48 +0100 Subject: [PATCH] net: squid: bump version to 4.4 Simple bump from 4.3 to 4.4 Changelog since 4.3: netdb not saving to disk (#311) Fix memory leak when parsing SNMP packet (#313) Fix several windows build issues (#309) Certificate fields injection via %D in ERR_SECURE_CONNECT_FAIL (#306) Allow compilation with minimal OpenSSL (#281) Fixed %USER_CA_CERT_xx and %USER_CERT_xx crashes (#301) Improve const correctness for hash_link (#300) Bug #4893: Malformed %>ru URIs for CONNECT requests (#299) Signed-off-by: Marko Ratkaj --- net/squid/Makefile | 4 ++-- net/squid/patches/001-cross_compile.patch | 8 +++----- net/squid/patches/002-glibc-compile.patch | 6 +++--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/net/squid/Makefile b/net/squid/Makefile index ff6b0a0d1c..19c5786ab2 100644 --- a/net/squid/Makefile +++ b/net/squid/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=squid -PKG_VERSION:=4.3 +PKG_VERSION:=4.4 PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0 @@ -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:=322612ef0544828f6c673a25124b32364fb41ef5e2847e21c89480b5546a4c7c +PKG_HASH:=4905e6da7f5574d2583ba36f398bb062a12d51e70d67035078b6e85b09e9ee82 PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 diff --git a/net/squid/patches/001-cross_compile.patch b/net/squid/patches/001-cross_compile.patch index 0eb83e602a..6b2ed9f2b9 100644 --- a/net/squid/patches/001-cross_compile.patch +++ b/net/squid/patches/001-cross_compile.patch @@ -8,11 +8,9 @@ Signed-off-by: Marko Ratkaj src/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: squid-4.0.21/src/Makefile.in -=================================================================== ---- squid-4.0.21.orig/src/Makefile.in -+++ squid-4.0.21/src/Makefile.in -@@ -7642,7 +7642,8 @@ cache_cf.o: cf_parser.cci +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -8383,7 +8383,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/002-glibc-compile.patch b/net/squid/patches/002-glibc-compile.patch index d930bdf348..24da83efc7 100644 --- a/net/squid/patches/002-glibc-compile.patch +++ b/net/squid/patches/002-glibc-compile.patch @@ -1,6 +1,6 @@ ---- squid-4.0.21.orig/src/tools.cc -+++ squid-4.0.21/src/tools.cc -@@ -581,7 +581,8 @@ +--- a/src/tools.cc ++++ b/src/tools.cc +@@ -582,7 +582,8 @@ } #else -- 2.30.2