CVS commit: pkgsrc/www/squid6

["Stephen Borrill" <sborrill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sborrill
Date:           Wed Feb 21 12:58:50 UTC 2024

Modified Files:
        pkgsrc/www/squid6: Makefile distinfo
Added Files:
        pkgsrc/www/squid6/patches: patch-src_ipcache.cc

Log Message:
squid6: patch bug 1691

https://github.com/squid-cache/squid/pull/1691

Since inception in 2017 commit fd9c47d, Dns::CachedIps::have() always
returned position zero after finding a matching IP address (at zero or
positive position). The bug affected two callers:

* markAsBad() always marked the first stored address (as bad);
* forgetMarking() always cleared the first stored address marking.

Buggy markings led to Squid sometimes not attempting to use a working
address (e.g., IPv4) while using a known problematic one (e.g., IPv6).


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/squid6/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/squid6/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/squid6/patches/patch-src_ipcache.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/squid6/Makefile
diff -u pkgsrc/www/squid6/Makefile:1.7 pkgsrc/www/squid6/Makefile:1.8
--- pkgsrc/www/squid6/Makefile:1.7      Mon Dec 18 16:13:23 2023
+++ pkgsrc/www/squid6/Makefile  Wed Feb 21 12:58:50 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2023/12/18 16:13:23 sborrill Exp $
+# $NetBSD: Makefile,v 1.8 2024/02/21 12:58:50 sborrill Exp $
 
 DISTNAME=      squid-6.6
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  http://www.squid-cache.org/Versions/v6/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/www/squid6/distinfo
diff -u pkgsrc/www/squid6/distinfo:1.5 pkgsrc/www/squid6/distinfo:1.6
--- pkgsrc/www/squid6/distinfo:1.5      Mon Dec 18 16:13:23 2023
+++ pkgsrc/www/squid6/distinfo  Wed Feb 21 12:58:50 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2023/12/18 16:13:23 sborrill Exp $
+$NetBSD: distinfo,v 1.6 2024/02/21 12:58:50 sborrill Exp $
 
 BLAKE2s (squid-6.6.tar.xz) = 3aa83a70f8f01881e19d872da8f9fd21044d1ed554265f50ab334cfc64ddf447
 SHA512 (squid-6.6.tar.xz) = 4ab261ed85ad674288467500aca9d8a48e3918b55f777635c0ba7a2551f248d35536848a5fbf2c946490a818004727f2aed33144f0a3ebab0be36cc4cffb020c
@@ -10,4 +10,5 @@ SHA1 (patch-src_Makefile.in) = afc5aefd9
 SHA1 (patch-src_acl_external_kerberos__ldap__group_support__resolv.cc) = 0ea41d55e32d689a16e012391a9eea67631daf3a
 SHA1 (patch-src_comm_ModKqueue.cc) = d8c5d235f07a48731275101d60fcbf2e22f77b96
 SHA1 (patch-src_esi_VarState.cc) = d9418e59cdc390b2d970195167a99bb7ed392c38
+SHA1 (patch-src_ipcache.cc) = cc0852ae2f9f08e8706c81e459f8c25f594b87df
 SHA1 (patch-tools_Makefile.in) = d098c0c9dc4af577f74e562d99f07ed98be5ae01

Added files:

Index: pkgsrc/www/squid6/patches/patch-src_ipcache.cc
diff -u /dev/null pkgsrc/www/squid6/patches/patch-src_ipcache.cc:1.1
--- /dev/null   Wed Feb 21 12:58:50 2024
+++ pkgsrc/www/squid6/patches/patch-src_ipcache.cc      Wed Feb 21 12:58:50 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_ipcache.cc,v 1.1 2024/02/21 12:58:50 sborrill Exp $
+
+https://github.com/squid-cache/squid/pull/1691
+
+Since inception in 2017 commit fd9c47d, Dns::CachedIps::have() always
+returned position zero after finding a matching IP address (at zero or
+positive position). The bug affected two callers:
+
+* markAsBad() always marked the first stored address (as bad);
+* forgetMarking() always cleared the first stored address marking.
+
+Buggy markings led to Squid sometimes not attempting to use a working
+address (e.g., IPv4) while using a known problematic one (e.g., IPv6).
+
+--- src/ipcache.cc.orig        2023-12-07 01:36:15.000000000 +0000
++++ src/ipcache.cc     2024-02-21 09:14:05.428281018 +0000
+@@ -990,6 +990,7 @@
+             debugs(14, 7, ip << " at " << pos << " in " << *this);
+             return true;
+         }
++        ++pos; // TODO: Replace with std::views::enumerate() after upgrading to C++23
+     }
+     // no such address; leave *position as is
+     debugs(14, 7, " no " << ip << " in " << *this);