if someone is using squid and wants to make sure that their use case
will still be OK with 7.x (there has been quite a lot of clean-up),
here's a ports diff to update to the beta release 7.0.1 to test.

: Major features dropped:
: 
:  * Edge Side Include (ESI): no longer used widely enough to justify
:    the ongoing effort of maintaining it
:  * ident protocol: an insecure relic of earlier Internet days
:  * cache_object protocol support: replaced by HTTP and the well-known
:    URL prefix /squid-internal-mgr/
:  * 'cachemgr.cgi', 'purge' and 'squidclient' tools: their functions can
:    now be implemented using standard HTTP clients such as curl

https://github.com/squid-cache/squid/releases/tag/SQUID_7_0_1

(if you have a custom log format based on the old default, it will
need updating to replace %[ui, probably with -, otherwise squid won't
start).

Index: Makefile
===================================================================
RCS file: /cvs/ports/www/squid/Makefile,v
diff -u -p -r1.276 Makefile
--- Makefile    24 Feb 2025 12:24:49 -0000      1.276
+++ Makefile    25 Feb 2025 16:36:03 -0000
@@ -1,13 +1,11 @@
 COMMENT-main=  WWW and FTP proxy cache and accelerator
 COMMENT-ldap=  LDAP authentication/ACL support for Squid
 
-V=             6.13
+V=             7.0.1
 DISTNAME=      squid-$V
 EXTRACT_SUFX=  .tar.xz
 DPB_PROPERTIES=        parallel
 
-REVISION=      0
-
 # subpackages aren't flavoured, so overwrite the default name/path
 FULLPKGNAME-ldap= squid-ldap-$V
 FULLPKGPATH-ldap= ${PKGPATH},-ldap
@@ -22,10 +20,10 @@ HOMEPAGE=   https://www.squid-cache.org/
 # GPLv2+
 PERMIT_PACKAGE=        Yes
 
-COMMONLIB=     ${COMPILER_LIBCXX} c execinfo gmp gnutls hogweed iconv \
-               idn2 intl m nettle p11-kit pthread ssl tasn1 unistring
+WANTLIB-main=  ${COMPILER_LIBCXX} c crypto execinfo gmp gnutls hogweed \
+               iconv idn2 intl m nettle p11-kit pthread ssl tasn1 tdb unistring
 
-SITES=         
https://github.com/squid-cache/squid/releases/download/SQUID_${V:S/./_/}/
+SITES=         
https://github.com/squid-cache/squid/releases/download/SQUID_${V:S/./_/g}/
 
 # C++17
 COMPILER=      base-clang ports-gcc
@@ -47,8 +45,6 @@ CONFIGURE_ARGS=       --disable-strict-error-c
 EXTERNAL_ACL=  SQL_session file_userip time_quota \
                unix_group
 
-WANTLIB-main +=        ${COMMONLIB} crypto tdb
-
 LIB_DEPENDS-main += \
                databases/tdb \
                devel/gettext,-runtime \
@@ -131,9 +127,9 @@ CONFIGURE_ARGS+= --with-krb5-config=no
 .if ${BUILD_PACKAGES:M-ldap}
 EXTERNAL_ACL+= LDAP_group eDirectory_userip
 .endif
-LIB_DEPENDS-ldap=   databases/openldap \
-                   security/gnutls
-WANTLIB-ldap +=     ${COMMONLIB} crypto lber ldap sasl2 ssl
+LIB_DEPENDS-ldap=   databases/openldap
+WANTLIB-ldap=  ${COMPILER_LIBCXX} c crypto execinfo lber ldap \
+               m nettle sasl2 ssl
 
 post-install:
        rm -rf ${WRKINST}/var/squid
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/squid/distinfo,v
diff -u -p -r1.126 distinfo
--- distinfo    4 Feb 2025 12:06:57 -0000       1.126
+++ distinfo    25 Feb 2025 16:36:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (squid-6.13.tar.xz) = Iy4FZ5RszAEVZTw8GPAeg/LZzEnEPZ3q2LMZrws1rVI=
-SIZE (squid-6.13.tar.xz) = 2548680
+SHA256 (squid-7.0.1.tar.xz) = Bw3Y5iGtItRdcAYF6xnSysG2zae3PwTzRXjTw/2N35s=
+SIZE (squid-7.0.1.tar.xz) = 2475692
Index: patches/patch-src_comm_cc
===================================================================
RCS file: /cvs/ports/www/squid/patches/patch-src_comm_cc,v
diff -u -p -r1.5 patch-src_comm_cc
--- patches/patch-src_comm_cc   25 Feb 2025 15:19:26 -0000      1.5
+++ patches/patch-src_comm_cc   25 Feb 2025 16:36:03 -0000
@@ -8,7 +8,7 @@ the default for SOCK_DGRAM to 8k).
 Index: src/comm.cc
 --- src/comm.cc.orig
 +++ src/comm.cc
