Merge branch 'master' into kernel-4.9

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

diff --git a/lfs/squidguard b/lfs/squidguard
index a5dd7b9cbfdbd1a7d165f4a5719ab11b310efa28..a48c25cbe2d275dfd79878a15b10b06a538431e7 100644 (file)
--- a/lfs/squidguard
+++ b/lfs/squidguard
@@ -70,12 +70,13 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squidguard-1.4-squid-helper-protocol.patch
        cd $(DIR_APP) && ./configure --prefix=/usr --datadir=/usr/share \
                --sysconfdir=/etc --localstatedir=/var --infodir=/usr/info --mandir=/usr/man  \
                --with-sg-config=/var/ipfire/urlfilter/squidGuard.conf \
                --with-sg-logdir=/var/log/squidGuard --with-sg-dbhome=/var/lib/squidguard \
                --with-db=/usr --with-db-inc=/usr/include --with-db-lib=/usr/lib
-       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
 
        # URL-Filter