Attachment 147394 Details for Bug 193705 – squid.diff

[patch] squid.diff

squid.diff (text/plain), 2.80 KB, created by Volodymyr Kostyrko on 2014-09-17 11:11:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Volodymyr Kostyrko

Created: 2014-09-17 11:11:21 UTC

Size: 2.80 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 368357)
>+++ Makefile	(working copy)
>@@ -47,14 +47,15 @@
> 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 HTCP ICAP ICMP IDENT IPV6 KQUEUE \
>+		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 experimentel
>+# 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 HTCP IDENT KQUEUE SNMP WCCP WCCPV2
>+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
>@@ -97,6 +98,7 @@
> 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
>@@ -118,8 +120,10 @@
> 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 (async-io) support
>+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
>@@ -236,8 +240,8 @@
> 			--enable-auth-ntlm="${ntlm_auth}"
> 
> # Storage schemes:
>-storage_schemes=	diskd rock ufs
>-diskio_modules=		AIO Blocking DiskDaemon IpcIo Mmapped
>+storage_schemes=	ufs
>+diskio_modules=		AIO Blocking IpcIo Mmapped
> 
> .if ${PORT_OPTIONS:MFS_AUFS}
> storage_schemes+=	aufs
>@@ -254,6 +258,16 @@
> 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}"
> 
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 368357)
>+++ pkg-plist	(working copy)
>@@ -2070,7 +2070,7 @@
> %%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/cert_tool
> %%SSL%%libexec/squid/cert_valid.pl
> libexec/squid/digest_file_auth
>-libexec/squid/diskd
>+%%FS_DISKD%%libexec/squid/diskd
> %%DNS_HELPER%%libexec/squid/dnsserver
> libexec/squid/ext_file_userip_acl
> %%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/ext_kerberos_ldap_group_acl

Actions: View | Diff

Attachments on bug 193705: 147394 | 147486