Attachment #162693 for bug #204217

Lines 1-7 Link Here

(-)./squid/Makefile (-1 / +1 lines)
1	# $FreeBSD: head/www/squid/Makefile 398713 2015-10-06 18:53:12Z flo $	1	# $FreeBSD: head/www/squid/Makefile 398713 2015-10-06 18:53:12Z flo $
2		2
3	PORTNAME= squid	3	PORTNAME= squid
4	PORTVERSION= 3.5.10	4	PORTVERSION= 3.5.11
5	CATEGORIES= www ipv6	5	CATEGORIES= www ipv6
6	MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \	6	MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
7	http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \	7	http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \

Lines 1-2 Link Here

(-)./squid/distinfo (-2 / +2 lines)
1	SHA256 (squid3.5/squid-3.5.10.tar.xz) = 736e69fbddd6e985d2f85c995526f0a2bc4294c46dfb6737c0ccf09274a458b3	1	SHA256 (squid3.5/squid-3.5.11.tar.xz) = c26211b8e349fd9a5fd357da33074ff6523c111024dd3a5a1f77153538aa40cf
2	SIZE (squid3.5/squid-3.5.10.tar.xz) = 2297452	2	SIZE (squid3.5/squid-3.5.11.tar.xz) = 2298436

Lines 1-4 Link Here

(-)./squid/files/patch-compat_compat.h (-1 / +1 lines)
1	--- compat/compat.h.orig 2015-08-01 06:08:17 UTC	1	--- compat/compat.h.orig 2015-11-01 10:44:25 UTC
2	+++ compat/compat.h	2	+++ compat/compat.h
3	@@ -42,17 +42,6 @@	3	@@ -42,17 +42,6 @@
4	#endif	4	#endif

Lines 1-4 Link Here

(-)./squid/files/patch-compat_shm.cc (-1 / +1 lines)
1	--- compat/shm.cc.orig 2015-05-28 11:06:38 UTC	1	--- compat/shm.cc.orig 2015-11-01 10:44:25 UTC
2	+++ compat/shm.cc	2	+++ compat/shm.cc
3	@@ -29,6 +29,8 @@ shm_portable_segment_name_is_path()	3	@@ -29,6 +29,8 @@ shm_portable_segment_name_is_path()
4	size_t len = sizeof(jailed);	4	size_t len = sizeof(jailed);




--- 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

   # 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 @@ done
 ##
 
 BUILD_HELPER="NIS"

 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 @@ if eval test \"x\$"$as_ac_Header"\" = x"
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 

 fi
 
 done
@@ -32519,7 +32523,7 @@ done
 
   # unconditionally requires crypt(3), for now
   if test "x$ac_cv_func_crypt" != "x"; then

 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 @@ for ac_header in \
   arpa/nameser.h \
   assert.h \
   bstring.h \

   ctype.h \
   direct.h \
   errno.h \
@@ -34785,6 +34789,7 @@ ac_fn_cxx_check_header_compile "$LINENO"
 #include <netinet/ip.h>
 #endif
 #if HAVE_NETINET_IP_COMPAT_H

 #include <netinet/ip_compat.h>
 #endif
 #if HAVE_NETINET_IP_FIL_H
@@ -38773,6 +38778,7 @@ if test "x$enable_ipf_transparent" != "x
 #     include <sys/ioccom.h>
 #     include <netinet/in.h>
 

 #     include <netinet/ip_compat.h>
 #     include <netinet/ip_fil.h>
 #     include <netinet/ip_nat.h>
@@ -38803,6 +38809,7 @@ else
 #       include <sys/ioccom.h>
 #       include <netinet/in.h>
 #undef minor_t

 #       include <netinet/ip_compat.h>
 #       include <netinet/ip_fil.h>
 #       include <netinet/ip_nat.h>
@@ -38847,6 +38854,7 @@ _ACEOF
 	ip_fil_compat.h \
 	ip_fil.h \
 	ip_nat.h \

 	netinet/ip_compat.h \
 	netinet/ip_fil_compat.h \
 	netinet/ip_fil.h \
@@ -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

Lines 1-6 Link Here

