Author: nc
Date: Thu Feb 11 02:17:46 2021
New Revision: 564927
URL: https://svnweb.freebsd.org/changeset/ports/564927
Log:
MFH: r564926
www/squid-devel: Update to 5.0.5
Changes: https://github.com/squid-cache/squid/blob/v5/ChangeLog
PR: 253416
Submitted by: timp87 AT gmail DOT com (maintainer)
Approved by: portmgr (bugfix blanket)
Modified:
branches/2021Q1/www/squid-devel/Makefile
branches/2021Q1/www/squid-devel/distinfo
branches/2021Q1/www/squid-devel/files/patch-configure
branches/2021Q1/www/squid-devel/files/squid.in
branches/2021Q1/www/squid-devel/pkg-plist
Directory Properties:
branches/2021Q1/ (props changed)
Modified: branches/2021Q1/www/squid-devel/Makefile
==============================================================================
--- branches/2021Q1/www/squid-devel/Makefile Thu Feb 11 02:16:52 2021 (r564926)
+++ branches/2021Q1/www/squid-devel/Makefile Thu Feb 11 02:17:46 2021 (r564927)
@@ -1,21 +1,24 @@
# $FreeBSD$
PORTNAME= squid
-PORTVERSION= 5.0.3
+PORTVERSION= 5.0.5
CATEGORIES= www
-MASTER_SITES= http://www.squid-cache.org/Versions/v5/ \
- http://www2.us.squid-cache.org/Versions/v5/ \
- http://www1.at.squid-cache.org/Versions/v5/ \
- http://www.eu.squid-cache.org/Versions/v5/ \
- http://www1.jp.squid-cache.org/Versions/v5/
+MASTER_SITES= http://www2.pl.squid-cache.org/Versions/v5/ \
+ http://ca.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/
PKGNAMESUFFIX= -devel
-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%/ \
+PATCH_SITES= http://www2.pl.squid-cache.org/%SUBDIR%/ \
+ http://ca.squid-cache.org/%SUBDIR%/ \
+ http://www1.il.squid-cache.org/%SUBDIR%/ \
http://www1.jp.squid-cache.org/%SUBDIR%/ \
- http://master.squid-cache.org/~amosjeffries/patches/:nosid
+ 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
MAINTAINER= timp87 at gmail.com
Modified: branches/2021Q1/www/squid-devel/distinfo
==============================================================================
--- branches/2021Q1/www/squid-devel/distinfo Thu Feb 11 02:16:52 2021 (r564926)
+++ branches/2021Q1/www/squid-devel/distinfo Thu Feb 11 02:17:46 2021 (r564927)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591779543
-SHA256 (squid-5.0.3.tar.xz) = c09dd43121ce7fe006b8afd8ddfe6ca064aadf0ab342303f4e6c6678463bb4d0
-SIZE (squid-5.0.3.tar.xz) = 2518568
+TIMESTAMP = 1612887883
+SHA256 (squid-5.0.5.tar.xz) = 68357a6799235080cb5f8258a3594b0006fc498240f2628f3da69e3f76d460cd
+SIZE (squid-5.0.5.tar.xz) = 2533836
Modified: branches/2021Q1/www/squid-devel/files/patch-configure
==============================================================================
--- branches/2021Q1/www/squid-devel/files/patch-configure Thu Feb 11 02:16:52 2021 (r564926)
+++ branches/2021Q1/www/squid-devel/files/patch-configure Thu Feb 11 02:17:46 2021 (r564927)
@@ -80,12 +80,3 @@
#include <netinet/ip_compat.h>
#endif
#if HAVE_IP_FIL_H
-@@ -42749,7 +42756,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: branches/2021Q1/www/squid-devel/files/squid.in
==============================================================================
--- branches/2021Q1/www/squid-devel/files/squid.in Thu Feb 11 02:16:52 2021 (r564926)
+++ branches/2021Q1/www/squid-devel/files/squid.in Thu Feb 11 02:17:46 2021 (r564927)
@@ -29,6 +29,14 @@
# 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.
@@ -74,7 +82,9 @@ squid_load_rc_config()
: ${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
@@ -87,6 +97,13 @@ squid_load_rc_config()
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
@@ -137,8 +154,15 @@ 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}
Modified: branches/2021Q1/www/squid-devel/pkg-plist
==============================================================================
--- branches/2021Q1/www/squid-devel/pkg-plist Thu Feb 11 02:16:52 2021 (r564926)
+++ branches/2021Q1/www/squid-devel/pkg-plist Thu Feb 11 02:17:46 2021 (r564927)
@@ -604,6 +604,7 @@ libexec/squid/basic_db_auth
%%ETCDIR%%/errors/sr-cyrl-me
%%ETCDIR%%/errors/sr-cyrl-cs
%%ETCDIR%%/errors/sr
+%%ETCDIR%%/errors/spq
%%ETCDIR%%/errors/sl/error-details.txt
%%ETCDIR%%/errors/sl/ERR_ZERO_SIZE_OBJECT
%%ETCDIR%%/errors/sl/ERR_WRITE_ERROR
@@ -1723,7 +1724,49 @@ libexec/squid/basic_db_auth
%%ETCDIR%%/errors/es-pe
%%ETCDIR%%/errors/es-pa
%%ETCDIR%%/errors/es-ni
-%%ETCDIR%%/errors/es-mx
+%%ETCDIR%%/errors/es-mx/ERR_ACCESS_DENIED
+%%ETCDIR%%/errors/es-mx/ERR_ACL_TIME_QUOTA_EXCEEDED
+%%ETCDIR%%/errors/es-mx/ERR_AGENT_CONFIGURE
+%%ETCDIR%%/errors/es-mx/ERR_AGENT_WPAD
+%%ETCDIR%%/errors/es-mx/ERR_CACHE_ACCESS_DENIED
+%%ETCDIR%%/errors/es-mx/ERR_CACHE_MGR_ACCESS_DENIED
+%%ETCDIR%%/errors/es-mx/ERR_CANNOT_FORWARD
+%%ETCDIR%%/errors/es-mx/ERR_CONFLICT_HOST
+%%ETCDIR%%/errors/es-mx/ERR_CONNECT_FAIL
+%%ETCDIR%%/errors/es-mx/ERR_DIR_LISTING
+%%ETCDIR%%/errors/es-mx/ERR_DNS_FAIL
+%%ETCDIR%%/errors/es-mx/ERR_ESI
+%%ETCDIR%%/errors/es-mx/ERR_FORWARDING_DENIED
+%%ETCDIR%%/errors/es-mx/ERR_FTP_DISABLED
+%%ETCDIR%%/errors/es-mx/ERR_FTP_FAILURE
+%%ETCDIR%%/errors/es-mx/ERR_FTP_FORBIDDEN
+%%ETCDIR%%/errors/es-mx/ERR_FTP_NOT_FOUND
+%%ETCDIR%%/errors/es-mx/ERR_FTP_PUT_CREATED
+%%ETCDIR%%/errors/es-mx/ERR_FTP_PUT_ERROR
+%%ETCDIR%%/errors/es-mx/ERR_FTP_PUT_MODIFIED
+%%ETCDIR%%/errors/es-mx/ERR_FTP_UNAVAILABLE
+%%ETCDIR%%/errors/es-mx/ERR_GATEWAY_FAILURE
+%%ETCDIR%%/errors/es-mx/ERR_ICAP_FAILURE
+%%ETCDIR%%/errors/es-mx/ERR_INVALID_REQ
+%%ETCDIR%%/errors/es-mx/ERR_INVALID_RESP
+%%ETCDIR%%/errors/es-mx/ERR_INVALID_URL
+%%ETCDIR%%/errors/es-mx/ERR_LIFETIME_EXP
+%%ETCDIR%%/errors/es-mx/ERR_NO_RELAY
+%%ETCDIR%%/errors/es-mx/ERR_ONLY_IF_CACHED_MISS
+%%ETCDIR%%/errors/es-mx/ERR_PRECONDITION_FAILED
+%%ETCDIR%%/errors/es-mx/ERR_PROTOCOL_UNKNOWN
+%%ETCDIR%%/errors/es-mx/ERR_READ_ERROR
+%%ETCDIR%%/errors/es-mx/ERR_READ_TIMEOUT
+%%ETCDIR%%/errors/es-mx/ERR_SECURE_CONNECT_FAIL
+%%ETCDIR%%/errors/es-mx/ERR_SHUTTING_DOWN
+%%ETCDIR%%/errors/es-mx/ERR_SOCKET_FAILURE
+%%ETCDIR%%/errors/es-mx/ERR_TOO_BIG
+%%ETCDIR%%/errors/es-mx/ERR_UNSUP_HTTPVERSION
+%%ETCDIR%%/errors/es-mx/ERR_UNSUP_REQ
+%%ETCDIR%%/errors/es-mx/ERR_URN_RESOLVE
+%%ETCDIR%%/errors/es-mx/ERR_WRITE_ERROR
+%%ETCDIR%%/errors/es-mx/ERR_ZERO_SIZE_OBJECT
+%%ETCDIR%%/errors/es-mx/error-details.txt
%%ETCDIR%%/errors/es-hn
%%ETCDIR%%/errors/es-gt
%%ETCDIR%%/errors/es-es
@@ -1732,6 +1775,8 @@ libexec/squid/basic_db_auth
%%ETCDIR%%/errors/es-cr
%%ETCDIR%%/errors/es-co
%%ETCDIR%%/errors/es-cl
+%%ETCDIR%%/errors/es-cu
+%%ETCDIR%%/errors/es-bz
%%ETCDIR%%/errors/es-bo
%%ETCDIR%%/errors/es-ar
%%ETCDIR%%/errors/en/error-details.txt