CVS commit: pkgsrc/www/squid6

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

Module Name:    pkgsrc
Committed By:   sborrill
Date:           Tue Jan  7 13:55:09 UTC 2025

Modified Files:
        pkgsrc/www/squid6: Makefile distinfo options.mk

Log Message:
squid6: update to 6.12

Switch to github releases as per Squid project's new release strategy.
Use USE_CXX_FEATURES to specify c++17 instead of USE_LANGUAGES.
Remove superseded c++11 assertion from options.mk

Changes from 6.11:
- Fix validation of Digest auth header parameters
- Fix build with libtool v2.4 + automake v1.17
- Use git to extract default build-info when enabled
- ... and a minor source-maintenance portability fix


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/squid6/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/squid6/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/squid6/options.mk

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.17 pkgsrc/www/squid6/Makefile:1.18
--- pkgsrc/www/squid6/Makefile:1.17     Thu Nov 14 22:22:11 2024
+++ pkgsrc/www/squid6/Makefile  Tue Jan  7 13:55:08 2025
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2024/11/14 22:22:11 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2025/01/07 13:55:08 sborrill Exp $
+
+VERSION=       6.12
+DISTNAME=      squid-${VERSION}
 
-DISTNAME=      squid-6.11
-PKGREVISION=   3
 CATEGORIES=    www
-MASTER_SITES=  http://www.squid-cache.org/Versions/v6/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=squid-cache/}squid/releases/download/SQUID_${VERSION:S/./_/g}/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -14,7 +15,8 @@ LICENSE=      gnu-gpl-v2
 # 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")
-USE_LANGUAGES=         c c++17
+USE_CXX_FEATURES+=     c++17
+USE_LANGUAGES+=                c c++
 GCC_REQD+=             10
 
 USE_TOOLS+=            perl:run gmake
@@ -36,6 +38,8 @@ CONFIGURE_ARGS+=      --with-aio
 CONFIGURE_ARGS+=       --with-default-user=${SQUID_USER}
 CONFIGURE_ARGS+=       --with-pidfile=${VARBASE}/run/squid.pid
 
+BUILD_DEFS=            VARBASE
+
 # Let 'purge' find correct config file by default.
 CPPFLAGS+=             -DDEFAULT_SQUID_CONF=\"${PKG_SYSCONFDIR}/squid.conf\"
 

Index: pkgsrc/www/squid6/distinfo
diff -u pkgsrc/www/squid6/distinfo:1.10 pkgsrc/www/squid6/distinfo:1.11
--- pkgsrc/www/squid6/distinfo:1.10     Thu Oct 10 11:41:53 2024
+++ pkgsrc/www/squid6/distinfo  Tue Jan  7 13:55:09 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2024/10/10 11:41:53 sborrill Exp $
+$NetBSD: distinfo,v 1.11 2025/01/07 13:55:09 sborrill Exp $
 
-BLAKE2s (squid-6.11.tar.xz) = 6a6fb934c3761f66baabb2ad9f9ec30a556a7bd51353e38a912232550e519ac3
-SHA512 (squid-6.11.tar.xz) = 669f658b0a58514f98c2b33df874706d40b9ed0837e1f32e08e274c79617063e06e706932011a34b115dcc96d43125f9cea30fba459cd31a88e3afd9b6076d7a
-Size (squid-6.11.tar.xz) = 2547824 bytes
+BLAKE2s (squid-6.12.tar.xz) = 906451612899f5c20a37c6eeb0c1a7f5cec13d828864dd801b006ce6f2922e77
+SHA512 (squid-6.12.tar.xz) = 7ab61f19416426fb8284de7bddc1ea9a5a7b3148fc54c018a243071ba5854610ef38a248f6a22634a2acb7d3ea408b582af1f48818dfe698ade0b7b8c00fd183
+Size (squid-6.12.tar.xz) = 2548220 bytes
 SHA1 (patch-compat_compat.h) = 839381a5e1f46e7d9b822bbb53d82a53c996ddc0
 SHA1 (patch-configure) = 66bf56c83876452ba12727d5d957619d75f4d1bc
 SHA1 (patch-errors_Makefile.in) = e7ba371bb24e40eeb9dd10dc6fe12d208e681d72

Index: pkgsrc/www/squid6/options.mk
diff -u pkgsrc/www/squid6/options.mk:1.1 pkgsrc/www/squid6/options.mk:1.2
--- pkgsrc/www/squid6/options.mk:1.1    Wed Sep 13 07:36:44 2023
+++ pkgsrc/www/squid6/options.mk        Tue Jan  7 13:55:09 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2023/09/13 07:36:44 taca Exp $
+# $NetBSD: options.mk,v 1.2 2025/01/07 13:55:09 sborrill Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.squid5
 PKG_SUPPORTED_OPTIONS=         inet6 snmp squid-backend-aufs \
@@ -90,7 +90,6 @@ CONFIGURE_ARGS+=      --enable-arp-acl
 CONFIGURE_ARGS+=       --enable-ecap
 USE_TOOLS+=            pkg-config
 CHECK_WRKREF_SKIP+=    sbin/squid
-USE_LANGUAGES+=                c++11
 .include "../../www/libecap/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-ecap