X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fsquid;h=3db063e135655f5e92a29d0c53841d33ea8e018f;hb=1020ff3069111bf5f7a485111afdea135a26da8f;hp=82f7e6cbb30cf74a229b43b8dcb6c20593745cf1;hpb=10e4f2395ed42d50545ef9c3d73994b542e09dac;p=ipfire-2.x.git

diff --git a/lfs/squid b/lfs/squid
index 82f7e6cbb3..3db063e135 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -26,7 +26,7 @@
 
 include Config
 
-VER        = 2.5.STABLE14
+VER        = 2.6.STABLE3
 
 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 = 5b181e9c08f35d098e53e54b01fbd092
 
 install : $(TARGET)
 
@@ -90,7 +90,7 @@ $(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
@@ -103,26 +103,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	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
-	chown -R squid:squid /var/log/squidGuard
-
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)