diff --git a/www/squid/Makefile b/www/squid/Makefile index 9a443436984c..18cd0599123c 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,292 +1,279 @@ PORTNAME= squid -DISTVERSION= 6.14 -PORTREVISION= 1 +DISTVERSION= 7.3 CATEGORIES= www MASTER_SITES= https://github.com/${PORTNAME}-cache/${PORTNAME}/releases/download/${PORTNAME:tu}_${DISTVERSION:S|.|_|g}/ -PATCH_SITES= http://www2.pl.squid-cache.org/%SUBDIR%/ \ - http://www1.il.squid-cache.org/%SUBDIR%/ \ - http://www2.gr.squid-cache.org/%SUBDIR%/ \ - http://ca2.squid-cache.org/%SUBDIR%/ \ - https://www.squid-cache.org/%SUBDIR%/ -PATCH_SITE_SUBDIR= Versions/v6/changesets - MAINTAINER= timp87@gmail.com COMMENT= HTTP Caching Proxy WWW= https://www.squid-cache.org/ \ https://github.com/squid-cache/squid/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= compiler:c++11-lib cpe gmake localbase:ldflags perl5 \ +USES= compiler:c++17-lang cpe gmake localbase:ldflags perl5 \ shebangfix tar:xz CPE_VENDOR= squid-cache USE_RC_SUBR= squid SHEBANG_FILES= contrib/*.pl scripts/*.pl tools/*.pl GNU_CONFIGURE= yes CONFIGURE_ARGS= --bindir=${PREFIX}/sbin \ --datadir=${ETCDIR} \ --disable-arch-native \ --disable-epoll \ --disable-strict-error-checking \ --enable-build-info \ --enable-removal-policies="lru heap" \ --libexecdir=${PREFIX}/libexec/squid \ --localstatedir=/var \ --sbindir=${PREFIX}/sbin \ --sysconfdir=${ETCDIR} \ --with-default-user=squid \ --with-included-ltdl \ --with-logdir=/var/log/squid \ --with-pidfile=/var/run/squid/squid.pid \ --with-swapdir=/var/squid/cache \ --without-cap \ --without-gnutls \ --without-netfilter-conntrack \ --without-systemd CONFLICTS= squid-devel -SUB_FILES+= pkg-install pkg-message +SUB_FILES+= 900.squid-rotate-log pkg-install pkg-message USERS= squid GROUPS= squid .if !defined(SQUID_CONFIGURE_ARGS) || \ ${SQUID_CONFIGURE_ARGS:M*--disable-unlinkd*} == "" PLIST_SUB+= UNLINKD="" .else PLIST_SUB+= UNLINKD="@comment " .endif PORTDOCS= ${MYDOCS:T} PORTEXAMPLES= * -OPTIONS_DEFINE= ARP_ACL CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP ESI \ +OPTIONS_DEFINE= ARP_ACL CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP \ EXAMPLES FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP \ - ICMP IDENT IPV6 KQUEUE LARGEFILE LAX_HTTP NETTLE SNMP \ - SSL SSL_CRTD STACKTRACES TDB VIA_DB WCCP WCCPV2 + ICMP IPV6 KQUEUE LARGEFILE LAX_HTTP NETTLE SNMP SSL \ + SSL_CRTD STACKTRACES TDB VIA_DB WCCP WCCPV2 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 + KQUEUE LARGEFILE LAX_HTTP SNMP SSL SSL_CRTD TP_IPFW \ + VIA_DB WCCP WCCPV2 OPTIONS_GROUP= AUTH OPTIONS_GROUP_AUTH= AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB AUTH_SQL OPTIONS_RADIO= FW OPTIONS_RADIO_FW= TP_IPF TP_IPFW TP_PF OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_SUB= yes 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 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 LAX_HTTP_DESC= Do not enforce strict HTTP compliance 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 TDB_DESC= TrivialDB support required for session and time quota external helpers 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 ARP_ACL_CONFIGURE_ENABLE= eui AUTH_LDAP_USES= ldap AUTH_LDAP_CONFIGURE_WITH= 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 CACHE_DIGESTS_CONFIGURE_ENABLE= cache-digests DELAY_POOLS_CONFIGURE_ENABLE= delay-pools ECAP_LIB_DEPENDS= libecap.so:www/libecap ECAP_USES= pkgconfig:build ECAP_CONFIGURE_ENABLE= ecap -ESI_LIB_DEPENDS= libexpat.so:textproc/expat2 \ - libxml2.so:textproc/libxml2 -ESI_CONFIGURE_ENABLE= esi -ESI_CONFIGURE_WITH= expat xml2 FOLLOW_XFF_CONFIGURE_ENABLE= follow-x-forwarded-for FS_AUFS_CONFIGURE_WITH= pthreads # 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_VARS= DISKIO_MODULES+=DiskThreads \ STORAGE_SCHEMES+=aufs FS_DISKD_VARS= DISKIO_MODULES+=DiskDaemon \ STORAGE_SCHEMES+=diskd FS_ROCK_VARS= STORAGE_SCHEMES+=rock GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ krb5_config=${GSSAPIBASEDIR}/bin/krb5-config .if exists(/usr/libdata/pkgconfig/mit-krb5.pc) GSSAPI_BASE_CONFIGURE_ON+= --with-mit-krb5=${GSSAPIBASEDIR} .else -GSSAPI_BASE_CONFIGURE_ON+= --with-heimdal-krb5=${GSSAPIBASEDIR} +GSSAPI_BASE_CONFIGURE_ON+= --with-heimdal-krb5=${GSSAPIBASEDIR} \ + --without-mit-krb5 .endif GSSAPI_BASE_PLIST_SUB= AUTH_KERB="" GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_HEIMDAL_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ --with-heimdal-krb5=${GSSAPIBASEDIR} \ + --without-mit-krb5 \ krb5_config=${GSSAPIBASEDIR}/bin/krb5-config GSSAPI_HEIMDAL_PLIST_SUB= AUTH_KERB="" GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ --with-mit-krb5=${GSSAPIBASEDIR} \ krb5_config=${GSSAPIBASEDIR}/bin/krb5-config GSSAPI_MIT_PLIST_SUB= AUTH_KERB="" -GSSAPI_NONE_CONFIGURE_ON= --without-gnugss \ +GSSAPI_NONE_CONFIGURE_ON= --without-gss \ --without-heimdal-krb5 \ --without-mit-krb5 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 NETTLE_LIB_DEPENDS= libnettle.so:security/nettle NETTLE_CONFIGURE_WITH= nettle SNMP_CONFIGURE_ENABLE= snmp SSL_USES= ssl SSL_CONFIGURE_ON= --enable-security-cert-generators="file" \ --with-openssl \ LIBOPENSSL_CFLAGS=-I${OPENSSLINC} \ LIBOPENSSL_LIBS="-lcrypto -lssl" SSL_CONFIGURE_ENABLE= ssl SSL_CRTD_IMPLIES= SSL SSL_CRTD_CONFIGURE_ENABLE= ssl-crtd STACKTRACES_LIB_DEPENDS= libunwind.so:devel/libunwind STACKTRACES_CONFIGURE_ENABLE= stacktraces STACKTRACES_CFLAGS= -g STACKTRACES_LDFLAGS= -lunwind STACKTRACES_EXTRA_PATCHES= ${FILESDIR}/extra-patch-gen-stacktrace STACKTRACES_VARS= STRIP="" TDB_LIB_DEPENDS= libtdb.so:${SAMBA_TDB_PORT} TDB_USES= pkgconfig:build samba:env TDB_CONFIGURE_WITH= tdb TDB_VARS= EXTERNAL_ACL+="time_quota session" 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 MYDOCS= QUICKSTART README RELEASENOTES.html doc/debug-sections.txt -change_files= ChangeLog 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 test-suite/Makefile.am \ - tools/Makefile.am tools/Makefile.in +change_files= ChangeLog errors/Makefile.am errors/Makefile.in src/Makefile.am \ + src/Makefile.in src/cf_gen.cc src/squid.8.in \ + test-suite/Makefile.in test-suite/Makefile.am .include # Authentication methods and modules: -BASIC_AUTH+= DB NCSA PAM POP3 RADIUS SMB_LM fake getpwnam +BASIC_AUTH+= DB NCSA PAM POP3 RADIUS 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 CPPFLAGS+= -DBOOL_DEFINED .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-auth-negotiate="${NEGOTIATE_AUTH}" \ - --enable-auth-ntlm="fake SMB_LM" \ + --enable-auth-ntlm="fake" \ --enable-disk-io="${DISKIO_MODULES}" \ --enable-external-acl-helpers="${EXTERNAL_ACL}" \ --enable-log-daemon-helpers="file DB" \ --enable-security-cert-validators="fake" \ --enable-storeid-rewrite-helpers="file" \ --enable-storeio="${STORAGE_SCHEMES}" \ --enable-url-rewrite-helpers="fake LFS" # Other options set via 'make config': .if ${PORT_OPTIONS:MDEBUG} || defined(WITH_DEBUG) 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} + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/weekly \ + ${STAGEDIR}${EXAMPLESDIR} \ + ${STAGEDIR}${DOCSDIR} + ${INSTALL_SCRIPT} ${WRKDIR}/900.squid-rotate-log \ + ${STAGEDIR}${PREFIX}/etc/periodic/weekly ${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 09166647c4a2..f30455af983d 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1750911454 -SHA256 (squid-6.14.tar.xz) = 9eafe06f58a199b918e79d33d8aa03afb9ae0c11d18974dca0b44c2669cab6dd -SIZE (squid-6.14.tar.xz) = 2548456 +TIMESTAMP = 1761688531 +SHA256 (squid-7.3.tar.xz) = dadc2a9a3926ce1b3babeaa7a7d7b21cbb089025876daa3f5c19e7eb6391ddcd +SIZE (squid-7.3.tar.xz) = 2441828 diff --git a/www/squid/files/900.squid-rotate-log.in b/www/squid/files/900.squid-rotate-log.in new file mode 100644 index 000000000000..cef03437410b --- /dev/null +++ b/www/squid/files/900.squid-rotate-log.in @@ -0,0 +1,26 @@ +#!/bin/sh +# +# Periodic script to rotate log files each week +# To enable it, add 'weekly_squid_rotate_log_enable="YES"' to /etc/periodic.conf +# + +if [ -r /etc/defaults/periodic.conf ] +then + . /etc/defaults/periodic.conf + source_periodic_confs +fi + +case "$weekly_squid_rotate_log_enable" in + [Yy][Ee][Ss]) + echo "" + echo "Rotating Squid's log files:" + + %%PREFIX%%/sbin/squid -k rotate + rc=$? + ;; + *) + rc=0 + ;; +esac + +exit $rc diff --git a/www/squid/files/patch-configure b/www/squid/files/patch-configure index 0aa171813c01..ff43b2fabcc3 100644 --- a/www/squid/files/patch-configure +++ b/www/squid/files/patch-configure @@ -1,27 +1,65 @@ ---- configure.orig 2025-02-01 11:08:28 UTC +--- configure.orig 2025-10-28 20:25:31 UTC +++ configure -@@ -43956,7 +43956,7 @@ BUILD_HELPER="NIS" +@@ -32420,15 +32420,15 @@ then : + with_mit_krb5=yes + if test -d "$withval/lib64" + then : +- LIB_KRB5_PATH+="-L$withval/lib64" ++ LIBMIT_KRB5_LIBS="$LIBMIT_KRB5_LIBS -L$withval/lib64" + fi + if test -d "$withval/lib" + then : +- LIB_KRB5_PATH+="-L$withval/lib" ++ LIBMIT_KRB5_LIBS="$LIBMIT_KRB5_LIBS -L$withval/lib" + fi + if test -d "$withval/include" + then : +- LIB_KRB5_CFLAGS+="-I$withval/include" ++ LIBMIT_KRB5_CFLAGS="$LIBMIT_KRB5_CFLAGS -I$withval/include" + fi + ;; + esac +@@ -35530,15 +35530,15 @@ then : + with_heimdal_krb5=yes + if test -d "$withval/lib64" + then : +- LIBHEIMDAL_KRB5_PATH+="-L$withval/lib64" ++ LIBHEIMDAL_KRB5_LIBS="$LIBHEIMDAL_KRB5_LIBS -L$withval/lib64" + fi + if test -d "$withval/lib" + then : +- LIBHEIMDAL_KRB5_PATH+="-L$withval/lib" ++ LIBHEIMDAL_KRB5_LIBS="$LIBHEIMDAL_KRB5_LIBS -L$withval/lib" + fi + if test -d "$withval/include" + then : +- LIBHEIMDAL_KRB5_CFLAGS+="-I$withval/include" ++ LIBHEIMDAL_KRB5_CFLAGS="$LIBHEIMDAL_KRB5_CFLAGS -I$withval/include" + fi + ;; + esac +@@ -40801,7 +40801,7 @@ BUILD_HELPER="NIS" ## 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=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " -@@ -50825,6 +50825,7 @@ ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type +@@ -47289,6 +47289,7 @@ ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type 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 -@@ -53793,6 +53794,7 @@ else $as_nop +@@ -49806,6 +49807,7 @@ else $as_nop # include # include #undef minor_t +# include /* IFNAMSIZ */ # include # include # include diff --git a/www/squid/files/squid.in b/www/squid/files/squid.in index b1ba8938bf56..e8ea315cc356 100644 --- a/www/squid/files/squid.in +++ b/www/squid/files/squid.in @@ -1,183 +1,180 @@ #!/bin/sh # PROVIDE: squid # REQUIRE: LOGIN # KEYWORD: shutdown # # Note: # Set "squid_enable=yes" in either /etc/rc.conf, /etc/rc.conf.local or # /etc/rc.conf.d/squid to activate Squid. # # Additional variables you can define in one of these files: # # squid_chdir: the directory into which the rc system moves into before # starting Squid. Default: /var/squid # # squid_conf: The configuration file that Squid should use. # Default: %%PREFIX%%/etc/squid/squid.conf # # squid_fib: The alternative routing table id that Squid should use. # Default: none # See setfib(1) for further details. Note that the setfib(2) # system call is not available in FreeBSD versions prior to 7.1. # # squid_user: The user id that should be used to run the Squid master # process. Default: squid. # Note that you probably need to define "squid_user=root" if # you want to run Squid in reverse proxy setups or if you want # Squid to listen on a "privileged" port < 1024. # # squid_group: The group id that should be used to run the Squid master # process. Default: squid # Note that it affects squid pid dir also, where SHM files # may be stored on some OS (see r391555) # # squid_maxwait: Seconds to wait for squid PID file # Default: 10 # # squid_pidfile: # The name (including the full path) of the Squid # master process' PID file. # Default: /var/run/squid/squid.pid. # You only need to change this if you changed the # corresponding entry in your Squid configuration. # # squid_flags: Additional commandline arguments for Squid you might want to # use. See squid(8) for further details. # # squid_krb5_ktname: # Alternative Kerberos 5 Key Table. # Default: none # squid_krb5_config: # Alternative Kerberos 5 config file # Default: none . /etc/rc.subr name=squid rcvar=squid_enable # Make sure that we invoke squid with "-f ${squid_conf}"; define this # variable early so reload_cmd and stop_precmd pick it up: -# Workaround for https://bugs.squid-cache.org/show_bug.cgi?id=5390 until squid-7 is ported -#extra_commands="reload configtest" -#reload_cmd=squid_reload +extra_commands="reload configtest" +reload_cmd=squid_reload start_precmd=squid_prestart start_postcmd=squid_getpid -# Workaround for https://bugs.squid-cache.org/show_bug.cgi?id=5390 until squid-7 is ported -#stop_precmd=squid_prestop -#configtest_cmd=squid_configtest -#reload_precmd=squid_configtest -#restart_precmd=squid_configtest +stop_precmd=squid_prestop +configtest_cmd=squid_configtest +reload_precmd=squid_configtest +restart_precmd=squid_configtest # squid(8) will not start if ${squid_conf} is not present so try # to catch that beforehand via ${required_files} rather than make # squid(8) crash. squid_load_rc_config() { : ${squid_chdir:=/var/squid} : ${squid_conf:=%%PREFIX%%/etc/squid/squid.conf} : ${squid_enable:=NO} : ${squid_program:=%%PREFIX%%/sbin/squid} : ${squid_pidfile:=/var/run/squid/squid.pid} : ${squid_maxwait:=10} : ${squid_user:=squid} : ${squid_group:=squid} required_args="-f ${squid_conf}" required_dirs=$chdir required_files=$squid_conf command_args="${required_args} ${squid_flags}" # We used to need it in squid3 to match pid and proc name # procname="?squid-*" pidfile=$squid_pidfile } squid_prestart() { # create piddir if it's missing (for example if /var/run is tmpfs) squid_piddir=${pidfile%/*} if [ ! -d "${squid_piddir}" ]; then echo "Creating PID directory ${squid_piddir}" mkdir ${squid_piddir} && chown ${squid_user}:${squid_group} ${squid_piddir} && chmod 750 ${squid_piddir}|| return $? fi # setup KRB5_KTNAME: squid_krb5_ktname=${squid_krb5_ktname:-"NONE"} if [ "${squid_krb5_ktname}" != "NONE" ]; then export KRB5_KTNAME=${squid_krb5_ktname} fi # setup KRB5_CONFIG: squid_krb5_config=${squid_krb5_config:-"NONE"} if [ "${squid_krb5_config}" != "NONE" ]; then export KRB5_CONFIG=${squid_krb5_config} fi # setup FIB tables: if command -v check_namevarlist > /dev/null 2>&1; then check_namevarlist fib && return 0 fi ${SYSCTL} net.fibs >/dev/null 2>&1 || return 0 squid_fib=${squid_fib:-"NONE"} if [ "${squid_fib}" != "NONE" ]; then command="setfib -F $squid_fib $command" else return 0 fi - # Workaround for https://bugs.squid-cache.org/show_bug.cgi?id=5390 until squid-7 is ported - #squid_configtest + squid_configtest } squid_reload() { $command $required_args $squid_flags -k reconfigure } squid_configtest() { echo "Performing sanity check on ${name} configuration." if $command $required_args $squid_flags -k check; then echo "Configuration for ${name} passes." return 0 else return $? fi } squid_getpid() { # retrieve the PID of the Squid master process explicitly here # in case rc.subr was unable to determine it: if [ -z "$rc_pid" ]; then squid_secs=0 while ! [ -f ${pidfile} ]; do if [ ${squid_maxwait} -le ${squid_secs} ]; then echo "give up waiting for pidfile" break fi sleep 1 echo -n "." : $(( squid_secs+=1 )) done read _pid _junk <${pidfile} [ -z "${_pid}" ] || pid=${_pid} else pid=${rc_pid} fi } squid_prestop() { command_args="$command_args -k shutdown" squid_configtest } load_rc_config $name squid_load_rc_config run_rc_command $1 diff --git a/www/squid/pkg-plist b/www/squid/pkg-plist index 12265ea015bf..6ec146d42c7e 100644 --- a/www/squid/pkg-plist +++ b/www/squid/pkg-plist @@ -1,185 +1,177 @@ -sbin/squidclient +etc/periodic/weekly/900.squid-rotate-log sbin/squid -sbin/purge share/man/man8/url_lfs_rewrite.8.gz share/man/man8/storeid_file_rewrite.8.gz share/man/man8/squid.8.gz share/man/man8/security_fake_certverify.8.gz share/man/man8/log_db_daemon.8.gz share/man/man8/helper-mux.8.gz share/man/man8/ext_unix_group_acl.8.gz share/man/man8/ext_file_userip_acl.8.gz share/man/man8/ext_delayer_acl.8.gz share/man/man8/digest_file_auth.8.gz -share/man/man8/cachemgr.cgi.8.gz share/man/man8/basic_radius_auth.8.gz share/man/man8/basic_pop3_auth.8.gz share/man/man8/basic_pam_auth.8.gz share/man/man8/basic_ncsa_auth.8.gz share/man/man8/basic_getpwnam_auth.8.gz share/man/man8/basic_db_auth.8.gz -share/man/man1/squidclient.1.gz -share/man/man1/purge.1.gz libexec/squid/url_lfs_rewrite libexec/squid/url_fake_rewrite.sh libexec/squid/url_fake_rewrite libexec/squid/storeid_file_rewrite libexec/squid/security_fake_certverify -libexec/squid/ntlm_smb_lm_auth libexec/squid/ntlm_fake_auth libexec/squid/log_file_daemon libexec/squid/log_db_daemon libexec/squid/helper-mux libexec/squid/ext_unix_group_acl libexec/squid/ext_file_userip_acl libexec/squid/ext_delayer_acl libexec/squid/digest_file_auth -libexec/squid/cachemgr.cgi -libexec/squid/basic_smb_lm_auth libexec/squid/basic_radius_auth libexec/squid/basic_pop3_auth libexec/squid/basic_pam_auth libexec/squid/basic_ncsa_auth libexec/squid/basic_getpwnam_auth libexec/squid/basic_fake_auth libexec/squid/basic_db_auth %%UNLINKD%%libexec/squid/unlinkd %%TDB%%share/man/man8/ext_time_quota_acl.8.gz %%TDB%%share/man/man8/ext_session_acl.8.gz %%TDB%%libexec/squid/ext_time_quota_acl %%TDB%%libexec/squid/ext_session_acl %%SSL%%share/man/man8/security_file_certgen.8.gz %%SSL%%libexec/squid/security_file_certgen %%ICMP%%@(,squid,4510) libexec/squid/pinger %%FS_DISKD%%libexec/squid/diskd %%ETCDIR%%/squid.conf.documented %%ETCDIR%%/mib.txt %%ETCDIR%%/icons/silk/script_palette.png %%ETCDIR%%/icons/silk/script_gear.png %%ETCDIR%%/icons/silk/script.png %%ETCDIR%%/icons/silk/plugin_add.png %%ETCDIR%%/icons/silk/plugin.png %%ETCDIR%%/icons/silk/picture.png %%ETCDIR%%/icons/silk/photo.png %%ETCDIR%%/icons/silk/page_world.png %%ETCDIR%%/icons/silk/page_white_zip.png %%ETCDIR%%/icons/silk/page_white_word.png %%ETCDIR%%/icons/silk/page_white_text.png %%ETCDIR%%/icons/silk/page_white_stack.png %%ETCDIR%%/icons/silk/page_white_powerpoint.png %%ETCDIR%%/icons/silk/page_white_picture.png %%ETCDIR%%/icons/silk/page_white_magnify.png %%ETCDIR%%/icons/silk/page_white_flash.png %%ETCDIR%%/icons/silk/page_white_cplusplus.png %%ETCDIR%%/icons/silk/page_white_c.png %%ETCDIR%%/icons/silk/page_white_acrobat.png %%ETCDIR%%/icons/silk/page_white.png %%ETCDIR%%/icons/silk/page_green.png %%ETCDIR%%/icons/silk/page_excel.png %%ETCDIR%%/icons/silk/page_code.png %%ETCDIR%%/icons/silk/package_go.png %%ETCDIR%%/icons/silk/package.png %%ETCDIR%%/icons/silk/music.png %%ETCDIR%%/icons/silk/link.png %%ETCDIR%%/icons/silk/layout.png %%ETCDIR%%/icons/silk/layers.png %%ETCDIR%%/icons/silk/information.png %%ETCDIR%%/icons/silk/image.png %%ETCDIR%%/icons/silk/folder_table.png %%ETCDIR%%/icons/silk/folder.png %%ETCDIR%%/icons/silk/film_key.png %%ETCDIR%%/icons/silk/film.png %%ETCDIR%%/icons/silk/drive_disk.png %%ETCDIR%%/icons/silk/database_table.png %%ETCDIR%%/icons/silk/database.png %%ETCDIR%%/icons/silk/cup.png %%ETCDIR%%/icons/silk/css.png %%ETCDIR%%/icons/silk/computer_link.png %%ETCDIR%%/icons/silk/compress.png %%ETCDIR%%/icons/silk/chart_line.png %%ETCDIR%%/icons/silk/cd.png %%ETCDIR%%/icons/silk/bullet_red.png %%ETCDIR%%/icons/silk/bricks.png %%ETCDIR%%/icons/silk/box.png %%ETCDIR%%/icons/silk/bomb.png %%ETCDIR%%/icons/silk/arrow_up.png %%ETCDIR%%/icons/silk/application.png %%ETCDIR%%/icons/SN.png %%ETCDIR%%/errors/templates/error-details.txt %%ETCDIR%%/errors/templates/ERR_ZERO_SIZE_OBJECT %%ETCDIR%%/errors/templates/ERR_WRITE_ERROR %%ETCDIR%%/errors/templates/ERR_URN_RESOLVE %%ETCDIR%%/errors/templates/ERR_UNSUP_REQ %%ETCDIR%%/errors/templates/ERR_UNSUP_HTTPVERSION %%ETCDIR%%/errors/templates/ERR_TOO_BIG %%ETCDIR%%/errors/templates/ERR_SOCKET_FAILURE %%ETCDIR%%/errors/templates/ERR_SHUTTING_DOWN %%ETCDIR%%/errors/templates/ERR_SECURE_CONNECT_FAIL %%ETCDIR%%/errors/templates/ERR_READ_TIMEOUT %%ETCDIR%%/errors/templates/ERR_READ_ERROR %%ETCDIR%%/errors/templates/ERR_PROTOCOL_UNKNOWN %%ETCDIR%%/errors/templates/ERR_PRECONDITION_FAILED %%ETCDIR%%/errors/templates/ERR_ONLY_IF_CACHED_MISS %%ETCDIR%%/errors/templates/ERR_NO_RELAY %%ETCDIR%%/errors/templates/ERR_LIFETIME_EXP %%ETCDIR%%/errors/templates/ERR_INVALID_URL %%ETCDIR%%/errors/templates/ERR_INVALID_RESP %%ETCDIR%%/errors/templates/ERR_INVALID_REQ %%ETCDIR%%/errors/templates/ERR_ICAP_FAILURE %%ETCDIR%%/errors/templates/ERR_GATEWAY_FAILURE %%ETCDIR%%/errors/templates/ERR_FTP_UNAVAILABLE %%ETCDIR%%/errors/templates/ERR_FTP_PUT_MODIFIED %%ETCDIR%%/errors/templates/ERR_FTP_PUT_ERROR %%ETCDIR%%/errors/templates/ERR_FTP_PUT_CREATED %%ETCDIR%%/errors/templates/ERR_FTP_NOT_FOUND %%ETCDIR%%/errors/templates/ERR_FTP_FORBIDDEN %%ETCDIR%%/errors/templates/ERR_FTP_FAILURE %%ETCDIR%%/errors/templates/ERR_FTP_DISABLED %%ETCDIR%%/errors/templates/ERR_FORWARDING_DENIED %%ETCDIR%%/errors/templates/ERR_ESI %%ETCDIR%%/errors/templates/ERR_DNS_FAIL %%ETCDIR%%/errors/templates/ERR_DIR_LISTING %%ETCDIR%%/errors/templates/ERR_CONNECT_FAIL %%ETCDIR%%/errors/templates/ERR_CONFLICT_HOST %%ETCDIR%%/errors/templates/ERR_CANNOT_FORWARD %%ETCDIR%%/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED %%ETCDIR%%/errors/templates/ERR_CACHE_ACCESS_DENIED %%ETCDIR%%/errors/templates/ERR_AGENT_WPAD %%ETCDIR%%/errors/templates/ERR_AGENT_CONFIGURE %%ETCDIR%%/errors/templates/ERR_ACL_TIME_QUOTA_EXCEEDED %%ETCDIR%%/errors/templates/ERR_ACCESS_DENIED %%ETCDIR%%/errors/TRANSLATORS %%ETCDIR%%/errors/COPYRIGHT %%AUTH_SQL%%share/man/man8/ext_sql_session_acl.8.gz %%AUTH_SQL%%libexec/squid/ext_sql_session_acl %%AUTH_SMB%%share/man/man8/ext_wbinfo_group_acl.8.gz %%AUTH_SMB%%libexec/squid/ext_wbinfo_group_acl %%AUTH_SMB%%libexec/squid/basic_smb_auth.sh %%AUTH_SMB%%libexec/squid/basic_smb_auth %%AUTH_SASL%%share/man/man8/basic_sasl_auth.8.gz %%AUTH_SASL%%libexec/squid/basic_sasl_auth %%AUTH_NIS%%libexec/squid/basic_nis_auth %%AUTH_LDAP%%share/man/man8/ext_ldap_group_acl.8.gz %%AUTH_LDAP%%share/man/man8/ext_edirectory_userip_acl.8.gz %%AUTH_LDAP%%share/man/man8/basic_ldap_auth.8.gz %%AUTH_LDAP%%libexec/squid/ext_ldap_group_acl %%AUTH_LDAP%%libexec/squid/ext_edirectory_userip_acl %%AUTH_LDAP%%libexec/squid/digest_ldap_auth %%AUTH_LDAP%%libexec/squid/digest_edirectory_auth %%AUTH_LDAP%%libexec/squid/basic_ldap_auth %%AUTH_KERB%%share/man/man8/negotiate_kerberos_auth.8.gz %%AUTH_KERB%%libexec/squid/negotiate_wrapper_auth %%AUTH_KERB%%libexec/squid/negotiate_kerberos_auth_test %%AUTH_KERB%%libexec/squid/negotiate_kerberos_auth %%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%share/man/man8/ext_kerberos_sid_group_acl.8.gz %%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/ext_kerberos_sid_group_acl %%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/ext_kerberos_ldap_group_acl %%AUTH_KERB%%%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/cert_tool @sample %%ETCDIR%%/squid.conf.sample @sample %%ETCDIR%%/mime.conf.sample @sample %%ETCDIR%%/errorpage.css.sample -@sample %%ETCDIR%%/cachemgr.conf.sample @dir(squid,squid,750) /var/squid/cache @dir(squid,squid,750) /var/squid @dir(squid,squid,750) /var/run/squid @dir(squid,squid,750) /var/log/squid