View | Details | Raw Unified | Return to bug 208290 | Differences between
and this patch

Collapse All | Expand All

(-)squid/Makefile (-13 / +39 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	squid
3
PORTNAME=	squid
4
PORTVERSION=	3.5.15
4
PORTVERSION=	3.5.15
5
PORTREVISION=	1
5
PORTREVISION=	2
6
CATEGORIES=	www ipv6
6
CATEGORIES=	www ipv6
7
MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
7
MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
8
		http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
8
		http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
Lines 21-27 Link Here
21
PATCHFILES=	squid-3.5-13997.patch \
21
PATCHFILES=	squid-3.5-13997.patch \
22
		squid-3.5-13998.patch \
22
		squid-3.5-13998.patch \
23
		squid-3.5-13999.patch \
23
		squid-3.5-13999.patch \
24
		squid-3.5-14000.patch
24
		squid-3.5-14000.patch \
25
		squid-3.5-14001.patch \
26
		squid-3.5-14002.patch \
27
		squid-3.5-14003.patch \
28
		squid-3.5-14004.patch \
29
		squid-3.5-14005.patch \
30
		squid-3.5-14006.patch \
31
		squid-3.5-14007.patch \
32
		squid-3.5-14008.patch \
33
		squid-3.5-14009.patch \
34
		squid-3.5-14010.patch \
35
		squid-3.5-14011.patch \
36
		squid-3.5-14012.patch
25
37
26
MAINTAINER=	timp87@gmail.com
38
MAINTAINER=	timp87@gmail.com
27
COMMENT=	HTTP Caching Proxy
39
COMMENT=	HTTP Caching Proxy
Lines 45-52 Link Here
45
SUB_FILES+=	pkg-install pkg-message
57
SUB_FILES+=	pkg-install pkg-message
46
58
47
OPTIONS_SUB=	yes
59
OPTIONS_SUB=	yes
48
OPTIONS_DEFINE=	ARP_ACL AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB \
60
OPTIONS_GROUP=	AUTH
49
		AUTH_SQL CACHE_DIGESTS DEBUG DELAY_POOLS ECAP ESI \
61
OPTIONS_RADIO=	SMB
62
OPTIONS_GROUP_AUTH=AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SQL
63
OPTIONS_RADIO_SMB=AUTH_SMB3 AUTH_SMB4
64
OPTIONS_DEFINE=	ARP_ACL CACHE_DIGESTS DEBUG DELAY_POOLS ECAP ESI \
50
		FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 \
65
		FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 \
51
		KQUEUE LARGEFILE NETTLE SNMP SSL SSL_CRTD STACKTRACES LAX_HTTP \
66
		KQUEUE LARGEFILE NETTLE SNMP SSL SSL_CRTD STACKTRACES LAX_HTTP \
52
		TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 DOCS EXAMPLES
67
		TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 DOCS EXAMPLES
Lines 54-61 Link Here
54
OPTIONS_SINGLE=	GSSAPI
69
OPTIONS_SINGLE=	GSSAPI
55
OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
70
OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
56
71
57
OPTIONS_DEFAULT=GSSAPI_BASE AUTH_NIS FS_AUFS FS_DISKD HTCP IDENT KQUEUE SNMP \
72
OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS DOCS EXAMPLES FOLLOW_XFF \
58
		WCCP WCCPV2
73
		FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 KQUEUE LARGEFILE \
74
		LAX_HTTP SNMP SSL SSL_CRTD TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 \
75
		GSSAPI_BASE
59
76
60
ARP_ACL_CONFIGURE_ENABLE=	eui
77
ARP_ACL_CONFIGURE_ENABLE=	eui
61
AUTH_LDAP_CFLAGS=		-I${LOCALBASE}/include
78
AUTH_LDAP_CFLAGS=		-I${LOCALBASE}/include
Lines 65-74 Link Here
65
AUTH_SASL_CPPFLAGS=		-I${LOCALBASE}/include
82
AUTH_SASL_CPPFLAGS=		-I${LOCALBASE}/include
66
AUTH_SASL_LDFLAGS=		-L${LOCALBASE}/lib
83
AUTH_SASL_LDFLAGS=		-L${LOCALBASE}/lib
67
AUTH_SASL_LIB_DEPENDS=		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
84
AUTH_SASL_LIB_DEPENDS=		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
68
AUTH_SMB_BUILD_DEPENDS=		smbclient:${PORTSDIR}/net/samba36
85
AUTH_SMB3_RUN_DEPENDS=		smbclient:${PORTSDIR}/net/samba36
69
AUTH_SMB_RUN_DEPENDS=		smbclient:${PORTSDIR}/net/samba36
86
AUTH_SMB4_RUN_DEPENDS=		smbclient:${PORTSDIR}/net/samba42
70
AUTH_SQL_RUN_DEPENDS=		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
87
AUTH_SQL_RUN_DEPENDS=		p5-DBI>=1.08:${PORTSDIR}/databases/p5-DBI
71
AUTH_SQL_USE=			MYSQL=yes
72
CACHE_DIGESTS_CONFIGURE_ENABLE=	cache-digests
88
CACHE_DIGESTS_CONFIGURE_ENABLE=	cache-digests
73
DELAY_POOLS_CONFIGURE_ENABLE=	delay-pools
89
DELAY_POOLS_CONFIGURE_ENABLE=	delay-pools
74
ECAP_CFLAGS=			-I${LOCALBASE}/include
90
ECAP_CFLAGS=			-I${LOCALBASE}/include
Lines 123-128 Link Here
123
# add an option for external_acl/session (requires some kind of external
139
# add an option for external_acl/session (requires some kind of external
124
# Berkeley DB support, unsure which one)
140
# Berkeley DB support, unsure which one)
125
ARP_ACL_DESC=		ARP/MAC/EUI based authentification
141
ARP_ACL_DESC=		ARP/MAC/EUI based authentification
142
AUTH_DESC=		Authentication helpers
126
GSSAPI_DESC=		Install Kerberos authentication helpers
143
GSSAPI_DESC=		Install Kerberos authentication helpers
127
GSSAPI_NONE_DESC=	Build without Kerberos support
144
GSSAPI_NONE_DESC=	Build without Kerberos support
128
GSSAPI_BASE_DESC=	Build with Kerberos support from base
145
GSSAPI_BASE_DESC=	Build with Kerberos support from base
Lines 131-138 Link Here
131
AUTH_LDAP_DESC=		Install LDAP authentication helpers
148
AUTH_LDAP_DESC=		Install LDAP authentication helpers
132
AUTH_NIS_DESC=		Install NIS/YP authentication helpers
149
AUTH_NIS_DESC=		Install NIS/YP authentication helpers
133
AUTH_SASL_DESC=		Install SASL authentication helpers
150
AUTH_SASL_DESC=		Install SASL authentication helpers
134
AUTH_SMB_DESC=		Install SMB auth. helpers (req. Samba)
151
AUTH_SMB3_DESC=		Install SMB3 auth. helpers (req. net/samba36)
135
AUTH_SQL_DESC=		Install SQL based auth (uses MySQL)
152
AUTH_SMB4_DESC=		Install SMB4 auth. helpers (req. net/samba42)
153
AUTH_SQL_DESC=		Install SQL based auth
136
CACHE_DIGESTS_DESC=	Use cache digests
154
CACHE_DIGESTS_DESC=	Use cache digests
137
DEBUG_DESC=		Build with extended debugging support
155
DEBUG_DESC=		Build with extended debugging support
138
DELAY_POOLS_DESC=	Delay pools (bandwidth limiting)
156
DELAY_POOLS_DESC=	Delay pools (bandwidth limiting)
Lines 149-154 Link Here
149
KQUEUE_DESC=		Kqueue(2) support
167
KQUEUE_DESC=		Kqueue(2) support
150
LARGEFILE_DESC=		Support large (>2GB) cache and log files
168
LARGEFILE_DESC=		Support large (>2GB) cache and log files
151
NETTLE_DESC=		Nettle MD5 algorithm support
169
NETTLE_DESC=		Nettle MD5 algorithm support
170
SMB_DESC=		Samba authentication helpers
152
SNMP_DESC=		SNMP support
171
SNMP_DESC=		SNMP support
153
SSL_CRTD_DESC=		Use ssl_crtd to handle SSL cert requests
172
SSL_CRTD_DESC=		Use ssl_crtd to handle SSL cert requests
154
SSL_DESC=		SSL gatewaying support
173
SSL_DESC=		SSL gatewaying support
Lines 221-229 Link Here
221
basic_auth+=	SASL
240
basic_auth+=	SASL
222
.endif
241
.endif
223
242
224
.if ${PORT_OPTIONS:MAUTH_SMB}
243
.if ${PORT_OPTIONS:MAUTH_SMB3} || ${PORT_OPTIONS:MAUTH_SMB4}
244
PLIST_SUB+=	AUTH_SMB=""
225
basic_auth+=	SMB
245
basic_auth+=	SMB
226
external_acl+=	wbinfo_group
246
external_acl+=	wbinfo_group
247
.else
248
PLIST_SUB+=	AUTH_SMB="@comment "
227
.endif
249
.endif
228
250
229
.if ${PORT_OPTIONS:MAUTH_SQL}
251
.if ${PORT_OPTIONS:MAUTH_SQL}
Lines 312-317 Link Here
312
LDFLAGS+=		-L${OPENSSLLIB}
334
LDFLAGS+=		-L${OPENSSLLIB}
313
.endif
335
.endif
314
336
337
.if ${PORT_OPTIONS:MSSL_CRTD} && !${PORT_OPTIONS:MSSL}
338
IGNORE=SSL_CRTD option can be used only if SSL option is enabled
339
.endif
340
315
.if ${PORT_OPTIONS:MSTACKTRACES}
341
.if ${PORT_OPTIONS:MSTACKTRACES}
316
CFLAGS+=	-g
342
CFLAGS+=	-g
317
LDFLAGS+=	-lunwind -L${LOCALBASE}/lib
343
LDFLAGS+=	-lunwind -L${LOCALBASE}/lib
(-)squid/distinfo (+24 lines)
Lines 8-10 Link Here
8
SIZE (squid3.5/squid-3.5-13999.patch) = 1585
8
SIZE (squid3.5/squid-3.5-13999.patch) = 1585
9
SHA256 (squid3.5/squid-3.5-14000.patch) = 36578a13e87150d1604b543c68b419de1c941be3f90e80fbf464f9c23139e2de
9
SHA256 (squid3.5/squid-3.5-14000.patch) = 36578a13e87150d1604b543c68b419de1c941be3f90e80fbf464f9c23139e2de
10
SIZE (squid3.5/squid-3.5-14000.patch) = 1676
10
SIZE (squid3.5/squid-3.5-14000.patch) = 1676
11
SHA256 (squid3.5/squid-3.5-14001.patch) = 127720c408c368070b7807092faae7980d900888f8bbaee0e2689b86573fea94
12
SIZE (squid3.5/squid-3.5-14001.patch) = 14099
13
SHA256 (squid3.5/squid-3.5-14002.patch) = 49c8dea344473c103fefce2b830e96fe94af14bc20640a0c244eea01ac03469d
14
SIZE (squid3.5/squid-3.5-14002.patch) = 2054
15
SHA256 (squid3.5/squid-3.5-14003.patch) = 27ccd9aeabf4e66fbf25a914cc614c8f8020c8010e94d2b6bf499def79fce8b6
16
SIZE (squid3.5/squid-3.5-14003.patch) = 1636
17
SHA256 (squid3.5/squid-3.5-14004.patch) = fc515a51866d518f4ff7e57ef92f2554d2715b59f547927af63192302238690f
18
SIZE (squid3.5/squid-3.5-14004.patch) = 1948
19
SHA256 (squid3.5/squid-3.5-14005.patch) = e7f17a11cb49742f6b535e8e4e8558e03f71335524c524f84f1ef68f71f99b93
20
SIZE (squid3.5/squid-3.5-14005.patch) = 1249
21
SHA256 (squid3.5/squid-3.5-14006.patch) = 88dd50a459ed68fb7c797a840f92a0ada6655b3fb92052f679088704eb1d9f32
22
SIZE (squid3.5/squid-3.5-14006.patch) = 2500
23
SHA256 (squid3.5/squid-3.5-14007.patch) = 1e2e14809e7ca8608300cfc3be027cd55c21fbe3084cc4568c8091adebc256c0
24
SIZE (squid3.5/squid-3.5-14007.patch) = 1214
25
SHA256 (squid3.5/squid-3.5-14008.patch) = 6c2f511ee33d74d1c91cae5ef0a9645facf0104067397866dd542bf3ff975255
26
SIZE (squid3.5/squid-3.5-14008.patch) = 1559
27
SHA256 (squid3.5/squid-3.5-14009.patch) = addc7dd78c5632b428f747eab93382195d2d4a820742afd2661ec920f1dc9a77
28
SIZE (squid3.5/squid-3.5-14009.patch) = 1902
29
SHA256 (squid3.5/squid-3.5-14010.patch) = bed1fb437b3f3925293d42c7032c44c7aa4e1944cc6ed17e9cc9e498a06ada7c
30
SIZE (squid3.5/squid-3.5-14010.patch) = 2974
31
SHA256 (squid3.5/squid-3.5-14011.patch) = c87ce0edb4dcb1f0ae49fb10006009534ce1e5922a4ceb8d784386681ce4b164
32
SIZE (squid3.5/squid-3.5-14011.patch) = 2400
33
SHA256 (squid3.5/squid-3.5-14012.patch) = 6f749e014907150cc9692b16edcb9d9a73fdb3831c718d908bd7c48561702b3c
34
SIZE (squid3.5/squid-3.5-14012.patch) = 1287
(-)squid/files/patch-configure (-5 / +10 lines)
Lines 1-11 Link Here
1
--- configure.orig	2015-11-01 10:46:19 UTC
1
--- configure.orig	2015-11-01 10:46:19 UTC
2
+++ configure
2
+++ configure
3
@@ -27729,9 +27729,11 @@
3
@@ -27731,7 +27731,7 @@
4
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5
   test $ac_status = 0; }; then
