X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fsquid;h=81118c2c39663bb2cdf5280b316a3c47ead22124;hp=814985cea0777cb95b24e004b627bd274c60cbf4;hb=f833ef4660862fce522799582957a64b2159ea72;hpb=fdde104f2d7a333b79fe61eeeb77582efe10cb58

diff --git a/lfs/squid b/lfs/squid
index 814985cea..81118c2c3 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.19
+VER        = 3.1.23
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9b6ffaf96bee8f05f0085bc6361d7c94
+$(DL_FILE)_MD5 = e15fdb8c615cf1f9525be0a2b75c60a7
 
 install : $(TARGET)
 
@@ -71,6 +71,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
 
+	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.1-10486.patch
+	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.1-10487.patch
+
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls \
 	   --datadir=/usr/lib/squid \
 	   --mandir=/usr/share/man --libexecdir=/usr/lib/squid \
@@ -87,8 +90,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	   --enable-referer-log \
 	      --enable-snmp \
 	   --with-pthreads --with-dl \
-	   --with-maxfd="16384" \
-	   --with-filedescriptors=16384 \
+	   --with-maxfd="65536" \
+	   --with-filedescriptors=65536 \
 	   --with-large-files \
 	   --with-aio \
 	   --enable-async-io=8 \
@@ -99,13 +102,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	   --enable-epoll \
 	   --disable-kqueue \
 	   --enable-select \
-	   --disable-cache-digests \
+	   --enable-cache-digests \
 	   --enable-forw-via-db \
 	   --enable-htcp \
 	   --enable-ipf-transparent \
 	   --enable-kill-parent-hack \
 	   --disable-wccpv2 \
-	   --disable-icap-client \
+	   --enable-icap-client \
 	   --disable-esi
 
 	cd $(DIR_APP) && make $(MAKETUNING)