-@@ -1715,6 +1715,8 @@ comm_open_uds(int sock_type,
+@@ -1697,6 +1697,8 @@ comm_open_uds(int sock_type,
      // TODO: merge with comm_openex() when Ip::Address becomes NetAddress
  
      int new_socket;
@@ -17,7 +17,7 @@ Index: src/comm.cc
  
      /* Create socket for accepting new connections. */
      ++ statCounter.syscalls.sock.sockets;
-@@ -1745,6 +1747,20 @@ comm_open_uds(int sock_type,
+@@ -1727,6 +1729,20 @@ comm_open_uds(int sock_type,
              debugs(50, DBG_CRITICAL, MYNAME << "socket failure: " << 
xstrerr(xerrno));
          }
          return -1;
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/www/squid/pkg/PLIST-main,v
diff -u -p -r1.21 PLIST-main
--- pkg/PLIST-main      9 Apr 2024 15:00:58 -0000       1.21
+++ pkg/PLIST-main      25 Feb 2025 16:36:03 -0000
@@ -11,8 +11,6 @@
 @extraunexec rm -rf ${LOCALSTATEDIR}/run/squid/*
 @rcscript ${RCDIR}/squid
 %%krb5%%
-@bin bin/purge
-@bin bin/squidclient
 libexec/squid/
 libexec/squid/basic_db_auth
 @bin libexec/squid/basic_fake_auth
@@ -21,7 +19,6 @@ libexec/squid/basic_pop3_auth
 @bin libexec/squid/basic_radius_auth
 @bin libexec/squid/basic_smb_auth
 libexec/squid/basic_smb_auth.sh
-@bin libexec/squid/cachemgr.cgi
 @bin libexec/squid/digest_file_auth
 @bin libexec/squid/diskd
 @bin libexec/squid/ext_file_userip_acl
@@ -40,13 +37,10 @@ libexec/squid/storeid_file_rewrite
 @bin libexec/squid/url_fake_rewrite
 libexec/squid/url_fake_rewrite.sh
 libexec/squid/url_lfs_rewrite
-@man man/man1/purge.1
-@man man/man1/squidclient.1
 @man man/man8/basic_db_auth.8
 @man man/man8/basic_ncsa_auth.8
 @man man/man8/basic_pop3_auth.8
 @man man/man8/basic_radius_auth.8
-@man man/man8/cachemgr.cgi.8
 @man man/man8/digest_file_auth.8
 @man man/man8/ext_file_userip_acl.8
 @man man/man8/ext_sql_session_acl.8
@@ -65,8 +59,6 @@ share/examples/login.conf.d/squid
 @sample /etc/login.conf.d/squid
 share/examples/squid/
 @sample ${SYSCONFDIR}/
-share/examples/squid/cachemgr.conf.default
-@sample ${SYSCONFDIR}/cachemgr.conf
 @mode 775
 @owner _squid
 @group _squid

Reply via email to