]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
Merge remote-tracking branch 'stevee/squid-zph-qos' into beyond-next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 21 Mar 2014 13:48:22 +0000 (14:48 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 21 Mar 2014 13:48:22 +0000 (14:48 +0100)
1  2 
lfs/squid

diff --combined lfs/squid
index 7c27fb41eb194948d120cc735f04c1d5266df15a,f76a16c36def8e6cfa1d70e617067b544ed826fa..00dc12a10a01a7b918e5f0c87a8ccf30737014fe
+++ b/lfs/squid
@@@ -24,7 -24,7 +24,7 @@@
  
  include Config
  
 -VER        = 3.3.11
 +VER        = 3.4.4
  
  THISAPP    = squid-$(VER)
  DL_FILE    = $(THISAPP).tar.xz
@@@ -40,7 -40,7 +40,7 @@@ objects = $(DL_FILE
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
 -$(DL_FILE)_MD5 = dd016ff5f14b2548083b3882207914f6
 +$(DL_FILE)_MD5 = dc2bcb967fc6b15bbbc6b961010c0c00
  
  install : $(TARGET)
  
@@@ -53,7 -53,6 +53,7 @@@ md5 : $(subst %,%_MD5,$(objects)
  ###############################################################################
  # Downloading, checking, md5sum
  ###############################################################################
 +
  $(patsubst %,$(DIR_CHK)/%,$(objects)) :
        @$(CHECK)
  
@@@ -117,7 -116,8 +117,8 @@@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(
                --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