X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fsquid;h=bdc164620a72059bedf41951a80fb6ea25ff2866;hp=c36170a8be82fe1ed707ff7ae85253629f66c064;hb=800c1607ae050be3e4334c5bdd5f29f76e005390;hpb=5ae664e1cf7f478f95a8716712cbc7053889b6a6 diff --git a/lfs/squid b/lfs/squid index c36170a8be..bdc164620a 100644 --- 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 # # # # 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.STABLE4 +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 = 88ea575a67d35013ec786761d8a14f33 +$(DL_FILE)_MD5 = 4b071d2bf4959f2d081344f2f69dd2f1 install : $(TARGET) @@ -69,52 +69,76 @@ $(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=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 /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 -# this binary is incompatible with -# cp -f $(DIR_SRC)/config/updxlrator/setperms /var/ipfire/updatexlrator/bin/setperms + 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 \ - /var/ipfire/updatexlrator/bin/lscache + /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 @@ -128,6 +152,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) 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 @@ -135,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)