www/squid: update to 6.3

Error message translation files are now part of www/squid-langpack.

Changelog: http://www.squid-cache.org/Versions/v6/squid-6.3-RELEASENOTES.html

PR:		272524

www/squid/Makefile

@@ -1,20 +1,20 @@
 PORTNAME=	squid
-DISTVERSION=	5.9
+DISTVERSION=	6.3
 CATEGORIES=	www
-MASTER_SITES=	http://www2.pl.squid-cache.org/Versions/v5/ \
-		http://www1.il.squid-cache.org/Versions/v5/ \
-		http://www1.jp.squid-cache.org/Versions/v5/ \
-		http://www2.gr.squid-cache.org/Versions/v5/ \
-		http://ca2.squid-cache.org/Versions/v5/ \
-		http://www.squid-cache.org/Versions/v5/
+MASTER_SITES=	http://www2.pl.squid-cache.org/Versions/v6/ \
+		http://www1.il.squid-cache.org/Versions/v6/ \
+		http://www1.jp.squid-cache.org/Versions/v6/ \
+		http://www2.gr.squid-cache.org/Versions/v6/ \
+		http://ca2.squid-cache.org/Versions/v6/ \
+		http://www.squid-cache.org/Versions/v6/
 
 PATCH_SITES=	http://www2.pl.squid-cache.org/%SUBDIR%/ \
 		http://www1.il.squid-cache.org/%SUBDIR%/ \
 		http://www1.jp.squid-cache.org/%SUBDIR%/ \
 		http://www2.gr.squid-cache.org/%SUBDIR%/ \
 		http://ca2.squid-cache.org/%SUBDIR%/ \
 		http://www.squid-cache.org/%SUBDIR%/
-PATCH_SITE_SUBDIR=	Versions/v5/changesets
+PATCH_SITE_SUBDIR=	Versions/v6/changesets
 
 MAINTAINER=	timp87@gmail.com
 COMMENT=	HTTP Caching Proxy
@@ -58,6 +58,7 @@ OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \
 		WCCPV2
 
 ARP_ACL_CONFIGURE_ENABLE=	eui
+AUTH_LDAP_CONFIGURE_WITH=	ldap
 AUTH_LDAP_USES=			ldap
 AUTH_LDAP_VARS=			BASIC_AUTH+=LDAP DIGEST_AUTH+="eDirectory LDAP" EXTERNAL_ACL+="LDAP_group eDirectory_userip"
 AUTH_SASL_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
@@ -66,7 +67,7 @@ AUTH_SMB_USES=			samba:run
 AUTH_SMB_VARS=			BASIC_AUTH+=SMB EXTERNAL_ACL+=wbinfo_group
 AUTH_SQL_RUN_DEPENDS=		p5-DBI>=1.08:databases/p5-DBI
 AUTH_SQL_VARS=			EXTERNAL_ACL+=SQL_session
-TDB_CONFIGURE_ENABLE=		tdb
+TDB_CONFIGURE_WITH=		tdb
 TDB_LIB_DEPENDS=		libtdb.so:databases/tdb
 TDB_VARS=			EXTERNAL_ACL+="time_quota session"
 CACHE_DIGESTS_CONFIGURE_ENABLE=	cache-digests
@@ -75,6 +76,7 @@ ECAP_CONFIGURE_ENABLE=		ecap
 ECAP_LIB_DEPENDS=		libecap.so:www/libecap
 ECAP_USES=			pkgconfig:build
 ESI_CONFIGURE_ENABLE=		esi
+ESI_CONFIGURE_WITH=		expat xml2
 ESI_LIB_DEPENDS=		libexpat.so:textproc/expat2 \
 				libxml2.so:textproc/libxml2
 FOLLOW_XFF_CONFIGURE_ENABLE=	follow-x-forwarded-for
@@ -90,14 +92,14 @@ FS_AUFS_VARS=			STORAGE_SCHEMES+=aufs DISKIO_MODULES+=DiskThreads
 # Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS,
 # e.g. SQUID_CONFIGURE_ARGS=--with-aufs-threads=N
 FS_AUFS_LDFLAGS=		-pthread
