]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - lfs/squid
Updated squid (3.1.11).
[people/pmueller/ipfire-2.x.git] / lfs / squid
index 2810dd15c787a4c6b54885a94d1144a26b4d9b96..b1942612f35017808f6d4054c34069110fd1dcb0 100644 (file)
--- 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-2011  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        #
-# 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.STABLE9
+VER        = 3.1.11
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -42,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 95997d6cb38fdb562ecb790c553f9cfc
+$(DL_FILE)_MD5 = 4b071d2bf4959f2d081344f2f69dd2f1
 
 install : $(TARGET)
 
@@ -71,56 +69,100 @@ $(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 xjf $(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 \
+          --enable-poll --enable-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-basic-auth-helpers="NCSA,SMB,MSNT,LDAP,multi-domain-NTLM,PAM,squid_radius_auth" \
           --enable-useragent-log \
           --enable-referer-log \
-          --with-pthreads --with-dl
+             --enable-snmp \
+          --with-pthreads --with-dl \
+          --with-maxfd="16384" \
+          --with-filedescriptors=16384 \
+          --with-large-files \
+          --with-aio \
+          --enable-async-io \
+          --enable-unlinkd \
+          --enable-ntln-fail-open \
+          --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \
+          --enable-internal-dns \
+          --enable-epoll \
+          --disable-kqueue \
+          --enable-select \
+          --disable-cache-digests \
+          --enable-forw-via-db \
+          --enable-htcp \
+          --enable-ipf-transparent \
+          --enable-kill-parent-hack \
+          --disable-wccpv2 \
+          --disable-icap-client \
+          --disable-esi
 
        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
+       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 -s /bin/false /var/ipfire/updatexlrator/autocheck/cron.daily
-       ln -s /bin/false /var/ipfire/updatexlrator/autocheck/cron.monthly
-       ln -s /bin/false /var/ipfire/updatexlrator/autocheck/cron.weekly
+       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
+
+       #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)