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

Collapse All | Expand All

(-)squid-devel/Makefile (-112 / +45 lines)
Lines 1-7 Link Here
1
# $FreeBSD: head/www/squid-devel/Makefile 415742 2016-05-23 20:35:01Z amdmi3 $
1
# $FreeBSD: head/www/squid-devel/Makefile 415742 2016-05-23 20:35:01Z amdmi3 $
2
2
3
PORTNAME=	squid
3
PORTNAME=	squid
4
PORTVERSION=	4.0.10
4
PORTVERSION=	4.0.11
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 63-74 Link Here
63
AUTH_LDAP_CFLAGS=		-I${LOCALBASE}/include
63
AUTH_LDAP_CFLAGS=		-I${LOCALBASE}/include
64
AUTH_LDAP_LDFLAGS=		-L${LOCALBASE}/lib
64
AUTH_LDAP_LDFLAGS=		-L${LOCALBASE}/lib
65
AUTH_LDAP_USE=			OPENLDAP=yes
65
AUTH_LDAP_USE=			OPENLDAP=yes
66
AUTH_LDAP_VARS=			BASIC_AUTH+=LDAP EXTERNAL_ACL+=LDAP_group
66
AUTH_SASL_CFLAGS=		-I${LOCALBASE}/include
67
AUTH_SASL_CFLAGS=		-I${LOCALBASE}/include
67
AUTH_SASL_CPPFLAGS=		-I${LOCALBASE}/include
68
AUTH_SASL_CPPFLAGS=		-I${LOCALBASE}/include
68
AUTH_SASL_LDFLAGS=		-L${LOCALBASE}/lib
69
AUTH_SASL_LDFLAGS=		-L${LOCALBASE}/lib
69
AUTH_SASL_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
70
AUTH_SASL_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
71
AUTH_SASL_VARS=			BASIC_AUTH+=SASL
70
AUTH_SMB_RUN_DEPENDS=		smbclient:net/samba42
72
AUTH_SMB_RUN_DEPENDS=		smbclient:net/samba42
73
AUTH_SMB_VARS=			BASIC_AUTH+=SMB EXTERNAL_ACL+=wbinfo_group
71
AUTH_SQL_RUN_DEPENDS=		p5-DBI>=1.08:databases/p5-DBI
74
AUTH_SQL_RUN_DEPENDS=		p5-DBI>=1.08:databases/p5-DBI
75
AUTH_SQL_VARS=			EXTERNAL_ACL+=SQL_session
72
CACHE_DIGESTS_CONFIGURE_ENABLE=	cache-digests
76
CACHE_DIGESTS_CONFIGURE_ENABLE=	cache-digests
73
DELAY_POOLS_CONFIGURE_ENABLE=	delay-pools
77
DELAY_POOLS_CONFIGURE_ENABLE=	delay-pools
74
ECAP_CFLAGS=			-I${LOCALBASE}/include
78
ECAP_CFLAGS=			-I${LOCALBASE}/include
Lines 90-103 Link Here
90
KQUEUE_CONFIGURE_ENABLE=	kqueue
94
KQUEUE_CONFIGURE_ENABLE=	kqueue
91
LARGEFILE_CONFIGURE_WITH=	large-files
95
LARGEFILE_CONFIGURE_WITH=	large-files
92
LAX_HTTP_CONFIGURE_ENABLE=	http-violations
96
LAX_HTTP_CONFIGURE_ENABLE=	http-violations
97
FS_AUFS_VARS=			STORAGE_SCHEMES+=aufs DISKIO_MODULES+=DiskThreads
98
FS_AUFS_LDFLAGS=		-pthread
99
FS_AUFS_CONFIGURE_OFF=		--without-pthreads
100
FS_DISKD_VARS=			STORAGE_SCHEMES+=diskd DISKIO_MODULES+=DiskDaemon
101
FS_ROCK_VARS=			STORAGE_SCHEMES+=rock
93
NETTLE_LIB_DEPENDS=		libnettle.so:security/nettle
102
NETTLE_LIB_DEPENDS=		libnettle.so:security/nettle
94
NETTLE_CONFIGURE_OFF=		--without-nettle
103
NETTLE_CONFIGURE_OFF=		--without-nettle
95
SNMP_CONFIGURE_ENABLE=		snmp
104
SNMP_CONFIGURE_ENABLE=		snmp
96
SSL_CONFIGURE_ENABLE=		ssl
105
SSL_CONFIGURE_ENABLE=		ssl
106
SSL_CONFIGURE_ON=		--with-openssl=${OPENSSLBASE} \
107
				--enable-security-cert-generators="file" \
