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

Collapse All | Expand All

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

Return to bug 208584