-FS_AUFS_CONFIGURE_OFF=		--without-pthreads
+FS_AUFS_CONFIGURE_WITH=		pthreads
 FS_DISKD_VARS=			STORAGE_SCHEMES+=diskd DISKIO_MODULES+=DiskDaemon
 FS_ROCK_VARS=			STORAGE_SCHEMES+=rock
 NETTLE_LIB_DEPENDS=		libnettle.so:security/nettle
-NETTLE_CONFIGURE_OFF=		--without-nettle
+NETTLE_CONFIGURE_WITH=		nettle
 SNMP_CONFIGURE_ENABLE=		snmp
 SSL_CONFIGURE_ENABLE=		ssl
-SSL_CONFIGURE_ON=		--with-openssl=${OPENSSLBASE} \
+SSL_CONFIGURE_ON=		--with-openssl \
 				--enable-security-cert-generators="file" \
 				LIBOPENSSL_CFLAGS=-I${OPENSSLINC} \
 				LIBOPENSSL_LIBS="-lcrypto -lssl"
@@ -120,7 +122,7 @@ WCCP_CONFIGURE_ENABLE=		wccp
 
 GSSAPI_NONE_CONFIGURE_ON=	--without-heimdal-krb5 \
 				--without-mit-krb5 \
-				--without-gss
+				--without-gnugss
 
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_BASE_CONFIGURE_ON=	--with-heimdal-krb5=${GSSAPIBASEDIR} \
@@ -177,8 +179,6 @@ WCCPV2_DESC=		Web Cache Coordination Protocol v2
 WCCP_DESC=		Web Cache Coordination Protocol
 
 change_files=	ChangeLog \
-		contrib/nextstep/makepkg \
-		contrib/nextstep/post_install \
 		errors/Makefile.am \
 		errors/Makefile.in \
 		src/auth/basic/SMB_LM/README.html \
@@ -209,23 +209,20 @@ CONFIGURE_ARGS=	--with-default-user=squid \
 		--with-swapdir=/var/squid/cache \
 		--without-gnutls \
 		--with-included-ltdl \
-		--enable-auth \
-		--enable-zph-qos \
 		--enable-build-info \
-		--enable-loadable-modules \
 		--enable-removal-policies="lru heap" \
 		--disable-epoll \
-		--disable-linux-netfilter \
-		--disable-linux-tproxy \
-		--disable-translation \
 		--disable-arch-native \
-		--disable-strict-error-checking
+		--disable-strict-error-checking \
+		--without-systemd \
+		--without-netfilter-conntrack \
+		--without-cap
 
 .include <bsd.port.options.mk>
 
 # Authentication methods and modules:
 
-BASIC_AUTH+=	DB SMB_LM NCSA PAM POP3 RADIUS fake getpwnam
+BASIC_AUTH+=	DB NCSA PAM POP3 RADIUS SMB_LM fake getpwnam
 DIGEST_AUTH+=	file
 EXTERNAL_ACL+=	file_userip unix_group delayer
 
@@ -253,20 +250,20 @@ DISKIO_MODULES+=	AIO Blocking IpcIo Mmapped
 
 CONFIGURE_ARGS+=	--enable-auth-basic="${BASIC_AUTH}" \
 			--enable-auth-digest="${DIGEST_AUTH}" \
-			--enable-external-acl-helpers="${EXTERNAL_ACL}" \
 			--enable-auth-negotiate="${NEGOTIATE_AUTH}" \
 			--enable-auth-ntlm="fake SMB_LM" \
-			--enable-storeio="${STORAGE_SCHEMES}" \
-			--enable-disk-io="${DISKIO_MODULES}" \
 			--enable-log-daemon-helpers="file DB" \
+			--enable-external-acl-helpers="${EXTERNAL_ACL}" \
 			--enable-url-rewrite-helpers="fake LFS" \
+			--enable-security-cert-validators="fake" \
 			--enable-storeid-rewrite-helpers="file" \
-			--enable-security-cert-validators="fake"
+			--enable-storeio="${STORAGE_SCHEMES}" \
+			--enable-disk-io="${DISKIO_MODULES}" \
 
 # Other options set via 'make config':
 
 .if ${PORT_OPTIONS:MDEBUG} || defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--disable-optimizations --enable-debug-cbdata
