svn commit: r473033 - in head/www/squid-devel: . files
Steve Wills
swills at FreeBSD.org
Fri Jun 22 11:51:24 UTC 2018
Author: swills
Date: Fri Jun 22 11:51:22 2018
New Revision: 473033
URL: https://svnweb.freebsd.org/changeset/ports/473033
Log:
www/squid-devel: update to 4.0.25
While here, remove patches for building on FreeBSD 9.x
PR: 229181
Submitted by: Pavel Timofeev <timp87 at gmail.com> (maintainer)
Added:
head/www/squid-devel/files/patch-src_ip_Intercept.cc (contents, props changed)
- copied, changed from r473032, head/www/squid-devel/files/patch-src__ip__Intercept.cc
Deleted:
head/www/squid-devel/files/extra-patch-build-8-9
head/www/squid-devel/files/patch-src__ip__Intercept.cc
Modified:
head/www/squid-devel/Makefile (contents, props changed)
head/www/squid-devel/distinfo (contents, props changed)
head/www/squid-devel/files/patch-configure (contents, props changed)
head/www/squid-devel/files/patch-src-cf.data.pre (contents, props changed)
head/www/squid-devel/files/patch-src_tools.cc (contents, props changed)
Modified: head/www/squid-devel/Makefile
==============================================================================
--- head/www/squid-devel/Makefile Fri Jun 22 11:18:02 2018 (r473032)
+++ head/www/squid-devel/Makefile Fri Jun 22 11:51:22 2018 (r473033)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= squid
-PORTVERSION= 4.0.24
+PORTVERSION= 4.0.25
CATEGORIES= www ipv6
MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \
http://www2.us.squid-cache.org/Versions/v4/ \
@@ -140,8 +140,6 @@ GSSAPI_NONE_CONFIGURE_ON= --without-heimdal-krb5 \
GSSAPI_BASE_USES= gssapi
GSSAPI_BASE_CONFIGURE_ON= --with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
GSSAPI_BASE_PLIST_SUB= AUTH_KERB=""
-# Make it build on FreeBSD < 10
-GSSAPI_BASE_EXTRA_PATCHES= ${FILESDIR}/extra-patch-build-8-9
GSSAPI_HEIMDAL_USES= gssapi:heimdal
GSSAPI_HEIMDAL_CONFIGURE_ON= --with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
Modified: head/www/squid-devel/distinfo
==============================================================================
--- head/www/squid-devel/distinfo Fri Jun 22 11:18:02 2018 (r473032)
+++ head/www/squid-devel/distinfo Fri Jun 22 11:51:22 2018 (r473033)
@@ -1,3 +1,3 @@
TIMESTAMP = 1522445865
-SHA256 (squid4.0/squid-4.0.24.tar.xz) = 091da0d763307dcc0f5c784ab07ea0c5a093f6dfac60f17ff26e2a6d50f76a07
-SIZE (squid4.0/squid-4.0.24.tar.xz) = 2420076
+SHA256 (squid4.0/squid-4.0.25.tar.xz) = f70dc75148895c3cc0d232596fee0eb346d92f5457c7180d493f133410c2d626
+SIZE (squid4.0/squid-4.0.25.tar.xz) = 2424644
Modified: head/www/squid-devel/files/patch-configure
==============================================================================
--- head/www/squid-devel/files/patch-configure Fri Jun 22 11:18:02 2018 (r473032)
+++ head/www/squid-devel/files/patch-configure Fri Jun 22 11:51:22 2018 (r473033)
@@ -1,6 +1,6 @@
---- configure.orig 2016-12-16 10:19:31 UTC
+--- configure.orig 2018-06-11 16:48:04 UTC
+++ configure
-@@ -33043,7 +33043,7 @@ done
+@@ -34345,7 +34345,7 @@ done
##
BUILD_HELPER="NIS"
@@ -9,7 +9,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" "
-@@ -33058,8 +33058,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"
+@@ -34360,8 +34360,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -22,7 +22,7 @@
fi
done
-@@ -33532,7 +33534,7 @@ done
+@@ -34834,7 +34836,7 @@ done
# unconditionally requires crypt(3), for now
if test "x$ac_cv_func_crypt" != "x"; then
@@ -31,7 +31,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"
-@@ -35882,7 +35884,7 @@ for ac_header in \
+@@ -37226,7 +37228,7 @@ for ac_header in \
arpa/nameser.h \
assert.h \
bstring.h \
@@ -40,7 +40,7 @@
ctype.h \
direct.h \
errno.h \
-@@ -36092,6 +36094,7 @@ ac_fn_cxx_check_header_compile "$LINENO"
+@@ -37434,6 +37436,7 @@ ac_fn_cxx_check_header_compile "$LINENO"
#include <netinet/ip.h>
#endif
#if HAVE_NETINET_IP_COMPAT_H
@@ -48,7 +48,7 @@
#include <netinet/ip_compat.h>
#endif
#if HAVE_NETINET_IP_FIL_H
-@@ -40315,6 +40318,7 @@ if test "x$enable_ipf_transparent" != "x
+@@ -41450,6 +41453,7 @@ if test "x$enable_ipf_transparent" != "x
# include <sys/ioccom.h>
# include <netinet/in.h>
@@ -56,7 +56,7 @@
# include <netinet/ip_compat.h>
# include <netinet/ip_fil.h>
# include <netinet/ip_nat.h>
-@@ -40345,6 +40349,7 @@ else
+@@ -41480,6 +41484,7 @@ else
# include <sys/ioccom.h>
# include <netinet/in.h>
#undef minor_t
@@ -64,7 +64,7 @@
# include <netinet/ip_compat.h>
# include <netinet/ip_fil.h>
# include <netinet/ip_nat.h>
-@@ -40389,6 +40394,7 @@ _ACEOF
+@@ -41524,6 +41529,7 @@ _ACEOF
ip_fil_compat.h \
ip_fil.h \
ip_nat.h \
@@ -72,7 +72,7 @@
netinet/ip_compat.h \
netinet/ip_fil_compat.h \
netinet/ip_fil.h \
-@@ -40418,6 +40424,7 @@ ac_fn_cxx_check_header_compile "$LINENO"
+@@ -41553,6 +41559,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-devel/files/patch-src-cf.data.pre
==============================================================================
--- head/www/squid-devel/files/patch-src-cf.data.pre Fri Jun 22 11:18:02 2018 (r473032)
+++ head/www/squid-devel/files/patch-src-cf.data.pre Fri Jun 22 11:51:22 2018 (r473033)
@@ -1,6 +1,6 @@
---- src/cf.data.pre.orig 2016-12-16 10:06:20 UTC
+--- src/cf.data.pre.orig 2018-06-11 16:30:57 UTC
+++ src/cf.data.pre
-@@ -4754,6 +4754,10 @@ DEFAULT: @DEFAULT_PID_FILE@
+@@ -4947,6 +4947,10 @@ DEFAULT: @DEFAULT_PID_FILE@
LOC: Config.pidFilename
DOC_START
A filename to write the process-id to. To disable, enter "none".
Copied and modified: head/www/squid-devel/files/patch-src_ip_Intercept.cc (from r473032, head/www/squid-devel/files/patch-src__ip__Intercept.cc)
==============================================================================
--- head/www/squid-devel/files/patch-src__ip__Intercept.cc Fri Jun 22 11:18:02 2018 (r473032, copy source)
+++ head/www/squid-devel/files/patch-src_ip_Intercept.cc Fri Jun 22 11:51:22 2018 (r473033)
@@ -1,13 +1,13 @@
---- src/ip/Intercept.cc.orig 2016-12-16 10:06:20 UTC
+--- src/ip/Intercept.cc.orig 2018-06-20 11:02:30 UTC
+++ src/ip/Intercept.cc
-@@ -206,10 +206,10 @@ Ip::Intercept::IpfInterception(const Com
- // for NAT lookup set local and remote IP:port's
- if (newConn->remote.isIPv6()) {
- #if IPFILTER_VERSION < 5000003
+@@ -215,10 +215,10 @@ Ip::Intercept::IpfInterception(const Com
+ newConn->remote.getInAddr(natLookup.nl_outipaddr.in4);
+ }
+ #else
- // warn once every 10 at critical level, then push down a level each repeated event
+ // warn once every million at critical level, then push down a level each repeated event
static int warningLevel = DBG_CRITICAL;
- debugs(89, warningLevel, "IPF (IPFilter v4) NAT does not support IPv6. Please upgrade to IPFilter v5.1");
+ debugs(89, warningLevel, "Your IPF (IPFilter) NAT does not support IPv6. Please upgrade it.");
- warningLevel = (warningLevel + 1) % 10;
+ warningLevel = (warningLevel + 1) % 1048576;
return false;
Modified: head/www/squid-devel/files/patch-src_tools.cc
==============================================================================
--- head/www/squid-devel/files/patch-src_tools.cc Fri Jun 22 11:18:02 2018 (r473032)
+++ head/www/squid-devel/files/patch-src_tools.cc Fri Jun 22 11:51:22 2018 (r473033)
@@ -1,8 +1,8 @@
---- src/tools.cc.orig 2016-12-16 10:06:20 UTC
+--- src/tools.cc.orig 2018-06-11 16:30:57 UTC
+++ src/tools.cc
-@@ -603,7 +603,7 @@ no_suid(void)
+@@ -605,7 +605,7 @@ no_suid(void)
uid = geteuid();
- debugs(21, 3, "no_suid: PID " << getpid() << " giving up root priveleges forever");
+ debugs(21, 3, "no_suid: PID " << getpid() << " giving up root privileges forever");
- if (setuid(0) < 0) {
+ if (setuid(0) < 0 && TheProcessKind != pkHelper) {
More information about the svn-ports-all
mailing list