Date: Sun, 8 Jul 2018 20:46:45 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474197 - in head/www/squid: . files Message-ID: <201807082046.w68Kkjww095790@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Sun Jul 8 20:46:45 2018 New Revision: 474197 URL: https://svnweb.freebsd.org/changeset/ports/474197 Log: www/squid: update to 4.1 PR: 229601 Submitted by: timp87@gmail.com (maintainer) Added: head/www/squid/files/patch-src_ip_Intercept.cc (contents, props changed) - copied, changed from r474196, head/www/squid/files/patch-src__ip__Intercept.cc Deleted: head/www/squid/files/patch-src__ip__Intercept.cc head/www/squid/files/patch-src_client__side__request.cc head/www/squid/files/patch-src_esi_CustomParser.cc Modified: head/www/squid/Makefile (contents, props changed) head/www/squid/distinfo (contents, props changed) head/www/squid/files/patch-compat_compat.h (contents, props changed) head/www/squid/files/patch-compat_shm.cc (contents, props changed) head/www/squid/files/patch-configure (contents, props changed) head/www/squid/files/patch-src-cf.data.pre (contents, props changed) head/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc (contents, props changed) head/www/squid/files/patch-src_ipc_mem_Segment.cc (contents, props changed) head/www/squid/files/patch-src_tools.cc (contents, props changed) head/www/squid/files/squid.in head/www/squid/pkg-plist (contents, props changed) Modified: head/www/squid/Makefile ============================================================================== --- head/www/squid/Makefile Sun Jul 8 20:10:26 2018 (r474196) +++ head/www/squid/Makefile Sun Jul 8 20:46:45 2018 (r474197) @@ -1,15 +1,15 @@ # $FreeBSD$ PORTNAME= squid -PORTVERSION= 3.5.27 -PORTREVISION= 3 +PORTVERSION= 4.1 CATEGORIES= www ipv6 -MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ - http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ - http://www1.at.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ - http://www.eu.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ - http://www1.jp.squid-cache.org/Versions/v3/${PORTVERSION:R}/ -DIST_SUBDIR= squid${PORTVERSION:R} +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/ +#DIST_SUBDIR= squid${PORTVERSION:R} +DIST_SUBDIR= squid${PORTVERSION} PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ http://www2.us.squid-cache.org/%SUBDIR%/ \ @@ -17,7 +17,7 @@ PATCH_SITES= http://www.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/v3/${PORTVERSION:R}/changesets +PATCH_SITE_SUBDIR= Versions/v4/changesets MAINTAINER= timp87@gmail.com COMMENT= HTTP Caching Proxy @@ -25,14 +25,13 @@ COMMENT= HTTP Caching Proxy LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= squid*-4.* +BROKEN_powerpc64= fails to link: ext_time_quota_acl.cc: undefined reference to std::ctype -BROKEN_powerpc64= Does not build: error: unrecognizable insn +CONFLICTS= squid*-3.* -USES= compiler cpe perl5 shebangfix tar:xz +USES= compiler:c++11-lib cpe perl5 shebangfix tar:xz CPE_VENDOR= squid-cache -SHEBANG_FILES= scripts/*.pl contrib/*.pl src/*.pl tools/*.pl \ - helpers/ssl/cert_valid.pl +SHEBANG_FILES= scripts/*.pl contrib/*.pl tools/*.pl GNU_CONFIGURE= yes USE_RC_SUBR= squid @@ -49,7 +48,7 @@ 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 CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI EXAMPLES \ +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 @@ -76,6 +75,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 +BDB_USES= bdb CACHE_DIGESTS_CONFIGURE_ENABLE= cache-digests DELAY_POOLS_CONFIGURE_ENABLE= delay-pools ECAP_CFLAGS= -I${LOCALBASE}/include @@ -98,6 +98,8 @@ 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 @@ -110,19 +112,19 @@ 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_VARS= BROKEN_SSL=openssl-devel SSL_CRTD_CONFIGURE_ENABLE= ssl-crtd SSL_CRTD_IMPLIES= SSL STACKTRACES_CONFIGURE_ENABLE= stacktraces -STACKTRACES_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gen-stacktrace +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="" +STACKTRACES_VARS= STRIP="" TP_IPFW_CONFIGURE_ENABLE= ipfw-transparent TP_IPF_CONFIGURE_ENABLE= ipf-transparent TP_PF_CONFIGURE_ENABLE= pf-transparent @@ -147,16 +149,14 @@ GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --with-mit-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_MIT_PLIST_SUB= AUTH_KERB="" -# TODO: -# add an option for external_acl/session (requires some kind of external -# Berkeley DB support, unsure which one) 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= Samba 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) @@ -190,7 +190,7 @@ change_files= ChangeLog \ contrib/nextstep/post_install \ errors/Makefile.am \ errors/Makefile.in \ - helpers/basic_auth/SMB_LM/README.html \ + src/auth/basic/SMB_LM/README.html \ src/Makefile.am \ src/Makefile.in \ src/cf_gen.cc \ @@ -232,8 +232,8 @@ CONFIGURE_ARGS= --with-default-user=squid \ # Authentication methods and modules: -BASIC_AUTH+= DB SMB_LM MSNT-multi-domain NCSA PAM POP3 RADIUS fake getpwnam -EXTERNAL_ACL+= file_userip time_quota unix_group +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) @@ -245,7 +245,6 @@ BASIC_AUTH+= NIS 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 @@ -253,7 +252,14 @@ EXTERNAL_ACL+= kerberos_ldap_group NEGOTIATE_AUTH= kerberos wrapper .endif -# Storage schemes +# 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 @@ -261,12 +267,13 @@ 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-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-storeid-rewrite-helpers="file" \ + --enable-security-cert-validators="fake" # Other options set via 'make config': @@ -298,16 +305,9 @@ post-patch-IPV6-off: post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql \ + ${INSTALL_DATA} ${WRKSRC}/src/auth/basic/DB/passwd.sql \ ${STAGEDIR}${EXAMPLESDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR}) -.include <bsd.port.pre.mk> - -.if ${CHOSEN_COMPILER_TYPE} == clang -CXXFLAGS+= -Wno-unknown-warning-option -CXXFLAGS+= -Wno-undefined-bool-conversion -Wno-tautological-undefined-compare -Wno-dynamic-class-memaccess -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/www/squid/distinfo ============================================================================== --- head/www/squid/distinfo Sun Jul 8 20:10:26 2018 (r474196) +++ head/www/squid/distinfo Sun Jul 8 20:46:45 2018 (r474197) @@ -1,3 +1,3 @@ -TIMESTAMP = 1479930399 -SHA256 (squid3.5/squid-3.5.27.tar.xz) = 5ddb4367f2dc635921f9ca7a59d8b87edb0412fa203d1543393ac3c7f9fef0ec -SIZE (squid3.5/squid-3.5.27.tar.xz) = 2303468 +TIMESTAMP = 1522445865 +SHA256 (squid4.1/squid-4.1.tar.xz) = b61e486fe1ba1f5c918a48d5ae3929d3f604e347c3c7dceb1105a9f0e5ee9eb5 +SIZE (squid4.1/squid-4.1.tar.xz) = 2425892 Modified: head/www/squid/files/patch-compat_compat.h ============================================================================== --- head/www/squid/files/patch-compat_compat.h Sun Jul 8 20:10:26 2018 (r474196) +++ head/www/squid/files/patch-compat_compat.h Sun Jul 8 20:46:45 2018 (r474197) @@ -1,8 +1,8 @@ ---- compat/compat.h.orig 2015-11-01 10:44:25 UTC +--- compat/compat.h.orig 2016-12-16 10:06:20 UTC +++ compat/compat.h -@@ -42,17 +42,6 @@ - #endif - #endif +@@ -29,17 +29,6 @@ + /******************************************************/ + #include "compat/osdetect.h" -/* Solaris 10 has a broken definition for minor_t in IPFilter compat. - * We must pre-define before doing anything with OS headers so the OS Modified: head/www/squid/files/patch-compat_shm.cc ============================================================================== --- head/www/squid/files/patch-compat_shm.cc Sun Jul 8 20:10:26 2018 (r474196) +++ head/www/squid/files/patch-compat_shm.cc Sun Jul 8 20:46:45 2018 (r474197) @@ -1,4 +1,4 @@ ---- compat/shm.cc.orig 2015-11-01 10:44:25 UTC +--- compat/shm.cc.orig 2016-12-16 10:06:20 UTC +++ compat/shm.cc @@ -29,6 +29,8 @@ shm_portable_segment_name_is_path() size_t len = sizeof(jailed); Modified: head/www/squid/files/patch-configure ============================================================================== --- head/www/squid/files/patch-configure Sun Jul 8 20:10:26 2018 (r474196) +++ head/www/squid/files/patch-configure Sun Jul 8 20:46:45 2018 (r474197) @@ -1,6 +1,6 @@ ---- configure.orig 2015-11-01 10:46:19 UTC +--- configure.orig 2018-07-02 03:32:06 UTC +++ configure -@@ -32038,7 +32040,7 @@ done +@@ -34345,7 +34345,7 @@ done ## BUILD_HELPER="NIS" @@ -9,7 +9,7 @@ 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" " -@@ -32053,8 +32055,10 @@ if eval test \"x\$"$as_ac_Header"\" = x" +@@ -34360,8 +34360,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -22,7 +22,7 @@ fi done -@@ -32519,7 +32523,7 @@ done +@@ -34834,7 +34836,7 @@ done # unconditionally requires crypt(3), for now if test "x$ac_cv_func_crypt" != "x"; then @@ -31,7 +31,7 @@ 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" -@@ -34574,7 +34578,7 @@ for ac_header in \ +@@ -37226,7 +37228,7 @@ for ac_header in \ arpa/nameser.h \ assert.h \ bstring.h \ @@ -40,7 +40,7 @@ ctype.h \ direct.h \ errno.h \ -@@ -34785,6 +34789,7 @@ ac_fn_cxx_check_header_compile "$LINENO" +@@ -37434,6 +37436,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" #include <netinet/ip.h> #endif #if HAVE_NETINET_IP_COMPAT_H @@ -48,7 +48,7 @@ #include <netinet/ip_compat.h> #endif #if HAVE_NETINET_IP_FIL_H -@@ -38773,6 +38778,7 @@ if test "x$enable_ipf_transparent" != "x +@@ -41463,6 +41466,7 @@ if test "x$enable_ipf_transparent" != "xno" ; then # include <sys/ioccom.h> # include <netinet/in.h> @@ -56,7 +56,7 @@ # include <netinet/ip_compat.h> # include <netinet/ip_fil.h> # include <netinet/ip_nat.h> -@@ -38803,6 +38809,7 @@ else +@@ -41493,6 +41497,7 @@ else # include <sys/ioccom.h> # include <netinet/in.h> #undef minor_t @@ -64,7 +64,7 @@ # include <netinet/ip_compat.h> # include <netinet/ip_fil.h> # include <netinet/ip_nat.h> -@@ -38847,6 +38854,7 @@ _ACEOF +@@ -41537,6 +41542,7 @@ _ACEOF ip_fil_compat.h \ ip_fil.h \ ip_nat.h \ @@ -72,7 +72,7 @@ netinet/ip_compat.h \ netinet/ip_fil_compat.h \ netinet/ip_fil.h \ -@@ -38876,6 +38884,7 @@ ac_fn_cxx_check_header_compile "$LINENO" +@@ -41566,6 +41572,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" #if HAVE_IP_COMPAT_H #include <ip_compat.h> #elif HAVE_NETINET_IP_COMPAT_H @@ -80,3 +80,13 @@ #include <netinet/ip_compat.h> #endif #if HAVE_IP_FIL_H +@@ -41629,8 +41636,7 @@ _ACEOF + + + fi +-ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6" +- "ac_cv_member_struct_natlookup_nl_realipaddr_in6___" " ++ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6" "ac_cv_member_struct_natlookup_nl_realipaddr_in6___" " + #if USE_SOLARIS_IPFILTER_MINOR_T_HACK + #define minor_t fubar + #endif Modified: head/www/squid/files/patch-src-cf.data.pre ============================================================================== --- head/www/squid/files/patch-src-cf.data.pre Sun Jul 8 20:10:26 2018 (r474196) +++ head/www/squid/files/patch-src-cf.data.pre Sun Jul 8 20:46:45 2018 (r474197) @@ -1,6 +1,6 @@ ---- src/cf.data.pre.orig 2015-11-01 10:44:25 UTC +--- src/cf.data.pre.orig 2018-06-11 16:30:57 UTC +++ src/cf.data.pre -@@ -4558,6 +4558,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". Modified: head/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc ============================================================================== --- head/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc Sun Jul 8 20:10:26 2018 (r474196) +++ head/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc Sun Jul 8 20:46:45 2018 (r474197) @@ -1,6 +1,6 @@ ---- src/DiskIO/Mmapped/MmappedFile.cc.orig 2015-11-01 10:44:25 UTC +--- src/DiskIO/Mmapped/MmappedFile.cc.orig 2016-12-16 10:06:20 UTC +++ src/DiskIO/Mmapped/MmappedFile.cc -@@ -235,7 +235,7 @@ Mmapping::map() +@@ -236,7 +236,7 @@ Mmapping::map() static const int pageSize = getpagesize(); delta = offset % pageSize; Copied and modified: head/www/squid/files/patch-src_ip_Intercept.cc (from r474196, head/www/squid/files/patch-src__ip__Intercept.cc) ============================================================================== --- head/www/squid/files/patch-src__ip__Intercept.cc Sun Jul 8 20:10:26 2018 (r474196, copy source) +++ head/www/squid/files/patch-src_ip_Intercept.cc Sun Jul 8 20:46:45 2018 (r474197) @@ -1,15 +1,15 @@ ---- src/ip/Intercept.cc.orig 2015-11-01 10:44:25 UTC +--- src/ip/Intercept.cc.orig 2018-07-02 03:26:07 UTC +++ src/ip/Intercept.cc -@@ -202,10 +202,10 @@ Ip::Intercept::IpfInterception(const Com - // for NAT lookup set local and remote IP:port's - if (newConn->remote.isIPv6()) { - #if IPFILTER_VERSION < 5000003 +@@ -215,10 +215,10 @@ Ip::Intercept::IpfInterception(const Comm::ConnectionP + 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, "IPF (IPFilter v4) NAT does not support IPv6. Please upgrade to IPFilter v5.1"); + debugs(89, warningLevel, "Your IPF (IPFilter) NAT does not support IPv6. Please upgrade it."); - warningLevel = (warningLevel + 1) % 10; + warningLevel = (warningLevel + 1) % 1048576; return false; - #else - natLookup.nl_v = 6; + } + newConn->local.getInAddr(natLookup.nl_inip); Modified: head/www/squid/files/patch-src_ipc_mem_Segment.cc ============================================================================== --- head/www/squid/files/patch-src_ipc_mem_Segment.cc Sun Jul 8 20:10:26 2018 (r474196) +++ head/www/squid/files/patch-src_ipc_mem_Segment.cc Sun Jul 8 20:46:45 2018 (r474197) @@ -1,11 +1,11 @@ ---- src/ipc/mem/Segment.cc.orig 2015-11-01 10:44:25 UTC +--- src/ipc/mem/Segment.cc.orig 2016-12-16 10:06:20 UTC +++ src/ipc/mem/Segment.cc -@@ -150,7 +150,7 @@ Ipc::Mem::Segment::attach() +@@ -173,7 +173,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); if (p == MAP_FAILED) { - debugs(54, 5, HERE << "mmap " << theName << ": " << xstrerror()); - fatalf("Ipc::Mem::Segment::attach failed to mmap(%s): %s\n", + int xerrno = errno; + debugs(54, 5, "mmap " << theName << ": " << xstrerr(xerrno)); Modified: head/www/squid/files/patch-src_tools.cc ============================================================================== --- head/www/squid/files/patch-src_tools.cc Sun Jul 8 20:10:26 2018 (r474196) +++ head/www/squid/files/patch-src_tools.cc Sun Jul 8 20:46:45 2018 (r474197) @@ -1,11 +1,11 @@ ---- src/tools.cc.orig 2015-11-01 10:44:25 UTC +--- src/tools.cc.orig 2018-06-11 16:30:57 UTC +++ src/tools.cc -@@ -635,7 +635,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) - debugs(50, DBG_IMPORTANT, "WARNING: no_suid: setuid(0): " << xstrerror()); - - if (setuid(uid) < 0) +- if (setuid(0) < 0) { ++ if (setuid(0) < 0 && TheProcessKind != pkHelper) { + int xerrno = errno; + debugs(50, DBG_IMPORTANT, "WARNING: no_suid: setuid(0): " << xstrerr(xerrno)); + } Modified: head/www/squid/files/squid.in ============================================================================== --- head/www/squid/files/squid.in Sun Jul 8 20:10:26 2018 (r474196) +++ head/www/squid/files/squid.in Sun Jul 8 20:46:45 2018 (r474197) @@ -42,7 +42,6 @@ # squid_krb5_ktname: # Alternative Kerberos 5 Key Table. # Default: none -# # squid_krb5_config: # Alternative Kerberos 5 config file # Default: none @@ -81,7 +80,8 @@ squid_load_rc_config() required_dirs=$chdir required_files=$squid_conf command_args="${required_args} ${squid_flags}" - procname="?squid-*" +# We used to need it in squid3 to match pid and proc name +# procname="?squid-*" pidfile=$squid_pidfile } Modified: head/www/squid/pkg-plist ============================================================================== --- head/www/squid/pkg-plist Sun Jul 8 20:10:26 2018 (r474196) +++ head/www/squid/pkg-plist Sun Jul 8 20:46:45 2018 (r474197) @@ -34,6 +34,7 @@ %%ETCDIR%%/errors/af/ERR_NO_RELAY %%ETCDIR%%/errors/af/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/af/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/af/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/af/ERR_READ_ERROR %%ETCDIR%%/errors/af/ERR_READ_TIMEOUT %%ETCDIR%%/errors/af/ERR_SECURE_CONNECT_FAIL @@ -92,6 +93,7 @@ %%ETCDIR%%/errors/ar/ERR_NO_RELAY %%ETCDIR%%/errors/ar/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/ar/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/ar/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/ar/ERR_READ_ERROR %%ETCDIR%%/errors/ar/ERR_READ_TIMEOUT %%ETCDIR%%/errors/ar/ERR_SECURE_CONNECT_FAIL @@ -135,6 +137,7 @@ %%ETCDIR%%/errors/az/ERR_NO_RELAY %%ETCDIR%%/errors/az/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/az/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/az/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/az/ERR_READ_ERROR %%ETCDIR%%/errors/az/ERR_READ_TIMEOUT %%ETCDIR%%/errors/az/ERR_SECURE_CONNECT_FAIL @@ -178,6 +181,7 @@ %%ETCDIR%%/errors/bg/ERR_NO_RELAY %%ETCDIR%%/errors/bg/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/bg/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/bg/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/bg/ERR_READ_ERROR %%ETCDIR%%/errors/bg/ERR_READ_TIMEOUT %%ETCDIR%%/errors/bg/ERR_SECURE_CONNECT_FAIL @@ -220,6 +224,7 @@ %%ETCDIR%%/errors/ca/ERR_NO_RELAY %%ETCDIR%%/errors/ca/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/ca/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/ca/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/ca/ERR_READ_ERROR %%ETCDIR%%/errors/ca/ERR_READ_TIMEOUT %%ETCDIR%%/errors/ca/ERR_SECURE_CONNECT_FAIL @@ -263,6 +268,7 @@ %%ETCDIR%%/errors/cs/ERR_NO_RELAY %%ETCDIR%%/errors/cs/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/cs/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/cs/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/cs/ERR_READ_ERROR %%ETCDIR%%/errors/cs/ERR_READ_TIMEOUT %%ETCDIR%%/errors/cs/ERR_SECURE_CONNECT_FAIL @@ -306,6 +312,7 @@ %%ETCDIR%%/errors/da/ERR_NO_RELAY %%ETCDIR%%/errors/da/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/da/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/da/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/da/ERR_READ_ERROR %%ETCDIR%%/errors/da/ERR_READ_TIMEOUT %%ETCDIR%%/errors/da/ERR_SECURE_CONNECT_FAIL @@ -353,6 +360,7 @@ %%ETCDIR%%/errors/de/ERR_NO_RELAY %%ETCDIR%%/errors/de/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/de/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/de/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/de/ERR_READ_ERROR %%ETCDIR%%/errors/de/ERR_READ_TIMEOUT %%ETCDIR%%/errors/de/ERR_SECURE_CONNECT_FAIL @@ -396,6 +404,7 @@ %%ETCDIR%%/errors/el/ERR_NO_RELAY %%ETCDIR%%/errors/el/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/el/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/el/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/el/ERR_READ_ERROR %%ETCDIR%%/errors/el/ERR_READ_TIMEOUT %%ETCDIR%%/errors/el/ERR_SECURE_CONNECT_FAIL @@ -453,6 +462,7 @@ %%ETCDIR%%/errors/en/ERR_NO_RELAY %%ETCDIR%%/errors/en/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/en/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/en/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/en/ERR_READ_ERROR %%ETCDIR%%/errors/en/ERR_READ_TIMEOUT %%ETCDIR%%/errors/en/ERR_SECURE_CONNECT_FAIL @@ -515,6 +525,7 @@ %%ETCDIR%%/errors/es/ERR_NO_RELAY %%ETCDIR%%/errors/es/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/es/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/es/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/es/ERR_READ_ERROR %%ETCDIR%%/errors/es/ERR_READ_TIMEOUT %%ETCDIR%%/errors/es/ERR_SECURE_CONNECT_FAIL @@ -558,6 +569,7 @@ %%ETCDIR%%/errors/et/ERR_NO_RELAY %%ETCDIR%%/errors/et/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/et/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/et/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/et/ERR_READ_ERROR %%ETCDIR%%/errors/et/ERR_READ_TIMEOUT %%ETCDIR%%/errors/et/ERR_SECURE_CONNECT_FAIL @@ -602,6 +614,7 @@ %%ETCDIR%%/errors/fa/ERR_NO_RELAY %%ETCDIR%%/errors/fa/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/fa/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/fa/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/fa/ERR_READ_ERROR %%ETCDIR%%/errors/fa/ERR_READ_TIMEOUT %%ETCDIR%%/errors/fa/ERR_SECURE_CONNECT_FAIL @@ -645,6 +658,7 @@ %%ETCDIR%%/errors/fi/ERR_NO_RELAY %%ETCDIR%%/errors/fi/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/fi/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/fi/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/fi/ERR_READ_ERROR %%ETCDIR%%/errors/fi/ERR_READ_TIMEOUT %%ETCDIR%%/errors/fi/ERR_SECURE_CONNECT_FAIL @@ -693,6 +707,7 @@ %%ETCDIR%%/errors/fr/ERR_NO_RELAY %%ETCDIR%%/errors/fr/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/fr/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/fr/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/fr/ERR_READ_ERROR %%ETCDIR%%/errors/fr/ERR_READ_TIMEOUT %%ETCDIR%%/errors/fr/ERR_SECURE_CONNECT_FAIL @@ -736,6 +751,7 @@ %%ETCDIR%%/errors/he/ERR_NO_RELAY %%ETCDIR%%/errors/he/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/he/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/he/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/he/ERR_READ_ERROR %%ETCDIR%%/errors/he/ERR_READ_TIMEOUT %%ETCDIR%%/errors/he/ERR_SECURE_CONNECT_FAIL @@ -779,6 +795,7 @@ %%ETCDIR%%/errors/hu/ERR_NO_RELAY %%ETCDIR%%/errors/hu/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/hu/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/hu/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/hu/ERR_READ_ERROR %%ETCDIR%%/errors/hu/ERR_READ_TIMEOUT %%ETCDIR%%/errors/hu/ERR_SECURE_CONNECT_FAIL @@ -823,6 +840,7 @@ %%ETCDIR%%/errors/hy/ERR_NO_RELAY %%ETCDIR%%/errors/hy/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/hy/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/hy/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/hy/ERR_READ_ERROR %%ETCDIR%%/errors/hy/ERR_READ_TIMEOUT %%ETCDIR%%/errors/hy/ERR_SECURE_CONNECT_FAIL @@ -866,6 +884,7 @@ %%ETCDIR%%/errors/id/ERR_NO_RELAY %%ETCDIR%%/errors/id/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/id/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/id/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/id/ERR_READ_ERROR %%ETCDIR%%/errors/id/ERR_READ_TIMEOUT %%ETCDIR%%/errors/id/ERR_SECURE_CONNECT_FAIL @@ -910,6 +929,7 @@ %%ETCDIR%%/errors/it/ERR_NO_RELAY %%ETCDIR%%/errors/it/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/it/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/it/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/it/ERR_READ_ERROR %%ETCDIR%%/errors/it/ERR_READ_TIMEOUT %%ETCDIR%%/errors/it/ERR_SECURE_CONNECT_FAIL @@ -953,6 +973,7 @@ %%ETCDIR%%/errors/ja/ERR_NO_RELAY %%ETCDIR%%/errors/ja/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/ja/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/ja/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/ja/ERR_READ_ERROR %%ETCDIR%%/errors/ja/ERR_READ_TIMEOUT %%ETCDIR%%/errors/ja/ERR_SECURE_CONNECT_FAIL @@ -996,6 +1017,7 @@ %%ETCDIR%%/errors/ka/ERR_NO_RELAY %%ETCDIR%%/errors/ka/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/ka/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/ka/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/ka/ERR_READ_ERROR %%ETCDIR%%/errors/ka/ERR_READ_TIMEOUT %%ETCDIR%%/errors/ka/ERR_SECURE_CONNECT_FAIL @@ -1040,6 +1062,7 @@ %%ETCDIR%%/errors/ko/ERR_NO_RELAY %%ETCDIR%%/errors/ko/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/ko/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/ko/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/ko/ERR_READ_ERROR %%ETCDIR%%/errors/ko/ERR_READ_TIMEOUT %%ETCDIR%%/errors/ko/ERR_SECURE_CONNECT_FAIL @@ -1083,6 +1106,7 @@ %%ETCDIR%%/errors/lt/ERR_NO_RELAY %%ETCDIR%%/errors/lt/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/lt/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/lt/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/lt/ERR_READ_ERROR %%ETCDIR%%/errors/lt/ERR_READ_TIMEOUT %%ETCDIR%%/errors/lt/ERR_SECURE_CONNECT_FAIL @@ -1126,6 +1150,7 @@ %%ETCDIR%%/errors/lv/ERR_NO_RELAY %%ETCDIR%%/errors/lv/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/lv/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/lv/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/lv/ERR_READ_ERROR %%ETCDIR%%/errors/lv/ERR_READ_TIMEOUT %%ETCDIR%%/errors/lv/ERR_SECURE_CONNECT_FAIL @@ -1169,6 +1194,7 @@ %%ETCDIR%%/errors/ms/ERR_NO_RELAY %%ETCDIR%%/errors/ms/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/ms/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/ms/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/ms/ERR_READ_ERROR %%ETCDIR%%/errors/ms/ERR_READ_TIMEOUT %%ETCDIR%%/errors/ms/ERR_SECURE_CONNECT_FAIL @@ -1212,6 +1238,7 @@ %%ETCDIR%%/errors/nl/ERR_NO_RELAY %%ETCDIR%%/errors/nl/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/nl/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/nl/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/nl/ERR_READ_ERROR %%ETCDIR%%/errors/nl/ERR_READ_TIMEOUT %%ETCDIR%%/errors/nl/ERR_SECURE_CONNECT_FAIL @@ -1254,6 +1281,7 @@ %%ETCDIR%%/errors/oc/ERR_NO_RELAY %%ETCDIR%%/errors/oc/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/oc/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/oc/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/oc/ERR_READ_ERROR %%ETCDIR%%/errors/oc/ERR_READ_TIMEOUT %%ETCDIR%%/errors/oc/ERR_SECURE_CONNECT_FAIL @@ -1297,6 +1325,7 @@ %%ETCDIR%%/errors/pl/ERR_NO_RELAY %%ETCDIR%%/errors/pl/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/pl/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/pl/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/pl/ERR_READ_ERROR %%ETCDIR%%/errors/pl/ERR_READ_TIMEOUT %%ETCDIR%%/errors/pl/ERR_SECURE_CONNECT_FAIL @@ -1339,6 +1368,7 @@ %%ETCDIR%%/errors/pt-br/ERR_NO_RELAY %%ETCDIR%%/errors/pt-br/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/pt-br/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/pt-br/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/pt-br/ERR_READ_ERROR %%ETCDIR%%/errors/pt-br/ERR_READ_TIMEOUT %%ETCDIR%%/errors/pt-br/ERR_SECURE_CONNECT_FAIL @@ -1383,6 +1413,7 @@ %%ETCDIR%%/errors/pt/ERR_NO_RELAY %%ETCDIR%%/errors/pt/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/pt/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/pt/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/pt/ERR_READ_ERROR %%ETCDIR%%/errors/pt/ERR_READ_TIMEOUT %%ETCDIR%%/errors/pt/ERR_SECURE_CONNECT_FAIL @@ -1427,6 +1458,7 @@ %%ETCDIR%%/errors/ro/ERR_NO_RELAY %%ETCDIR%%/errors/ro/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/ro/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/ro/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/ro/ERR_READ_ERROR %%ETCDIR%%/errors/ro/ERR_READ_TIMEOUT %%ETCDIR%%/errors/ro/ERR_SECURE_CONNECT_FAIL @@ -1470,6 +1502,7 @@ %%ETCDIR%%/errors/ru/ERR_NO_RELAY %%ETCDIR%%/errors/ru/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/ru/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/ru/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/ru/ERR_READ_ERROR %%ETCDIR%%/errors/ru/ERR_READ_TIMEOUT %%ETCDIR%%/errors/ru/ERR_SECURE_CONNECT_FAIL @@ -1513,6 +1546,7 @@ %%ETCDIR%%/errors/sk/ERR_NO_RELAY %%ETCDIR%%/errors/sk/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/sk/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/sk/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/sk/ERR_READ_ERROR %%ETCDIR%%/errors/sk/ERR_READ_TIMEOUT %%ETCDIR%%/errors/sk/ERR_SECURE_CONNECT_FAIL @@ -1556,6 +1590,7 @@ %%ETCDIR%%/errors/sl/ERR_NO_RELAY %%ETCDIR%%/errors/sl/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/sl/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/sl/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/sl/ERR_READ_ERROR %%ETCDIR%%/errors/sl/ERR_READ_TIMEOUT %%ETCDIR%%/errors/sl/ERR_SECURE_CONNECT_FAIL @@ -1602,6 +1637,7 @@ %%ETCDIR%%/errors/sr-cyrl/ERR_NO_RELAY %%ETCDIR%%/errors/sr-cyrl/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/sr-cyrl/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/sr-cyrl/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/sr-cyrl/ERR_READ_ERROR %%ETCDIR%%/errors/sr-cyrl/ERR_READ_TIMEOUT %%ETCDIR%%/errors/sr-cyrl/ERR_SECURE_CONNECT_FAIL @@ -1647,6 +1683,7 @@ %%ETCDIR%%/errors/sr-latn/ERR_NO_RELAY %%ETCDIR%%/errors/sr-latn/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/sr-latn/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/sr-latn/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/sr-latn/ERR_READ_ERROR %%ETCDIR%%/errors/sr-latn/ERR_READ_TIMEOUT %%ETCDIR%%/errors/sr-latn/ERR_SECURE_CONNECT_FAIL @@ -1693,6 +1730,7 @@ %%ETCDIR%%/errors/sv/ERR_NO_RELAY %%ETCDIR%%/errors/sv/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/sv/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/sv/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/sv/ERR_READ_ERROR %%ETCDIR%%/errors/sv/ERR_READ_TIMEOUT %%ETCDIR%%/errors/sv/ERR_SECURE_CONNECT_FAIL @@ -1735,6 +1773,7 @@ %%ETCDIR%%/errors/templates/ERR_NO_RELAY %%ETCDIR%%/errors/templates/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/templates/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/templates/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/templates/ERR_READ_ERROR %%ETCDIR%%/errors/templates/ERR_READ_TIMEOUT %%ETCDIR%%/errors/templates/ERR_SECURE_CONNECT_FAIL @@ -1778,6 +1817,7 @@ %%ETCDIR%%/errors/th/ERR_NO_RELAY %%ETCDIR%%/errors/th/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/th/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/th/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/th/ERR_READ_ERROR %%ETCDIR%%/errors/th/ERR_READ_TIMEOUT %%ETCDIR%%/errors/th/ERR_SECURE_CONNECT_FAIL @@ -1821,6 +1861,7 @@ %%ETCDIR%%/errors/tr/ERR_NO_RELAY %%ETCDIR%%/errors/tr/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/tr/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/tr/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/tr/ERR_READ_ERROR %%ETCDIR%%/errors/tr/ERR_READ_TIMEOUT %%ETCDIR%%/errors/tr/ERR_SECURE_CONNECT_FAIL @@ -1864,6 +1905,7 @@ %%ETCDIR%%/errors/uk/ERR_NO_RELAY %%ETCDIR%%/errors/uk/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/uk/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/uk/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/uk/ERR_READ_ERROR %%ETCDIR%%/errors/uk/ERR_READ_TIMEOUT %%ETCDIR%%/errors/uk/ERR_SECURE_CONNECT_FAIL @@ -1906,6 +1948,7 @@ %%ETCDIR%%/errors/uz/ERR_NO_RELAY %%ETCDIR%%/errors/uz/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/uz/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/uz/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/uz/ERR_READ_ERROR %%ETCDIR%%/errors/uz/ERR_READ_TIMEOUT %%ETCDIR%%/errors/uz/ERR_SECURE_CONNECT_FAIL @@ -1949,6 +1992,7 @@ %%ETCDIR%%/errors/vi/ERR_NO_RELAY %%ETCDIR%%/errors/vi/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/vi/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/vi/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/vi/ERR_READ_ERROR %%ETCDIR%%/errors/vi/ERR_READ_TIMEOUT %%ETCDIR%%/errors/vi/ERR_SECURE_CONNECT_FAIL @@ -1994,6 +2038,7 @@ %%ETCDIR%%/errors/zh-hans/ERR_NO_RELAY %%ETCDIR%%/errors/zh-hans/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/zh-hans/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/zh-hans/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/zh-hans/ERR_READ_ERROR %%ETCDIR%%/errors/zh-hans/ERR_READ_TIMEOUT %%ETCDIR%%/errors/zh-hans/ERR_SECURE_CONNECT_FAIL @@ -2039,6 +2084,7 @@ %%ETCDIR%%/errors/zh-hant/ERR_NO_RELAY %%ETCDIR%%/errors/zh-hant/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/zh-hant/ERR_PRECONDITION_FAILED +%%ETCDIR%%/errors/zh-hant/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/zh-hant/ERR_READ_ERROR %%ETCDIR%%/errors/zh-hant/ERR_READ_TIMEOUT %%ETCDIR%%/errors/zh-hant/ERR_SECURE_CONNECT_FAIL @@ -2112,7 +2158,6 @@ libexec/squid/basic_db_auth libexec/squid/basic_fake_auth libexec/squid/basic_getpwnam_auth %%AUTH_LDAP%%libexec/squid/basic_ldap_auth -libexec/squid/basic_msnt_multi_domain_auth libexec/squid/basic_ncsa_auth %%AUTH_NIS%%libexec/squid/basic_nis_auth libexec/squid/basic_pam_auth @@ -2124,17 +2169,18 @@ libexec/squid/basic_radius_auth libexec/squid/basic_smb_lm_auth libexec/squid/cachemgr.cgi %%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/cert_tool -%%SSL%%libexec/squid/cert_valid.pl libexec/squid/digest_file_auth %%FS_DISKD%%libexec/squid/diskd libexec/squid/ext_file_userip_acl %%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/ext_kerberos_ldap_group_acl %%AUTH_LDAP%%libexec/squid/ext_ldap_group_acl +%%BDB%%libexec/squid/ext_session_acl %%AUTH_SQL%%libexec/squid/ext_sql_session_acl -libexec/squid/ext_time_quota_acl +%%BDB%%libexec/squid/ext_time_quota_acl libexec/squid/ext_unix_group_acl %%AUTH_SMB%%libexec/squid/ext_wbinfo_group_acl -libexec/squid/helper-mux.pl +libexec/squid/helper-mux +man/man8/helper-mux.8.gz libexec/squid/log_file_daemon %%AUTH_KERB%%libexec/squid/negotiate_kerberos_auth %%AUTH_KERB%%libexec/squid/negotiate_kerberos_auth_test @@ -2146,7 +2192,9 @@ libexec/squid/ntlm_smb_lm_auth %%ICMP%%libexec/squid/pinger %%ICMP%%@group %%ICMP%%@mode -%%SSL_CRTD%%libexec/squid/ssl_crtd +libexec/squid/security_fake_certverify +man/man8/security_fake_certverify.8.gz +%%SSL%%libexec/squid/security_file_certgen libexec/squid/storeid_file_rewrite %%UNLINKD%%libexec/squid/unlinkd libexec/squid/url_fake_rewrite @@ -2155,7 +2203,6 @@ man/man1/squidclient.1.gz man/man8/basic_db_auth.8.gz man/man8/basic_getpwnam_auth.8.gz %%AUTH_LDAP%%man/man8/basic_ldap_auth.8.gz -man/man8/basic_msnt_multi_domain_auth.8.gz man/man8/basic_ncsa_auth.8.gz man/man8/basic_pam_auth.8.gz man/man8/basic_pop3_auth.8.gz @@ -2165,15 +2212,17 @@ man/man8/cachemgr.cgi.8.gz man/man8/digest_file_auth.8.gz man/man8/ext_file_userip_acl.8.gz %%AUTH_LDAP%%man/man8/ext_ldap_group_acl.8.gz +%%BDB%%man/man8/ext_session_acl.8.gz %%AUTH_SQL%%man/man8/ext_sql_session_acl.8.gz -man/man8/ext_time_quota_acl.8.gz +%%BDB%%man/man8/ext_time_quota_acl.8.gz man/man8/ext_unix_group_acl.8.gz %%AUTH_SMB%%man/man8/ext_wbinfo_group_acl.8.gz %%AUTH_KERB%%man/man8/negotiate_kerberos_auth.8.gz +%%SSL%%man/man8/security_file_certgen.8.gz man/man8/squid.8.gz -%%SSL_CRTD%%man/man8/ssl_crtd.8.gz man/man8/storeid_file_rewrite.8.gz sbin/purge +man/man1/purge.1.gz sbin/squid sbin/squidclient @dir(squid,squid,750) /var/log/squid
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807082046.w68Kkjww095790>