Attachment #178103 for bug #215416

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




# $FreeBSD: head/www/squid/Makefile 427389 2016-11-29 18:46:21Z mat $

PORTNAME=	squid
PORTVERSION=	3.5.23
CATEGORIES=	www ipv6
MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
		http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \

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

BROKEN=		Does not build with openssl-devel
.endif

.if ${CHOSEN_COMPILER_TYPE} == clang
#CXXFLAGS+=	-Wno-unused-private-field
CXXFLAGS+=	-Wno-unknown-warning-option
CXXFLAGS+=	-Wno-undefined-bool-conversion -Wno-tautological-undefined-compare -Wno-dynamic-class-memaccess
.endif
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)squid/distinfo (-2 / +2 lines)
1	TIMESTAMP = 1479930399	1	TIMESTAMP = 1479930399
2	SHA256 (squid3.5/squid-3.5.22.tar.xz) = 1ce95b469257abeb2ed8a1c0417812301c1ef5a4cc40ca504167daa470ad9358	2	SHA256 (squid3.5/squid-3.5.23.tar.xz) = fa4c0c99f41e92fe1330bed3968d176c6f47ef2e3aea2f83977d5501afa40bdb
3	SIZE (squid3.5/squid-3.5.22.tar.xz) = 2324164	3	SIZE (squid3.5/squid-3.5.23.tar.xz) = 2325884




         return false;
 #else
         natLookup.nl_v = 6;
@@ -323,13 +323,21 @@
     }
 
     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;

Return to bug 215416

Lines 1-7 Link Here

(-)squid/Makefile (-4 / +4 lines)
1	# $FreeBSD: head/www/squid/Makefile 427389 2016-11-29 18:46:21Z mat $	1	# $FreeBSD: head/www/squid/Makefile 427389 2016-11-29 18:46:21Z mat $
2		2
3	PORTNAME= squid	3	PORTNAME= squid
4	PORTVERSION= 3.5.22	4	PORTVERSION= 3.5.23
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 222-227 Link Here
222	--with-swapdir=/var/squid/cache \	222	--with-swapdir=/var/squid/cache \
223	--without-gnutls \	223	--without-gnutls \
224	--enable-auth \	224	--enable-auth \
		225	--enable-zph-qos \
225	--enable-build-info \	226	--enable-build-info \
226	--enable-loadable-modules \	227	--enable-loadable-modules \
227	--enable-removal-policies="lru heap" \	228	--enable-removal-policies="lru heap" \
Lines 316-326 Link Here
316	BROKEN= Does not build with openssl-devel	317	BROKEN= Does not build with openssl-devel
317	.endif	318	.endif
318		319
319	.if ${COMPILER_TYPE} == clang	320	.if ${CHOSEN_COMPILER_TYPE} == clang
320	#CXXFLAGS+= -Wno-unused-private-field	321	#CXXFLAGS+= -Wno-unused-private-field
321	.if ${COMPILER_VERSION} >= 35	322	CXXFLAGS+= -Wno-unknown-warning-option
322	CXXFLAGS+= -Wno-undefined-bool-conversion -Wno-tautological-undefined-compare -Wno-dynamic-class-memaccess	323	CXXFLAGS+= -Wno-undefined-bool-conversion -Wno-tautological-undefined-compare -Wno-dynamic-class-memaccess
323	.endif	324	.endif
324	.endif
325		325
326	.include <bsd.port.post.mk>	326	.include <bsd.port.post.mk>

Lines 13-53 Link Here

(-)squid/files/patch-src__ip__Intercept.cc (-38 lines)
13	return false;	13	return false;
14	#else	14	#else
15	natLookup.nl_v = 6;	15	natLookup.nl_v = 6;
16	@@ -323,13 +323,21 @@
17	}
18
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;