CVS commit: pkgsrc/www/squid7

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Wed Feb 11 09:18:50 UTC 2026

Modified Files:
        pkgsrc/www/squid7: Makefile PLIST distinfo
Added Files:
        pkgsrc/www/squid7: Makefile.common
        pkgsrc/www/squid7/files: README-pkgsrc
Removed Files:
        pkgsrc/www/squid7: MESSAGE

Log Message:
www/squid7: update to 7.4

pkgsrc change:
* Move MESSAGE to README-pkgsrc.
* Use own Makefile.common now preparing remove of squid6.

7.4 (2026-01-20)

- Do not create world-readable directories
- digest_edirectory_auth: Fix LDAPS memory leaks
- snmplib: Improve handling of zero-length ASN OCTET STRINGs
- Debug tls_read_method()/tls_write_method() errors
- ICMP: Harden echo paths, fix overflows, UB, and leaks
- Set SSL_OP_LEGACY_SERVER_CONNECT when peeking at servers
- security_file_certgen: Fix OPENSSL_malloc()/free(3) mismatch
- Detect FreeBSD ports Heimdal package
- Remove SQUID_CHECK_KRB5_HEIMDAL_BROKEN_KRB5_H macro
- Remove SQUID_CHECK_KRB5_SOLARIS_BROKEN_KRB5_H macro
- ext_kerberos_ldap_group_acl: Do not prohibit all LDFLAGS
- negotiate_sspi_auth: Respond with ERR when FormatMessage() fails
- ... and some code cleanups
- ... and some CI improvements


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 pkgsrc/www/squid7/MESSAGE
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/squid7/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/www/squid7/Makefile.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/squid7/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/squid7/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/squid7/files/README-pkgsrc

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/Makefile
diff -u pkgsrc/www/squid7/Makefile:1.7 pkgsrc/www/squid7/Makefile:1.8
--- pkgsrc/www/squid7/Makefile:1.7      Fri Feb  6 10:06:12 2026
+++ pkgsrc/www/squid7/Makefile  Wed Feb 11 09:18:49 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2026/02/06 10:06:12 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2026/02/11 09:18:49 taca Exp $
 
 DISTNAME=      squid-${VERSION}
-PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=squid-cache/}squid/releases/download/SQUID_${VERSION:S/./_/g}/
 EXTRACT_SUFX=  .tar.xz
@@ -11,7 +10,7 @@ HOMEPAGE=     http://www.squid-cache.org/
 COMMENT=       Post-Harvest_cached WWW proxy cache and accelerator
 LICENSE=       gnu-gpl-v2
 
-VERSION=       7.3
+VERSION=       7.4
 
 # GCC 7 fails even with c++17
 # src/ipc/TypedMsgHdr.h fails with
@@ -70,13 +69,13 @@ OWN_DIRS=           ${SQUID_DATADIR}
 OWN_DIRS_PERMS+=       ${SQUID_DATADIR}/cache ${SQUID_USER} ${SQUID_GROUP} 0750 \
                        ${SQUID_DATADIR}/logs ${SQUID_USER} ${SQUID_GROUP} 0750
 
-.include "../../www/squid6/Makefile.common"
+.include "Makefile.common"
 .include "options.mk"
 
 # Incorrect check for <netinet/ip_icmp.h> on FreeBSD:
 CONFIGURE_ENV.FreeBSD+=        ac_cv_header_netinet_ip_icmp_h=yes
 
-INSTALLATION_DIRS=     ${EGDIR}
+INSTALLATION_DIRS+=    ${EGDIR} share/doc/squid
 
 SPECIAL_PERMS+=                libexec/pinger ${SETUID_ROOT_PERMS}
 
@@ -90,6 +89,15 @@ SUBST_FILES.confs=   src/cf.data.pre
 SUBST_SED.confs=       -e "s/@DEFAULT_CACHE_EFFECTIVE_USER@/${SQUID_USER}/"
 SUBST_MESSAGE.confs=   Fixing configuration files.
 
+SUBST_CLASSES+=                name
+SUBST_STAGE.name=      pre-configure
+SUBST_FILES.name=      ${WRKDIR}/README-pkgsrc
+SUBST_VARS.name+=      PKGNAME
+SUBST_MESSAGE.name=    Fixing package name.
+
+post-patch:
+       ${CP} ${FILESDIR}/README-pkgsrc ${WRKDIR}/README-pkgsrc
+
 post-build:
        cd ${WRKSRC}/src && ${CP} -pf squid.conf.documented squid.conf.default
 
@@ -98,6 +106,8 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/${f} \
                ${DESTDIR}${PREFIX}/${EGDIR}/`basename ${f} .default`
 .endfor
+       ${INSTALL_DATA} ${WRKDIR}/README-pkgsrc \
+               ${DESTDIR}${PREFIX}/share/doc/squid
 
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../mk/atomic64.mk"