(-)./squid/files/patch-src-cf.data.pre (-2 / +2 lines)
1	--- src/cf.data.pre.orig 2015-08-01 06:08:17 UTC	1	--- src/cf.data.pre.orig 2015-11-01 10:44:25 UTC
2	+++ src/cf.data.pre	2	+++ src/cf.data.pre
3	@@ -4537,6 +4537,10 @@ DEFAULT: @DEFAULT_PID_FILE@	3	@@ -4558,6 +4558,10 @@ DEFAULT: @DEFAULT_PID_FILE@
4	LOC: Config.pidFilename	4	LOC: Config.pidFilename
5	DOC_START	5	DOC_START
6	A filename to write the process-id to. To disable, enter "none".	6	A filename to write the process-id to. To disable, enter "none".

Lines 1-4 Link Here

(-)./squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc (-1 / +1 lines)
1	--- src/DiskIO/Mmapped/MmappedFile.cc.orig 2015-08-01 06:08:17 UTC	1	--- src/DiskIO/Mmapped/MmappedFile.cc.orig 2015-11-01 10:44:25 UTC
2	+++ src/DiskIO/Mmapped/MmappedFile.cc	2	+++ src/DiskIO/Mmapped/MmappedFile.cc
3	@@ -235,7 +235,7 @@ Mmapping::map()	3	@@ -235,7 +235,7 @@ Mmapping::map()
4	static const int pageSize = getpagesize();	4	static const int pageSize = getpagesize();

Lines 1-6 Link Here

