X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fsquid;h=f5d06769a0b4afa934c58ac47ba895cf6b9e4775;hb=a6090720da282a83a0bf67acbf5f3f9c21a2864c;hp=f545ee1ab4f7a5ef7cd8b4d2a32b1fa1e2431777;hpb=57d5b1381770baff23f6df588f7c88d7406edd04;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/squid b/lfs/squid
index f545ee1ab..f5d06769a 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.STABLE13
+VER        = 2.6.STABLE19
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -42,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = fdc4ece264b47bab1b112d8f6f842b8b
+$(DL_FILE)_MD5 = e1f355ab907369903b5e28aff0fe8386
 
 install : $(TARGET)
 
@@ -107,7 +105,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	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
 
@@ -116,13 +113,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	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
+	
+	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)