Updated squid (3.1.11).

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

diff --git a/lfs/squid b/lfs/squid
index f4bc5f00c27860f93dbd8cf8fa5dbb2f78c36783..b1942612f35017808f6d4054c34069110fd1dcb0 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) 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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.7.STABLE6
+VER        = 3.1.11
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6de3a6a7a56a7ecae092f2d31a04f039
+$(DL_FILE)_MD5 = 4b071d2bf4959f2d081344f2f69dd2f1
 
 install : $(TARGET)
 
@@ -69,38 +69,62 @@ $(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-icmp --disable-wccp \
-          --disable-ident-lookups \
-          --enable-storeio="aufs,coss,diskd,ufs,null" --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 \
-           --enable-snmp \
-          --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
@@ -110,8 +134,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 \
@@ -138,5 +160,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)