(-)./squid/files/patch-src__ip__Intercept.cc (-3 / +3 lines)
1	--- src/ip/Intercept.cc.orig 2015-09-01 12:52:00.000000000 -0700	1	--- src/ip/Intercept.cc.orig 2015-11-01 10:44:25 UTC
2	+++ src/ip/Intercept.cc 2015-09-17 21:52:44.892553613 -0700	2	+++ src/ip/Intercept.cc
3	@@ -202,10 +202,10 @@	3	@@ -202,10 +202,10 @@ Ip::Intercept::IpfInterception(const Com
4	// for NAT lookup set local and remote IP:port's	4	// for NAT lookup set local and remote IP:port's
5	if (newConn->remote.isIPv6()) {	5	if (newConn->remote.isIPv6()) {
6	#if IPFILTER_VERSION < 5000003	6	#if IPFILTER_VERSION < 5000003

Lines 1-4 Link Here

(-)./squid/files/patch-src_ipc_mem_Segment.cc (-1 / +1 lines)
1	--- src/ipc/mem/Segment.cc.orig 2015-08-01 06:08:17 UTC	1	--- src/ipc/mem/Segment.cc.orig 2015-11-01 10:44:25 UTC
2	+++ src/ipc/mem/Segment.cc	2	+++ src/ipc/mem/Segment.cc
3	@@ -150,7 +150,7 @@ Ipc::Mem::Segment::attach()	3	@@ -150,7 +150,7 @@ Ipc::Mem::Segment::attach()
4	assert(theSize == static_cast<off_t>(static_cast<size_t>(theSize)));	4	assert(theSize == static_cast<off_t>(static_cast<size_t>(theSize)));

Lines 1-4 Link Here

(-)./squid/files/patch-src_tools.cc (-1 / +1 lines)
1	--- src/tools.cc.orig 2015-08-01 06:08:17 UTC	1	--- src/tools.cc.orig 2015-11-01 10:44:25 UTC
2	+++ src/tools.cc	2	+++ src/tools.cc
3	@@ -635,7 +635,7 @@ no_suid(void)	3	@@ -635,7 +635,7 @@ no_suid(void)
4	uid = geteuid();	4	uid = geteuid();

Return to bug 204217

Lines 1-6 Link Here

(-)./squid/files/patch-configure (-12 / +12 lines)
1	--- configure.orig 2015-09-01 12:53:55.000000000 -0700	1	--- configure.orig 2015-11-01 10:46:19 UTC
2	+++ configure 2015-09-05 00:14:50.050817462 -0700	2	+++ configure
3	@@ -23624,7 +23624,9 @@	3	@@ -23624,7 +23624,9 @@ fi
4		4
5	if test $ac_with_krb5_count -gt 1 ; then	5	if test $ac_with_krb5_count -gt 1 ; then
6	as_fn_error $? "Please choose only one Kerberos library." "$LINENO" 5	6	as_fn_error $? "Please choose only one Kerberos library." "$LINENO" 5
Lines 11-17 Link Here
11	# find installed libs via pkg-config or krb5-config	11	# find installed libs via pkg-config or krb5-config
12	if test -n "$PKG_CONFIG" && \	12	if test -n "$PKG_CONFIG" && \
13	{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gssapi-krb5 krb5\""; } >&5	13	{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gssapi-krb5 krb5\""; } >&5
14	@@ -32038,7 +32040,7 @@	14	@@ -32038,7 +32040,7 @@ done
15	##	15	##
16		16
17	BUILD_HELPER="NIS"	17	BUILD_HELPER="NIS"
Lines 20-26 Link Here
20	do :	20	do :
21	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`	21	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`
22	ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "	22	ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
23	@@ -32053,8 +32055,10 @@	23	@@ -32053,8 +32055,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"
24	#define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1	24	#define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1
25	_ACEOF	25	_ACEOF
26		26
Lines 33-39 Link Here
33	fi	33	fi
34		34
35	done	35	done
36	@@ -32519,7 +32523,7 @@	36	@@ -32519,7 +32523,7 @@ done
37		37
38	# unconditionally requires crypt(3), for now	38	# unconditionally requires crypt(3), for now
39	if test "x$ac_cv_func_crypt" != "x"; then	39	if test "x$ac_cv_func_crypt" != "x"; then
Lines 42-48 Link Here
42	do :	42	do :
43	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`	43	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`
44	ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"	44	ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
45	@@ -34574,7 +34578,7 @@	45	@@ -34574,7 +34578,7 @@ for ac_header in \
46	arpa/nameser.h \	46	arpa/nameser.h \
47	assert.h \	47	assert.h \
48	bstring.h \	48	bstring.h \
Lines 51-57 Link Here
51	ctype.h \	51	ctype.h \
52	direct.h \	52	direct.h \
53	errno.h \	53	errno.h \
54	@@ -34785,6 +34789,7 @@	54	@@ -34785,6 +34789,7 @@ ac_fn_cxx_check_header_compile "$LINENO"
55	#include <netinet/ip.h>	55	#include <netinet/ip.h>
56	#endif	56	#endif
57	#if HAVE_NETINET_IP_COMPAT_H	57	#if HAVE_NETINET_IP_COMPAT_H
Lines 59-65 Link Here
59	#include <netinet/ip_compat.h>	59	#include <netinet/ip_compat.h>
60	#endif	60	#endif
61	#if HAVE_NETINET_IP_FIL_H	61	#if HAVE_NETINET_IP_FIL_H
62	@@ -38773,6 +38778,7 @@	62	@@ -38773,6 +38778,7 @@ if test "x$enable_ipf_transparent" != "x
63	# include <sys/ioccom.h>	63	# include <sys/ioccom.h>
64	# include <netinet/in.h>	64	# include <netinet/in.h>
65		65
Lines 67-73 Link Here
67	# include <netinet/ip_compat.h>	67	# include <netinet/ip_compat.h>
68	# include <netinet/ip_fil.h>	68	# include <netinet/ip_fil.h>
69	# include <netinet/ip_nat.h>	69	# include <netinet/ip_nat.h>
70	@@ -38803,6 +38809,7 @@	70	@@ -38803,6 +38809,7 @@ else
71	# include <sys/ioccom.h>	71	# include <sys/ioccom.h>
72	# include <netinet/in.h>	72	# include <netinet/in.h>
73	#undef minor_t	73	#undef minor_t
Lines 75-81 Link Here
75	# include <netinet/ip_compat.h>	75	# include <netinet/ip_compat.h>
76	# include <netinet/ip_fil.h>	76	# include <netinet/ip_fil.h>
77	# include <netinet/ip_nat.h>	77	# include <netinet/ip_nat.h>
78	@@ -38847,6 +38854,7 @@	78	@@ -38847,6 +38854,7 @@ _ACEOF
79	ip_fil_compat.h \	79	ip_fil_compat.h \
80	ip_fil.h \	80	ip_fil.h \
81	ip_nat.h \	81	ip_nat.h \
Lines 83-89 Link Here
83	netinet/ip_compat.h \	83	netinet/ip_compat.h \
84	netinet/ip_fil_compat.h \	84	netinet/ip_fil_compat.h \
85	netinet/ip_fil.h \	85	netinet/ip_fil.h \
86	@@ -38876,6 +38884,7 @@	86	@@ -38876,6 +38884,7 @@ ac_fn_cxx_check_header_compile "$LINENO"
87	#if HAVE_IP_COMPAT_H	87	#if HAVE_IP_COMPAT_H
88	#include <ip_compat.h>	88	#include <ip_compat.h>
89	#elif HAVE_NETINET_IP_COMPAT_H	89	#elif HAVE_NETINET_IP_COMPAT_H