View | Details | Raw Unified | Return to bug 253416
Collapse All | Expand All

(-)squid-devel/Makefile (-11 / +14 lines)
Lines 1-21 Link Here
1
# $FreeBSD: head/www/squid-devel/Makefile 539292 2020-06-15 21:27:20Z cs $
1
# $FreeBSD: head/www/squid-devel/Makefile 539292 2020-06-15 21:27:20Z cs $
2
2
3
PORTNAME=	squid
3
PORTNAME=	squid
4
PORTVERSION=	5.0.3
4
PORTVERSION=	5.0.5
5
CATEGORIES=	www
5
CATEGORIES=	www
6
MASTER_SITES=	http://www.squid-cache.org/Versions/v5/ \
6
MASTER_SITES=	http://www2.pl.squid-cache.org/Versions/v5/ \
7
		http://www2.us.squid-cache.org/Versions/v5/ \
7
		http://ca.squid-cache.org/Versions/v5/ \
8
		http://www1.at.squid-cache.org/Versions/v5/ \
8
		http://www1.il.squid-cache.org/Versions/v5/ \
9
		http://www.eu.squid-cache.org/Versions/v5/ \
9
		http://www1.jp.squid-cache.org/Versions/v5/ \
10
		http://www1.jp.squid-cache.org/Versions/v5/
10
		http://www2.gr.squid-cache.org/Versions/v5/ \
11
		http://ca2.squid-cache.org/Versions/v5/ \
12
		http://www.squid-cache.org/Versions/v5/
11
PKGNAMESUFFIX=	-devel
13
PKGNAMESUFFIX=	-devel
12
14
13
PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
15
PATCH_SITES=	http://www2.pl.squid-cache.org/%SUBDIR%/ \
14
		http://www2.us.squid-cache.org/%SUBDIR%/ \
16
		http://ca.squid-cache.org/%SUBDIR%/ \
15
		http://www1.at.squid-cache.org/%SUBDIR%/ \
17
		http://www1.il.squid-cache.org/%SUBDIR%/ \
16
		http://www.eu.squid-cache.org/%SUBDIR%/ \
17
		http://www1.jp.squid-cache.org/%SUBDIR%/ \
18
		http://www1.jp.squid-cache.org/%SUBDIR%/ \
18
		http://master.squid-cache.org/~amosjeffries/patches/:nosid
19
		http://www2.gr.squid-cache.org/%SUBDIR%/ \
20
		http://ca2.squid-cache.org/%SUBDIR%/ \
21
		http://www.squid-cache.org/%SUBDIR%/
19
PATCH_SITE_SUBDIR=	Versions/v5/changesets
22
PATCH_SITE_SUBDIR=	Versions/v5/changesets
20
23
21
MAINTAINER=	timp87@gmail.com
24
MAINTAINER=	timp87@gmail.com
(-)squid-devel/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1591779543
1
TIMESTAMP = 1612887883
2
SHA256 (squid-5.0.3.tar.xz) = c09dd43121ce7fe006b8afd8ddfe6ca064aadf0ab342303f4e6c6678463bb4d0
2
SHA256 (squid-5.0.5.tar.xz) = 68357a6799235080cb5f8258a3594b0006fc498240f2628f3da69e3f76d460cd
3
SIZE (squid-5.0.3.tar.xz) = 2518568
3
SIZE (squid-5.0.5.tar.xz) = 2533836
(-)squid-devel/files/patch-configure (-9 lines)
Lines 80-91 Link Here
80
 #include <netinet/ip_compat.h>
80
 #include <netinet/ip_compat.h>
81
 #endif
81
 #endif
82
 #if HAVE_IP_FIL_H
82
 #if HAVE_IP_FIL_H
83
@@ -42749,7 +42756,7 @@ _ACEOF
84
 
85
 
86
 fi
87
-ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6" "ac_cv_member_struct_natlookup_nl_realipaddr_in6" "
88
+ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6" "ac_cv_member_struct_natlookup_nl_realipaddr_in6__" "
89
 #if USE_SOLARIS_IPFILTER_MINOR_T_HACK
90
 #define minor_t fubar
91
 #endif
(-)squid-devel/files/squid.in (+24 lines)
Lines 29-34 Link Here
29
#		you want to run Squid in reverse proxy setups or if you want
29
#		you want to run Squid in reverse proxy setups or if you want
30
#		Squid to listen on a "privileged" port < 1024.
30
#		Squid to listen on a "privileged" port < 1024.
31
#
31
#
32
# squid_group:	The group id that should be used to run the Squid master
33
#		process. Default: squid
34
#		Note that it affects squid pid dir also, where SHM files
35
#		may be stored on some OS (see r391555)
36
#
37
# squid_maxwait:	Seconds to wait for squid PID file
38
#		Default: 10
39
#
32
# squid_pidfile:
40
# squid_pidfile:
33
#		The name (including the full path) of the Squid
41
#		The name (including the full path) of the Squid
34
#		master process' PID file.
42
#		master process' PID file.
Lines 74-80 Link Here
74
	: ${squid_enable:=NO}
