CVS commit: pkgsrc/www/squid7

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Tue Oct 28 15:46:38 UTC 2025

Modified Files:
        pkgsrc/www/squid7: DESCR Makefile distinfo options.mk
Added Files:
        pkgsrc/www/squid7/patches: patch-src_anyp_Uri.cc

Log Message:
www/squid7: Apply fix for Squid Bug 5520

* Add patch for fix Squid bug 5520.
* Reduce pkglint warnings.
* There is no scripts/tcp-banger.pl any more.
* Use PKG_OPTIONS.squid7 instead of PKG_OPTIONS.squid5.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/squid7/DESCR pkgsrc/www/squid7/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/squid7/Makefile \
    pkgsrc/www/squid7/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/squid7/patches/patch-src_anyp_Uri.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/squid7/DESCR
diff -u pkgsrc/www/squid7/DESCR:1.1 pkgsrc/www/squid7/DESCR:1.2
--- pkgsrc/www/squid7/DESCR:1.1 Wed Jul 16 10:58:02 2025
+++ pkgsrc/www/squid7/DESCR     Tue Oct 28 15:46:38 2025
@@ -10,9 +10,12 @@ new features are:
 
 Since version 6, some previously deprecated features have been removed:
  * Edge Side Includes (ESI)
- * access to the cache manager using the cache_object:// scheme - use http instead
- * the squidclient tool - use curl http://<squid-address>/squid-internal-mgr/menu instead
+ * access to the cache manager using the cache_object://
+   scheme - use http instead
+ * the squidclient tool - use curl
+   http://<squid-address>/squid-internal-mgr/menu instead
  * the cachemgr.cgi tool
  * the purge tool - use the http PURGE method instead
  * Ident protocol support
- * basic_smb_lm_auth and ntlm_smb_lm_auth helpers - use Samba's ntlm_auth instead
+ * basic_smb_lm_auth and ntlm_smb_lm_auth helpers - use
+   Samba's ntlm_auth instead
Index: pkgsrc/www/squid7/options.mk
diff -u pkgsrc/www/squid7/options.mk:1.1 pkgsrc/www/squid7/options.mk:1.2
--- pkgsrc/www/squid7/options.mk:1.1    Wed Jul 16 10:58:02 2025
+++ pkgsrc/www/squid7/options.mk        Tue Oct 28 15:46:38 2025
@@ -1,6 +1,6 @@
-# $NetBSD: options.mk,v 1.1 2025/07/16 10:58:02 sborrill Exp $
+# $NetBSD: options.mk,v 1.2 2025/10/28 15:46:38 taca Exp $
 
-PKG_OPTIONS_VAR=               PKG_OPTIONS.squid5
+PKG_OPTIONS_VAR=               PKG_OPTIONS.squid7
 PKG_SUPPORTED_OPTIONS=         inet6 snmp squid-backend-aufs \
                                squid-backend-diskd squid-backend-rock \
                                squid-backend-ufs squid-ecap squid-esi \

Index: pkgsrc/www/squid7/Makefile
diff -u pkgsrc/www/squid7/Makefile:1.2 pkgsrc/www/squid7/Makefile:1.3
--- pkgsrc/www/squid7/Makefile:1.2      Wed Oct 22 14:38:28 2025
+++ pkgsrc/www/squid7/Makefile  Tue Oct 28 15:46:38 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2025/10/22 14:38:28 taca Exp $
+# $NetBSD: Makefile,v 1.3 2025/10/28 15:46:38 taca Exp $
 
-VERSION=       7.2
 DISTNAME=      squid-${VERSION}
-
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=squid-cache/}squid/releases/download/SQUID_${VERSION:S/./_/g}/
 EXTRACT_SUFX=  .tar.xz
@@ -12,6 +11,8 @@ HOMEPAGE=     http://www.squid-cache.org/
 COMMENT=       Post-Harvest_cached WWW proxy cache and accelerator
 LICENSE=       gnu-gpl-v2
 
+VERSION=       7.2
+
 # GCC 7 fails even with c++17
 # src/ipc/TypedMsgHdr.h fails with
 # static_assert(std::is_trivially_copyable<Pod>::value, "getPod() used for a POD")
@@ -53,7 +54,7 @@ REPLACE_PERL+=                contrib/url-normalizer.p
                        scripts/calc-must-ids.pl scripts/check_cache.pl \
                        scripts/fileno-to-pathname.pl scripts/find-alive.pl \
                        scripts/flag_truncs.pl scripts/icp-test.pl \
