diff options
Diffstat (limited to 'net-proxy/squid')
| -rw-r--r-- | net-proxy/squid/Manifest | 5 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid-4.17-fix-libxml2-2.10.0.patch | 30 | ||||
| -rw-r--r-- | net-proxy/squid/squid-4.17-r1.ebuild | 1 | ||||
| -rw-r--r-- | net-proxy/squid/squid-5.4.1-r2.ebuild | 1 |
4 files changed, 35 insertions, 2 deletions
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest index e638d74672cd..17384f489045 100644 --- a/net-proxy/squid/Manifest +++ b/net-proxy/squid/Manifest @@ -1,3 +1,4 @@ +AUX squid-4.17-fix-libxml2-2.10.0.patch 1343 BLAKE2B a3af97f3951dc84c1fe7d1aee4cba3e51d56204fe02b6c457e67bc80dd8d1f51f9dff7fffce91836034f64fc3f6b602d68cd5d8207f262a2b92a4900c8beb192 SHA512 130b2918b2fc55f13d50d501b343ab741a8ae1b081ef569d1935a655246e30ff8e0109fdc79277ed15473b6e87bca7ed8f4ebab2dba724d66fb32b08e6722327 AUX squid-4.17-use-system-libltdl.patch 497 BLAKE2B 38dbd734d7a56c2d5acb508ac5ab348c81247ce20f2bb9b7a278c9b480c15b2d29f106647d58aa2abb290b864bb103f2d11deeb7a50f7574e3f619b9392353a7 SHA512 754c41b03e5627ead2b824fc9ed6e91463b51308833e4c7ad6f4e35b0cfb5e58af1a8db9a6a5f3157933f408f7d5127214efbf91db4f74a7176f2dcb8ae87ad9 AUX squid-4.3-gentoo.patch 2767 BLAKE2B fbf424bec42a8bd29f54431107e73db1d1acd7612c8acc4d38022419a72ccabc9d0287fb34cbd26e96df2b6e2aaceae929c1005ef2ad4f731cf28edf66ac569a SHA512 eaf076cef4b60c1f5e9985a69f5ae674082b04a6f70d5b484ad13e9e397a8c67cb1780960a11fd943dc2500ec9f0590192b276bf36451d3063537661200487bf AUX squid-5.3-gentoo.patch 2765 BLAKE2B 0260544df7ed59b99e6fb030b277330ad6d9ffc3130b550a8b3aee7386ba635b9848cdf655bf264fe83614c00772921eaaa5e66ed3ccefddc23a8b8f1fedfc62 SHA512 d68c1fd82a2a65cfc7bf257b7305827cfead3e37361952171cb6f5e933c607ba82025434b1430e4210ff937d58200019d66b4869a4c0d0291d19192e76105770 @@ -10,6 +11,6 @@ DIST squid-4.15.tar.xz 2454176 BLAKE2B 3cb08c806f03fcddd7233b05986434d2be3e62a50 DIST squid-4.17.tar.xz 2464204 BLAKE2B e227dfbac846dff66f04c6c72d81d667076107653721d14804f079518cef68efc53f5404fbe3306efb0c775a10638661c300a8e7cd3d7ab43c0e57a344387674 SHA512 cea36de10f128f5beb51bdc89604c16af3a820a5ac27284b2aa181ac87144930489688e1d85ce357fe1ed8a4e96e300277b95034a2475cbf86c9d6923ddf7c0a DIST squid-5.4.1.tar.xz 2561444 BLAKE2B 3281f592c342b59a1017f4c0829543c857d61c4d1e191461f6e69bda2dc61ff59d5b92a04744dcebb75bd1b5d85c214c1f0bea78a791033a50f29891b6995fb8 SHA512 d53e64e8c44cfc978307f3965c52889d238121735fd201a8286139f974d5db9af41fe886d64e57dfacc87b777f5940cd6123a6e178d12530117cace945a9f6c1 EBUILD squid-4.15-r3.ebuild 8015 BLAKE2B 219a853661c70d8797424bd6461964193b2ad1f173141e546630ba190b61f39a4e89a335db2a6fd184242ecf9bc8fe14b60397a70a865179838f77a0df1ec171 SHA512 ce47b241e6e9fb945214e74439fc94fb0ee68dd024baf8540595ccdd9ef4f246419c09039360b1ba6beab1b2fbc2e8756bc104cb4351e01ce0a3859be21bfcf0 -EBUILD squid-4.17-r1.ebuild 8123 BLAKE2B c985caab058a72b3b4cae3d421a7754a6eb6ff8ead8cb0964e44f19ed06a52151e0cea9a9c54f4e9455bb36669c20a4f6905c65eaf0914e4d7f8597dbb7ec0bb SHA512 32cd9f2164dfbc5ab37371f65958526034ce46c998d1c21b89fdd35d464e24d2388cd28edb3379ff442e75e619350852f05efd58628022849e91171831a9ace0 -EBUILD squid-5.4.1-r2.ebuild 8190 BLAKE2B 73b7271566a64745dd666df13487d05c91af8655b075ecfdae391ce21c225116f2e7e5943871a50ae5dfe06300c0b1935fc8cfbee9ba90cd4d25e3af37eb2b77 SHA512 ecf27ca294954a5649fa0ecc2e1b245148a090d800878d2f62a55e81383da168377df3881c039af9a6cf218ce759bdcb18e7c25e9529adbfdd75a2ac7845ee18 +EBUILD squid-4.17-r1.ebuild 8181 BLAKE2B 4dc3dbebaba4e6f9035a522b92ace1989648957adb4d1c9d614672f8da16a3a9b13dc9ca8378ed2ef00e0aa61ec8a78d639273a9ffcae623a20429297833bf81 SHA512 ad1db57edee84935bfce4dc665bb19115e5b7c06630403284148d569db9ee735527a021311f92cda208c528b96924d2ab4487dd5a966833100cc0b593cea1fa2 +EBUILD squid-5.4.1-r2.ebuild 8248 BLAKE2B c139a046e67cc733c851dd32d29eb339f5ca205bc1b9a0da405fbe0795c76bf061acd049955cc810fc0293e869cb3efeb8620a6c53d56776280545acc5ad03d1 SHA512 f6af01ce4d442a5b18d4a5f824772c3682613fd8e673bd907cf33e7b2c0b34870ca6ed18d46eda7549b31266eea9a8c09576417ef67735749f9abd593557e183 MISC metadata.xml 1178 BLAKE2B ef1e50d591c080e753b2eded1cb9934d26f46358125188ae539489e7bcaa787862c177e3a72f48217ade968fa1bf7870fb0420ae8fc214cc142522a9bf2675f2 SHA512 72db9b79e1861ccd78df889cd5d95e17fdfdc55846b1f3a21171ff5b24ddada441dc807dc818086689b3c20b9e53e6cbc83abfc5afdaea6d744b486e519b6d64 diff --git a/net-proxy/squid/files/squid-4.17-fix-libxml2-2.10.0.patch b/net-proxy/squid/files/squid-4.17-fix-libxml2-2.10.0.patch new file mode 100644 index 000000000000..ebc0cd698e14 --- /dev/null +++ b/net-proxy/squid/files/squid-4.17-fix-libxml2-2.10.0.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/866518 +https://github.com/squid-cache/squid/commit/c4e6b7c2a12fa218089fe839f769ffc8ae18dea4 + +From c4e6b7c2a12fa218089fe839f769ffc8ae18dea4 Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer <wellnhofer@aevum.de> +Date: Sun, 20 Feb 2022 19:42:40 +0000 +Subject: [PATCH] ESI: Drop incorrect and unnecessary xmlSetFeature() call + (#988) + +xmlSetFeature() has been deprecated for 10+ years and will eventually be +removed from libxml2. Squid calls xmlSetFeature() with the wrong +argument: a nil `value` pointer instead of a pointer to a zero value. +When called with a nil `value`, the function does nothing but returning +an error. Squid does not check whether xmlSetFeature() call is +successful, and the bug went unnoticed since libxml2 support was added +in commit 964b44c. + +Since libxml2 does not substitute entities by default, the call can be +removed to achieve the intended effect. +--- a/src/esi/Libxml2Parser.cc ++++ b/src/esi/Libxml2Parser.cc +@@ -118,7 +118,6 @@ ESILibxml2Parser::ESILibxml2Parser(ESIParserClient *aClient) : theClient (aClien + + /* TODO: grab the document encoding from the headers */ + parser = xmlCreatePushParserCtxt(&sax, static_cast<void *>(this), NULL, 0, NULL); +- xmlSetFeature(parser, "substitute entities", 0); + + if (entity_doc == NULL) + entity_doc = htmlNewDoc(NULL, NULL); + diff --git a/net-proxy/squid/squid-4.17-r1.ebuild b/net-proxy/squid/squid-4.17-r1.ebuild index 106d72f54d7e..32578aaf7326 100644 --- a/net-proxy/squid/squid-4.17-r1.ebuild +++ b/net-proxy/squid/squid-4.17-r1.ebuild @@ -80,6 +80,7 @@ pkg_pretend() { src_prepare() { eapply "${FILESDIR}/${PN}-4.3-gentoo.patch" eapply "${FILESDIR}/${PN}-4.17-use-system-libltdl.patch" + eapply "${FILESDIR}/${PN}-4.17-fix-libxml2-2.10.0.patch" sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \ INSTALL QUICKSTART \ diff --git a/net-proxy/squid/squid-5.4.1-r2.ebuild b/net-proxy/squid/squid-5.4.1-r2.ebuild index 94456703bd17..4a8f16e2cd05 100644 --- a/net-proxy/squid/squid-5.4.1-r2.ebuild +++ b/net-proxy/squid/squid-5.4.1-r2.ebuild @@ -82,6 +82,7 @@ pkg_pretend() { src_prepare() { eapply "${FILESDIR}/${PN}-5.3-gentoo.patch" eapply "${FILESDIR}/${PN}-4.17-use-system-libltdl.patch" + eapply "${FILESDIR}/${PN}-4.17-fix-libxml2-2.10.0.patch" sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \ INSTALL QUICKSTART \ |