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

Collapse All | Expand All

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

Return to bug 208584