Attachment 100118 Details for Bug 139368 – file.diff

[patch] file.diff

file.diff (text/plain), 4.13 KB, created by Thomas-Martin Seck on 2009-10-05 13:50:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas-Martin Seck

Created: 2009-10-05 13:50:02 UTC

Size: 4.13 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(.../www/squid31)	(revision 1670)
>+++ Makefile	(.../local/squid31)	(revision 1670)
>@@ -91,7 +91,7 @@
> 
> LATEST_LINK=	squid31
> 
>-SQUID_BETA_VER=	13
>+SQUID_BETA_VER=	14
> 
> CONFLICTS=	squid-2.[0-9].* squid-3.[^1].* cacheboy-[0-9]*
> GNU_CONFIGURE=	yes
>@@ -135,7 +135,7 @@
> 		SQUID_ECAP "En. loadable content adaptation modules" off \
> 		SQUID_ICAP "Enable ICAP client functionality" off \
> 		SQUID_ESI "Enable ESI support (experimental)" off \
>-		SQUID_AUFS "Enable the aufs storage scheme" off \
>+		SQUID_AUFS "Enable the aufs storage scheme" on \
> 		SQUID_COSS "Enable COSS (currently not available)" off \
> 		SQUID_KQUEUE "Use kqueue(2) (experimental)" on \
> 		SQUID_LARGEFILE "Support log and cache files >2GB" off \
>@@ -162,9 +162,10 @@
> 
> error_files=	ERR_ACCESS_DENIED ERR_CACHE_ACCESS_DENIED \
> 		ERR_CACHE_MGR_ACCESS_DENIED ERR_CANNOT_FORWARD \
>-		ERR_CONNECT_FAIL ERR_DNS_FAIL ERR_ESI ERR_FORWARDING_DENIED \
>+		ERR_CONNECT_FAIL ERR_DIR_LISTING ERR_DNS_FAIL \
>+		ERR_ESI ERR_FORWARDING_DENIED \
> 		ERR_FTP_DISABLED ERR_FTP_FAILURE ERR_FTP_FORBIDDEN \
>-		ERR_FTP_LISTING ERR_FTP_NOT_FOUND ERR_FTP_PUT_CREATED \
>+		ERR_FTP_NOT_FOUND ERR_FTP_PUT_CREATED \
> 		ERR_FTP_PUT_ERROR ERR_FTP_PUT_MODIFIED ERR_FTP_UNAVAILABLE \
> 		ERR_ICAP_FAILURE ERR_INVALID_REQ ERR_INVALID_RESP \
> 		ERR_INVALID_URL ERR_LIFETIME_EXP ERR_NO_RELAY \
>@@ -180,11 +181,20 @@
> 
> error_dir_links=	ar-ae ar-bh ar-dz ar-eg ar-iq ar-jo ar-kw ar-lb \
> 			ar-ly ar-ma ar-om ar-qa ar-sa ar-sy ar-tn ar-ye \
>-			az-az bg-bg cs-cz da-dk de-de el-gr en-au en-ca \
>-			en-gb en-in en-nz en-sg en-tt en-uk en-us en-za \
>-			es-ar es-pe es-es et-ee fi-fi fr-fr he-il hu-hu \
>-			hy-am id-id it-it ja-jp ko-kr lt-lt lv-lv ms-my \
>-			nl-nl pl-pl pt-pt ro-ro ru-ru sk-sk sr-sp sv-se \
>+			az-az bg-bg cs-cz da-dk \
>+			de-at de-ch de-de de-li de-lu \
>+			el-gr \
>+			en-au en-bz en-ca en-gb en-ie en-in en-jm en-nz \
>+			en-ph en-sg en-tt en-uk en-us en-za en-zw \
>+			es-ar es-bo es-cl es-co es-cr es-do es-ec es-es \
>+			es-gt es-hn es-mx es-ni es-pa es-pe es-pr es-py \
>+			es-sv es-uy es-ve \
>+			et-ee \
>+			fa-fa fa-ir fi-fi \
>+			fr-be fr-ca fr-ch fr-fr fr-lu fr-mc \
>+			he-il hu-hu hy-am id-id it-ch it-it \
>+			ja-jp ko-kp ko-kr lt-lt lv-lv ms-my nl-nl \
>+			pl-pl pt-pt ro-ro ru-ru sk-sk sr-sp sv-fi sv-se \
> 			th-th tr-tr uk-ua zh-hk zh-mo zh-sg
> 
> libexec=	cachemgr.cgi digest_pw_auth diskd ip_user_check \
>@@ -269,16 +279,21 @@
> # Storage schemes:
> 
> storage_schemes=	ufs diskd
>+# TODO: should AIO be optional as well?
>+diskio_modules=	AIO Blocking DiskDaemon
> .if defined(WITH_SQUID_AUFS)
> storage_schemes+=	aufs
>+diskio_modules+=	DiskThreads
> # Only document switching from libpthread to libthr using libmap.conf
> # where lipthread is the default threading library:
> .if ${OSVERSION} < 700041
> EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-src-cf.data.pre.aufs
> .endif
>-# Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS
>-CONFIGURE_ARGS+=	--with-pthreads
>+# Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS,
>+# e.g. SQUID_CONFIGURE_ARGS=--with-aufs-threads=N
> CFLAGS+=	${PTHREAD_CFLAGS}
>+.else
>+CONFIGURE_ARGS+=	--without-pthreads
> .endif
> .if defined(WITH_SQUID_COSS)
> # COSS is currently disabled in Squid-3 until fixes from the 2.x series are
>@@ -286,6 +301,7 @@
> #storage_schemes+=	coss
> .endif
> CONFIGURE_ARGS+=	--enable-storeio="${storage_schemes}"
>+CONFIGURE_ARGS+=	--enable-disk-io="${diskio_modules}"
> 
> # Other options set via 'make config':
> 
>Index: distinfo
>===================================================================
>--- distinfo	(.../www/squid31)	(revision 1670)
>+++ distinfo	(.../local/squid31)	(revision 1670)
>@@ -1,3 +1,3 @@
>-MD5 (squid3.1/squid-3.1.0.13.tar.bz2) = a7e3f6c35853a8ad200ba448004417da
>-SHA256 (squid3.1/squid-3.1.0.13.tar.bz2) = 25316da63796d2ef459bfa8c25f44a09e7a552e5d9517c4a98d320101e64a67e
>-SIZE (squid3.1/squid-3.1.0.13.tar.bz2) = 2386678
>+MD5 (squid3.1/squid-3.1.0.14.tar.bz2) = 0e76bc406495b010ac898937e19528c3
>+SHA256 (squid3.1/squid-3.1.0.14.tar.bz2) = fb41d1762a48e52f4041b416665f1f9416bf6d1946f3ba3c4e31a74185fcad57
>+SIZE (squid3.1/squid-3.1.0.14.tar.bz2) = 2398582

Actions: View | Diff

Attachments on bug 139368: 100118