+CONFIGURE_ARGS+=	--disable-optimizations
 WITH_DEBUG?=		yes
 .endif
 

www/squid/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1685219517
-SHA256 (squid-5.9.tar.xz) = 3fe5c2007da2757446af91b6ef974f154b208120a9a39396ea681e5c4abb04b5
-SIZE (squid-5.9.tar.xz) = 2569204
+TIMESTAMP = 1696273281
+SHA256 (squid-6.3.tar.xz) = 74a0f5586a7a5d89573d502708d5e1d66ddf0430cf4802cc7261b765653248fa
+SIZE (squid-6.3.tar.xz) = 2547264

www/squid/files/patch-compat_shm.cc

@@ -1,8 +1,8 @@
---- compat/shm.cc.orig	2016-12-16 10:06:20 UTC
+--- compat/shm.cc.orig	2023-02-28 09:10:25 UTC
 +++ compat/shm.cc
 @@ -29,6 +29,8 @@ shm_portable_segment_name_is_path()
      size_t len = sizeof(jailed);
-     ::sysctlbyname("security.jail.jailed", &jailed, &len, NULL, 0);
+     ::sysctlbyname("security.jail.jailed", &jailed, &len, nullptr, 0);
      return !jailed;
 +#elif defined (__DragonFly__)
 +    return true;

www/squid/files/patch-configure

@@ -1,27 +1,26 @@
---- configure.orig	2021-12-07 14:11:12 UTC
+--- configure.orig	2023-02-28 09:24:52 UTC
 +++ configure
-@@ -36683,8 +36683,10 @@ then :
- #define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
+@@ -44124,7 +44124,10 @@ _ACEOF
+
+ else $as_nop
 
--else $as_nop
 -  BUILD_HELPER=""
 +# XXX: On FreeBSD we have to do this to make NIS work
 +# until https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=188247
 +# is resolved.
 +  BUILD_HELPER="NIS"
+
  fi
 
- done
-@@ -42604,6 +42606,7 @@ fi
+@@ -50983,6 +50986,7 @@ fi
 
  ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type_cpu_set_t" "
  #if HAVE_SCHED_H
 +#define _WITH_CPU_SET_T
  #include <sched.h>
  #endif
 
-@@ -45611,6 +45614,7 @@ else $as_nop
+@@ -54169,6 +54173,7 @@ else $as_nop
  #       include <sys/ioccom.h>
  #       include <netinet/in.h>
  #undef minor_t

www/squid/files/patch-include_squid.h

@@ -1,10 +1,10 @@
---- include/squid.h.orig	2021-12-07 14:15:52 UTC
+--- include/squid.h.orig	2023-02-28 09:10:25 UTC
 +++ include/squid.h
 @@ -9,6 +9,7 @@
  #ifndef SQUID_CONFIG_H
  #define SQUID_CONFIG_H
 
 +#define _WITH_CPU_SET_T
  #include "autoconf.h"       /* For GNU autoconf variables */
+ #include "version.h"
  
- #if !defined(HAVE_SQUID)

www/squid/files/patch-src-cf.data.pre

@@ -1,6 +1,6 @@
---- src/cf.data.pre.orig	2021-12-07 14:15:52 UTC
+--- src/cf.data.pre.orig	2023-02-28 09:10:25 UTC
 +++ src/cf.data.pre
-@@ -5354,6 +5354,10 @@ DEFAULT: @DEFAULT_PID_FILE@
+@@ -5507,6 +5507,10 @@ DEFAULT: @DEFAULT_PID_FILE@
  LOC: Config.pidFilename
  DOC_START
  	A filename to write the process-id to.  To disable, enter "none".

www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc

@@ -1,11 +1,11 @@
---- src/DiskIO/Mmapped/MmappedFile.cc.orig	2016-12-16 10:06:20 UTC
+--- src/DiskIO/Mmapped/MmappedFile.cc.orig	2023-02-28 09:10:25 UTC
 +++ src/DiskIO/Mmapped/MmappedFile.cc
 @@ -236,7 +236,7 @@ Mmapping::map()
      static const int pageSize = getpagesize();
      delta = offset % pageSize;
 
