git: 6de950937d16 - main - www/squid: Update 6.14 => 7.3
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 29 Dec 2025 21:26:43 UTC
The branch main has been updated by vvd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6de950937d1686a8c0b5e68ef4bdfaf6bcc5bb33
commit 6de950937d1686a8c0b5e68ef4bdfaf6bcc5bb33
Author: Pavel Timofeev <timp87@gmail.com>
AuthorDate: 2025-12-29 21:24:04 +0000
Commit: Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-12-29 21:24:04 +0000
www/squid: Update 6.14 => 7.3
Changelogs:
https://github.com/squid-cache/squid/releases/tag/SQUID_7_0_1
https://github.com/squid-cache/squid/releases/tag/SQUID_7_0_2
https://github.com/squid-cache/squid/releases/tag/SQUID_7_1
https://github.com/squid-cache/squid/releases/tag/SQUID_7_2
https://github.com/squid-cache/squid/releases/tag/SQUID_7_3
PR: 290630
---
www/squid/Makefile | 57 +++++++++++++--------------------
www/squid/distinfo | 6 ++--
www/squid/files/900.squid-rotate-log.in | 26 +++++++++++++++
www/squid/files/patch-configure | 46 +++++++++++++++++++++++---
www/squid/files/squid.in | 17 ++++------
www/squid/pkg-plist | 10 +-----
6 files changed, 101 insertions(+), 61 deletions(-)
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 9a443436984c..18cd0599123c 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,16 +1,8 @@
PORTNAME= squid
-DISTVERSION= 6.14
-PORTREVISION= 1
+DISTVERSION= 7.3
CATEGORIES= www
MASTER_SITES= https://github.com/${PORTNAME}-cache/${PORTNAME}/releases/download/${PORTNAME:tu}_${DISTVERSION:S|.|_|g}/
-PATCH_SITES= http://www2.pl.squid-cache.org/%SUBDIR%/ \
- http://www1.il.squid-cache.org/%SUBDIR%/ \
- http://www2.gr.squid-cache.org/%SUBDIR%/ \
- http://ca2.squid-cache.org/%SUBDIR%/ \
- https://www.squid-cache.org/%SUBDIR%/
-PATCH_SITE_SUBDIR= Versions/v6/changesets
-
MAINTAINER= timp87@gmail.com
COMMENT= HTTP Caching Proxy
WWW= https://www.squid-cache.org/ \
@@ -19,7 +11,7 @@ WWW= https://www.squid-cache.org/ \
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= compiler:c++11-lib cpe gmake localbase:ldflags perl5 \
+USES= compiler:c++17-lang cpe gmake localbase:ldflags perl5 \
shebangfix tar:xz
CPE_VENDOR= squid-cache
USE_RC_SUBR= squid
@@ -50,7 +42,7 @@ CONFIGURE_ARGS= --bindir=${PREFIX}/sbin \
CONFLICTS= squid-devel
-SUB_FILES+= pkg-install pkg-message
+SUB_FILES+= 900.squid-rotate-log pkg-install pkg-message
USERS= squid
GROUPS= squid
@@ -64,14 +56,14 @@ PLIST_SUB+= UNLINKD="@comment "
PORTDOCS= ${MYDOCS:T}
PORTEXAMPLES= *
-OPTIONS_DEFINE= ARP_ACL CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI \
+OPTIONS_DEFINE= ARP_ACL CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP \
EXAMPLES FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP \
- ICMP IDENT IPV6 KQUEUE LARGEFILE LAX_HTTP NETTLE SNMP \
- SSL SSL_CRTD STACKTRACES TDB VIA_DB WCCP WCCPV2
+ ICMP IPV6 KQUEUE LARGEFILE LAX_HTTP NETTLE SNMP SSL \
+ SSL_CRTD STACKTRACES TDB VIA_DB WCCP WCCPV2
OPTIONS_DEFAULT= ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF \
FS_AUFS FS_DISKD FS_ROCK GSSAPI_BASE HTCP ICAP ICMP \
- IDENT KQUEUE LARGEFILE LAX_HTTP SNMP SSL SSL_CRTD \
- TP_IPFW VIA_DB WCCP WCCPV2
+ KQUEUE LARGEFILE LAX_HTTP SNMP SSL SSL_CRTD TP_IPFW \
+ VIA_DB WCCP WCCPV2
OPTIONS_GROUP= AUTH
OPTIONS_GROUP_AUTH= AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB AUTH_SQL
OPTIONS_RADIO= FW
@@ -91,7 +83,6 @@ CACHE_DIGESTS_DESC= Use cache digests
DEBUG_DESC= Build with extended debugging support
DELAY_POOLS_DESC= Delay pools (bandwidth limiting)
ECAP_DESC= Loadable content adaptation modules
-ESI_DESC= ESI support
FOLLOW_XFF_DESC= Support for the X-Following-For header
FS_AUFS_DESC= AUFS (threaded-io) support
FS_DISKD_DESC= DISKD storage engine controlled by separate service
@@ -99,7 +90,6 @@ FS_ROCK_DESC= ROCK storage engine
HTCP_DESC= HTCP support
ICAP_DESC= the ICAP client
ICMP_DESC= ICMP pinging and network measurement
-IDENT_DESC= Ident lookups (RFC 931)
KQUEUE_DESC= Kqueue(2) support
LARGEFILE_DESC= Support large (>2GB) cache and log files
LAX_HTTP_DESC= Do not enforce strict HTTP compliance
@@ -134,10 +124,6 @@ DELAY_POOLS_CONFIGURE_ENABLE= delay-pools
ECAP_LIB_DEPENDS= libecap.so:www/libecap
ECAP_USES= pkgconfig:build
ECAP_CONFIGURE_ENABLE= ecap
-ESI_LIB_DEPENDS= libexpat.so:textproc/expat2 \
- libxml2.so:textproc/libxml2
-ESI_CONFIGURE_ENABLE= esi
-ESI_CONFIGURE_WITH= expat xml2
FOLLOW_XFF_CONFIGURE_ENABLE= follow-x-forwarded-for
FS_AUFS_CONFIGURE_WITH= pthreads
# Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS,
@@ -154,12 +140,14 @@ GSSAPI_BASE_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \
.if exists(/usr/libdata/pkgconfig/mit-krb5.pc)
GSSAPI_BASE_CONFIGURE_ON+= --with-mit-krb5=${GSSAPIBASEDIR}
.else
-GSSAPI_BASE_CONFIGURE_ON+= --with-heimdal-krb5=${GSSAPIBASEDIR}
+GSSAPI_BASE_CONFIGURE_ON+= --with-heimdal-krb5=${GSSAPIBASEDIR} \
+ --without-mit-krb5
.endif
GSSAPI_BASE_PLIST_SUB= AUTH_KERB=""
GSSAPI_HEIMDAL_USES= gssapi:heimdal
GSSAPI_HEIMDAL_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \
--with-heimdal-krb5=${GSSAPIBASEDIR} \
+ --without-mit-krb5 \
krb5_config=${GSSAPIBASEDIR}/bin/krb5-config
GSSAPI_HEIMDAL_PLIST_SUB= AUTH_KERB=""
GSSAPI_MIT_USES= gssapi:mit
@@ -167,13 +155,12 @@ GSSAPI_MIT_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \
--with-mit-krb5=${GSSAPIBASEDIR} \
krb5_config=${GSSAPIBASEDIR}/bin/krb5-config
GSSAPI_MIT_PLIST_SUB= AUTH_KERB=""
-GSSAPI_NONE_CONFIGURE_ON= --without-gnugss \
+GSSAPI_NONE_CONFIGURE_ON= --without-gss \
--without-heimdal-krb5 \
--without-mit-krb5
HTCP_CONFIGURE_ENABLE= htcp
ICAP_CONFIGURE_ENABLE= icap-client
ICMP_CONFIGURE_ENABLE= icmp
-IDENT_CONFIGURE_ENABLE= ident-lookups
IPV6_CONFIGURE_ENABLE= ipv6
KQUEUE_CONFIGURE_ENABLE= kqueue
LARGEFILE_CONFIGURE_WITH= large-files
@@ -209,17 +196,14 @@ WCCP_CONFIGURE_ENABLE= wccp
MYDOCS= QUICKSTART README RELEASENOTES.html doc/debug-sections.txt
-change_files= ChangeLog errors/Makefile.am errors/Makefile.in \
- src/auth/basic/SMB_LM/README.html \
- src/Makefile.am src/Makefile.in \
- src/cf_gen.cc src/squid.8.in \
- test-suite/Makefile.in test-suite/Makefile.am \
- tools/Makefile.am tools/Makefile.in
+change_files= ChangeLog errors/Makefile.am errors/Makefile.in src/Makefile.am \
+ src/Makefile.in src/cf_gen.cc src/squid.8.in \
+ test-suite/Makefile.in test-suite/Makefile.am
.include <bsd.port.options.mk>
# Authentication methods and modules:
-BASIC_AUTH+= DB NCSA PAM POP3 RADIUS SMB_LM fake getpwnam
+BASIC_AUTH+= DB NCSA PAM POP3 RADIUS fake getpwnam
DIGEST_AUTH+= file
EXTERNAL_ACL+= file_userip unix_group delayer
@@ -250,7 +234,7 @@ DISKIO_MODULES+= AIO Blocking IpcIo Mmapped
CONFIGURE_ARGS+= --enable-auth-basic="${BASIC_AUTH}" \
--enable-auth-digest="${DIGEST_AUTH}" \
--enable-auth-negotiate="${NEGOTIATE_AUTH}" \
- --enable-auth-ntlm="fake SMB_LM" \
+ --enable-auth-ntlm="fake" \
--enable-disk-io="${DISKIO_MODULES}" \
--enable-external-acl-helpers="${EXTERNAL_ACL}" \
--enable-log-daemon-helpers="file DB" \
@@ -283,10 +267,13 @@ post-patch-IPV6-off:
${WRKSRC}/src/cf.data.pre
post-install:
- @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+ @${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/weekly \
+ ${STAGEDIR}${EXAMPLESDIR} \
+ ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_SCRIPT} ${WRKDIR}/900.squid-rotate-log \
+ ${STAGEDIR}${PREFIX}/etc/periodic/weekly
${INSTALL_DATA} ${WRKSRC}/src/auth/basic/DB/passwd.sql \
${STAGEDIR}${EXAMPLESDIR}
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR})
.include <bsd.port.mk>
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 09166647c4a2..f30455af983d 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1750911454
-SHA256 (squid-6.14.tar.xz) = 9eafe06f58a199b918e79d33d8aa03afb9ae0c11d18974dca0b44c2669cab6dd
-SIZE (squid-6.14.tar.xz) = 2548456
+TIMESTAMP = 1761688531
+SHA256 (squid-7.3.tar.xz) = dadc2a9a3926ce1b3babeaa7a7d7b21cbb089025876daa3f5c19e7eb6391ddcd
+SIZE (squid-7.3.tar.xz) = 2441828
diff --git a/www/squid/files/900.squid-rotate-log.in b/www/squid/files/900.squid-rotate-log.in
new file mode 100644
index 000000000000..cef03437410b
--- /dev/null
+++ b/www/squid/files/900.squid-rotate-log.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# Periodic script to rotate log files each week
+# To enable it, add 'weekly_squid_rotate_log_enable="YES"' to /etc/periodic.conf
+#
+
+if [ -r /etc/defaults/periodic.conf ]
+then
+ . /etc/defaults/periodic.conf
+ source_periodic_confs
+fi
+
+case "$weekly_squid_rotate_log_enable" in
+ [Yy][Ee][Ss])
+ echo ""
+ echo "Rotating Squid's log files:"
+
+ %%PREFIX%%/sbin/squid -k rotate
+ rc=$?
+ ;;
+ *)
+ rc=0
+ ;;
+esac
+
+exit $rc
diff --git a/www/squid/files/patch-configure b/www/squid/files/patch-configure
index 0aa171813c01..ff43b2fabcc3 100644
--- a/www/squid/files/patch-configure
+++ b/www/squid/files/patch-configure
@@ -1,6 +1,44 @@
---- configure.orig 2025-02-01 11:08:28 UTC
+--- configure.orig 2025-10-28 20:25:31 UTC
+++ configure
-@@ -43956,7 +43956,7 @@ BUILD_HELPER="NIS"
+@@ -32420,15 +32420,15 @@ then :
+ with_mit_krb5=yes
+ if test -d "$withval/lib64"
+ then :
+- LIB_KRB5_PATH+="-L$withval/lib64"
++ LIBMIT_KRB5_LIBS="$LIBMIT_KRB5_LIBS -L$withval/lib64"
+ fi
+ if test -d "$withval/lib"
+ then :
+- LIB_KRB5_PATH+="-L$withval/lib"
++ LIBMIT_KRB5_LIBS="$LIBMIT_KRB5_LIBS -L$withval/lib"
+ fi
+ if test -d "$withval/include"
+ then :
+- LIB_KRB5_CFLAGS+="-I$withval/include"
++ LIBMIT_KRB5_CFLAGS="$LIBMIT_KRB5_CFLAGS -I$withval/include"
+ fi
+ ;;
+ esac
+@@ -35530,15 +35530,15 @@ then :
+ with_heimdal_krb5=yes
+ if test -d "$withval/lib64"
+ then :
+- LIBHEIMDAL_KRB5_PATH+="-L$withval/lib64"
++ LIBHEIMDAL_KRB5_LIBS="$LIBHEIMDAL_KRB5_LIBS -L$withval/lib64"
+ fi
+ if test -d "$withval/lib"
+ then :
+- LIBHEIMDAL_KRB5_PATH+="-L$withval/lib"
++ LIBHEIMDAL_KRB5_LIBS="$LIBHEIMDAL_KRB5_LIBS -L$withval/lib"
+ fi
+ if test -d "$withval/include"
+ then :
+- LIBHEIMDAL_KRB5_CFLAGS+="-I$withval/include"
++ LIBHEIMDAL_KRB5_CFLAGS="$LIBHEIMDAL_KRB5_CFLAGS -I$withval/include"
+ fi
+ ;;
+ esac
+@@ -40801,7 +40801,7 @@ BUILD_HELPER="NIS"
##
BUILD_HELPER="NIS"
@@ -9,7 +47,7 @@
do :
as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
-@@ -50825,6 +50825,7 @@ ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type
+@@ -47289,6 +47289,7 @@ ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type
ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type_cpu_set_t" "
#if HAVE_SCHED_H
@@ -17,7 +55,7 @@
#include <sched.h>
#endif
-@@ -53793,6 +53794,7 @@ else $as_nop
+@@ -49806,6 +49807,7 @@ else $as_nop
# include <sys/ioccom.h>
# include <netinet/in.h>
#undef minor_t
diff --git a/www/squid/files/squid.in b/www/squid/files/squid.in
index b1ba8938bf56..e8ea315cc356 100644
--- a/www/squid/files/squid.in
+++ b/www/squid/files/squid.in
@@ -60,16 +60,14 @@ rcvar=squid_enable
# Make sure that we invoke squid with "-f ${squid_conf}"; define this
# variable early so reload_cmd and stop_precmd pick it up:
-# Workaround for https://bugs.squid-cache.org/show_bug.cgi?id=5390 until squid-7 is ported
-#extra_commands="reload configtest"
-#reload_cmd=squid_reload
+extra_commands="reload configtest"
+reload_cmd=squid_reload
start_precmd=squid_prestart
start_postcmd=squid_getpid
-# Workaround for https://bugs.squid-cache.org/show_bug.cgi?id=5390 until squid-7 is ported
-#stop_precmd=squid_prestop
-#configtest_cmd=squid_configtest
-#reload_precmd=squid_configtest
-#restart_precmd=squid_configtest
+stop_precmd=squid_prestop
+configtest_cmd=squid_configtest
+reload_precmd=squid_configtest
+restart_precmd=squid_configtest
# squid(8) will not start if ${squid_conf} is not present so try
# to catch that beforehand via ${required_files} rather than make
@@ -130,8 +128,7 @@ squid_prestart()
return 0
fi
- # Workaround for https://bugs.squid-cache.org/show_bug.cgi?id=5390 until squid-7 is ported
- #squid_configtest
+ squid_configtest
}
squid_reload()
diff --git a/www/squid/pkg-plist b/www/squid/pkg-plist
index 12265ea015bf..6ec146d42c7e 100644
--- a/www/squid/pkg-plist
+++ b/www/squid/pkg-plist
@@ -1,6 +1,5 @@
-sbin/squidclient
+etc/periodic/weekly/900.squid-rotate-log
sbin/squid
-sbin/purge
share/man/man8/url_lfs_rewrite.8.gz
share/man/man8/storeid_file_rewrite.8.gz
share/man/man8/squid.8.gz
@@ -11,21 +10,17 @@ share/man/man8/ext_unix_group_acl.8.gz
share/man/man8/ext_file_userip_acl.8.gz
share/man/man8/ext_delayer_acl.8.gz
share/man/man8/digest_file_auth.8.gz
-share/man/man8/cachemgr.cgi.8.gz
share/man/man8/basic_radius_auth.8.gz
share/man/man8/basic_pop3_auth.8.gz
share/man/man8/basic_pam_auth.8.gz
share/man/man8/basic_ncsa_auth.8.gz
share/man/man8/basic_getpwnam_auth.8.gz
share/man/man8/basic_db_auth.8.gz
-share/man/man1/squidclient.1.gz
-share/man/man1/purge.1.gz
libexec/squid/url_lfs_rewrite
libexec/squid/url_fake_rewrite.sh
libexec/squid/url_fake_rewrite
libexec/squid/storeid_file_rewrite
libexec/squid/security_fake_certverify
-libexec/squid/ntlm_smb_lm_auth
libexec/squid/ntlm_fake_auth
libexec/squid/log_file_daemon
libexec/squid/log_db_daemon
@@ -34,8 +29,6 @@ libexec/squid/ext_unix_group_acl
libexec/squid/ext_file_userip_acl
libexec/squid/ext_delayer_acl
libexec/squid/digest_file_auth
-libexec/squid/cachemgr.cgi
-libexec/squid/basic_smb_lm_auth
libexec/squid/basic_radius_auth
libexec/squid/basic_pop3_auth
libexec/squid/basic_pam_auth
@@ -178,7 +171,6 @@ libexec/squid/basic_db_auth
@sample %%ETCDIR%%/squid.conf.sample
@sample %%ETCDIR%%/mime.conf.sample
@sample %%ETCDIR%%/errorpage.css.sample
-@sample %%ETCDIR%%/cachemgr.conf.sample
@dir(squid,squid,750) /var/squid/cache
@dir(squid,squid,750) /var/squid
@dir(squid,squid,750) /var/run/squid