Attachment 178103 Details for Bug 215416 – port patch

[patch] port patch

squid.patch (text/plain), 3.13 KB, created by Pavel Timofeev on 2016-12-19 14:21:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2016-12-19 14:21:42 UTC

Size: 3.13 KB

patch

obsolete

>diff -ruN /home/timp/squid.orig/Makefile squid/Makefile
>--- /home/timp/squid.orig/Makefile	2016-12-17 09:42:36.063774000 +0300
>+++ squid/Makefile	2016-12-18 11:01:35.937157000 +0300
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/www/squid/Makefile 427389 2016-11-29 18:46:21Z mat $
> 
> PORTNAME=	squid
>-PORTVERSION=	3.5.22
>+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}/ \
>@@ -222,6 +222,7 @@
> 		--with-swapdir=/var/squid/cache \
> 		--without-gnutls \
> 		--enable-auth \
>+		--enable-zph-qos \
> 		--enable-build-info \
> 		--enable-loadable-modules \
> 		--enable-removal-policies="lru heap" \
>@@ -316,11 +317,10 @@
> BROKEN=		Does not build with openssl-devel
> .endif
> 
>-.if ${COMPILER_TYPE} == clang
>+.if ${CHOSEN_COMPILER_TYPE} == clang
> #CXXFLAGS+=	-Wno-unused-private-field
>-.if ${COMPILER_VERSION} >= 35
>+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>
>diff -ruN /home/timp/squid.orig/distinfo squid/distinfo
>--- /home/timp/squid.orig/distinfo	2016-12-17 09:42:36.064149000 +0300
>+++ squid/distinfo	2016-12-17 09:47:21.914236000 +0300
>@@ -1,3 +1,3 @@
> TIMESTAMP = 1479930399
>-SHA256 (squid3.5/squid-3.5.22.tar.xz) = 1ce95b469257abeb2ed8a1c0417812301c1ef5a4cc40ca504167daa470ad9358
>-SIZE (squid3.5/squid-3.5.22.tar.xz) = 2324164
>+SHA256 (squid3.5/squid-3.5.23.tar.xz) = fa4c0c99f41e92fe1330bed3968d176c6f47ef2e3aea2f83977d5501afa40bdb
>+SIZE (squid3.5/squid-3.5.23.tar.xz) = 2325884
>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	2016-12-17 09:42:36.067331000 +0300
>+++ squid/files/patch-src__ip__Intercept.cc	2016-12-17 09:55:58.241831000 +0300
>@@ -13,41 +13,3 @@
>          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;

Flags:

timp87: maintainer-approval+

Actions: View | Diff

Attachments on bug 215416: 178103