-                       scripts/icpserver.pl scripts/tcp-banger.pl \
+                       scripts/icpserver.pl \
                        scripts/trace-job.pl scripts/trace-master.pl \
                        scripts/udp-banger.pl scripts/upgrade-1.0-store.pl \
                        tools/helper-ok-dying.pl tools/helper-ok.pl
Index: pkgsrc/www/squid7/distinfo
diff -u pkgsrc/www/squid7/distinfo:1.2 pkgsrc/www/squid7/distinfo:1.3
--- pkgsrc/www/squid7/distinfo:1.2      Wed Oct 22 14:38:28 2025
+++ pkgsrc/www/squid7/distinfo  Tue Oct 28 15:46:38 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2025/10/22 14:38:28 taca Exp $
+$NetBSD: distinfo,v 1.3 2025/10/28 15:46:38 taca Exp $
 
 BLAKE2s (squid-7.2.tar.xz) = 89e0413f9a6e2b5904a8ce3b64990096f9e37869acfadb365b42d42433056da3
 SHA512 (squid-7.2.tar.xz) = 424c425dde7b399531c9ed5a700ef84bf8e828b1896f0bd037da121e9b4c8ad0fb0c2b8daad1a0a5308269cc5ffbda42e4c1815421c0bdd6a4046d92dcb56fa7
@@ -8,4 +8,5 @@ SHA1 (patch-configure) = 6d33a33d05b343a
 SHA1 (patch-errors_Makefile.in) = e7ba371bb24e40eeb9dd10dc6fe12d208e681d72
 SHA1 (patch-src_Makefile.in) = afc5aefd97c46d1ffab43e97aeaeade3a5a8c648
 SHA1 (patch-src_acl_external_kerberos__ldap__group_support__resolv.cc) = 0ea41d55e32d689a16e012391a9eea67631daf3a
+SHA1 (patch-src_anyp_Uri.cc) = f87f35c24c5afac468925b1b0e7494640e96a9ad
 SHA1 (patch-src_comm_ModKqueue.cc) = d8c5d235f07a48731275101d60fcbf2e22f77b96

Added files:

Index: pkgsrc/www/squid7/patches/patch-src_anyp_Uri.cc
diff -u /dev/null pkgsrc/www/squid7/patches/patch-src_anyp_Uri.cc:1.1
--- /dev/null   Tue Oct 28 15:46:38 2025
+++ pkgsrc/www/squid7/patches/patch-src_anyp_Uri.cc     Tue Oct 28 15:46:38 2025
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_anyp_Uri.cc,v 1.1 2025/10/28 15:46:38 taca Exp $
+
+Fix for Squid Bug 5520: Allow hostnames starting with decimal digit.
+
+--- src/anyp/Uri.cc.orig       2025-10-15 20:31:05.000000000 +0000
++++ src/anyp/Uri.cc
+@@ -637,23 +637,11 @@ AnyP::Uri::parseHost(Parser::Tokenizer &
+ 
+     // no brackets implies we are looking at IPv4address or reg-name
+ 
+-    static const CharacterSet IPv4chars = CharacterSet("period", ".") + CharacterSet::DIGIT;
+-    SBuf ipv4ish; // IPv4address-ish
+-    if (tok.prefix(ipv4ish, IPv4chars)) {
+-        // This rejects non-IP addresses that our caller would have
+-        // otherwise mistaken for a domain name (e.g., '127.0.0' or '1234.5').
+-        Ip::Address ipCheck;
+-        if (!ipCheck.fromHost(ipv4ish.c_str()))
+-            throw TextException("malformed IP address in uri-host", Here());
+-
+-        return ipv4ish;
+-    }
+-
+-    // XXX: This code does not detect/reject some bad host values (e.g. "!#$%&").
++    // XXX: This code does not detect/reject some bad host values (e.g. `!#$%&`).
+     // TODO: Add more checks here, after migrating the
+     // non-CONNECT uri-host parsing code to use us.
+ 
+-    SBuf otherHost; // IPv4address-ish or reg-name-ish;
++    SBuf otherHost; // IPv4address-ish or reg-name-ish
+     // ":" is not in TCHAR so we will stop before any port specification
+     if (tok.prefix(otherHost, CharacterSet::TCHAR))
+         return otherHost;