Attachment 222342 Details for Bug 253416 – port patch

[patch] port patch

squid-devel-5.0.5.patch (text/plain), 7.35 KB, created by Pavel Timofeev on 2021-02-10 21:15:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2021-02-10 21:15:54 UTC

Size: 7.35 KB

patch

obsolete

>diff -ruN /root/squid-devel.orig/Makefile squid-devel/Makefile
>--- /root/squid-devel.orig/Makefile	2021-02-09 09:24:23.338207000 -0700
>+++ squid-devel/Makefile	2021-02-09 14:08:04.598170000 -0700
>@@ -1,21 +1,24 @@
> # $FreeBSD: head/www/squid-devel/Makefile 539292 2020-06-15 21:27:20Z cs $
> 
> 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@gmail.com
>diff -ruN /root/squid-devel.orig/distinfo squid-devel/distinfo
>--- /root/squid-devel.orig/distinfo	2021-02-09 09:24:23.333957000 -0700
>+++ squid-devel/distinfo	2021-02-09 09:24:43.374427000 -0700
>@@ -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
>diff -ruN /root/squid-devel.orig/files/patch-configure squid-devel/files/patch-configure
>--- /root/squid-devel.orig/files/patch-configure	2021-02-09 09:24:23.337396000 -0700
>+++ squid-devel/files/patch-configure	2021-02-10 14:11:30.126204000 -0700
>@@ -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
>diff -ruN /root/squid-devel.orig/files/squid.in squid-devel/files/squid.in
>--- /root/squid-devel.orig/files/squid.in	2021-02-09 09:24:23.337893000 -0700
>+++ squid-devel/files/squid.in	2021-02-09 14:03:41.015549000 -0700
>@@ -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_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_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 @@
> 	# 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}
>diff -ruN /root/squid-devel.orig/pkg-plist squid-devel/pkg-plist
>--- /root/squid-devel.orig/pkg-plist	2021-02-09 09:24:23.338972000 -0700
>+++ squid-devel/pkg-plist	2021-02-09 13:16:16.633313000 -0700
>@@ -604,6 +604,7 @@
> %%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 @@
> %%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 @@
> %%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

Flags:

timp87: maintainer-approval+

Actions: View | Diff

Attachments on bug 253416: 222342