CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

squid: upgrade 4.15 -> 5.7

Browse Source 
- drop included patches
- refresh remaining patches
- update to new ptest

Licence change: update year

Signed-off-by: Andrej Kozemcak <andrej.kozemcak@siemens.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Andrej Kozemcak 2022-09-22 15:57:45 +02:00 committed by Khem Raj
parent 2239a3063c
commit 1dc95cae90
7 changed files with 27 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
meta-networking/recipes-daemons/squid/files/0001-Fix-build-on-Fedora-Rawhide-772.patch
View File

@ -1,82 +0,0 @@
From 1f8b5f0e1cc27634a7310be4c9674112f919d974 Mon Sep 17 00:00:00 2001
From: uhliarik <luhliari@redhat.com>
Date: Thu, 18 Feb 2021 01:08:40 +0000
Subject: [PATCH] Fix build on Fedora Rawhide (#772)
* add SYSTEMD_LIBS to all binaries using client_side.cc, fixing linking
* add `<limits>` to all sources using std::numeric_limits, fixing gcc-11
builds
---
Upstream-Status: Backport [https://github.com/kraj/squid/commit/1f8b5f0e1cc27634a7310be4c9674112f919d974]
src/Makefile.am | 4 ++++
src/ip/QosConfig.cc | 1 +
src/ipc/mem/PageStack.cc | 1 +
src/ssl/helper.cc | 2 ++
4 files changed, 8 insertions(+)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2320,6 +2320,7 @@ tests_test_http_range_LDADD = \
$(SSLLIB) \
$(KRB5LIBS) \
$(LIBCPPUNIT_LIBS) \
+ $(SYSTEMD_LIBS) \
$(COMPAT_LIB) \
$(XTRA_LIBS)
tests_test_http_range_LDFLAGS = $(LIBADD_DL)
@@ -2624,6 +2625,7 @@ tests_testHttpRequest_LDADD = \
$(SSLLIB) \
$(KRB5LIBS) \
$(LIBCPPUNIT_LIBS) \
+ $(SYSTEMD_LIBS) \
$(COMPAT_LIB) \
$(XTRA_LIBS)
tests_testHttpRequest_LDFLAGS = $(LIBADD_DL)
@@ -3487,6 +3489,7 @@ tests_testURL_LDADD = \
$(SSLLIB) \
$(KRB5LIBS) \
$(LIBCPPUNIT_LIBS) \
+ $(SYSTEMD_LIBS) \
$(COMPAT_LIB) \
$(XTRA_LIBS)
tests_testURL_LDFLAGS = $(LIBADD_DL)
@@ -3646,6 +3649,7 @@ nodist_tests_testYesNoNone_SOURCES = \
tests_testYesNoNone_LDADD= \
base/libbase.la \
$(LIBCPPUNIT_LIBS) \
+ $(SYSTEMD_LIBS) \
$(COMPAT_LIB) \
$(XTRA_LIBS)
tests_testYesNoNone_LDFLAGS = $(LIBADD_DL)
--- a/src/ip/QosConfig.cc
+++ b/src/ip/QosConfig.cc
@@ -21,6 +21,7 @@
#include "Parsing.h"
#include <cerrno>
+#include <limits>
CBDATA_CLASS_INIT(acl_tos);
--- a/src/ipc/mem/PageStack.cc
+++ b/src/ipc/mem/PageStack.cc
@@ -14,6 +14,7 @@
#include "Debug.h"
#include "ipc/mem/Page.h"
#include "ipc/mem/PageStack.h"
+#include <limits>
/// used to mark a stack slot available for storing free page offsets
const Ipc::Mem::PageStack::Value Writable = 0;
--- a/src/ssl/helper.cc
+++ b/src/ssl/helper.cc
@@ -19,6 +19,8 @@
#include "ssl/helper.h"
#include "wordlist.h"
+#include <limits>
+
Ssl::CertValidationHelper::LruCache *Ssl::CertValidationHelper::HelperCache = nullptr;
#if USE_SSL_CRTD

31
meta-networking/recipes-daemons/squid/files/0001-splay.cc-fix-bind-is-not-a-member-of-std.patch
View File

@ -1,31 +0,0 @@
From 1def5b4278d97f197520d23c1dce52f93a1b2f46 Mon Sep 17 00:00:00 2001
From: Andrej Valek <andrej.valek@siemens.com>
Date: Tue, 9 Apr 2019 09:40:30 +0200
Subject: [PATCH] splay.cc: fix bind is not a member of std
fix
| ../../squid-4.6/test-suite/splay.cc:134:28: error: 'bind' is not a member of 'std'
| auto nextRandom = std::bind (distribution, generator);
| ^~~~
| ../../squid-4.6/test-suite/splay.cc:134:28: note: 'std::bind' is defined in header '<functional>'; did you forget to '#include <functional>'?
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
---
test-suite/splay.cc | 1 +
1 file changed, 1 insertion(+)
diff --git a/test-suite/splay.cc b/test-suite/splay.cc
index f71b337..4e21adc 100644
--- a/test-suite/splay.cc
+++ b/test-suite/splay.cc
@@ -20,6 +20,7 @@
#include <unistd.h>
#endif
#include <random>
+#include <functional>
class intnode
{
--
2.11.0

34
meta-networking/recipes-daemons/squid/files/0001-tools.cc-fixed-unused-result-warning.patch
View File

@ -1,34 +0,0 @@
From 86dae8010310d13bd2a2beb006b4085d06ae1556 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 25 Jun 2017 00:59:24 -0700
Subject: [PATCH] tools.cc: fixed unused-result warning
fix
| ../../squid-3.5.26/src/tools.cc: In function 'void enter_suid()':
| ../../squid-3.5.26/src/tools.cc:616:11: error: ignoring return value of 'int setuid(__uid_t)', declared with attribute warn_unused_result [-Werror=unused-result]
| setuid(0);
| ~~~~~~^~~
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/tools.cc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/tools.cc b/src/tools.cc
index 5829574..19f0836 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -581,8 +581,10 @@ enter_suid(void)
debugs (21, 3, "enter_suid: setresuid failed: " << xstrerr(xerrno));
}
#else
-
- setuid(0);
+ if (setuid(0) < 0) {
+ const auto xerrno = errno;
+ debugs(50, DBG_IMPORTANT, "WARNING: no_suid: setuid(0): " << xstrerr(xerrno));
+ }
#endif
#if HAVE_PRCTL && defined(PR_SET_DUMPABLE)
/* Set Linux DUMPABLE flag */

2
meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch
View File

@ -19,7 +19,7 @@ diff --git a/configure.ac b/configure.ac
index d2f7feb..c7ae568 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3235,6 +3235,16 @@ case "$host" in
@@ -3268,6 +3268,16 @@ case "$host" in
;;
esac

15
meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch
View File

@ -38,10 +38,10 @@ index ad0ba60..4477446 100644
])
]) dnl SQUID_CHECK_KRB5_HEIMDAL_BROKEN_KRB5_H
diff --git a/acinclude/lib-checks.m4 b/acinclude/lib-checks.m4
index 7624b56..b449c5a 100644
index 1e9333527c..2d42787029 100644
--- a/acinclude/lib-checks.m4
+++ b/acinclude/lib-checks.m4
@@ -217,7 +217,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_METHOD],[
@@ -227,7 +227,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_METHOD],[
[
AC_MSG_RESULT([no])
],
@ -52,14 +52,15 @@ index 7624b56..b449c5a 100644
SQUID_STATE_ROLLBACK(check_const_SSL_METHOD)
])
@@ -377,7 +379,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_TXTDB],[
@@ -386,8 +386,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_TXTDB],[
[
AC_MSG_RESULT([yes])
AC_DEFINE(SQUID_USE_SSLLHASH_HACK, 1)
],
- ],
-[])
+[
+ AC_MSG_RESULT([skipped - can't test in cross-compiled env])
+])
+ ],[
+ AC_MSG_RESULT([skipped - can't test in cross-compiled env])
+ ])
SQUID_STATE_ROLLBACK(check_TXTDB)
])

