X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fsquid;h=1b4a8a2c8772e26cdf39a59d6b3e40d78f22e0d6;hb=3ca9ebffcf231a31aef9f998564a29ddae251cba;hp=cbae8e03908a87f83a954d5a86976808cc4bfd96;hpb=bd365f3a895ad577a13a48ef123e205fe22e8f68;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/squid b/lfs/squid
index cbae8e0390..1b4a8a2c87 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -26,7 +26,7 @@
 
 include Config
 
-VER        = 2.5.STABLE14
+VER        = 2.6.STABLE14
 
 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 = eadb138d48320df8b99349121159c6bf
 
 install : $(TARGET)
 
@@ -90,18 +90,45 @@ $(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
+	
+	chown squid:squid /var/log/squid
+	ln -sf /usr/lib/squid /usr/lib/squid/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 -sf /srv/web/ipfire/html/proxy.pac /srv/web/ipfire/html/wpad.dat
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)