Merge remote-tracking branch 'stevee/squid-zph-qos' into beyond-next

[people/teissler/ipfire-2.x.git] / lfs / squid

diff --git a/lfs/squid b/lfs/squid
index a341857f76c0130d978d7c50e094f39e06bd486b..00dc12a10a01a7b918e5f0c87a8ccf30737014fe 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.3.10
+VER        = 3.4.4
 
 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 = dc2bcb967fc6b15bbbc6b961010c0c00
 
 install : $(TARGET)
 
@@ -70,9 +70,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 +101,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 +117,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