svn commit: r401286 - in head/www/squid: . files
Jason Unovitch
junovitch at FreeBSD.org
Wed Nov 11 17:24:33 UTC 2015
Author: junovitch
Date: Wed Nov 11 17:24:31 2015
New Revision: 401286
URL: https://svnweb.freebsd.org/changeset/ports/401286
Log:
www/squid: update 3.5.10 -> 3.5.11
- Regen patches for new release and for portlint
- Drop creating/deleting /var/run/squid in the rc script as this duplicates
handling it in the pkg-plist
Changes:
* Bug 3574: crashes on reconfigure and startup
* Bug 4347: compile errors with LibreSSL 2.3
* Bug 4281: copy-paste typos in src/tools.cc
* Bug 4279: No response from proxy for FTP-download of non-existing file
* Bug 4188: Bumping intercepted SSL connections does not work on Solaris
* Fix incorrect authentication headers on cache digest requests
* Fix connection stats, including %<lp, missing for persistent connections
* Fix invalid memory access issues in SBuf
* Avoid errors when parsing manager ACL in old squid.conf
PR: 204217
Submitted by: Pavel Timofeev <timp87 at gmail.com> (maintainer)
Tested by: ncrogers at gmail.com
Modified:
head/www/squid/Makefile
head/www/squid/distinfo
head/www/squid/files/patch-compat_compat.h
head/www/squid/files/patch-compat_shm.cc
head/www/squid/files/patch-configure
head/www/squid/files/patch-src-cf.data.pre
head/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc
head/www/squid/files/patch-src__ip__Intercept.cc
head/www/squid/files/patch-src_ipc_mem_Segment.cc
head/www/squid/files/patch-src_tools.cc
head/www/squid/files/squid.in
Modified: head/www/squid/Makefile
==============================================================================
--- head/www/squid/Makefile Wed Nov 11 16:54:38 2015 (r401285)
+++ head/www/squid/Makefile Wed Nov 11 17:24:31 2015 (r401286)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= squid
-PORTVERSION= 3.5.10
+PORTVERSION= 3.5.11
CATEGORIES= www ipv6
MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
Modified: head/www/squid/distinfo
==============================================================================
--- head/www/squid/distinfo Wed Nov 11 16:54:38 2015 (r401285)
+++ head/www/squid/distinfo Wed Nov 11 17:24:31 2015 (r401286)
@@ -1,2 +1,2 @@
-SHA256 (squid3.5/squid-3.5.10.tar.xz) = 736e69fbddd6e985d2f85c995526f0a2bc4294c46dfb6737c0ccf09274a458b3
-SIZE (squid3.5/squid-3.5.10.tar.xz) = 2297452
+SHA256 (squid3.5/squid-3.5.11.tar.xz) = c26211b8e349fd9a5fd357da33074ff6523c111024dd3a5a1f77153538aa40cf
+SIZE (squid3.5/squid-3.5.11.tar.xz) = 2298436
Modified: head/www/squid/files/patch-compat_compat.h
==============================================================================
--- head/www/squid/files/patch-compat_compat.h Wed Nov 11 16:54:38 2015 (r401285)
+++ head/www/squid/files/patch-compat_compat.h Wed Nov 11 17:24:31 2015 (r401286)
@@ -1,4 +1,4 @@
---- compat/compat.h.orig 2015-08-01 06:08:17 UTC
+--- compat/compat.h.orig 2015-11-01 10:44:25 UTC
+++ compat/compat.h
@@ -42,17 +42,6 @@
#endif
Modified: head/www/squid/files/patch-compat_shm.cc
==============================================================================
--- head/www/squid/files/patch-compat_shm.cc Wed Nov 11 16:54:38 2015 (r401285)
+++ head/www/squid/files/patch-compat_shm.cc Wed Nov 11 17:24:31 2015 (r401286)
@@ -1,4 +1,4 @@
---- compat/shm.cc.orig 2015-05-28 11:06:38 UTC
+--- compat/shm.cc.orig 2015-11-01 10:44:25 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 Wed Nov 11 16:54:38 2015 (r401285)
+++ head/www/squid/files/patch-configure Wed Nov 11 17:24:31 2015 (r401286)
@@ -1,6 +1,6 @@
---- configure.orig 2015-09-01 12:53:55.000000000 -0700
-+++ configure 2015-09-05 00:14:50.050817462 -0700
-@@ -23624,7 +23624,9 @@
+--- configure.orig 2015-11-01 10:46:19 UTC
++++ configure
+@@ -23624,7 +23624,9 @@ fi
if test $ac_with_krb5_count -gt 1 ; then
as_fn_error $? "Please choose only one Kerberos library." "$LINENO" 5
@@ -11,7 +11,7 @@
# find installed libs via pkg-config or krb5-config
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gssapi-krb5 krb5\""; } >&5
-@@ -32038,7 +32040,7 @@
+@@ -32038,7 +32040,7 @@ done
##
BUILD_HELPER="NIS"
@@ -20,7 +20,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 @@
+@@ -32053,8 +32055,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -33,7 +33,7 @@
fi
done
-@@ -32519,7 +32523,7 @@
+@@ -32519,7 +32523,7 @@ done
# unconditionally requires crypt(3), for now
if test "x$ac_cv_func_crypt" != "x"; then
@@ -42,7 +42,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 @@
+@@ -34574,7 +34578,7 @@ for ac_header in \
arpa/nameser.h \
assert.h \
bstring.h \
@@ -51,7 +51,7 @@
ctype.h \
direct.h \
errno.h \
-@@ -34785,6 +34789,7 @@
+@@ -34785,6 +34789,7 @@ ac_fn_cxx_check_header_compile "$LINENO"
#include <netinet/ip.h>
#endif
#if HAVE_NETINET_IP_COMPAT_H
@@ -59,7 +59,7 @@
#include <netinet/ip_compat.h>
#endif
#if HAVE_NETINET_IP_FIL_H
-@@ -38773,6 +38778,7 @@
+@@ -38773,6 +38778,7 @@ if test "x$enable_ipf_transparent" != "x
# include <sys/ioccom.h>
# include <netinet/in.h>
@@ -67,7 +67,7 @@
# include <netinet/ip_compat.h>
# include <netinet/ip_fil.h>
# include <netinet/ip_nat.h>
-@@ -38803,6 +38809,7 @@
+@@ -38803,6 +38809,7 @@ else
# include <sys/ioccom.h>
# include <netinet/in.h>
#undef minor_t
@@ -75,7 +75,7 @@
# include <netinet/ip_compat.h>
# include <netinet/ip_fil.h>
# include <netinet/ip_nat.h>
-@@ -38847,6 +38854,7 @@
+@@ -38847,6 +38854,7 @@ _ACEOF
ip_fil_compat.h \
ip_fil.h \
ip_nat.h \
@@ -83,7 +83,7 @@
netinet/ip_compat.h \
netinet/ip_fil_compat.h \
netinet/ip_fil.h \
-@@ -38876,6 +38884,7 @@
+@@ -38876,6 +38884,7 @@ ac_fn_cxx_check_header_compile "$LINENO"
#if HAVE_IP_COMPAT_H
#include <ip_compat.h>
#elif HAVE_NETINET_IP_COMPAT_H
Modified: head/www/squid/files/patch-src-cf.data.pre
==============================================================================
--- head/www/squid/files/patch-src-cf.data.pre Wed Nov 11 16:54:38 2015 (r401285)
+++ head/www/squid/files/patch-src-cf.data.pre Wed Nov 11 17:24:31 2015 (r401286)
@@ -1,6 +1,6 @@
---- src/cf.data.pre.orig 2015-08-01 06:08:17 UTC
+--- src/cf.data.pre.orig 2015-11-01 10:44:25 UTC
+++ src/cf.data.pre
-@@ -4537,6 +4537,10 @@ DEFAULT: @DEFAULT_PID_FILE@
+@@ -4558,6 +4558,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 Wed Nov 11 16:54:38 2015 (r401285)
+++ head/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc Wed Nov 11 17:24:31 2015 (r401286)
@@ -1,4 +1,4 @@
---- src/DiskIO/Mmapped/MmappedFile.cc.orig 2015-08-01 06:08:17 UTC
+--- src/DiskIO/Mmapped/MmappedFile.cc.orig 2015-11-01 10:44:25 UTC
+++ src/DiskIO/Mmapped/MmappedFile.cc
@@ -235,7 +235,7 @@ Mmapping::map()
static const int pageSize = getpagesize();
Modified: head/www/squid/files/patch-src__ip__Intercept.cc
==============================================================================
--- head/www/squid/files/patch-src__ip__Intercept.cc Wed Nov 11 16:54:38 2015 (r401285)
+++ head/www/squid/files/patch-src__ip__Intercept.cc Wed Nov 11 17:24:31 2015 (r401286)
@@ -1,6 +1,6 @@
---- src/ip/Intercept.cc.orig 2015-09-01 12:52:00.000000000 -0700
-+++ src/ip/Intercept.cc 2015-09-17 21:52:44.892553613 -0700
-@@ -202,10 +202,10 @@
+--- src/ip/Intercept.cc.orig 2015-11-01 10:44:25 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
Modified: head/www/squid/files/patch-src_ipc_mem_Segment.cc
==============================================================================
--- head/www/squid/files/patch-src_ipc_mem_Segment.cc Wed Nov 11 16:54:38 2015 (r401285)
+++ head/www/squid/files/patch-src_ipc_mem_Segment.cc Wed Nov 11 17:24:31 2015 (r401286)
@@ -1,4 +1,4 @@
---- src/ipc/mem/Segment.cc.orig 2015-08-01 06:08:17 UTC
+--- src/ipc/mem/Segment.cc.orig 2015-11-01 10:44:25 UTC
+++ src/ipc/mem/Segment.cc
@@ -150,7 +150,7 @@ Ipc::Mem::Segment::attach()
assert(theSize == static_cast<off_t>(static_cast<size_t>(theSize)));
Modified: head/www/squid/files/patch-src_tools.cc
==============================================================================
--- head/www/squid/files/patch-src_tools.cc Wed Nov 11 16:54:38 2015 (r401285)
+++ head/www/squid/files/patch-src_tools.cc Wed Nov 11 17:24:31 2015 (r401286)
@@ -1,4 +1,4 @@
---- src/tools.cc.orig 2015-08-01 06:08:17 UTC
+--- src/tools.cc.orig 2015-11-01 10:44:25 UTC
+++ src/tools.cc
@@ -635,7 +635,7 @@ no_suid(void)
uid = geteuid();
Modified: head/www/squid/files/squid.in
==============================================================================
--- head/www/squid/files/squid.in Wed Nov 11 16:54:38 2015 (r401285)
+++ head/www/squid/files/squid.in Wed Nov 11 17:24:31 2015 (r401286)
@@ -56,7 +56,6 @@ reload_cmd=squid_reload
start_precmd=squid_prestart
start_postcmd=squid_getpid
stop_precmd=squid_prestop
-stop_postcmd=squid_poststop
configtest_cmd=squid_configtest
reload_precmd=squid_configtest
restart_precmd=squid_configtest
@@ -80,15 +79,10 @@ squid_load_rc_config()
command_args="${required_args} ${squid_flags}"
procname="?squid-*"
pidfile=$squid_pidfile
- state_dir=/var/run/squid
}
squid_prestart()
{
- # prepare the state directory:
- [ -d ${state_dir} ] && rm -rf ${state_dir}
- install -d -o ${squid_user} -m 0755 ${state_dir}
-
# setup KRB5_KTNAME:
squid_krb5_ktname=${squid_krb5_ktname:-"NONE"}
if [ "${squid_krb5_ktname}" != "NONE" ]; then
@@ -151,11 +145,6 @@ squid_prestop()
$command $required_args $squid_flags -k check 2>/dev/null
}
-squid_poststop()
-{
- rm -rf ${state_dir}
-}
-
load_rc_config $name
squid_load_rc_config
run_rc_command $1
More information about the svn-ports-all
mailing list