108
				LIBOPENSSL_CFLAGS=-I${OPENSSLINC} \
109
				LIBOPENSSL_LIBS="-lcrypto -lssl"
110
SSL_USE=			OPENSSL=yes
97
SSL_CRTD_CONFIGURE_ENABLE=	ssl-crtd
111
SSL_CRTD_CONFIGURE_ENABLE=	ssl-crtd
112
SSL_CRTD_IMPLIES=		SSL
98
STACKTRACES_CONFIGURE_ENABLE=	stacktraces
113
STACKTRACES_CONFIGURE_ENABLE=	stacktraces
114
STACKTRACES_EXTRA_PATCHES+=	${FILESDIR}/extra-patch-gen-stacktrace
99
STACKTRACES_LIB_DEPENDS=	libunwind.so:devel/libunwind
115
STACKTRACES_LIB_DEPENDS=	libunwind.so:devel/libunwind
100
STACKTRACES_CONFIGURE_ON=	--disable-strict-error-checking
116
STACKTRACES_CONFIGURE_ON=	--disable-strict-error-checking
117
STACKTRACES_CFLAGS=		-g
118
STACKTRACES_LDFLAGS=		-lunwind -L${LOCALBASE}/lib
119
STACKTRACES_VARS=		strip=""
101
TP_IPFW_CONFIGURE_ENABLE=	ipfw-transparent
120
TP_IPFW_CONFIGURE_ENABLE=	ipfw-transparent
102
TP_IPF_CONFIGURE_ENABLE=	ipf-transparent
121
TP_IPF_CONFIGURE_ENABLE=	ipf-transparent
103
TP_PF_CONFIGURE_ENABLE=		pf-transparent
122
TP_PF_CONFIGURE_ENABLE=		pf-transparent
Lines 112-134 Link Here
112
131
113
GSSAPI_BASE_USES=		gssapi
132
GSSAPI_BASE_USES=		gssapi
114
GSSAPI_BASE_CONFIGURE_ON=	--with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
133
GSSAPI_BASE_CONFIGURE_ON=	--with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
134
GSSAPI_BASE_PLIST_SUB=		AUTH_KERB=""
135
# Make it build on FreeBSD < 10
136
GSSAPI_BASE_EXTRA_PATCHES=	${FILESDIR}/extra-patch-build-8-9
115
137
116
GSSAPI_HEIMDAL_USES=		gssapi:heimdal
138
GSSAPI_HEIMDAL_USES=		gssapi:heimdal
117
GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
139
GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-heimdal-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
140
GSSAPI_HEIMDAL_PLIST_SUB=	AUTH_KERB=""
118
141
119
GSSAPI_MIT_USES=		gssapi:mit
142
GSSAPI_MIT_USES=		gssapi:mit
120
GSSAPI_MIT_CONFIGURE_ON=	--with-mit-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
143
GSSAPI_MIT_CONFIGURE_ON=	--with-mit-krb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
144
GSSAPI_MIT_PLIST_SUB=		AUTH_KERB=""
121
145
122
# TODO:
146
# TODO:
123
# add an option for external_acl/session (requires some kind of external
147
# add an option for external_acl/session (requires some kind of external
124
# Berkeley DB support, unsure which one)
148
# Berkeley DB support, unsure which one)
125
ARP_ACL_DESC=		ARP/MAC/EUI based authentification
149
ARP_ACL_DESC=		ARP/MAC/EUI based authentification
126
AUTH_DESC=		Authentication helpers
150
AUTH_DESC=		Authentication helpers
127
GSSAPI_DESC=		Install Kerberos authentication helpers
128
GSSAPI_NONE_DESC=	Build without Kerberos support
129
GSSAPI_BASE_DESC=	Build with Kerberos support from base
130
GSSAPI_HEIMDAL_DESC=	Build with Kerberos support from security/heimdal
131
GSSAPI_MIT_DESC=	Build with Kerberos support from security/krb5
132
AUTH_LDAP_DESC=		Install LDAP authentication helpers
151
AUTH_LDAP_DESC=		Install LDAP authentication helpers
133
AUTH_NIS_DESC=		Install NIS/YP authentication helpers
152
AUTH_NIS_DESC=		Install NIS/YP authentication helpers
134
AUTH_SASL_DESC=		Install SASL authentication helpers
153
AUTH_SASL_DESC=		Install SASL authentication helpers
Lines 207-341 Link Here
207
.include <bsd.port.options.mk>
226
.include <bsd.port.options.mk>
208
227
209
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
228
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
210
IGNORE=		Doesn't build, messes C++ headers and libs
229
IGNORE=		doesn't build, messes C++ headers and libs
211
.endif
230
.endif
212
231
213
# Authentication methods and modules:
232
# Authentication methods and modules:
214
233
215
basic_auth=	DB SMB_LM NCSA PAM POP3 RADIUS fake getpwnam
234
BASIC_AUTH+=	DB SMB_LM NCSA PAM POP3 RADIUS fake getpwnam
216
digest_auth=	file
235
EXTERNAL_ACL+=	file_userip time_quota unix_group
217
external_acl=	file_userip time_quota unix_group
218
ntlm_auth=	fake SMB_LM
219
220
.if ${PORT_OPTIONS:MAUTH_LDAP}
221
basic_auth+=	LDAP
222
external_acl+=	LDAP_group
223
.endif
224
225
.if ${PORT_OPTIONS:MAUTH_SASL}
226
basic_auth+=	SASL
227
.endif
228
229
.if ${PORT_OPTIONS:MAUTH_SMB}
230
basic_auth+=	SMB
231
external_acl+=	wbinfo_group
232
.endif
233
234
.if ${PORT_OPTIONS:MAUTH_SQL}
235
external_acl+=	SQL_session
236
.endif
237
236
238
# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
237
# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
239
.if ${PORT_OPTIONS:MAUTH_NIS} && !defined(NO_NIS) && !defined(WITHOUT_NIS)
238
.if ${PORT_OPTIONS:MAUTH_NIS} && !defined(NO_NIS) && !defined(WITHOUT_NIS)
240
basic_auth+=	NIS
239
BASIC_AUTH+=	NIS
241
.endif
240
.endif
242
241
243
# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
242
# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
244
.if ${PORT_OPTIONS:MGSSAPI_NONE} || defined(NO_KERBEROS) || defined(WITHOUT_KERBEROS)
243
.if ${PORT_OPTIONS:MGSSAPI_NONE} || defined(NO_KERBEROS) || defined(WITHOUT_KERBEROS)
245
negotiate_auth=	none
244
NEGOTIATE_AUTH=	none
246
PLIST_SUB+=	AUTH_KERB="@comment "
245
PLIST_SUB+=	AUTH_KERB="@comment "
247
.else
246
.else
248
# The kerberos_ldap_group external helper also depends on LDAP and SASL:
247
# The kerberos_ldap_group external helper also depends on LDAP and SASL:
249
. if ${PORT_OPTIONS:MAUTH_LDAP} && ${PORT_OPTIONS:MAUTH_SASL}
248
. if ${PORT_OPTIONS:MAUTH_LDAP} && ${PORT_OPTIONS:MAUTH_SASL}
250
external_acl+=	kerberos_ldap_group
249
EXTERNAL_ACL+=	kerberos_ldap_group
251
. endif
250
. endif
252
negotiate_auth=	kerberos wrapper
251
NEGOTIATE_AUTH=	kerberos wrapper
253
PLIST_SUB+=	AUTH_KERB=""
254
.endif
255
256
# Make it build on FreeBSD < 10
257
.if ${PORT_OPTIONS:MGSSAPI_BASE}
258
EXTRA_PATCHES+=		${FILESDIR}/extra-patch-build-8-9
259
.endif
252
.endif
260
253
261
CONFIGURE_ARGS+=	--enable-auth-basic="${basic_auth}" \
262
			--enable-auth-digest="${digest_auth}" \