6
   squid_pc_krb5_name="heimdal-gssapi"
4
   squid_pc_krb5_name="heimdal-gssapi"
7
+    else
8
+      squid_pc_krb5_name="heimdal-gssapi"
9
 fi
5
 fi
10
   fi
6
   fi
11
-  if test "x$squid_pc_krb5_name" != "x" -a "$cross_compiling" = "no"; then
7
-  if test "x$squid_pc_krb5_name" != "x" -a "$cross_compiling" = "no"; then
Lines 13-18 Link Here
13
     # Look for krb5-config (unless cross-compiling)
9
     # Look for krb5-config (unless cross-compiling)
14
     # Extract the first word of "krb5-config", so it can be a program name with args.
10
     # Extract the first word of "krb5-config", so it can be a program name with args.
15
 set dummy krb5-config; ac_word=$2
11
 set dummy krb5-config; ac_word=$2
12
@@ -27777,7 +27777,7 @@
13
     if test "x$ac_cv_path_krb5_config" != "xno" ; then
14
       krb5confpath="`dirname $ac_cv_path_krb5_config`"
15
       ac_heimdal="`$ac_cv_path_krb5_config --version 2>/dev/null | grep -c -i heimdal`"
16
-      if test "x$with_heimdal_krb5" = "xyes"; then
17
+      if test "x$with_heimdal_krb5" = "xyes" -a $ac_heimdal = 0; then
18
         as_fn_error $? "Could not find pkg-config or krb5-config for Heimdal Kerberos" "$LINENO" 5
