diff --git a/www/squid/Makefile b/www/squid/Makefile index 5fb52fa5ce30..ef776b412e28 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,297 +1,294 @@ 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 WWW= http://www.squid-cache.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USES= compiler:c++11-lib cpe gmake localbase:ldflags perl5 shebangfix tar:xz CONFLICTS= squid-devel CPE_VENDOR= squid-cache SHEBANG_FILES= scripts/*.pl contrib/*.pl tools/*.pl GNU_CONFIGURE= yes USE_RC_SUBR= squid USERS= squid GROUPS= squid MYDOCS= QUICKSTART README RELEASENOTES.html doc/debug-sections.txt PORTDOCS= ${MYDOCS:T} PORTEXAMPLES= * SUB_FILES+= pkg-install pkg-message OPTIONS_SUB= yes OPTIONS_GROUP= AUTH OPTIONS_RADIO= FW OPTIONS_GROUP_AUTH=AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB AUTH_SQL OPTIONS_RADIO_FW=TP_IPF TP_IPFW TP_PF OPTIONS_DEFINE= ARP_ACL TDB CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI EXAMPLES \ FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 \ KQUEUE LARGEFILE LAX_HTTP NETTLE SNMP SSL SSL_CRTD \ STACKTRACES VIA_DB WCCP WCCPV2 OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT 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 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 AUTH_SASL_VARS= BASIC_AUTH+=SASL 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 DELAY_POOLS_CONFIGURE_ENABLE= delay-pools 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 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 LAX_HTTP_CONFIGURE_ENABLE= http-violations 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" SSL_USES= ssl SSL_CRTD_CONFIGURE_ENABLE= ssl-crtd SSL_CRTD_IMPLIES= SSL STACKTRACES_CONFIGURE_ENABLE= stacktraces STACKTRACES_EXTRA_PATCHES= ${FILESDIR}/extra-patch-gen-stacktrace STACKTRACES_LIB_DEPENDS= libunwind.so:devel/libunwind STACKTRACES_CFLAGS= -g STACKTRACES_LDFLAGS= -lunwind STACKTRACES_VARS= STRIP="" TP_IPFW_CONFIGURE_ENABLE= ipfw-transparent TP_IPF_CONFIGURE_ENABLE= ipf-transparent TP_PF_CONFIGURE_ENABLE= pf-transparent TP_PF_CONFIGURE_WITH= nat-devpf VIA_DB_CONFIGURE_ENABLE= forw-via-db WCCPV2_CONFIGURE_ENABLE= wccpv2 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} \ ${GSSAPI_CONFIGURE_ARGS} \ krb5_config=${GSSAPIBASEDIR}/bin/krb5-config GSSAPI_BASE_PLIST_SUB= AUTH_KERB="" GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_HEIMDAL_CONFIGURE_ON= --with-heimdal-krb5=${GSSAPIBASEDIR} \ ${GSSAPI_CONFIGURE_ARGS} \ krb5_config=${GSSAPIBASEDIR}/bin/krb5-config GSSAPI_HEIMDAL_PLIST_SUB= AUTH_KERB="" GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --with-mit-krb5=${GSSAPIBASEDIR} \ ${GSSAPI_CONFIGURE_ARGS} \ krb5_config=${GSSAPIBASEDIR}/bin/krb5-config GSSAPI_MIT_PLIST_SUB= AUTH_KERB="" ARP_ACL_DESC= ARP/MAC/EUI based authentification AUTH_DESC= Authentication helpers AUTH_LDAP_DESC= Install LDAP authentication helpers AUTH_NIS_DESC= Install NIS/YP authentication helpers AUTH_SASL_DESC= Install SASL authentication helpers AUTH_SMB_DESC= Install SMB auth. helpers (req. Samba) AUTH_SQL_DESC= Install SQL based auth TDB_DESC= TrivialDB support required for session and time quota external helpers 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 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 NETTLE_DESC= Nettle MD5 algorithm support SNMP_DESC= SNMP support SSL_CRTD_DESC= Use ssl_crtd to handle SSL cert requests SSL_DESC= SSL gatewaying support STACKTRACES_DESC= Enable automatic backtraces on fatal errors LAX_HTTP_DESC= Do not enforce strict HTTP compliance TP_IPFW_DESC= Transparent proxying with IPFW TP_IPF_DESC= Transparent proxying with IPFilter TP_PF_DESC= Transparent proxying with PF VIA_DB_DESC= Forward/Via database 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 \ src/Makefile.am \ src/Makefile.in \ src/cf_gen.cc \ src/squid.8.in \ test-suite/Makefile.in \ tools/Makefile.am \ tools/Makefile.in .if !defined(SQUID_CONFIGURE_ARGS) \ || ${SQUID_CONFIGURE_ARGS:M*--disable-unlinkd*} == "" PLIST_SUB+= UNLINKD="" .else PLIST_SUB+= UNLINKD="@comment " .endif CONFIGURE_ARGS= --with-default-user=squid \ --bindir=${PREFIX}/sbin \ --sbindir=${PREFIX}/sbin \ --datadir=${ETCDIR} \ --libexecdir=${PREFIX}/libexec/squid \ --localstatedir=/var \ --sysconfdir=${ETCDIR} \ --with-logdir=/var/log/squid \ --with-pidfile=/var/run/squid/squid.pid \ --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 # 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 # POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too: .if ${PORT_OPTIONS:MAUTH_NIS} && !defined(NO_NIS) && !defined(WITHOUT_NIS) BASIC_AUTH+= NIS .endif # POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too: .if ${PORT_OPTIONS:MGSSAPI_NONE} || defined(NO_KERBEROS) || defined(WITHOUT_KERBEROS) NEGOTIATE_AUTH= none PLIST_SUB+= AUTH_KERB="@comment " .else # The kerberos_ldap_group external helper also depends on LDAP and SASL: # The kerberos_sid_group external helper depends on kerberos_ldap_group meanwhile . if ${PORT_OPTIONS:MAUTH_LDAP} && ${PORT_OPTIONS:MAUTH_SASL} EXTERNAL_ACL+= kerberos_ldap_group kerberos_sid_group . endif NEGOTIATE_AUTH= kerberos wrapper .endif # Storage schemes: STORAGE_SCHEMES+= ufs 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 # Finally, add additional user specified configuration options: CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS} post-patch: @(cd ${WRKSRC} && ${REINPLACE_CMD} \ -e 's|\.conf\.default|.conf.sample|' \ -e 's|)\.default|).sample|' \ ${change_files}) @(cd ${WRKSRC} && ${MV} src/mime.conf.default src/mime.conf.sample) post-patch-IPV6-off: @${REINPLACE_CMD} -E -e's| ::1$$||' -e's| ::1?/128||g' \ -e'/acl localnet src f[ce][08]0::/d' \ -e's| 2001:DB8::[^[:space:]]+$$||' \ -e'/tcp_outgoing_address 2001:db8::/d' \ ${WRKSRC}/src/cf.data.pre post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/src/auth/basic/DB/passwd.sql \ ${STAGEDIR}${EXAMPLESDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR}) .include diff --git a/www/squid/distinfo b/www/squid/distinfo index f1473ce953c9..dbde633e8775 100644 --- a/www/squid/distinfo +++ b/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 diff --git a/www/squid/files/patch-compat_shm.cc b/www/squid/files/patch-compat_shm.cc index c220f4deacc6..f028effdc800 100644 --- a/www/squid/files/patch-compat_shm.cc +++ b/www/squid/files/patch-compat_shm.cc @@ -1,11 +1,11 @@ ---- 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; #else return false; #endif diff --git a/www/squid/files/patch-configure b/www/squid/files/patch-configure index 6fe4b5b2547c..a5f7ac84549b 100644 --- a/www/squid/files/patch-configure +++ b/www/squid/files/patch-configure @@ -1,31 +1,30 @@ ---- 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 #endif -@@ -45611,6 +45614,7 @@ else $as_nop +@@ -54169,6 +54173,7 @@ else $as_nop # include # include #undef minor_t +# include /* IFNAMSIZ */ # include # include # include diff --git a/www/squid/files/patch-include_squid.h b/www/squid/files/patch-include_squid.h index d08de0ff2998..a12c1a52aad6 100644 --- a/www/squid/files/patch-include_squid.h +++ b/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) diff --git a/www/squid/files/patch-src-cf.data.pre b/www/squid/files/patch-src-cf.data.pre index d9f7d1394d23..f6acb5d213c7 100644 --- a/www/squid/files/patch-src-cf.data.pre +++ b/www/squid/files/patch-src-cf.data.pre @@ -1,13 +1,13 @@ ---- 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". + + Note: If you change this setting, you need to set squid_pidfile + in /etc/rc.conf to reflect the new value. Please see + /usr/local/etc/rc.d/squid for details. DOC_END NAME: client_netmask diff --git a/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc b/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc index 9005a0912f7b..4a7a2ab3d1ce 100644 --- a/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc +++ b/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; diff --git a/www/squid/files/patch-src_base_RandomUuid.cc b/www/squid/files/patch-src_base_RandomUuid.cc new file mode 100644 index 000000000000..eba0bfa8ad42 --- /dev/null +++ b/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 + #include + + static_assert(sizeof(RandomUuid) == 128/8, "RandomUuid has RFC 4122-prescribed 128-bit size"); diff --git a/www/squid/files/patch-src_ip_Intercept.cc b/www/squid/files/patch-src_ip_Intercept.cc index bf8d9ad50899..3ca029e6b8ea 100644 --- a/www/squid/files/patch-src_ip_Intercept.cc +++ b/www/squid/files/patch-src_ip_Intercept.cc @@ -1,15 +1,15 @@ ---- 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; debugs(89, warningLevel, "Your IPF (IPFilter) NAT does not support IPv6. Please upgrade it."); - warningLevel = (warningLevel + 1) % 10; + warningLevel = (warningLevel + 1) % 1048576; return false; } newConn->local.getInAddr(natLookup.nl_inip); diff --git a/www/squid/files/patch-src_ipc_mem_Segment.cc b/www/squid/files/patch-src_ipc_mem_Segment.cc index 88431a56aaee..199808b45b69 100644 --- a/www/squid/files/patch-src_ipc_mem_Segment.cc +++ b/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(static_cast(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)); diff --git a/www/squid/files/patch-src_tools.cc b/www/squid/files/patch-src_tools.cc index 155d8d84dcaf..ad2a99c6df01 100644 --- a/www/squid/files/patch-src_tools.cc +++ b/www/squid/files/patch-src_tools.cc @@ -1,11 +1,11 @@ ---- 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"); - if (setuid(0) < 0) { + if (setuid(0) < 0 && TheProcessKind != pkHelper) { int xerrno = errno; debugs(50, DBG_IMPORTANT, "WARNING: no_suid: setuid(0): " << xstrerr(xerrno)); } diff --git a/www/squid/files/pkg-message.in b/www/squid/files/pkg-message.in index 739ae1433c57..4b78eb8e599d 100644 --- a/www/squid/files/pkg-message.in +++ b/www/squid/files/pkg-message.in @@ -1,53 +1,56 @@ [ { type: install message: <