Merge branch 'master' into perl

[people/pmueller/ipfire-2.x.git] / lfs / squid

diff --git a/lfs/squid b/lfs/squid
index f895307d6a9c59643371d0f79f56db2770376967..16df6210109aa01ce0f309b90e6dcdd2a67e6373 100644 (file)
--- 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.7.STABLE7
+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 = c18b0371fca813d5e7c7e0baf87baa22
+$(DL_FILE)_MD5 = 0a233d8966a563a795065ccb654caa4f
 
 install : $(TARGET)
 
@@ -69,7 +69,7 @@ $(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 \
@@ -77,18 +77,18 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
           --localstatedir=/var --sysconfdir=/etc/squid \
           --disable-poll --disable-icmp --disable-wccp \
           --enable-ident-lookups \
-          --enable-storeio="aufs,coss,diskd,ufs,null" --enable-ssl \
+          --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 \
              --enable-snmp \
           --with-pthreads --with-dl \
-          --with-maxfd="16384"
+          --with-maxfd="16384" \
+          --with-large-files
 
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
@@ -98,7 +98,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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
@@ -116,8 +116,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        cp -f $(DIR_SRC)/config/updxlrator/updxlrator-lib.pl /var/ipfire/updatexlrator//updxlrator-lib.pl
 
-       -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/convert \
@@ -144,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)