19
       fi
20
     else
16
@@ -32038,7 +32040,7 @@ done
21
@@ -32038,7 +32040,7 @@ done
17
 ##
22
 ##
18
 
23
 
(-)squid/files/patch-src__ip__Intercept.cc (+38 lines)
Lines 13-15 Link Here
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;
(-)squid/files/pkg-message.in (-1 / +7 lines)
Lines 10-16 Link Here
10
       If your cache directories are already initialized (e.g. after an
10
       If your cache directories are already initialized (e.g. after an
11
       upgrade of squid) you do not need to initialize them again.
11
       upgrade of squid) you do not need to initialize them again.
12
12
13
     0 When using DiskD storage scheme remember to read documentation:
13
     o When using DiskD storage scheme remember to read documentation:
14
         http://wiki.squid-cache.org/Features/DiskDaemon
14
         http://wiki.squid-cache.org/Features/DiskDaemon
15
       and alter your kern.ipc defaults in /boot/loader.conf. DiskD will not
15
       and alter your kern.ipc defaults in /boot/loader.conf. DiskD will not
16
       work reliably without this. Last recomendations were:
16
       work reliably without this. Last recomendations were:
Lines 25-30 Link Here
25
       allow/deny" directives in %%PREFIX%%/etc/squid/squid.conf
