diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-06-13 19:04:52 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-06-13 19:05:50 +0200 |
| commit | 7996e55281ff273a4d933f36e64bcb50f330fe9e (patch) | |
| tree | 9482c43dfdf5083091f210fb597b1b5788ef814d /package/squid/patches | |
| parent | bc31076d386ef0342eff03469022f20478ffa1e1 (diff) | |
squid: update to 3.5.26, fix gcc 7.1 compile issue
Diffstat (limited to 'package/squid/patches')
| -rw-r--r-- | package/squid/patches/patch-configure_ac | 6 | ||||
| -rw-r--r-- | package/squid/patches/patch-include_SquidNew_h | 26 | ||||
| -rw-r--r-- | package/squid/patches/patch-src_Makefile_am | 6 |
3 files changed, 32 insertions, 6 deletions
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 |