X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fsquid;h=610154b3bc4a7e2eadd848e336100727c6f93666;hp=005c2bc5a49907bd553b9707741f1276e5812cd2;hb=99f96fa93d504d15de16f972e141dfe01675532c;hpb=7a98bae5d3e411334e3c29cd8ea2369983694c7b diff --git a/lfs/squid b/lfs/squid index 005c2bc5a4..610154b3bc 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-2011 IPFire Team # +# # +# 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 # +# along with this program. If not, see . # # # ############################################################################### @@ -26,7 +24,7 @@ include Config -VER = 2.5.STABLE14 +VER = 3.1.18 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -38,17 +36,11 @@ TARGET = $(DIR_INFO)/$(THISAPP) # Top-level Rules ############################################################################### -objects = $(DL_FILE) \ - $(THISAPP)-httpReplyDestroy.patch \ - $(THISAPP)-hierarchy_tag.patch +objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(THISAPP)-httpReplyDestroy.patch = $(URL_IPFIRE)/$(THISAPP)-httpReplyDestroy.patch -$(THISAPP)-hierarchy_tag.patch = $(URL_IPFIRE)/$(THISAPP)-hierarchy_tag.patch -$(DL_FILE)_MD5 = f413e0b887a5f9b2a75350243ed5564c -$(THISAPP)-httpReplyDestroy.patch_MD5 = 1529f8b0170e24b26353578778435bd4 -$(THISAPP)-hierarchy_tag.patch_MD5 = 9abe563ca3d01dc58502737edc6f3c60 +$(DL_FILE)_MD5 = b53f8fb6e22551c2a7376292df5b6ec7 install : $(TARGET) @@ -77,39 +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) && patch -Np1 < $(DIR_DL)/$(THISAPP)-httpReplyDestroy.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/$(THISAPP)-hierarchy_tag.patch 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 - - cd $(DIR_APP) && make -j 3 + --enable-snmp \ + --with-pthreads --with-dl \ + --with-maxfd="16384" \ + --with-filedescriptors=16384 \ + --with-large-files \ + --with-aio \ + --enable-async-io=8 \ + --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 $(CONFIG_ROOT)/proxy/squid.conf /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 - -mkdir -p /var/log/squid + -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 + 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/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 + ln -fs /bin/false /var/ipfire/updatexlrator/autocheck/cron.weekly + + chown -R nobody:nobody /var/ipfire/updatexlrator + 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)