82
	: ${squid_enable:=NO}
75
	: ${squid_program:=%%PREFIX%%/sbin/squid}
83
	: ${squid_program:=%%PREFIX%%/sbin/squid}
76
	: ${squid_pidfile:=/var/run/squid/squid.pid}
84
	: ${squid_pidfile:=/var/run/squid/squid.pid}
85
	: ${squid_maxwait:=10}
77
	: ${squid_user:=squid}
86
	: ${squid_user:=squid}
87
	: ${squid_group:=squid}
78
88
79
	required_args="-f ${squid_conf}"
89
	required_args="-f ${squid_conf}"
80
	required_dirs=$chdir
90
	required_dirs=$chdir
Lines 87-92 Link Here
87
97
88
squid_prestart()
98
squid_prestart()
89
{
99
{
100
	# create piddir if it's missing (for example if /var/run is tmpfs)
101
	squid_piddir=${pidfile%/*}
102
	if [ ! -d "${squid_piddir}" ]; then
103
		echo "Creating PID directory ${squid_piddir}"
104
		mkdir ${squid_piddir} && chown ${squid_user}:${squid_group} ${squid_piddir} && chmod 750 ${squid_piddir}|| return $?
105
	fi
106
90
	# setup KRB5_KTNAME:
107
	# setup KRB5_KTNAME:
91
	squid_krb5_ktname=${squid_krb5_ktname:-"NONE"}
108
	squid_krb5_ktname=${squid_krb5_ktname:-"NONE"}
92
	if [ "${squid_krb5_ktname}" != "NONE" ]; then
109
	if [ "${squid_krb5_ktname}" != "NONE" ]; then
Lines 137-144 Link Here
137
	# retrieve the PID of the Squid master process explicitly here
154
	# retrieve the PID of the Squid master process explicitly here
138
	# in case rc.subr was unable to determine it:
155
	# in case rc.subr was unable to determine it:
139
	if [ -z "$rc_pid" ]; then
156
	if [ -z "$rc_pid" ]; then
157
		squid_secs=0
140
		while ! [ -f ${pidfile} ]; do
158
		while ! [ -f ${pidfile} ]; do
159
			if [ ${squid_maxwait} -le ${squid_secs} ]; then
160
				echo "give up waiting for pidfile"
161
				break
162
			fi
141
			sleep 1
163
			sleep 1
164
			echo -n "."
165
			: $(( squid_secs+=1 ))
142
		done
166
		done
143
		read _pid _junk <${pidfile}
167
		read _pid _junk <${pidfile}
144
		[ -z "${_pid}" ] || pid=${_pid}
168
		[ -z "${_pid}" ] || pid=${_pid}
(-)squid-devel/pkg-plist (-1 / +46 lines)
Lines 604-609 Link Here
604
%%ETCDIR%%/errors/sr-cyrl-me
604
%%ETCDIR%%/errors/sr-cyrl-me
605
%%ETCDIR%%/errors/sr-cyrl-cs
605
%%ETCDIR%%/errors/sr-cyrl-cs
606
%%ETCDIR%%/errors/sr
606
%%ETCDIR%%/errors/sr
607
%%ETCDIR%%/errors/spq
607
%%ETCDIR%%/errors/sl/error-details.txt
608
%%ETCDIR%%/errors/sl/error-details.txt
608
%%ETCDIR%%/errors/sl/ERR_ZERO_SIZE_OBJECT
609
%%ETCDIR%%/errors/sl/ERR_ZERO_SIZE_OBJECT
609
%%ETCDIR%%/errors/sl/ERR_WRITE_ERROR
610
%%ETCDIR%%/errors/sl/ERR_WRITE_ERROR
Lines 1723-1729 Link Here
1723
%%ETCDIR%%/errors/es-pe
1724
%%ETCDIR%%/errors/es-pe
1724
%%ETCDIR%%/errors/es-pa
1725
%%ETCDIR%%/errors/es-pa
1725
%%ETCDIR%%/errors/es-ni
1726
%%ETCDIR%%/errors/es-ni
1726
%%ETCDIR%%/errors/es-mx
1727
%%ETCDIR%%/errors/es-mx/ERR_ACCESS_DENIED
1728
%%ETCDIR%%/errors/es-mx/ERR_ACL_TIME_QUOTA_EXCEEDED
1729
%%ETCDIR%%/errors/es-mx/ERR_AGENT_CONFIGURE
1730
%%ETCDIR%%/errors/es-mx/ERR_AGENT_WPAD
1731
%%ETCDIR%%/errors/es-mx/ERR_CACHE_ACCESS_DENIED
1732
%%ETCDIR%%/errors/es-mx/ERR_CACHE_MGR_ACCESS_DENIED
1733
%%ETCDIR%%/errors/es-mx/ERR_CANNOT_FORWARD
1734
%%ETCDIR%%/errors/es-mx/ERR_CONFLICT_HOST
1735
%%ETCDIR%%/errors/es-mx/ERR_CONNECT_FAIL
1736
%%ETCDIR%%/errors/es-mx/ERR_DIR_LISTING
1737
%%ETCDIR%%/errors/es-mx/ERR_DNS_FAIL
1738
%%ETCDIR%%/errors/es-mx/ERR_ESI
1739
%%ETCDIR%%/errors/es-mx/ERR_FORWARDING_DENIED
1740
%%ETCDIR%%/errors/es-mx/ERR_FTP_DISABLED
1741
%%ETCDIR%%/errors/es-mx/ERR_FTP_FAILURE
1742
%%ETCDIR%%/errors/es-mx/ERR_FTP_FORBIDDEN
1743
%%ETCDIR%%/errors/es-mx/ERR_FTP_NOT_FOUND
1744
%%ETCDIR%%/errors/es-mx/ERR_FTP_PUT_CREATED
1745
%%ETCDIR%%/errors/es-mx/ERR_FTP_PUT_ERROR
1746
%%ETCDIR%%/errors/es-mx/ERR_FTP_PUT_MODIFIED
1747
%%ETCDIR%%/errors/es-mx/ERR_FTP_UNAVAILABLE
1748
%%ETCDIR%%/errors/es-mx/ERR_GATEWAY_FAILURE
1749
%%ETCDIR%%/errors/es-mx/ERR_ICAP_FAILURE
1750
%%ETCDIR%%/errors/es-mx/ERR_INVALID_REQ
1751
%%ETCDIR%%/errors/es-mx/ERR_INVALID_RESP
1752
%%ETCDIR%%/errors/es-mx/ERR_INVALID_URL
1753
%%ETCDIR%%/errors/es-mx/ERR_LIFETIME_EXP
1754
%%ETCDIR%%/errors/es-mx/ERR_NO_RELAY
1755
%%ETCDIR%%/errors/es-mx/ERR_ONLY_IF_CACHED_MISS
1756
%%ETCDIR%%/errors/es-mx/ERR_PRECONDITION_FAILED
1757
%%ETCDIR%%/errors/es-mx/ERR_PROTOCOL_UNKNOWN
1758
%%ETCDIR%%/errors/es-mx/ERR_READ_ERROR
1759
%%ETCDIR%%/errors/es-mx/ERR_READ_TIMEOUT
1760
%%ETCDIR%%/errors/es-mx/ERR_SECURE_CONNECT_FAIL
1761
%%ETCDIR%%/errors/es-mx/ERR_SHUTTING_DOWN
1762
%%ETCDIR%%/errors/es-mx/ERR_SOCKET_FAILURE
1763
%%ETCDIR%%/errors/es-mx/ERR_TOO_BIG
1764
%%ETCDIR%%/errors/es-mx/ERR_UNSUP_HTTPVERSION
1765
%%ETCDIR%%/errors/es-mx/ERR_UNSUP_REQ
1766
%%ETCDIR%%/errors/es-mx/ERR_URN_RESOLVE
1767
%%ETCDIR%%/errors/es-mx/ERR_WRITE_ERROR
1768
%%ETCDIR%%/errors/es-mx/ERR_ZERO_SIZE_OBJECT
1769
%%ETCDIR%%/errors/es-mx/error-details.txt
1727
%%ETCDIR%%/errors/es-hn
1770
%%ETCDIR%%/errors/es-hn
1728
%%ETCDIR%%/errors/es-gt
1771
%%ETCDIR%%/errors/es-gt
1729
%%ETCDIR%%/errors/es-es
1772
%%ETCDIR%%/errors/es-es
Lines 1732-1737 Link Here
1732
%%ETCDIR%%/errors/es-cr
1775
%%ETCDIR%%/errors/es-cr
1733
%%ETCDIR%%/errors/es-co
1776
%%ETCDIR%%/errors/es-co
1734
%%ETCDIR%%/errors/es-cl
1777
%%ETCDIR%%/errors/es-cl
1778
%%ETCDIR%%/errors/es-cu
1779
%%ETCDIR%%/errors/es-bz
1735
%%ETCDIR%%/errors/es-bo
1780
%%ETCDIR%%/errors/es-bo
1736
%%ETCDIR%%/errors/es-ar
1781
%%ETCDIR%%/errors/es-ar
1737
%%ETCDIR%%/errors/en/error-details.txt
1782
%%ETCDIR%%/errors/en/error-details.txt

Return to bug 253416