X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fsquid;h=f76a16c36def8e6cfa1d70e617067b544ed826fa;hp=a341857f76c0130d978d7c50e094f39e06bd486b;hb=abfd82b15e479ccfc351328ca0e86fc646f0eac5;hpb=36b1c19138f9936ae97fac4f94c443593702f22d;ds=sidebyside

diff --git a/lfs/squid b/lfs/squid
index a341857f7..f76a16c36 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.3.10
+VER        = 3.3.11
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 28058812d722cac303517a643e28bcb0
+$(DL_FILE)_MD5 = dd016ff5f14b2548083b3882207914f6
 
 install : $(TARGET)
 
@@ -53,7 +53,6 @@ md5 : $(subst %,%_MD5,$(objects))
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
-
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 	@$(CHECK)
 
@@ -70,9 +69,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
-
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/squid-3.3.10-optional-ssl-options.patch
-
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc/squid \
@@ -104,8 +100,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--enable-eui \
 		--with-pthreads \
 		--with-dl \
-		--with-maxfd="65536" \
-		--with-filedescriptors=65536 \
+		--with-filedescriptors=$$(( 16384 * 64 )) \
 		--with-large-files \
 		--with-aio \
 		--enable-async-io=8 \
@@ -121,7 +116,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--enable-kill-parent-hack \
 		--disable-wccpv2 \
 		--enable-icap-client \
-		--disable-esi
+		--disable-esi \
+		--enable-zph-qos
 
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install