Hi,

merged.

On Sat, 2016-05-07 at 13:01 +0200, Matthias Fischer wrote:
> Removed unecessary quotations and two configure-options, see:
> ftp://ftp.fu-berlin.de/unix/www/squid/archive/3.1/squid-3.1.0.16-
> RELEASENOTES.html

Could you please link to the orignal resource and not to a mirror next time? The
mirror might go down and URLs won't work any more then.

-Michael

> 
> --with-aio
> Deprecated. POSIX AIO is now auto-detected and enabled.
> Use --without-aio to disable, but only if you really have to.
> 
> --with-pthreads
> Deprecated. pthreads library is now auto-detected and enabled.
> Use --without-pthreads to disable, but only if you really have to.
> 
> Best,
> Matthias
> 
> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
> ---
>  lfs/squid | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/lfs/squid b/lfs/squid
> index 66ad875..a7edc9d 100644
> --- a/lfs/squid
> +++ b/lfs/squid
> @@ -24,7 +24,7 @@
>  
>  include Config
>  
> -VER        = 3.5.17
> +VER        = 3.5.18
>  
>  THISAPP    = squid-$(VER)
>  DL_FILE    = $(THISAPP).tar.xz
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_MD5 = 2dc73cc01e77b1bd16d9070780ae79b1
> +$(DL_FILE)_MD5 = 9ae3843c341e8a142e963ab937c51cdd
>  
>  install : $(TARGET)
>  
> @@ -92,10 +92,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  		--disable-ipv6 \
>  		--enable-poll \
>  		--enable-ident-lookups \
> -		--enable-storeio="aufs,diskd,ufs" \
> +		--enable-storeio=aufs,diskd,ufs \
>  		--enable-underscores \
>  		--enable-http-violations \
> -		--enable-removal-policies="heap,lru" \
> +		--enable-removal-policies=heap,lru \
>  		--enable-delay-pools \
>  		--enable-linux-netfilter \
>  		--enable-snmp \
> @@ -119,11 +119,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  		--enable-kill-parent-hack \
>  		--enable-icap-client \
>  		--enable-zph-qos \
> -		--with-pthreads \
>  		--with-dl \
>  		--with-filedescriptors=$$(( 16384 * 64 )) \
> -		--with-large-files \
> -		--with-aio
> +		--with-large-files
>  
>  	cd $(DIR_APP) && make $(MAKETUNING)
>  	cd $(DIR_APP) && make install