25
       allow/deny" directives in %%PREFIX%%/etc/squid/squid.conf
26
       to suit your needs.
26
       to suit your needs.
27
27
28
     o If AUTH_SQL option is set, please, don't forget to install one of
29
       following perl modules depending on database you like:
30
         databases/p5-DBD-mysql
31
         databases/p5-DBD-Pg
32
         databases/p5-DBD-SQLite
33
28
     To enable Squid, set squid_enable=yes in either
34
     To enable Squid, set squid_enable=yes in either
29
     /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid
35
     /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid
30
     Please see %%PREFIX%%/etc/rc.d/squid for further details.
36
     Please see %%PREFIX%%/etc/rc.d/squid for further details.
(-)squid/files/squid.in (-3 / +1 lines)
Lines 108-120 Link Here
108
108
109
squid_reload()
109
squid_reload()
110
{
110
{
111
112
	$command $required_args $squid_flags -k reconfigure
111
	$command $required_args $squid_flags -k reconfigure
113
}
112
}
114
113
115
squid_configtest()
114
squid_configtest()
116
{
115
{
117
118
	echo "Performing sanity check on ${name} configuration."
116
	echo "Performing sanity check on ${name} configuration."
119
	if $command $required_args $squid_flags -k check; then
117
	if $command $required_args $squid_flags -k check; then
120
		echo "Configuration for ${name} passes."
118
		echo "Configuration for ${name} passes."
Lines 142-148 Link Here
142
squid_prestop()
140
squid_prestop()
143
{
141
{
144
	command_args="$command_args -k shutdown"
142
	command_args="$command_args -k shutdown"
145
	$command $required_args $squid_flags -k check 2>/dev/null
143
	squid_configtest
146
}
144
}
147
145
148
load_rc_config $name
146
load_rc_config $name

Return to bug 208290