263
			--enable-external-acl-helpers="${external_acl}" \
264
			--enable-auth-negotiate="${negotiate_auth}" \
265
			--enable-auth-ntlm="${ntlm_auth}"
266
267
# Storage schemes:
254
# Storage schemes:
268
storage_schemes=	ufs
255
STORAGE_SCHEMES+=	ufs
269
diskio_modules=		AIO Blocking IpcIo Mmapped
256
DISKIO_MODULES+=	AIO Blocking IpcIo Mmapped
270
271
.if ${PORT_OPTIONS:MFS_AUFS}
272
storage_schemes+=	aufs
273
diskio_modules+=	DiskThreads
274
# Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS,
275
# e.g. SQUID_CONFIGURE_ARGS=--with-aufs-threads=N
276
LDFLAGS+=		-pthread
277
.else
278
CONFIGURE_ARGS+=	--without-pthreads
279
.endif
280
281
.if ${PORT_OPTIONS:MFS_DISKD}
282
storage_schemes+=	diskd
283
diskio_modules+=	DiskDaemon
284
.endif
285
286
.if ${PORT_OPTIONS:MFS_ROCK}
287
storage_schemes+=	rock
288
.endif
289
290
CONFIGURE_ARGS+=	--enable-storeio="${storage_schemes}" \
291
			--enable-disk-io="${diskio_modules}"
