X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fsquid;h=16df6210109aa01ce0f309b90e6dcdd2a67e6373;hp=2bdf5bea82017e417355e9bb9af824c7fe5153ee;hb=68388766c3ce8644b8983d9c1b6726c9e94fa2a6;hpb=268292e730717ad07349ea74e3b10ed3a3902102 diff --git a/lfs/squid b/lfs/squid index 2bdf5bea82..16df621010 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) 2010 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,10 +24,10 @@ include Config -VER = 2.6.STABLE13 +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) @@ -42,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fdc4ece264b47bab1b112d8f6f842b8b +$(DL_FILE)_MD5 = 0a233d8966a563a795065ccb654caa4f install : $(TARGET) @@ -71,65 +69,82 @@ $(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 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 - chwon squid:squid /var/log/squid - mkdir /var/ipfire/proxy/advanced/auth - cp -f $(DIR_SRC)/config/proxy/auth /var/ipfire/proxy/advanced/auth + 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 -f /srv/web/ipfire/html/proxy.pac /srv/web/ipfire/html//wpad.dat + 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)