squid: update to 6.6

This commit is contained in:
Juergen Daubert 2023-12-07 11:11:23 +01:00
parent bae0d3dccb
commit 4630875091
3 changed files with 6 additions and 35 deletions

View File

@ -1,7 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/aMK7uyq07EPS+6pEw8mkvJlrtANSZUB+vrEZEWToCZDvzbPPOWDKaMdegOt44HUihV3O/WFvYczi/B/6bBKAgg=
SHA256 (Pkgfile) = d8d29c9d13bf76d52fb0e2b270a9814531fd04917dd3998a41fca160f55cbb08
RWSE3ohX2g5d/U364iXnO5eooxaTDEd+QonLDkSIVkTTmJ46QzygcCFvNRTukrmUf7bxp1cw1ordGZV6BxijuxJQWPWpU6xTAA8=
SHA256 (Pkgfile) = 718b61feca214010246be39cd8c364e498463031e39c8bbc01583628a5230e46
SHA256 (.footprint) = 86ef6433e602fb7ce136697b81c5c3b04185d777ab56d06011fc72e4aa9dd653
SHA256 (squid-6.5.tar.xz) = 5070f8a3ae6666870c8fc716326befb0a1abe8b5ff3a6f3932cbc5543d7c8549
SHA256 (squid-6.6.tar.xz) = 55bd7f9f4898153161ea1228998acb551bf840832b9e5b90fc8ecd2942420318
SHA256 (squid) = c807a9373705537b648c38ed456ab016cc2fd7d40e6d47c20611931437588d96
SHA256 (libxml2-2.12.patch) = 079e42e69f08ff7848db02bd259512c03a130729c50c4e14fda68c75c777cbc5

View File

@ -5,16 +5,14 @@
# Optional: brotli gnutls krb5 libunistr libidn2 nettle tdb
name=squid
version=6.5
release=2
version=6.6
release=1
source=(http://www.squid-cache.org/Versions/v6/$name-$version.tar.xz
squid libxml2-2.12.patch)
squid)
build() {
cd $name-$version
patch -p1 -i $SRC/libxml2-2.12.patch
sed '/DEFAULT_STATEDIR/s/$(localstatedir)//' -i src/ipc/Makefile.in
./configure \

View File

@ -1,26 +0,0 @@
From c9b3edc1396925aa7eca3d3cc6c798806286a974 Mon Sep 17 00:00:00 2001
From: bkuhls <bkuhls@users.noreply.github.com>
Date: Sun, 26 Nov 2023 15:09:21 +0000
Subject: [PATCH] Bug 5328: Fix ESI build with libxml2 v2.12.0 (#1600)
Libxml2Parser.cc:147:40: error: invalid conversion from
'const xmlError*' to 'xmlErrorPtr' {aka 'xmlError*'} [-fpermissive]
libxml2 recently made xmlGetLastError() return a constant object.
---
src/esi/Libxml2Parser.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/esi/Libxml2Parser.cc b/src/esi/Libxml2Parser.cc
index f0375288511..236a37433cd 100644
--- a/src/esi/Libxml2Parser.cc
+++ b/src/esi/Libxml2Parser.cc
@@ -144,7 +144,7 @@ ESILibxml2Parser::lineNumber() const
char const *
ESILibxml2Parser::errorString() const
{
- xmlErrorPtr error = xmlGetLastError();
+ const auto error = xmlGetLastError();
if (error == nullptr)
return nullptr;