Attachment #147394 for bug #193705




OPTIONS_DEFINE=	ARP_ACL AUTH_KERB AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB \
		AUTH_SQL \
		CACHE_DIGESTS DEBUG DELAY_POOLS DNS_HELPER ECAP ESI \
		FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 KQUEUE \
		LARGEFILE SNMP SSL SSL_CRTD STACKTRACES LAX_HTTP \
		TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 DOCS EXAMPLES

# Note: FS_FCOSS was removed from OPTIONS, it is broken and only experimental
#OPTIONS_DEFINE+=	FS_COSS

OPTIONS_DEFAULT=AUTH_KERB AUTH_NIS FS_AUFS FS_DISKD HTCP IDENT KQUEUE SNMP \
		WCCP WCCPV2

ARP_ACL_CONFIGURE_ENABLE=	eui
AUTH_LDAP_CFLAGS=		-I${LOCALBASE}/include

TP_IPFW_CONFIGURE_ENABLE=	ipfw-transparent
TP_IPF_CONFIGURE_ENABLE=	ipf-transparent
TP_PF_CONFIGURE_ENABLE=		pf-transparent
TP_PF_CONFIGURE_WITH=		nat-devpf
VIA_DB_CONFIGURE_ENABLE=	forw-via-db
WCCPV2_CONFIGURE_ENABLE=	wccpv2
WCCP_CONFIGURE_ENABLE=		wccp

ECAP_DESC=		Loadable content adaptation modules (broken on FreeBSD 10+)
ESI_DESC=		ESI support
FOLLOW_XFF_DESC=	Support for the X-Following-For header
FS_AUFS_DESC=		AUFS (threaded-io) support
FS_COSS_DESC=		COSS (not stable yet)
FS_DISKD_DESC=		DISKD storage engine controlled by separate service
FS_ROCK_DESC=		ROCK (unstable)
HTCP_DESC=		HTCP support
ICAP_DESC=		the ICAP client
ICMP_DESC=		ICMP pinging and network measurement

			--enable-auth-ntlm="${ntlm_auth}"

# Storage schemes:
storage_schemes=	ufs
diskio_modules=		AIO Blocking IpcIo Mmapped

.if ${PORT_OPTIONS:MFS_AUFS}
storage_schemes+=	aufs

storage_schemes+=	coss
.endif

.if ${PORT_OPTIONS:MFS_DISKD}
storage_schemes+=	diskd
diskio_modules+=	DiskDaemon
.endif

.if ${PORT_OPTIONS:MFS_ROCK}
storage_schemes+=	rock
.endif


CONFIGURE_ARGS+=	--enable-storeio="${storage_schemes}" \
			--enable-disk-io="${diskio_modules}"


Lines 2070-2076 Link Here

(-)pkg-plist (-1 / +1 lines)
2070	%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/cert_tool	2070	%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/cert_tool
2071	%%SSL%%libexec/squid/cert_valid.pl	2071	%%SSL%%libexec/squid/cert_valid.pl
2072	libexec/squid/digest_file_auth	2072	libexec/squid/digest_file_auth
2073	libexec/squid/diskd	2073	%%FS_DISKD%%libexec/squid/diskd
2074	%%DNS_HELPER%%libexec/squid/dnsserver	2074	%%DNS_HELPER%%libexec/squid/dnsserver
2075	libexec/squid/ext_file_userip_acl	2075	libexec/squid/ext_file_userip_acl
2076	%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/ext_kerberos_ldap_group_acl	2076	%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/ext_kerberos_ldap_group_acl

Return to bug 193705

Lines 47-60 Link Here

(-)Makefile (-6 / +20 lines)
47	OPTIONS_DEFINE= ARP_ACL AUTH_KERB AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB \	47	OPTIONS_DEFINE= ARP_ACL AUTH_KERB AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB \
48	AUTH_SQL \	48	AUTH_SQL \
49	CACHE_DIGESTS DEBUG DELAY_POOLS DNS_HELPER ECAP ESI \	49	CACHE_DIGESTS DEBUG DELAY_POOLS DNS_HELPER ECAP ESI \
50	FOLLOW_XFF FS_AUFS HTCP ICAP ICMP IDENT IPV6 KQUEUE \	50	FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP ICMP IDENT IPV6 KQUEUE \
51	LARGEFILE SNMP SSL SSL_CRTD STACKTRACES LAX_HTTP \	51	LARGEFILE SNMP SSL SSL_CRTD STACKTRACES LAX_HTTP \
52	TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 DOCS EXAMPLES	52	TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 DOCS EXAMPLES
53		53
54	# Note: FS_FCOSS was removed from OPTIONS, it is broken and only experimentel	54	# Note: FS_FCOSS was removed from OPTIONS, it is broken and only experimental
55	#OPTIONS_DEFINE+= FS_COSS	55	#OPTIONS_DEFINE+= FS_COSS
56		56
57	OPTIONS_DEFAULT=AUTH_KERB AUTH_NIS FS_AUFS HTCP IDENT KQUEUE SNMP WCCP WCCPV2	57	OPTIONS_DEFAULT=AUTH_KERB AUTH_NIS FS_AUFS FS_DISKD HTCP IDENT KQUEUE SNMP \
		58	WCCP WCCPV2
