Merge remote-tracking branch 'ms/ipsec-subnets' into next

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

diff --git a/lfs/squid b/lfs/squid
index d8c8a05a700261a7430f04df3d084b1c9c19cd51..de6c87d46e0aa45394e99d2c09a566ef472984f0 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -70,6 +70,7 @@ $(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) && ./configure \
                --prefix=/usr \
                --sysconfdir=/etc/squid \
@@ -113,7 +114,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --enable-cache-digests \
                --enable-forw-via-db \
                --enable-htcp \
-               --enable-linux-netfilter \
                --enable-kill-parent-hack \
                --disable-wccpv2 \
                --enable-icap-client \