X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fsquid;h=16df6210109aa01ce0f309b90e6dcdd2a67e6373;hp=e195a7da76831867f2f4f75bf9cc499e5bf36f3b;hb=0ccf2cc4170c0072b88246938d793b624ac71c4e;hpb=323208ea0165aceb323b8837475105f654f04049

diff --git a/lfs/squid b/lfs/squid
index e195a7da76..16df621010 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
 #                                                                             #
 # 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        #
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.6.STABLE18
+VER        = 3.1.10
 
 THISAPP    = squid-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = eb49bc06ea1a40421b6f1ac9e76d1757
+$(DL_FILE)_MD5 = 0a233d8966a563a795065ccb654caa4f
 
 install : $(TARGET)
 
@@ -69,45 +69,58 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE)
 
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls \
 	   --datadir=/usr/lib/squid \
 	   --mandir=/usr/share/man --libexecdir=/usr/lib/squid \
 	   --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 \
+	   --disable-poll --disable-icmp --disable-wccp \
+	   --enable-ident-lookups \
+	   --enable-storeio="aufs,diskd,ufs" --enable-ssl \
 	   --enable-underscores --enable-ntlm-fail-open --enable-arp-acl \
 	   --enable-http-violations --enable-auth=basic,ntlm \
 	   --enable-removal-policies="heap,lru" \
 	   --enable-delay-pools --enable-linux-netfilter \
 	   --enable-basic-auth-helpers="NCSA,SMB,MSNT,LDAP,multi-domain-NTLM" \
-	   --enable-ntlm-auth-helpers="SMB" \
 	   --enable-useragent-log \
 	   --enable-referer-log \
-	   --with-pthreads --with-dl
+	      --enable-snmp \
+	   --with-pthreads --with-dl \
+	   --with-maxfd="16384" \
+	   --with-large-files
 
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
 	rm -f /etc/squid/squid.conf
 	ln -sf /var/ipfire/proxy/squid.conf /etc/squid/squid.conf
+	rm -f /etc/squid/cachemgr.conf
+	ln -sf /var/ipfire/proxy/cachemgr.conf /etc/squid/cachemgr.conf
 	rm -f /etc/squid/errors
-	ln -sf /usr/lib/squid/errors/English /etc/squid/errors
+	ln -sf /usr/lib/squid/errors/en /etc/squid/errors
 
 	-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 /var/log/updatexlrator
 
+	cp /usr/lib/squid/cachemgr.cgi /srv/web/ipfire/cgi-bin/cachemgr.cgi
+	chown nobody.nobody /srv/web/ipfire/cgi-bin/cachemgr.cgi
+
 	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 {} \;
+	cp -f $(DIR_SRC)/config/updxlrator/convert /var/ipfire/updatexlrator/bin/convert
+	cp -f $(DIR_SRC)/config/updxlrator/lscache /var/ipfire/updatexlrator/bin/lscache
+	cp -f $(DIR_SRC)/config/updxlrator/checkdeaddl /var/ipfire/updatexlrator/bin/checkdeaddl
+
+	cp -f $(DIR_SRC)/config/updxlrator/updxlrator-lib.pl /var/ipfire/updatexlrator//updxlrator-lib.pl
+
 	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 \
+		/var/ipfire/updatexlrator/bin/checkdeaddl
 
 	ln -fs /bin/false /var/ipfire/updatexlrator/autocheck/cron.daily
 	ln -fs /bin/false /var/ipfire/updatexlrator/autocheck/cron.monthly
@@ -121,6 +134,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	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
@@ -128,5 +142,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	chown nobody.nobody /srv/web/ipfire/html/proxy.pac
 	ln -sf /srv/web/ipfire/html/proxy.pac /srv/web/ipfire/html/wpad.dat
 
+	#Copy stylesheets for the errorpages
+	cp -f $(DIR_SRC)/config/proxy/errorpage-ipfire.css /var/ipfire/proxy/
+	cp -f /etc/squid/errorpage.css /var/ipfire/proxy/errorpage-squid.css
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)