--    buf = mmap(NULL, length + delta, prot, flags, fd, offset - delta);
-+    buf = mmap(NULL, length + delta, prot, flags | MAP_NOSYNC, fd, offset - delta);
+-    buf = mmap(nullptr, length + delta, prot, flags, fd, offset - delta);
++    buf = mmap(nullptr, length + delta, prot, flags | MAP_NOSYNC, fd, offset - delta);
 
      if (buf == MAP_FAILED) {
          const int errNo = errno;

www/squid/files/patch-src_base_RandomUuid.cc

@@ -0,0 +1,10 @@
+--- src/base/RandomUuid.cc.orig	2023-02-28 09:10:25 UTC
++++ src/base/RandomUuid.cc
+@@ -13,6 +13,7 @@
+ #include "base/TextException.h"
+ #include "defines.h"
+
++#include <netinet/in.h>
+ #include <iostream>
+
+ static_assert(sizeof(RandomUuid) == 128/8, "RandomUuid has RFC 4122-prescribed 128-bit size");

www/squid/files/patch-src_ip_Intercept.cc

@@ -1,9 +1,9 @@
---- src/ip/Intercept.cc.orig	2021-12-07 14:15:52 UTC
+--- src/ip/Intercept.cc.orig	2023-02-28 09:10:25 UTC
 +++ src/ip/Intercept.cc
-@@ -211,10 +211,10 @@ Ip::Intercept::IpfInterception(const Comm::ConnectionP
+@@ -217,10 +217,10 @@ Ip::Intercept::IpfInterception(const Comm::ConnectionP
          newConn->remote.getInAddr(natLookup.nl_outipaddr.in4);
      }
- #else
+ #else /* HAVE_STRUCT_NATLOOKUP_NL_INIPADDR_IN6 */
 -        // warn once every 10 at critical level, then push down a level each repeated event
 +        // warn once every million at critical level, then push down a level each repeated event
          static int warningLevel = DBG_CRITICAL;

www/squid/files/patch-src_ipc_mem_Segment.cc

@@ -1,11 +1,12 @@
---- src/ipc/mem/Segment.cc.orig	2016-12-16 10:06:20 UTC
+-- src/ipc/mem/Segment.cc.orig	2023-03-08 18:21:44.707065000 -0700
+--- src/ipc/mem/Segment.cc.orig	2023-02-28 09:10:25 UTC
 +++ src/ipc/mem/Segment.cc
-@@ -173,7 +173,7 @@ Ipc::Mem::Segment::attach()
+@@ -174,7 +174,7 @@ Ipc::Mem::Segment::attach()
      assert(theSize == static_cast<off_t>(static_cast<size_t>(theSize)));
 
      void *const p =
--        mmap(NULL, theSize, PROT_READ | PROT_WRITE, MAP_SHARED, theFD, 0);
-+        mmap(NULL, theSize, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_NOSYNC, theFD, 0);
+-        mmap(nullptr, theSize, PROT_READ | PROT_WRITE, MAP_SHARED, theFD, 0);
++        mmap(nullptr, theSize, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_NOSYNC, theFD, 0);
      if (p == MAP_FAILED) {
          int xerrno = errno;
          debugs(54, 5, "mmap " << theName << ": " << xstrerr(xerrno));

www/squid/files/patch-src_tools.cc

@@ -1,6 +1,6 @@
---- src/tools.cc.orig	2021-12-07 14:15:52 UTC
+--- src/tools.cc.orig	2023-02-28 09:10:25 UTC
 +++ src/tools.cc
-@@ -608,7 +608,7 @@ no_suid(void)
+@@ -650,7 +650,7 @@ no_suid(void)
      uid = geteuid();
      debugs(21, 3, "no_suid: PID " << getpid() << " giving up root privileges forever");
 

www/squid/files/pkg-message.in

@@ -22,6 +22,9 @@
          kern.ipc.msgssz=64
          kern.ipc.msgtql=2048
 
+     o The pre-translated error pages are no longer included into the port.
+       If you need them install www/squid-langpack port as well.
+
      o The default configuration will deny everyone but the local host and
        local networks as defined in RFC 1918 for IPv4 and RFCs 4193 and
        4291 for IPv6 access to the proxy service.  Edit the "http_access