Index: head/www/squid-devel/Makefile =================================================================== --- head/www/squid-devel/Makefile (revision 473032) +++ head/www/squid-devel/Makefile (revision 473033) @@ -1,315 +1,313 @@ # $FreeBSD$ PORTNAME= squid -PORTVERSION= 4.0.24 +PORTVERSION= 4.0.25 CATEGORIES= www ipv6 MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \ http://www2.us.squid-cache.org/Versions/v4/ \ http://www1.at.squid-cache.org/Versions/v4/ \ http://www.eu.squid-cache.org/Versions/v4/ \ http://www1.jp.squid-cache.org/Versions/v4/ PKGNAMESUFFIX= -devel DIST_SUBDIR= squid${PORTVERSION:R} PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ http://www2.us.squid-cache.org/%SUBDIR%/ \ http://www1.at.squid-cache.org/%SUBDIR%/ \ http://www.eu.squid-cache.org/%SUBDIR%/ \ http://www1.jp.squid-cache.org/%SUBDIR%/ \ http://master.squid-cache.org/~amosjeffries/patches/:nosid PATCH_SITE_SUBDIR= Versions/v4/changesets MAINTAINER= timp87@gmail.com COMMENT= HTTP Caching Proxy LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_powerpc64= fails to link: ext_time_quota_acl.cc: undefined reference to std::ctype CONFLICTS= squid*-3.* USES= compiler:c++11-lib cpe perl5 shebangfix tar:xz 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 BDB 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 PCRE 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 PCRE SNMP SSL SSL_CRTD TP_IPFW VIA_DB WCCP \ WCCPV2 ARP_ACL_CONFIGURE_ENABLE= eui AUTH_LDAP_CFLAGS= -I${LOCALBASE}/include AUTH_LDAP_LDFLAGS= -L${LOCALBASE}/lib AUTH_LDAP_USE= OPENLDAP=yes AUTH_LDAP_VARS= BASIC_AUTH+=LDAP EXTERNAL_ACL+=LDAP_group AUTH_SASL_CFLAGS= -I${LOCALBASE}/include AUTH_SASL_CPPFLAGS= -I${LOCALBASE}/include AUTH_SASL_LDFLAGS= -L${LOCALBASE}/lib 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 BDB_USES= bdb CACHE_DIGESTS_CONFIGURE_ENABLE= cache-digests DELAY_POOLS_CONFIGURE_ENABLE= delay-pools ECAP_CFLAGS= -I${LOCALBASE}/include ECAP_CONFIGURE_ENABLE= ecap ECAP_LDFLAGS= -L${LOCALBASE}/lib ECAP_LIB_DEPENDS= libecap.so:www/libecap ECAP_USES= pkgconfig:build ESI_CFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2 ESI_CONFIGURE_ENABLE= esi ESI_LDFLAGS= -L${LOCALBASE}/lib 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_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 PCRE_LIB_DEPENDS= libpcre.so:devel/pcre PCRE_CPPFLAGS= -I${LOCALBASE}/include PCRE_LDFLAGS= -L${LOCALBASE}/lib -lpcreposix -lpcre SNMP_CONFIGURE_ENABLE= snmp SSL_CONFIGURE_ENABLE= ssl SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} \ --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_CONFIGURE_ON= --disable-strict-error-checking STACKTRACES_CFLAGS= -g STACKTRACES_LDFLAGS= -lunwind -L${LOCALBASE}/lib 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 GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_BASE_PLIST_SUB= AUTH_KERB="" -# Make it build on FreeBSD < 10 -GSSAPI_BASE_EXTRA_PATCHES= ${FILESDIR}/extra-patch-build-8-9 GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_HEIMDAL_CONFIGURE_ON= --with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_HEIMDAL_PLIST_SUB= AUTH_KERB="" GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --with-mit-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} 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 BDB_DESC= Berkeley DB 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 \ --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 .include # Authentication methods and modules: BASIC_AUTH+= DB SMB_LM NCSA PAM POP3 RADIUS fake getpwnam EXTERNAL_ACL+= file_userip unix_group # 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: . if ${PORT_OPTIONS:MAUTH_LDAP} && ${PORT_OPTIONS:MAUTH_SASL} EXTERNAL_ACL+= kerberos_ldap_group . endif NEGOTIATE_AUTH= kerberos wrapper .endif # The session and time_quota external helpers require Berkeley DB support: .if ${PORT_OPTIONS:MBDB} CPPFLAGS+= -I${BDB_INCLUDE_DIR} LDFLAGS+= -L${BDB_LIB_DIR} EXTERNAL_ACL+= time_quota session .endif # Storage schemes: STORAGE_SCHEMES+= ufs DISKIO_MODULES+= AIO Blocking IpcIo Mmapped CONFIGURE_ARGS+= --enable-auth-basic="${BASIC_AUTH}" \ --enable-auth-digest="file" \ --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" \ --enable-url-rewrite-helpers="fake" \ --enable-storeid-rewrite-helpers="file" \ --enable-security-cert-validators="fake" # Other options set via 'make config': .if ${PORT_OPTIONS:MDEBUG} || defined(WITH_DEBUG) CONFIGURE_ARGS+= --disable-optimizations --enable-debug-cbdata WITH_DEBUG?= yes .endif # Finally, add additional user specified configuration options: CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS} post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/src/cf.data.pre @(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's/ ::1//' -e's/ fc00::\/7//' \ -e's/ fe80::\/10//' -e's/ 2001:DB8::2//' \ -e's/ 2001:DB8::a:0\/64//' \ -e'/tcp_outgoing_address 2001:db8::c001 good_service_net/d' \ -e'/tcp_outgoing_address 2001:db8::beef normal_service_net/d' \ -e'/tcp_outgoing_address 2001:db8::1/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 Index: head/www/squid-devel/distinfo =================================================================== --- head/www/squid-devel/distinfo (revision 473032) +++ head/www/squid-devel/distinfo (revision 473033) @@ -1,3 +1,3 @@ TIMESTAMP = 1522445865 -SHA256 (squid4.0/squid-4.0.24.tar.xz) = 091da0d763307dcc0f5c784ab07ea0c5a093f6dfac60f17ff26e2a6d50f76a07 -SIZE (squid4.0/squid-4.0.24.tar.xz) = 2420076 +SHA256 (squid4.0/squid-4.0.25.tar.xz) = f70dc75148895c3cc0d232596fee0eb346d92f5457c7180d493f133410c2d626 +SIZE (squid4.0/squid-4.0.25.tar.xz) = 2424644 Index: head/www/squid-devel/files/patch-src__ip__Intercept.cc =================================================================== --- head/www/squid-devel/files/patch-src__ip__Intercept.cc (revision 473032) +++ head/www/squid-devel/files/patch-src__ip__Intercept.cc (nonexistent) @@ -1,15 +0,0 @@ ---- src/ip/Intercept.cc.orig 2016-12-16 10:06:20 UTC -+++ src/ip/Intercept.cc -@@ -206,10 +206,10 @@ Ip::Intercept::IpfInterception(const Com - // for NAT lookup set local and remote IP:port's - if (newConn->remote.isIPv6()) { - #if IPFILTER_VERSION < 5000003 -- // 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, "IPF (IPFilter v4) NAT does not support IPv6. Please upgrade to IPFilter v5.1"); -- warningLevel = (warningLevel + 1) % 10; -+ warningLevel = (warningLevel + 1) % 1048576; - return false; - } - newConn->local.getInAddr(natLookup.nl_inip); Property changes on: head/www/squid-devel/files/patch-src__ip__Intercept.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/squid-devel/files/extra-patch-build-8-9 =================================================================== --- head/www/squid-devel/files/extra-patch-build-8-9 (revision 473032) +++ head/www/squid-devel/files/extra-patch-build-8-9 (nonexistent) @@ -1,11 +0,0 @@ ---- src/auth/negotiate/kerberos/negotiate_kerberos.h.orig 2015-08-01 06:08:17 UTC -+++ src/auth/negotiate/kerberos/negotiate_kerberos.h -@@ -140,7 +140,7 @@ int check_gss_err(OM_uint32 major_status - - char *gethost_name(void); - --#if (HAVE_GSSKRB5_EXTRACT_AUTHZ_DATA_FROM_SEC_CONTEXT || HAVE_GSS_MAP_NAME_TO_ANY) && HAVE_KRB5_PAC -+#if (HAVE_GSSKRB5_EXTRACT_AUTHZ_DATA_FROM_SEC_CONTEXT || HAVE_GSS_MAP_NAME_TO_ANY) && HAVE_KRB5_PAC && __FreeBSD__ >= 10 - #define HAVE_PAC_SUPPORT 1 - #define MAX_PAC_GROUP_SIZE 200*60 - typedef struct { Property changes on: head/www/squid-devel/files/extra-patch-build-8-9 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/squid-devel/files/patch-configure =================================================================== --- head/www/squid-devel/files/patch-configure (revision 473032) +++ head/www/squid-devel/files/patch-configure (revision 473033) @@ -1,82 +1,82 @@ ---- configure.orig 2016-12-16 10:19:31 UTC +--- configure.orig 2018-06-11 16:48:04 UTC +++ configure -@@ -33043,7 +33043,7 @@ done +@@ -34345,7 +34345,7 @@ done ## BUILD_HELPER="NIS" -for ac_header in sys/types.h rpc/rpc.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h crypt.h +for ac_header in sys/types.h rpc/rpc.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h rpcsvc/crypt.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " -@@ -33058,8 +33058,10 @@ if eval test \"x\$"$as_ac_Header"\" = x" +@@ -34360,8 +34360,10 @@ if eval test \"x\$"$as_ac_Header"\" = x" #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -else - 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 -@@ -33532,7 +33534,7 @@ done +@@ -34834,7 +34836,7 @@ done # unconditionally requires crypt(3), for now if test "x$ac_cv_func_crypt" != "x"; then - for ac_header in unistd.h crypt.h shadow.h + for ac_header in unistd.h rpcsvc/crypt.h shadow.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -@@ -35882,7 +35884,7 @@ for ac_header in \ +@@ -37226,7 +37228,7 @@ for ac_header in \ arpa/nameser.h \ assert.h \ bstring.h \ - crypt.h \ + rpcsvc/crypt.h \ ctype.h \ direct.h \ errno.h \ -@@ -36092,6 +36094,7 @@ ac_fn_cxx_check_header_compile "$LINENO" +@@ -37434,6 +37436,7 @@ ac_fn_cxx_check_header_compile "$LINENO" #include #endif #if HAVE_NETINET_IP_COMPAT_H +#include /* IFNAMSIZ */ #include #endif #if HAVE_NETINET_IP_FIL_H -@@ -40315,6 +40318,7 @@ if test "x$enable_ipf_transparent" != "x +@@ -41450,6 +41453,7 @@ if test "x$enable_ipf_transparent" != "x # include # include +# include /* IFNAMSIZ */ # include # include # include -@@ -40345,6 +40349,7 @@ else +@@ -41480,6 +41484,7 @@ else # include # include #undef minor_t +# include /* IFNAMSIZ */ # include # include # include -@@ -40389,6 +40394,7 @@ _ACEOF +@@ -41524,6 +41529,7 @@ _ACEOF ip_fil_compat.h \ ip_fil.h \ ip_nat.h \ + net/if.h \ netinet/ip_compat.h \ netinet/ip_fil_compat.h \ netinet/ip_fil.h \ -@@ -40418,6 +40424,7 @@ ac_fn_cxx_check_header_compile "$LINENO" +@@ -41553,6 +41559,7 @@ ac_fn_cxx_check_header_compile "$LINENO" #if HAVE_IP_COMPAT_H #include #elif HAVE_NETINET_IP_COMPAT_H +#include /* IFNAMSIZ */ #include #endif #if HAVE_IP_FIL_H Index: head/www/squid-devel/files/patch-src-cf.data.pre =================================================================== --- head/www/squid-devel/files/patch-src-cf.data.pre (revision 473032) +++ head/www/squid-devel/files/patch-src-cf.data.pre (revision 473033) @@ -1,13 +1,13 @@ ---- src/cf.data.pre.orig 2016-12-16 10:06:20 UTC +--- src/cf.data.pre.orig 2018-06-11 16:30:57 UTC +++ src/cf.data.pre -@@ -4754,6 +4754,10 @@ DEFAULT: @DEFAULT_PID_FILE@ +@@ -4947,6 +4947,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 Index: head/www/squid-devel/files/patch-src_ip_Intercept.cc =================================================================== --- head/www/squid-devel/files/patch-src_ip_Intercept.cc (nonexistent) +++ head/www/squid-devel/files/patch-src_ip_Intercept.cc (revision 473033) @@ -0,0 +1,15 @@ +--- src/ip/Intercept.cc.orig 2018-06-20 11:02:30 UTC ++++ src/ip/Intercept.cc +@@ -215,10 +215,10 @@ Ip::Intercept::IpfInterception(const Com + newConn->remote.getInAddr(natLookup.nl_outipaddr.in4); + } + #else +- // 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); Property changes on: head/www/squid-devel/files/patch-src_ip_Intercept.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/squid-devel/files/patch-src_tools.cc =================================================================== --- head/www/squid-devel/files/patch-src_tools.cc (revision 473032) +++ head/www/squid-devel/files/patch-src_tools.cc (revision 473033) @@ -1,11 +1,11 @@ ---- src/tools.cc.orig 2016-12-16 10:06:20 UTC +--- src/tools.cc.orig 2018-06-11 16:30:57 UTC +++ src/tools.cc -@@ -603,7 +603,7 @@ no_suid(void) +@@ -605,7 +605,7 @@ no_suid(void) uid = geteuid(); - debugs(21, 3, "no_suid: PID " << getpid() << " giving up root priveleges forever"); + 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)); }