X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fsquid;h=80e14f017fbbca839d0d89040deebddfd33ae6d5;hb=1b8e5968dfa332010c0029953f7a27df129843c6;hp=c2b7d4a832fde0c4f4fda56786a8aa22b0389788;hpb=ee78a5efc7c5a5aa81d4d3c24166aa0a5a951228;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/squid b/lfs/squid
index c2b7d4a832..80e14f017f 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,7 +24,7 @@
 
 include Config
 
-VER        = 2.6.STABLE12
+VER        = 2.7.STABLE5
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -42,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a830ccc95cb39cdfa5e5b773add0bb0d
+$(DL_FILE)_MD5 = 5d495d285b3b951a5859c660463e9832
 
 install : $(TARGET)
 
@@ -79,7 +77,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	   --localstatedir=/var --sysconfdir=/etc/squid \
 	   --disable-poll --disable-snmp --disable-icmp --disable-wccp \
 	   --disable-http-violations --disable-ident-lookups \
-	   --enable-storeio="aufs,coss,diskd,ufs" --enable-ssl \
+	   --enable-storeio="aufs,coss,diskd,ufs,null" --enable-ssl \
 	   --enable-underscores --enable-ntlm-fail-open --enable-arp-acl \
 	   --enable-http-violations --enable-auth=basic,ntlm \
 	   --enable-removal-policies="heap,lru" \
@@ -105,23 +103,35 @@ $(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
+	cp -f $(DIR_SRC)/config/updxlrator/convert /var/ipfire/updatexlrator/bin/convert
+	cp -f $(DIR_SRC)/config/updxlrator/lscache /var/ipfire/updatexlrator/bin/lscache
+
 	-mkdir -p /usr/lib/squid/errors.ipfire
 	cp -fr $(DIR_SRC)/config/proxy/errors.ipfire/* /usr/lib/squid/errors.ipfire/
 	chmod 755 /usr/sbin/updxlrator /var/ipfire/updatexlrator/bin/checkup \
-		/var/ipfire/updatexlrator/bin/download
+		/var/ipfire/updatexlrator/bin/download \
+		/var/ipfire/updatexlrator/bin/convert \
+		/var/ipfire/updatexlrator/bin/lscache
 
 	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
+	chown nobody.squid /var/updatecache
+	chown nobody.squid /var/updatecache/download
+	chown nobody.squid /var/updatecache/metadata
+	chmod 775 /var/updatecache
+	chmod 775 /var/updatecache/download
+	chmod 775 /var/updatecache/metadata
 	chmod 755 /var/log/updatexlrator
+	chmod 755 /srv/web/ipfire/html/images/updbooster
+	
+	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)