diff -ruN /home/timp/squid.orig/Makefile ./squid/Makefile --- /home/timp/squid.orig/Makefile 2015-11-10 19:33:42.301685000 +0300 +++ ./squid/Makefile 2015-11-10 19:34:27.519899000 +0300 @@ -1,7 +1,7 @@ # $FreeBSD: head/www/squid/Makefile 398713 2015-10-06 18:53:12Z flo $ 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}/ \ diff -ruN /home/timp/squid.orig/distinfo ./squid/distinfo --- /home/timp/squid.orig/distinfo 2015-11-10 19:33:42.301799000 +0300 +++ ./squid/distinfo 2015-11-10 19:34:27.520459000 +0300 @@ -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 diff -ruN /home/timp/squid.orig/files/patch-compat_compat.h ./squid/files/patch-compat_compat.h --- /home/timp/squid.orig/files/patch-compat_compat.h 2015-11-10 19:33:42.302371000 +0300 +++ ./squid/files/patch-compat_compat.h 2015-11-10 19:34:27.521009000 +0300 @@ -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 diff -ruN /home/timp/squid.orig/files/patch-compat_shm.cc ./squid/files/patch-compat_shm.cc --- /home/timp/squid.orig/files/patch-compat_shm.cc 2015-11-10 19:33:42.302485000 +0300 +++ ./squid/files/patch-compat_shm.cc 2015-11-10 19:34:27.521476000 +0300 @@ -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); diff -ruN /home/timp/squid.orig/files/patch-configure ./squid/files/patch-configure --- /home/timp/squid.orig/files/patch-configure 2015-11-10 19:33:42.302620000 +0300 +++ ./squid/files/patch-configure 2015-11-10 19:34:27.522348000 +0300 @@ -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 #endif #if HAVE_NETINET_IP_COMPAT_H @@ -59,7 +59,7 @@ #include #endif #if HAVE_NETINET_IP_FIL_H -@@ -38773,6 +38778,7 @@ +@@ -38773,6 +38778,7 @@ if test "x$enable_ipf_transparent" != "x # include # include @@ -67,7 +67,7 @@ # include # include # include -@@ -38803,6 +38809,7 @@ +@@ -38803,6 +38809,7 @@ else # include # include #undef minor_t @@ -75,7 +75,7 @@ # include # include # include -@@ -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 #elif HAVE_NETINET_IP_COMPAT_H diff -ruN /home/timp/squid.orig/files/patch-src-cf.data.pre ./squid/files/patch-src-cf.data.pre --- /home/timp/squid.orig/files/patch-src-cf.data.pre 2015-11-10 19:33:42.302731000 +0300 +++ ./squid/files/patch-src-cf.data.pre 2015-11-10 19:34:27.522855000 +0300 @@ -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". diff -ruN /home/timp/squid.orig/files/patch-src_DiskIO_Mmapped_MmappedFile.cc ./squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc --- /home/timp/squid.orig/files/patch-src_DiskIO_Mmapped_MmappedFile.cc 2015-11-10 19:33:42.302839000 +0300 +++ ./squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc 2015-11-10 19:34:27.523376000 +0300 @@ -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(); diff -ruN /home/timp/squid.orig/files/patch-src__ip__Intercept.cc ./squid/files/patch-src__ip__Intercept.cc --- /home/timp/squid.orig/files/patch-src__ip__Intercept.cc 2015-11-10 19:33:42.302961000 +0300 +++ ./squid/files/patch-src__ip__Intercept.cc 2015-11-10 19:34:27.523912000 +0300 @@ -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 diff -ruN /home/timp/squid.orig/files/patch-src_ipc_mem_Segment.cc ./squid/files/patch-src_ipc_mem_Segment.cc --- /home/timp/squid.orig/files/patch-src_ipc_mem_Segment.cc 2015-11-10 19:33:42.303104000 +0300 +++ ./squid/files/patch-src_ipc_mem_Segment.cc 2015-11-10 19:34:27.524412000 +0300 @@ -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(static_cast(theSize))); diff -ruN /home/timp/squid.orig/files/patch-src_tools.cc ./squid/files/patch-src_tools.cc --- /home/timp/squid.orig/files/patch-src_tools.cc 2015-11-10 19:33:42.303212000 +0300 +++ ./squid/files/patch-src_tools.cc 2015-11-10 19:34:27.524902000 +0300 @@ -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(); diff -ruN /home/timp/squid.orig/files/squid.in ./squid/files/squid.in --- /home/timp/squid.orig/files/squid.in 2015-11-10 19:33:42.303598000 +0300 +++ ./squid/files/squid.in 2015-11-10 19:35:17.080308000 +0300 @@ -56,7 +56,6 @@ 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 @@ 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 @@ $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