Netzwerkscripts erweitert.

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

diff --git a/lfs/squid b/lfs/squid
index 609a41977c05705601ab9030f6c8246fe37dc048..e8c631e7cf04b285a267544266213f6bbac5f4c8 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -26,7 +26,7 @@
 
 include Config
 
-VER        = 2.5.STABLE14
+VER        = 2.6.STABLE12
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f413e0b887a5f9b2a75350243ed5564c
+$(DL_FILE)_MD5 = a830ccc95cb39cdfa5e5b773add0bb0d
 
 install : $(TARGET)
 
@@ -90,40 +90,37 @@ $(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
-
-       # URL-Filter
-       -mkdir /etc/squidGuard /home/httpd/html/repository
-       cp -f  $(DIR_CONF)/urlfilter/autoupdate.urls /var/ipfire/urlfilter/autoupdate/autoupdate.urls
-       ln -fs /bin/false /var/ipfire/urlfilter/autoupdate/cron.daily
-       ln -fs /bin/false /var/ipfire/urlfilter/autoupdate/cron.weekly
-       ln -fs /bin/false /var/ipfire/urlfilter/autoupdate/cron.monthly
-       cp -f  $(DIR_CONF)/urlfilter/squidGuard.conf /var/ipfire/urlfilter/squidGuard.conf
-       ln -fs /var/ipfire/urlfilter/squidGuard.conf /etc/squidGuard/squidGuard.conf
-       cp -f  $(DIR_CONF)/urlfilter/prebuild.pl /var/ipfire/urlfilter/bin/prebuild.pl
-       chmod 755 /var/ipfire/urlfilter/bin/prebuild.pl
-       cp -f  $(DIR_CONF)/urlfilter/autoupdate.pl /var/ipfire/urlfilter/bin/autoupdate.pl
-       chmod 755 /var/ipfire/urlfilter/bin/autoupdate.pl
-       echo "1.7.1" > /var/ipfire/urlfilter/version
-
-       /bin/tar --no-same-owner -xzf $(DIR_CONF)/urlfilter/blacklists.tar.gz -C /var/ipfire/urlfilter
-       /usr/bin/perl $(DIR_CONF)/urlfilter/makeconf.pl
-       chown -R nobody:nobody /var/ipfire/urlfilter
-       chown -R nobody:nobody /home/httpd/html/images/urlfilter
-       chown -R nobody:nobody /home/httpd/html/repository
-       touch /var/log/squidGuard
-       chown -R squid:squid /var/log/squidGuard
+       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
+       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
+
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)