X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fsquid;h=80e14f017fbbca839d0d89040deebddfd33ae6d5;hb=a4ff59ef4fc420c48faa4a228dbced4dea2cb6c3;hp=cb6319aedf99d8620bafe161a5f126c8b6b43ceb;hpb=5db10f476c90304d2c5fcaf453d63e5b4693ee55;p=ipfire-2.x.git

diff --git a/lfs/squid b/lfs/squid
index cb6319aedf..80e14f017f 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.6.STABLE16
+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 = 849bee6f269e6c773f215fd4b41de0e3
+$(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,11 +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/
-	-find /usr/lib/squid/errors.ipfire/ -name .svn -exec rm -rf {} \;
 	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
@@ -121,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