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 b933de27276496d3b59b70b58edc3be425251d0d..2bdf5bea82017e417355e9bb9af824c7fe5153ee 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: squid,v 1.4.2.21 2005/10/24 22:19:58 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 2.5.STABLE13
+VER        = 2.6.STABLE13
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = http://www.squid-cache.org/Versions/v2/2.5
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3e64468e123be1246d17486dab6bee87
+$(DL_FILE)_MD5 = fdc4ece264b47bab1b112d8f6f842b8b
 
 install : $(TARGET)
 
@@ -96,18 +90,46 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
           --enable-referer-log \
           --with-pthreads --with-dl
 
-       cd $(DIR_APP) && make -j 3
+       cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
        rm -f /etc/squid/squid.conf
-       ln -sf $(CONFIG_ROOT)/proxy/squid.conf /etc/squid/squid.conf
+       ln -sf /var/ipfire/proxy/squid.conf /etc/squid/squid.conf
        rm -f /etc/squid/errors
        ln -sf /usr/lib/squid/errors/English /etc/squid/errors
 
-       -mkdir -p /var/log/cache
-       -mkdir -p /var/log/squid
+       -mkdir -p /var/log/cache /var/log/squid /var/log/updatexlrator
        touch /var/log/squid/access.log
-       chown -R squid:squid /var/log/squid /var/log/cache
+       chown -R squid:squid /var/log/squid /var/log/cache /var/log/updatexlrator
+
+       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
+
+       ln -fs /bin/false /var/ipfire/updatexlrator/autocheck/cron.daily
+       ln -fs /bin/false /var/ipfire/updatexlrator/autocheck/cron.monthly
+       ln -fs /bin/false /var/ipfire/updatexlrator/autocheck/cron.weekly
+
+       chown -R nobody:nobody /var/ipfire/updatexlrator
+       chown nobody.squid /srv/web/ipfire/html/updatecache
+       chown nobody.squid /srv/web/ipfire/html/updatecache/download
+       chown nobody.squid /srv/web/ipfire/html/updatecache/metadata
+       chmod 775 /srv/web/ipfire/html/updatecache
+       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)