squid: update to 3.5.26, fix gcc 7.1 compile issue

4 files changed, 35 insertions, 8 deletions

diff --git a/package/squid/Makefile b/package/squid/Makefile
index 3c2ba14be..0fd357101 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		squid
-PKG_VERSION:=		3.5.19
+PKG_VERSION:=		3.5.26
 PKG_RELEASE:=		1
-PKG_HASH:=		c4b8a2efb85acc600e506605f175298ce3324048e60f4708926d354fe4b5c7a0
+PKG_HASH:=		baa1eecb7d6e18881f4455060d80ee7cb95ae7e2695fdccf7e21ccc8f879a982
 PKG_DESCR:=		web and cache proxy
 PKG_SECTION:=		net/proxy
 PKG_DEPENDS:=		libltdl
@@ -151,6 +151,7 @@ CONFIGURE_ARGS+=	--datadir=/usr/share/squid \
 			--with-pthreads \
 			--with-dl \
 			--disable-debug-cbdata \
+			--disable-strict-error-checking \
 			--enable-kill-parent-hack \
 			--enable-arp-acl \
 			--enable-err-languages=English \
diff --git a/package/squid/patches/patch-configure_ac b/package/squid/patches/patch-configure_ac
index 0aae95639..26d1ceac1 100644
--- a/package/squid/patches/patch-configure_ac
+++ b/package/squid/patches/patch-configure_ac
@@ -1,6 +1,6 @@
---- squid-3.5.2.orig/configure.ac	2015-02-18 06:18:57.000000000 -0600
-+++ squid-3.5.2/configure.ac	2015-02-20 13:01:31.755039271 -0600
-@@ -1343,7 +1343,7 @@ if test "x$with_openssl" = "xyes"; then
+--- squid-3.5.26.orig/configure.ac	2017-06-01 15:55:25.000000000 +0200
++++ squid-3.5.26/configure.ac	2017-06-13 02:16:52.536880342 +0200
+@@ -1368,7 +1368,7 @@ if test "x$with_openssl" = "xyes"; then
      AC_DEFINE(USE_OPENSSL,1,[OpenSSL support is available])
  
      # check for other specific broken implementations
diff --git a/package/squid/patches/patch-include_SquidNew_h b/package/squid/patches/patch-include_SquidNew_h
new file mode 100644
index 000000000..8223c3cb1
--- /dev/null
+++ b/package/squid/patches/patch-include_SquidNew_h
@@ -0,0 +1,26 @@
+--- squid-3.5.26.orig/include/SquidNew.h	2017-06-01 15:49:00.000000000 +0200
++++ squid-3.5.26/include/SquidNew.h	2017-06-13 03:13:51.928727436 +0200
+@@ -18,19 +18,19 @@
+  */
+ #include <new>
+ 
+-_SQUID_EXTERNNEW_ void *operator new(size_t size) throw (std::bad_alloc)
++_SQUID_EXTERNNEW_ void *operator new(size_t size) noexcept(false)
+ {
+     return xmalloc(size);
+ }
+-_SQUID_EXTERNNEW_ void operator delete (void *address) throw()
++_SQUID_EXTERNNEW_ void operator delete (void *address) noexcept(true)
+ {
+     xfree(address);
+ }
+-_SQUID_EXTERNNEW_ void *operator new[] (size_t size) throw (std::bad_alloc)
++_SQUID_EXTERNNEW_ void *operator new[] (size_t size) noexcept(false)
+ {
+     return xmalloc(size);
+ }
+-_SQUID_EXTERNNEW_ void operator delete[] (void *address) throw()
++_SQUID_EXTERNNEW_ void operator delete[] (void *address) noexcept(true)
+ {
+     xfree(address);
+ }
diff --git a/package/squid/patches/patch-src_Makefile_am b/package/squid/patches/patch-src_Makefile_am
index 049ff3a1d..17c26aea6 100644
--- a/package/squid/patches/patch-src_Makefile_am
+++ b/package/squid/patches/patch-src_Makefile_am
@@ -1,6 +1,6 @@
---- squid-3.5.2.orig/src/Makefile.am	2015-02-18 06:17:02.000000000 -0600
-+++ squid-3.5.2/src/Makefile.am	2015-02-23 15:32:32.084583233 -0600
-@@ -970,7 +970,7 @@ cache_cf.o: cf_parser.cci
+--- squid-3.5.26.orig/src/Makefile.am	2017-06-01 15:49:00.000000000 +0200
++++ squid-3.5.26/src/Makefile.am	2017-06-13 02:16:52.592883945 +0200
+@@ -968,7 +968,7 @@ cache_cf.o: cf_parser.cci
  
  # cf_gen builds the configuration files.
  cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci