Attachment #178105 for bug #215418

View | Details | Raw Unified | Return to bug 215418
Collapse All | Expand All




# $FreeBSD: head/www/squid-devel/Makefile 425986 2016-11-12 19:24:16Z antoine $

PORTNAME=	squid
PORTVERSION=	4.0.17
CATEGORIES=	www ipv6
MASTER_SITES=	http://www.squid-cache.org/Versions/v4/ \
		http://www2.us.squid-cache.org/Versions/v4/ \

		--with-swapdir=/var/squid/cache \
		--without-gnutls \
		--enable-auth \
		--enable-zph-qos \
		--enable-build-info \
		--enable-loadable-modules \
		--enable-removal-policies="lru heap" \

		${change_files})
	@(cd ${WRKSRC} && ${MV} src/mime.conf.default src/mime.conf.sample)

post-patch-IPV6-off:
	@${REINPLACE_CMD} -e's/ ::1//' -e's/ fc00::\/7//' \
		-e's/ fe80::\/10//' -e's/ 2001:DB8::2//' \
		-e's/ 2001:DB8::a:0\/64//' \

		-e'/tcp_outgoing_address 2001:db8::beef normal_service_net/d' \
		-e'/tcp_outgoing_address 2001:db8::1/d' \
		${WRKSRC}/src/cf.data.pre
.endif

post-install:
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}


.include <bsd.port.pre.mk>

.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel}
BROKEN=		Does not build with openssl-devel
.endif

.if ${CHOSEN_COMPILER_TYPE} == clang
#CXXFLAGS+=	-Wno-unused-private-field
CXXFLAGS+=	-Wno-unknown-warning-option

Lines 1-3 Link Here

(-)squid-devel/distinfo (-2 / +2 lines)
1	TIMESTAMP = 1467941699	1	TIMESTAMP = 1467941699
2	SHA256 (squid4.0/squid-4.0.14.tar.xz) = c0e9e2d1bc2e18b2317aff165d3d697eac253977a6c37b9659de3ed81d004d1a	2	SHA256 (squid4.0/squid-4.0.17.tar.xz) = 8b1f3487495d1b02892bd63d6bdd97862be62a9cebc27245426de4543876239c
3	SIZE (squid4.0/squid-4.0.14.tar.xz) = 2404528	3	SIZE (squid4.0/squid-4.0.17.tar.xz) = 2410244

Lines 1-8 Link Here

(-)squid-devel/files/patch-compat_compat.h (-4 / +4 lines)
1	--- compat/compat.h.orig 2015-11-01 10:44:25 UTC	1	--- compat/compat.h.orig 2016-12-16 10:06:20 UTC
2	+++ compat/compat.h	2	+++ compat/compat.h
3	@@ -42,17 +42,6 @@	3	@@ -29,17 +29,6 @@
4	#endif	4	/******************************************************/
5	#endif	5	#include "compat/osdetect.h"
6		6
7	-/* Solaris 10 has a broken definition for minor_t in IPFilter compat.	7	-/* Solaris 10 has a broken definition for minor_t in IPFilter compat.
8	- * We must pre-define before doing anything with OS headers so the OS	8	- * We must pre-define before doing anything with OS headers so the OS

Lines 1-4 Link Here

(-)squid-devel/files/patch-compat_shm.cc (-1 / +1 lines)
1	--- compat/shm.cc.orig 2015-11-01 10:44:25 UTC	1	--- compat/shm.cc.orig 2016-12-16 10:06:20 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	2016-12-16 10:19:31 UTC
+++ configure
@@ -33043,7 +33043,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" "
@@ -33058,8 +33058,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 

 fi
 
 done
@@ -33532,7 +33534,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"
@@ -35882,7 +35884,7 @@ for ac_header in \
   arpa/nameser.h \
   assert.h \
   bstring.h \

   ctype.h \
   direct.h \
   errno.h \
@@ -36092,6 +36094,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
@@ -40315,6 +40318,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>
@@ -40345,6 +40349,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>
@@ -40389,6 +40394,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 \
@@ -40418,6 +40424,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-devel/files/patch-src-cf.data.pre (-2 / +2 lines)
1	--- src/cf.data.pre.orig 2015-11-01 10:44:25 UTC	1	--- src/cf.data.pre.orig 2016-12-16 10:06:20 UTC
2	+++ src/cf.data.pre	2	+++ src/cf.data.pre
3	@@ -4558,6 +4558,10 @@ DEFAULT: @DEFAULT_PID_FILE@	3	@@ -4754,6 +4754,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-6 Link Here

(-)squid-devel/files/patch-src_DiskIO_Mmapped_MmappedFile.cc (-2 / +2 lines)
1	--- src/DiskIO/Mmapped/MmappedFile.cc.orig 2015-11-01 10:44:25 UTC	1	--- src/DiskIO/Mmapped/MmappedFile.cc.orig 2016-12-16 10:06:20 UTC
2	+++ src/DiskIO/Mmapped/MmappedFile.cc	2	+++ src/DiskIO/Mmapped/MmappedFile.cc
3	@@ -235,7 +235,7 @@ Mmapping::map()	3	@@ -236,7 +236,7 @@ Mmapping::map()
4	static const int pageSize = getpagesize();	4	static const int pageSize = getpagesize();
5	delta = offset % pageSize;	5	delta = offset % pageSize;
6		6




--- src/ip/Intercept.cc.orig	2016-12-16 10:06:20 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

-        warningLevel = (warningLevel + 1) % 10;
+        warningLevel = (warningLevel + 1) % 1048576;
         return false;
 #else
         natLookup.nl_v = 6;
@@ -323,13 +323,21 @@
     }
     newConn->local.getInAddr(natLookup.nl_inip);
     memset(&nl, 0, sizeof(struct pfioc_natlook));
-    newConn->remote.getInAddr(nl.saddr.v4);
+    if (newConn->remote.isIPv4()) {
+        newConn->remote.getInAddr(nl.saddr.v4);
+    } else {
+        newConn->remote.getInAddr(nl.saddr.v6);
+    }
     nl.sport = htons(newConn->remote.port());
 
-    newConn->local.getInAddr(nl.daddr.v4);
+    if (newConn->local.isIPv4()) {
+        newConn->local.getInAddr(nl.daddr.v4);
+    } else {
+        newConn->local.getInAddr(nl.daddr.v6);
+    }
     nl.dport = htons(newConn->local.port());
 
-    nl.af = AF_INET;
+    nl.af = newConn->remote.isIPv4() ? AF_INET : AF_INET6;
     nl.proto = IPPROTO_TCP;
     nl.direction = PF_OUT;
 
@@ -345,7 +353,11 @@
         debugs(89, 9, HERE << "address: " << newConn);
         return false;
     } else {
-        newConn->local = nl.rdaddr.v4;
+        if (nl.af == AF_INET) {
+            newConn->local = nl.rdaddr.v4;
+        } else {
+            newConn->local = nl.rdaddr.v6;
+        }
         newConn->local.port(ntohs(nl.rdport));
         debugs(89, 5, HERE << "address NAT: " << newConn);
         return true;

Lines 1-11 Link Here

(-)squid-devel/files/patch-src_ipc_mem_Segment.cc (-4 / +4 lines)
1	--- src/ipc/mem/Segment.cc.orig 2015-11-01 10:44:25 UTC	1	--- src/ipc/mem/Segment.cc.orig 2016-12-16 10:06:20 UTC
2	+++ src/ipc/mem/Segment.cc	2	+++ src/ipc/mem/Segment.cc
3	@@ -150,7 +150,7 @@ Ipc::Mem::Segment::attach()	3	@@ -173,7 +173,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)));
5		5
6	void *const p =	6	void *const p =
7	- mmap(NULL, theSize, PROT_READ \| PROT_WRITE, MAP_SHARED, theFD, 0);	7	- mmap(NULL, theSize, PROT_READ \| PROT_WRITE, MAP_SHARED, theFD, 0);
8	+ mmap(NULL, theSize, PROT_READ \| PROT_WRITE, MAP_SHARED \| MAP_NOSYNC, theFD, 0);	8	+ mmap(NULL, theSize, PROT_READ \| PROT_WRITE, MAP_SHARED \| MAP_NOSYNC, theFD, 0);
9	if (p == MAP_FAILED) {	9	if (p == MAP_FAILED) {
10	debugs(54, 5, HERE << "mmap " << theName << ": " << xstrerror());	10	int xerrno = errno;
11	fatalf("Ipc::Mem::Segment::attach failed to mmap(%s): %s\n",	11	debugs(54, 5, "mmap " << theName << ": " << xstrerr(xerrno));

Lines 1-4 Link Here

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

Return to bug 215418

Lines 1-7 Link Here

(-)squid-devel/Makefile (-3 / +7 lines)
1	# $FreeBSD: head/www/squid-devel/Makefile 425986 2016-11-12 19:24:16Z antoine $	1	# $FreeBSD: head/www/squid-devel/Makefile 425986 2016-11-12 19:24:16Z antoine $
2		2
3	PORTNAME= squid	3	PORTNAME= squid
4	PORTVERSION= 4.0.14	4	PORTVERSION= 4.0.17
5	CATEGORIES= www ipv6	5	CATEGORIES= www ipv6
6	MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \	6	MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \
7	http://www2.us.squid-cache.org/Versions/v4/ \	7	http://www2.us.squid-cache.org/Versions/v4/ \
Lines 216-221 Link Here
216	--with-swapdir=/var/squid/cache \	216	--with-swapdir=/var/squid/cache \
217	--without-gnutls \	217	--without-gnutls \
218	--enable-auth \	218	--enable-auth \
		219	--enable-zph-qos \
219	--enable-build-info \	220	--enable-build-info \
220	--enable-loadable-modules \	221	--enable-loadable-modules \
221	--enable-removal-policies="lru heap" \	222	--enable-removal-policies="lru heap" \
Lines 288-294 Link Here
288	${change_files})	289	${change_files})
289	@(cd ${WRKSRC} && ${MV} src/mime.conf.default src/mime.conf.sample)	290	@(cd ${WRKSRC} && ${MV} src/mime.conf.default src/mime.conf.sample)
290		291
291	.if !${PORT_OPTIONS:MIPV6}	292	post-patch-IPV6-off:
292	@${REINPLACE_CMD} -e's/ ::1//' -e's/ fc00::\/7//' \	293	@${REINPLACE_CMD} -e's/ ::1//' -e's/ fc00::\/7//' \
293	-e's/ fe80::\/10//' -e's/ 2001:DB8::2//' \	294	-e's/ fe80::\/10//' -e's/ 2001:DB8::2//' \
294	-e's/ 2001:DB8::a:0\/64//' \	295	-e's/ 2001:DB8::a:0\/64//' \
Lines 296-302 Link Here
296	-e'/tcp_outgoing_address 2001:db8::beef normal_service_net/d' \	297	-e'/tcp_outgoing_address 2001:db8::beef normal_service_net/d' \
297	-e'/tcp_outgoing_address 2001:db8::1/d' \	298	-e'/tcp_outgoing_address 2001:db8::1/d' \
298	${WRKSRC}/src/cf.data.pre	299	${WRKSRC}/src/cf.data.pre
299	.endif
300		300
301	post-install:	301	post-install:
302	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	302	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
Lines 307-312 Link Here
307		307
308	.include <bsd.port.pre.mk>	308	.include <bsd.port.pre.mk>
309		309
		310	.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel}
		311	BROKEN= Does not build with openssl-devel
		312	.endif
		313
310	.if ${CHOSEN_COMPILER_TYPE} == clang	314	.if ${CHOSEN_COMPILER_TYPE} == clang
311	#CXXFLAGS+= -Wno-unused-private-field	315	#CXXFLAGS+= -Wno-unused-private-field
312	CXXFLAGS+= -Wno-unknown-warning-option	316	CXXFLAGS+= -Wno-unknown-warning-option

Lines 1-6 Link Here

(-)squid-devel/files/patch-configure (-10 / +10 lines)
1	--- configure.orig 2015-11-01 10:46:19 UTC	1	--- configure.orig 2016-12-16 10:19:31 UTC
2	+++ configure	2	+++ configure
3	@@ -32038,7 +32040,7 @@ done	3	@@ -33043,7 +33043,7 @@ done
4	##	4	##
5		5
6	BUILD_HELPER="NIS"	6	BUILD_HELPER="NIS"
Lines 9-15 Link Here
9	do :	9	do :
10	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`	10	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`
11	ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "	11	ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
12	@@ -32053,8 +32055,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"	12	@@ -33058,8 +33058,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"
13	#define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1	13	#define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1
14	_ACEOF	14	_ACEOF
15		15
Lines 22-28 Link Here
22	fi	22	fi
23		23
24	done	24	done
25	@@ -32519,7 +32523,7 @@ done	25	@@ -33532,7 +33534,7 @@ done
26		26
27	# unconditionally requires crypt(3), for now	27	# unconditionally requires crypt(3), for now
28	if test "x$ac_cv_func_crypt" != "x"; then	28	if test "x$ac_cv_func_crypt" != "x"; then
Lines 31-37 Link Here
31	do :	31	do :
32	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`	32	as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`
33	ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"	33	ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
34	@@ -34574,7 +34578,7 @@ for ac_header in \	34	@@ -35882,7 +35884,7 @@ for ac_header in \
35	arpa/nameser.h \	35	arpa/nameser.h \
36	assert.h \	36	assert.h \
37	bstring.h \	37	bstring.h \
Lines 40-46 Link Here
40	ctype.h \	40	ctype.h \
41	direct.h \	41	direct.h \
42	errno.h \	42	errno.h \
43	@@ -34785,6 +34789,7 @@ ac_fn_cxx_check_header_compile "$LINENO"	43	@@ -36092,6 +36094,7 @@ ac_fn_cxx_check_header_compile "$LINENO"
44	#include <netinet/ip.h>	44	#include <netinet/ip.h>
45	#endif	45	#endif
46	#if HAVE_NETINET_IP_COMPAT_H	46	#if HAVE_NETINET_IP_COMPAT_H
Lines 48-54 Link Here
48	#include <netinet/ip_compat.h>	48	#include <netinet/ip_compat.h>
49	#endif	49	#endif
50	#if HAVE_NETINET_IP_FIL_H	50	#if HAVE_NETINET_IP_FIL_H
51	@@ -38773,6 +38778,7 @@ if test "x$enable_ipf_transparent" != "x	51	@@ -40315,6 +40318,7 @@ if test "x$enable_ipf_transparent" != "x
52	# include <sys/ioccom.h>	52	# include <sys/ioccom.h>
53	# include <netinet/in.h>	53	# include <netinet/in.h>
54		54
Lines 56-62 Link Here
56	# include <netinet/ip_compat.h>	56	# include <netinet/ip_compat.h>
57	# include <netinet/ip_fil.h>	57	# include <netinet/ip_fil.h>
58	# include <netinet/ip_nat.h>	58	# include <netinet/ip_nat.h>
59	@@ -38803,6 +38809,7 @@ else	59	@@ -40345,6 +40349,7 @@ else
60	# include <sys/ioccom.h>	60	# include <sys/ioccom.h>
61	# include <netinet/in.h>	61	# include <netinet/in.h>
62	#undef minor_t	62	#undef minor_t
Lines 64-70 Link Here
64	# include <netinet/ip_compat.h>	64	# include <netinet/ip_compat.h>
65	# include <netinet/ip_fil.h>	65	# include <netinet/ip_fil.h>
66	# include <netinet/ip_nat.h>	66	# include <netinet/ip_nat.h>
67	@@ -38847,6 +38854,7 @@ _ACEOF	67	@@ -40389,6 +40394,7 @@ _ACEOF
68	ip_fil_compat.h \	68	ip_fil_compat.h \
69	ip_fil.h \	69	ip_fil.h \
70	ip_nat.h \	70	ip_nat.h \
Lines 72-78 Link Here
72	netinet/ip_compat.h \	72	netinet/ip_compat.h \
73	netinet/ip_fil_compat.h \	73	netinet/ip_fil_compat.h \
74	netinet/ip_fil.h \	74	netinet/ip_fil.h \
75	@@ -38876,6 +38884,7 @@ ac_fn_cxx_check_header_compile "$LINENO"	75	@@ -40418,6 +40424,7 @@ ac_fn_cxx_check_header_compile "$LINENO"
76	#if HAVE_IP_COMPAT_H	76	#if HAVE_IP_COMPAT_H
77	#include <ip_compat.h>	77	#include <ip_compat.h>
78	#elif HAVE_NETINET_IP_COMPAT_H	78	#elif HAVE_NETINET_IP_COMPAT_H

Lines 1-6 Link Here

(-)squid-devel/files/patch-src__ip__Intercept.cc (-41 / +3 lines)
1	--- src/ip/Intercept.cc.orig 2015-11-01 10:44:25 UTC	1	--- src/ip/Intercept.cc.orig 2016-12-16 10:06:20 UTC
2	+++ src/ip/Intercept.cc	2	+++ src/ip/Intercept.cc
3	@@ -202,10 +202,10 @@ Ip::Intercept::IpfInterception(const Com	3	@@ -206,10 +206,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 11-53 Link Here
11	- warningLevel = (warningLevel + 1) % 10;	11	- warningLevel = (warningLevel + 1) % 10;
12	+ warningLevel = (warningLevel + 1) % 1048576;	12	+ warningLevel = (warningLevel + 1) % 1048576;
13	return false;	13	return false;
14	#else
15	natLookup.nl_v = 6;
16	@@ -323,13 +323,21 @@
17	}	14	}
18		15	newConn->local.getInAddr(natLookup.nl_inip);
19	memset(&nl, 0, sizeof(struct pfioc_natlook));
20	- newConn->remote.getInAddr(nl.saddr.v4);
21	+ if (newConn->remote.isIPv4()) {
22	+ newConn->remote.getInAddr(nl.saddr.v4);
23	+ } else {
24	+ newConn->remote.getInAddr(nl.saddr.v6);
25	+ }
26	nl.sport = htons(newConn->remote.port());
27
28	- newConn->local.getInAddr(nl.daddr.v4);
29	+ if (newConn->local.isIPv4()) {
30	+ newConn->local.getInAddr(nl.daddr.v4);
31	+ } else {
32	+ newConn->local.getInAddr(nl.daddr.v6);
33	+ }
34	nl.dport = htons(newConn->local.port());
35
36	- nl.af = AF_INET;
37	+ nl.af = newConn->remote.isIPv4() ? AF_INET : AF_INET6;
38	nl.proto = IPPROTO_TCP;
39	nl.direction = PF_OUT;
40
41	@@ -345,7 +353,11 @@
42	debugs(89, 9, HERE << "address: " << newConn);
43	return false;
44	} else {
45	- newConn->local = nl.rdaddr.v4;
46	+ if (nl.af == AF_INET) {
47	+ newConn->local = nl.rdaddr.v4;
48	+ } else {
49	+ newConn->local = nl.rdaddr.v6;
50	+ }
51	newConn->local.port(ntohs(nl.rdport));
52	debugs(89, 5, HERE << "address NAT: " << newConn);
53	return true;