Viele CGIs geaendert, einige Proxy Dateien hinzugefuegt, iptables aus dem menu geschm...

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

diff --git a/lfs/squid b/lfs/squid
index e8c631e7cf04b285a267544266213f6bbac5f4c8..2bdf5bea82017e417355e9bb9af824c7fe5153ee 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -26,7 +26,7 @@
 
 include Config
 
-VER        = 2.6.STABLE12
+VER        = 2.6.STABLE13
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a830ccc95cb39cdfa5e5b773add0bb0d
+$(DL_FILE)_MD5 = fdc4ece264b47bab1b112d8f6f842b8b
 
 install : $(TARGET)
 
@@ -105,6 +105,9 @@ $(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
+       -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
 
@@ -120,7 +123,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chmod 775 /srv/web/ipfire/html/updatecache/download
        chmod 775 /srv/web/ipfire/html/updatecache/metadata
        chmod 755 /var/log/updatexlrator
-
+       
+  chwon squid:squid /var/log/squid
+  mkdir /var/ipfire/proxy/advanced/auth
+       cp -f $(DIR_SRC)/config/proxy/auth /var/ipfire/proxy/advanced/auth
+       cp -f $(DIR_SRC)/config/proxy/proxy.pac /srv/web/ipfire/html/proxy.pac
+       chown nobody.nobody /srv/web/ipfire/html/proxy.pac
+       ln -f /srv/web/ipfire/html/proxy.pac /srv/web/ipfire/html//wpad.dat
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)