8
meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch
View File

@ -20,11 +20,11 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index 061a463..350dfb2 100644
index 0233c0e..e0021b6 100644
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -41,8 +41,7 @@ TESTS += debug \
MemPoolTest\
@@ -40,8 +40,7 @@ TESTS += debug \
splay\
mem_node_test\
mem_hdr_test\
- $(ESI_TESTS) \
@ -33,7 +33,7 @@ index 061a463..350dfb2 100644
## Sort by alpha - any build failures are significant.
check_PROGRAMS += debug \
@@ -125,19 +124,19 @@ VirtualDeleteOperator_SOURCES = VirtualDeleteOperator.cc $(DEBUG_SOURCE)
@@ -159,19 +158,19 @@ VirtualDeleteOperator_SOURCES = \
##$(TARGLIB): $(LIBOBJS)
## $(AR_R) $(TARGLIB) $(LIBOBJS)

21
meta-networking/recipes-daemons/squid/squid_4.15.bb → meta-networking/recipes-daemons/squid/squid_5.7.bb
View File

@ -22,17 +22,14 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.bz2
file://set_sysroot_patch.patch \
file://squid-don-t-do-squid-conf-tests-at-build-time.patch \
file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \
file://0001-tools.cc-fixed-unused-result-warning.patch \
file://0001-splay.cc-fix-bind-is-not-a-member-of-std.patch \
file://0001-Fix-build-on-Fedora-Rawhide-772.patch \
"
SRC_URI:remove:toolchain-clang = "file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch"
SRC_URI[sha256sum] = "71635811e766ce8b155225a9e3c7757cfc7ff93df26b28d82e5e6fc021b9a605"
SRC_URI[sha256sum] = "4c17e1eb324c4b7aa3c6889eba66eeca7ed98625d44076f7db7b027b2b093bd5"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://errors/COPYRIGHT;md5=0e03cd976052c45697ad5d96e7dff8dc \
file://errors/COPYRIGHT;md5=0a7deb73d8fb7a9849af7145987829a4 \
"
DEPENDS = "libtool krb5 openldap db cyrus-sasl"
@ -80,12 +77,21 @@ do_install_ptest() {
cp -rf ${B}/${TESTDIR} ${D}${PTEST_PATH}
cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH}
# Needed to generate file squid.conf.default
oe_runmake DESTDIR=${D}${PTEST_PATH} -C src install-data-local
install -d ${D}${sysconfdir}/squid
install -m 0644 ${D}${PTEST_PATH}/${sysconfdir}/squid/squid.conf.default ${D}${sysconfdir}/squid
# Don't need these directories
rm -rf ${D}${PTEST_PATH}/${sysconfdir}
rm -rf ${D}${PTEST_PATH}/usr
rm -rf ${D}${PTEST_PATH}/var
# do NOT need to rebuild Makefile itself
sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
# Add squid-conf-tests for runtime tests
sed -e 's/^\(runtest-TESTS:\)/\1 squid-conf-tests/' \
-e "s/\(list=' \$(TESTS)\)/\1 squid-conf-tests/" \
-i ${D}${PTEST_PATH}/${TESTDIR}/Makefile
# Ensure the path for command true is correct
@ -112,6 +118,7 @@ do_install:append() {
FILES:${PN} += "${libdir} ${datadir}/errors ${datadir}/icons"
FILES:${PN}-dbg += "/usr/src/debug"
FILES:${PN}-doc += "${datadir}/*.txt"
FILES:${PN}-ptest += "${sysconfdir}/squid/squid.conf.default"
RDEPENDS:${PN} += "perl"
RDEPENDS:${PN}-ptest += "make"
RDEPENDS:${PN}-ptest += "perl make"