squid 3.5.23: latest patch (14129)

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

diff --git a/lfs/squid b/lfs/squid
index 6725a6e827df96931f3942ced144b9e0479082e2..00152080c5648a13de5d3e20c09a6b74072260bc 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.4.14
+VER        = 3.5.23
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4e7d7d062159484563ef11f69a0df50a
+$(DL_FILE)_MD5 = 9b68f689e3d9578932b9c6a4041037c2
 
 install : $(TARGET)
 
@@ -70,14 +70,8 @@ $(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 -i $(DIR_SRC)/src/patches/squid-3.4-13228.patch
-       cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4.14-fix-max-file-descriptors.patch
-       cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13230.patch
-       cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13231.patch
-       cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13232.patch
-       cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13233.patch
-       cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13234.patch
-       cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13235.patch
+       cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14129.patch
+       cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.23-fix-max-file-descriptors.patch
 
        cd $(DIR_APP) && autoreconf -vfi
        cd $(DIR_APP)/libltdl && autoreconf -vfi
@@ -96,13 +90,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --disable-kqueue \
                --disable-esi \
                --disable-arch-native \
-               --disable-ipv6 \
+               --enable-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 \
@@ -126,11 +120,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