58		59
59	ARP_ACL_CONFIGURE_ENABLE= eui	60	ARP_ACL_CONFIGURE_ENABLE= eui
60	AUTH_LDAP_CFLAGS= -I${LOCALBASE}/include	61	AUTH_LDAP_CFLAGS= -I${LOCALBASE}/include
Lines 97-102 Link Here
97	TP_IPFW_CONFIGURE_ENABLE= ipfw-transparent	98	TP_IPFW_CONFIGURE_ENABLE= ipfw-transparent
98	TP_IPF_CONFIGURE_ENABLE= ipf-transparent	99	TP_IPF_CONFIGURE_ENABLE= ipf-transparent
99	TP_PF_CONFIGURE_ENABLE= pf-transparent	100	TP_PF_CONFIGURE_ENABLE= pf-transparent
		101	TP_PF_CONFIGURE_WITH= nat-devpf
100	VIA_DB_CONFIGURE_ENABLE= forw-via-db	102	VIA_DB_CONFIGURE_ENABLE= forw-via-db
101	WCCPV2_CONFIGURE_ENABLE= wccpv2	103	WCCPV2_CONFIGURE_ENABLE= wccpv2
102	WCCP_CONFIGURE_ENABLE= wccp	104	WCCP_CONFIGURE_ENABLE= wccp
Lines 118-125 Link Here
118	ECAP_DESC= Loadable content adaptation modules (broken on FreeBSD 10+)	120	ECAP_DESC= Loadable content adaptation modules (broken on FreeBSD 10+)
119	ESI_DESC= ESI support	121	ESI_DESC= ESI support
120	FOLLOW_XFF_DESC= Support for the X-Following-For header	122	FOLLOW_XFF_DESC= Support for the X-Following-For header
121	FS_AUFS_DESC= AUFS (async-io) support	123	FS_AUFS_DESC= AUFS (threaded-io) support
122	FS_COSS_DESC= COSS (not stable yet)	124	FS_COSS_DESC= COSS (not stable yet)
		125	FS_DISKD_DESC= DISKD storage engine controlled by separate service
		126	FS_ROCK_DESC= ROCK (unstable)
123	HTCP_DESC= HTCP support	127	HTCP_DESC= HTCP support
124	ICAP_DESC= the ICAP client	128	ICAP_DESC= the ICAP client
125	ICMP_DESC= ICMP pinging and network measurement	129	ICMP_DESC= ICMP pinging and network measurement
Lines 236-243 Link Here
236	--enable-auth-ntlm="${ntlm_auth}"	240	--enable-auth-ntlm="${ntlm_auth}"
237		241
238	# Storage schemes:	242	# Storage schemes:
239	storage_schemes= diskd rock ufs	243	storage_schemes= ufs
240	diskio_modules= AIO Blocking DiskDaemon IpcIo Mmapped	244	diskio_modules= AIO Blocking IpcIo Mmapped
241		245
242	.if ${PORT_OPTIONS:MFS_AUFS}	246	.if ${PORT_OPTIONS:MFS_AUFS}
243	storage_schemes+= aufs	247	storage_schemes+= aufs
Lines 254-259 Link Here
254	storage_schemes+= coss	258	storage_schemes+= coss
255	.endif	259	.endif
256		260
		261	.if ${PORT_OPTIONS:MFS_DISKD}
		262	storage_schemes+= diskd
		263	diskio_modules+= DiskDaemon
		264	.endif
		265
		266	.if ${PORT_OPTIONS:MFS_ROCK}
		267	storage_schemes+= rock
		268	.endif
		269
		270
257	CONFIGURE_ARGS+= --enable-storeio="${storage_schemes}" \	271	CONFIGURE_ARGS+= --enable-storeio="${storage_schemes}" \
258	--enable-disk-io="${diskio_modules}"	272	--enable-disk-io="${diskio_modules}"
259		273