292
257
293
# Log daemon helpers:
258
CONFIGURE_ARGS+=	--enable-auth-basic="${BASIC_AUTH}" \
294
logdaemon_helpers=	file
259
			--enable-auth-digest="file" \
295
CONFIGURE_ARGS+=	--enable-log-daemon-helpers="${logdaemon_helpers}"
260
			--enable-external-acl-helpers="${EXTERNAL_ACL}" \
296
261
			--enable-auth-negotiate="${NEGOTIATE_AUTH}" \
297
# URL rewrite helpers:
262
			--enable-auth-ntlm="fake SMB_LM" \
298
url_rewrite_helpers=	fake
263
			--enable-storeio="${STORAGE_SCHEMES}" \
299
CONFIGURE_ARGS+=	--enable-url-rewrite-helpers="${url_rewrite_helpers}"
264
			--enable-disk-io="${DISKIO_MODULES}" \
300
265
			--enable-log-daemon-helpers="file" \
301
# Storeid rewrite helpers:
266
			--enable-url-rewrite-helpers="fake" \
302
storeid_rewrite_helpers=	file
267
			--enable-storeid-rewrite-helpers="file" \
303
CONFIGURE_ARGS+=	--enable-storeid-rewrite-helpers="${storeid_rewrite_helpers}"
268
			--enable-security-cert-validators="fake"
304
305
# Security certificate validator helpers:
306
security_cert_validators=	fake
307
CONFIGURE_ARGS+=	--enable-security-cert-validators="${security_cert_validators}"
308
269
309
# Other options set via 'make config':
270
# Other options set via 'make config':
310
271
311
.if ${PORT_OPTIONS:MSSL}
312
# we need to .include bsd.openssl.mk manually here.because USE_OPENSSL only
313
# works when it is defined before bsd.port{.pre}.mk is .included.
314
# This makes it currently impossible to combine this macro with OPTIONS to
315
# conditionally include OpenSSL support.
316
# XXX: is this still true with OptionsNG as of 2015-03?
317
#.include "${.CURDIR}/../../Mk/bsd.openssl.mk"
318
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
319
CONFIGURE_ARGS+=	--with-openssl="${OPENSSLBASE}"
320
CFLAGS+=		-I${OPENSSLINC}
321
LDFLAGS+=		-L${OPENSSLLIB}
322
323
# Security certificate generator helpers:
324
security_cert_generators=	file
325
CONFIGURE_ARGS+=	--enable-security-cert-generators="${security_cert_generators}"
326
.endif
327
328
.if ${PORT_OPTIONS:MSSL_CRTD} && !${PORT_OPTIONS:MSSL}
329
IGNORE=SSL_CRTD option can be used only if SSL option is enabled
330
.endif
331
332
.if ${PORT_OPTIONS:MSTACKTRACES}
333
CFLAGS+=	-g
334
LDFLAGS+=	-lunwind -L${LOCALBASE}/lib
335
STRIP=
336
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-gen-stacktrace
337
.endif
338
339
.if ${PORT_OPTIONS:MDEBUG} || defined(WITH_DEBUG)
272
.if ${PORT_OPTIONS:MDEBUG} || defined(WITH_DEBUG)
340
CONFIGURE_ARGS+=	--disable-optimizations --enable-debug-cbdata
273
CONFIGURE_ARGS+=	--disable-optimizations --enable-debug-cbdata
341
WITH_DEBUG?=		yes
274
WITH_DEBUG?=		yes
(-)squid-devel/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (squid4.0/squid-4.0.10.tar.xz) = 2f9309da2c91e1a66b8b32227dcc6d4f277a333681507a6e5d29a9de39bf5a13
1
SHA256 (squid4.0/squid-4.0.11.tar.xz) = 2eda025d12ee6c7a18f5c1efb4c2689e370077038c21dbe97d5071167892f5ee
2
SIZE (squid4.0/squid-4.0.10.tar.xz) = 2383452
2
SIZE (squid4.0/squid-4.0.11.tar.xz) = 2387896

Return to bug 210224