diff options
| author | Khem Raj <raj.khem@gmail.com> | 2018-05-05 23:18:04 -0700 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2018-05-17 08:32:26 -0700 |
| commit | 309963b2f1966be69f02311daa86a0d4b5ac52da (patch) | |
| tree | 3669fb0366e549f2032866771f27ed894a64c3ba /meta-networking/recipes-daemons/squid/files | |
| parent | 12e8c3ea698905e2ed0edd9b7f351a497a1bd68d (diff) | |
| download | meta-openembedded-309963b2f1966be69f02311daa86a0d4b5ac52da.tar.gz | |
squid: Upgrade to 3.5.27
Drop upstreamed/backported patches
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking/recipes-daemons/squid/files')
| -rw-r--r-- | meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch | 46 | ||||
| -rw-r--r-- | meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch | 26 |
2 files changed, 0 insertions, 72 deletions
diff --git a/meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch b/meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch deleted file mode 100644 index f482f80885..0000000000 --- a/meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch +++ /dev/null | |||
| @@ -1,46 +0,0 @@ | |||
| 1 | From 27e10667bf27baf5f119a791e3473bb9435a786a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sun, 23 Apr 2017 10:28:28 -0700 | ||
| 4 | Subject: [PATCH] SquidNew: use noexcept instead of throw for C++11 compilers | ||
| 5 | |||
| 6 | Fixes errors with gcc7 which is more pedantic about c++11 | ||
| 7 | conformance regarding deprecated features | ||
| 8 | |||
| 9 | include/SquidNew.h:21:51: error: dynamic exception specifications are deprecated in C++11 | ||
| 10 | _SQUID_EXTERNNEW_ void *operator new[] (size_t size) throw (std::bad_alloc) | ||
| 11 | ^~~~~ | ||
| 12 | |||
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 14 | |||
| 15 | --- | ||
| 16 | include/SquidNew.h | 8 ++++---- | ||
| 17 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/include/SquidNew.h b/include/SquidNew.h | ||
| 20 | index 39fcee0..c960347 100644 | ||
| 21 | --- a/include/SquidNew.h | ||
| 22 | +++ b/include/SquidNew.h | ||
| 23 | @@ -18,19 +18,19 @@ | ||
| 24 | */ | ||
| 25 | #include <new> | ||
| 26 | |||
| 27 | -_SQUID_EXTERNNEW_ void *operator new(size_t size) throw (std::bad_alloc) | ||
| 28 | +_SQUID_EXTERNNEW_ void *operator new(size_t size) noexcept(false) | ||
| 29 | { | ||
| 30 | return xmalloc(size); | ||
| 31 | } | ||
| 32 | -_SQUID_EXTERNNEW_ void operator delete (void *address) throw() | ||
| 33 | +_SQUID_EXTERNNEW_ void operator delete (void *address) noexcept(true) | ||
| 34 | { | ||
| 35 | xfree(address); | ||
| 36 | } | ||
| 37 | -_SQUID_EXTERNNEW_ void *operator new[] (size_t size) throw (std::bad_alloc) | ||
| 38 | +_SQUID_EXTERNNEW_ void *operator new[] (size_t size) noexcept(false) | ||
| 39 | { | ||
| 40 | return xmalloc(size); | ||
| 41 | } | ||
| 42 | -_SQUID_EXTERNNEW_ void operator delete[] (void *address) throw() | ||
| 43 | +_SQUID_EXTERNNEW_ void operator delete[] (void *address) noexcept(true) | ||
| 44 | { | ||
| 45 | xfree(address); | ||
| 46 | } | ||
diff --git a/meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch b/meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch deleted file mode 100644 index 2feca4986e..0000000000 --- a/meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch +++ /dev/null | |||
| @@ -1,26 +0,0 @@ | |||
| 1 | From 660fce9cfa00a57e5b7cec46116a31e21595c306 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 19 Jun 2017 23:47:01 -0700 | ||
| 4 | Subject: [PATCH] squid: Upgrade to 3.5.26 | ||
| 5 | |||
| 6 | ../../squid-3.5.26/src/DiskIO/DiskThreads/aiops.cc: In function 'void squidaio_init()': ../../squid-3.5.26/src/DiskIO/DiskThreads/DiskThreads.h:30:50: error: '*' in boolean context, suggest '&&' instead [-Werror=int-in-bool-context] #define NUMTHREADS (Config.cacheSwap.n_configured*16) | ||
| 7 | |||
| 8 | Upstream-Status: Backport | ||
| 9 | |||
| 10 | --- | ||
| 11 | src/DiskIO/DiskThreads/aiops.cc | 2 +- | ||
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/src/DiskIO/DiskThreads/aiops.cc b/src/DiskIO/DiskThreads/aiops.cc | ||
| 15 | index b44adfa..e11f948 100644 | ||
| 16 | --- a/src/DiskIO/DiskThreads/aiops.cc | ||
| 17 | +++ b/src/DiskIO/DiskThreads/aiops.cc | ||
| 18 | @@ -290,7 +290,7 @@ squidaio_init(void) | ||
| 19 | /* Create threads and get them to sit in their wait loop */ | ||
| 20 | squidaio_thread_pool = memPoolCreate("aio_thread", sizeof(squidaio_thread_t)); | ||
| 21 | |||
| 22 | - assert(NUMTHREADS); | ||
| 23 | + assert(NUMTHREADS != 0); | ||
| 24 | |||
| 25 | for (i = 0; i < NUMTHREADS; ++i) { | ||
| 26 | threadp = (squidaio_thread_t *)squidaio_thread_pool->alloc(); | ||