Index: pkgsrc/www/squid7/PLIST
diff -u pkgsrc/www/squid7/PLIST:1.1 pkgsrc/www/squid7/PLIST:1.2
--- pkgsrc/www/squid7/PLIST:1.1 Wed Jul 16 10:58:02 2025
+++ pkgsrc/www/squid7/PLIST     Wed Feb 11 09:18:49 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2025/07/16 10:58:02 sborrill Exp $
+@comment $NetBSD: PLIST,v 1.2 2026/02/11 09:18:49 taca Exp $
 libexec/basic_db_auth
 libexec/basic_fake_auth
 ${PLIST.ba_getpwnam}libexec/basic_getpwnam_auth
@@ -43,6 +43,7 @@ man/man8/squid.8
 man/man8/storeid_file_rewrite.8
 man/man8/url_lfs_rewrite.8
 sbin/squid
+share/doc/squid/README-pkgsrc
 share/examples/squid/errorpage.css
 share/examples/squid/mime.conf
 share/examples/squid/squid.conf

Index: pkgsrc/www/squid7/distinfo
diff -u pkgsrc/www/squid7/distinfo:1.4 pkgsrc/www/squid7/distinfo:1.5
--- pkgsrc/www/squid7/distinfo:1.4      Wed Oct 29 00:27:09 2025
+++ pkgsrc/www/squid7/distinfo  Wed Feb 11 09:18:49 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2025/10/29 00:27:09 taca Exp $
+$NetBSD: distinfo,v 1.5 2026/02/11 09:18:49 taca Exp $
 
-BLAKE2s (squid-7.3.tar.xz) = 89246ad2be89fd114df29840d00e4318c0594bcbad025b2d6ee052c8cc6392ee
-SHA512 (squid-7.3.tar.xz) = ad6bbe518d79d079f7fe5d1ee9ae7a3f49b28ba75afdb1f0db16675e1e4127be2bc30dd246b00576f29e987c08c41dbff50c8227166ae3955c460ff837a89e2b
-Size (squid-7.3.tar.xz) = 2441828 bytes
+BLAKE2s (squid-7.4.tar.xz) = 98acdf42846642db6a40f967a995002b6ccd382646b346fe4f42c5d28547b5ba
+SHA512 (squid-7.4.tar.xz) = bf63183a9086de991bc4f1987344681a061958539c1202d9f9527005dc6d21e73900f60963345ae6d0f23521c4d3cdc3e589c054d84c2e8d549ad4209fe23577
+Size (squid-7.4.tar.xz) = 2441824 bytes
 SHA1 (patch-compat_compat.h) = 839381a5e1f46e7d9b822bbb53d82a53c996ddc0
 SHA1 (patch-configure) = 6d33a33d05b343a052674b5b2a427f17d5e65435
 SHA1 (patch-errors_Makefile.in) = e7ba371bb24e40eeb9dd10dc6fe12d208e681d72

Added files:

Index: pkgsrc/www/squid7/Makefile.common
diff -u /dev/null pkgsrc/www/squid7/Makefile.common:1.1
--- /dev/null   Wed Feb 11 09:18:50 2026
+++ pkgsrc/www/squid7/Makefile.common   Wed Feb 11 09:18:49 2026
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile.common,v 1.1 2026/02/11 09:18:49 taca Exp $
+#
+# used by www/squid7/Makefile
+
+SQUID_DATADIR= ${VARBASE}/squid
+
+PKG_SYSCONFSUBDIR?=            squid
+
+SQUID_USER?=                   squid
+SQUID_GROUP?=                  squid
+
+PKG_GROUPS_VARS+=              SQUID_GROUP
+PKG_USERS_VARS+=               SQUID_USER
+
+PKG_GROUPS=                    ${SQUID_GROUP}
+PKG_USERS=                     ${SQUID_USER}:${SQUID_GROUP}
+PKG_GECOS.${SQUID_USER}=       Squid Web-Cache pseudo-user
+
+BUILD_DEFS+=                   VARBASE

Index: pkgsrc/www/squid7/files/README-pkgsrc
diff -u /dev/null pkgsrc/www/squid7/files/README-pkgsrc:1.1
--- /dev/null   Wed Feb 11 09:18:50 2026
+++ pkgsrc/www/squid7/files/README-pkgsrc       Wed Feb 11 09:18:49 2026
@@ -0,0 +1,10 @@
+===========================================================================
+$NetBSD: README-pkgsrc,v 1.1 2026/02/11 09:18:49 taca Exp $
+
+You DO need running nameservice to start and run @PKGNAME@.
+
+Please note that to use the diskd storage method, you'll likely have to
+change SYSV-IPC parameters in the kernel config file (see
+http://wiki.squid-cache.org/Features/DiskDaemon for details)
+
+===========================================================================