Don't provide ssh keys in the update to 2.3.

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

diff --git a/lfs/squid b/lfs/squid
index 194351285604484b1219ab72d6aeefef6d020d9d..80e14f017fbbca839d0d89040deebddfd33ae6d5 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.7.STABLE3
+VER        = 2.7.STABLE5
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9756d9cf9c197356346d1f931046d3a4
+$(DL_FILE)_MD5 = 5d495d285b3b951a5859c660463e9832
 
 install : $(TARGET)
 
@@ -77,7 +77,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
           --localstatedir=/var --sysconfdir=/etc/squid \
           --disable-poll --disable-snmp --disable-icmp --disable-wccp \
           --disable-http-violations --disable-ident-lookups \
-          --enable-storeio="aufs,coss,diskd,ufs" --enable-ssl \
+          --enable-storeio="aufs,coss,diskd,ufs,null" --enable-ssl \
           --enable-underscores --enable-ntlm-fail-open --enable-arp-acl \
           --enable-http-violations --enable-auth=basic,ntlm \
           --enable-removal-policies="heap,lru" \
@@ -103,10 +103,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cp -f $(DIR_SRC)/config/updxlrator/updxlrator /usr/sbin/updxlrator
        cp -f $(DIR_SRC)/config/updxlrator/checkup /var/ipfire/updatexlrator/bin/checkup
        cp -f $(DIR_SRC)/config/updxlrator/download /var/ipfire/updatexlrator/bin/download
+       cp -f $(DIR_SRC)/config/updxlrator/convert /var/ipfire/updatexlrator/bin/convert
+       cp -f $(DIR_SRC)/config/updxlrator/lscache /var/ipfire/updatexlrator/bin/lscache
+
        -mkdir -p /usr/lib/squid/errors.ipfire
        cp -fr $(DIR_SRC)/config/proxy/errors.ipfire/* /usr/lib/squid/errors.ipfire/
        chmod 755 /usr/sbin/updxlrator /var/ipfire/updatexlrator/bin/checkup \
-               /var/ipfire/updatexlrator/bin/download
+               /var/ipfire/updatexlrator/bin/download \
+               /var/ipfire/updatexlrator/bin/convert \
+               /var/ipfire/updatexlrator/bin/lscache
 
        ln -fs /bin/false /var/ipfire/updatexlrator/autocheck/cron.daily
        ln -fs /bin/false /var/ipfire/updatexlrator/autocheck/cron.monthly
@@ -120,6 +125,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chmod 775 /var/updatecache/download
        chmod 775 /var/updatecache/metadata
        chmod 755 /var/log/updatexlrator
+       chmod 755 /srv/web/ipfire/html/images/updbooster
        
        chown squid:squid /var/log/squid
        ln -sf /usr/lib/squid /usr/lib/squid/auth