commit da77c3c551625a7cef49ab174ff837ccc38db535 Author: Juergen Daubert <jue@jue.li> Date: Wed Nov 29 12:24:04 2023 +0100 squid: fix build with libxml2 2.12 diff --git a/squid/.signature b/squid/.signature index 8463002ab..ba8bc9649 100644 --- a/squid/.signature +++ b/squid/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/eFZ8LNUUnpW5UA6d3Rij5C3RnIcJZ7k049Ykb/Ye6tDCUGvq5sNTnYXw4ddVXrzAiXKZBHR8xz1Rr1yHEvqswE= -SHA256 (Pkgfile) = 0b4b16fd885edb4dc5716311a1e2982254b56d8da41e58f1943ca5cdbc1e1d7e +RWSE3ohX2g5d/aMK7uyq07EPS+6pEw8mkvJlrtANSZUB+vrEZEWToCZDvzbPPOWDKaMdegOt44HUihV3O/WFvYczi/B/6bBKAgg= +SHA256 (Pkgfile) = d8d29c9d13bf76d52fb0e2b270a9814531fd04917dd3998a41fca160f55cbb08 SHA256 (.footprint) = 86ef6433e602fb7ce136697b81c5c3b04185d777ab56d06011fc72e4aa9dd653 SHA256 (squid-6.5.tar.xz) = 5070f8a3ae6666870c8fc716326befb0a1abe8b5ff3a6f3932cbc5543d7c8549 SHA256 (squid) = c807a9373705537b648c38ed456ab016cc2fd7d40e6d47c20611931437588d96 +SHA256 (libxml2-2.12.patch) = 079e42e69f08ff7848db02bd259512c03a130729c50c4e14fda68c75c777cbc5 diff --git a/squid/Pkgfile b/squid/Pkgfile index 826e8385c..bb9c6c8fb 100644 --- a/squid/Pkgfile +++ b/squid/Pkgfile @@ -6,13 +6,15 @@ name=squid version=6.5 -release=1 +release=2 source=(http://www.squid-cache.org/Versions/v6/$name-$version.tar.xz - squid) + squid libxml2-2.12.patch) build() { cd $name-$version + patch -p1 -i $SRC/libxml2-2.12.patch + sed '/DEFAULT_STATEDIR/s/$(localstatedir)//' -i src/ipc/Makefile.in ./configure \ diff --git a/squid/libxml2-2.12.patch b/squid/libxml2-2.12.patch new file mode 100644 index 000000000..fcc8451e1 --- /dev/null +++ b/squid/libxml2-2.12.patch @@ -0,0 +1,26 @@ +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;