mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

squid: Upgrade to 3.5.27

Browse Source 
Drop upstreamed/backported patches

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Khem Raj
2018-05-05 23:18:04 -07:00
committed by Armin Kuster
parent 12e8c3ea69
commit 309963b2f1
3 changed files with 2 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch
-46
View File
@@ -1,46 +0,0 @@
From 27e10667bf27baf5f119a791e3473bb9435a786a Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 23 Apr 2017 10:28:28 -0700
Subject: [PATCH] SquidNew: use noexcept instead of throw for C++11 compilers
Fixes errors with gcc7 which is more pedantic about c++11
conformance regarding deprecated features
include/SquidNew.h:21:51: error: dynamic exception specifications are deprecated in C++11
_SQUID_EXTERNNEW_ void *operator new[] (size_t size) throw (std::bad_alloc)
^~~~~
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
include/SquidNew.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/SquidNew.h b/include/SquidNew.h
index 39fcee0..c960347 100644
--- a/include/SquidNew.h
+++ b/include/SquidNew.h
@@ -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);
}
meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch
-26
View File
@@ -1,26 +0,0 @@
From 660fce9cfa00a57e5b7cec46116a31e21595c306 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 19 Jun 2017 23:47:01 -0700
Subject: [PATCH] squid: Upgrade to 3.5.26
../../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)
Upstream-Status: Backport
---
src/DiskIO/DiskThreads/aiops.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/DiskIO/DiskThreads/aiops.cc b/src/DiskIO/DiskThreads/aiops.cc
index b44adfa..e11f948 100644
--- a/src/DiskIO/DiskThreads/aiops.cc
+++ b/src/DiskIO/DiskThreads/aiops.cc
@@ -290,7 +290,7 @@ squidaio_init(void)
/* Create threads and get them to sit in their wait loop */
squidaio_thread_pool = memPoolCreate("aio_thread", sizeof(squidaio_thread_t));
- assert(NUMTHREADS);
+ assert(NUMTHREADS != 0);
for (i = 0; i < NUMTHREADS; ++i) {
threadp = (squidaio_thread_t *)squidaio_thread_pool->alloc();
meta-networking/recipes-daemons/squid/squid_3.5.26.bb → meta-networking/recipes-daemons/squid/squid_3.5.27.bb
+2 -4
View File
@@ -21,16 +21,14 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P
file://volatiles.03_squid \
file://set_sysroot_patch.patch \
file://squid-don-t-do-squid-conf-tests-at-build-time.patch \
file://0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch \
file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \
file://gcc7-fixes.patch \
file://0001-tools.cc-fixed-unused-result-warning.patch \
"
SRC_URI_remove_toolchain-clang = "file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch"
SRC_URI[md5sum] = "dc1830cd361e077814aa39bcc3691d8b"
SRC_URI[sha256sum] = "41d8845863dcd026c856508cd1599d417c8947ffd96e86e24085f9893cb8b8c2"
SRC_URI[md5sum] = "c17a3ed3a40cd59c23f48b8539dafcd8"
SRC_URI[sha256sum] = "467da134eaf0f7962ba5881793d106772fb05fefa4aea7d9569eec0412c52433"
LIC_FILES_CHKSUM = "file://COPYING;md5=c492e2d6d32ec5c1aad0e0609a141ce9 \
file://errors/COPYRIGHT;md5=8861130fae91400bcf99b66f133172b3 \