X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fsquid;h=f85b5e9a8029cf47df49042843b0f5cd5ce341c5;hp=5f5cb1d1fcc91ae93f9770142ef37880325dea8f;hb=5930a368ad783c21e4e5542aea64561f409cbd68;hpb=5bbecc69ba46ae259657b75f521d41f961d8f035 diff --git a/lfs/squid b/lfs/squid index 5f5cb1d1f..e050b17c5 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-2012 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,10 +24,10 @@ include Config -VER = 2.6.STABLE16 +VER = 3.4.5 THISAPP = squid-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 849bee6f269e6c773f215fd4b41de0e3 +$(DL_FILE)_MD5 = a831efb36cfbaa419f8dc7a43cba72c9 install : $(TARGET) @@ -69,58 +69,103 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(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-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 + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc/squid \ + --datadir=/usr/lib/squid \ + --mandir=/usr/share/man \ + --libexecdir=/usr/lib/squid \ + --localstatedir=/var \ + --disable-ipv6 \ + --enable-poll \ + --disable-icmp \ + --disable-wccp \ + --enable-ident-lookups \ + --enable-storeio="aufs,diskd,ufs" \ + --enable-ssl \ + --enable-underscores \ + --enable-http-violations \ + --enable-removal-policies="heap,lru" \ + --enable-delay-pools \ + --enable-linux-netfilter \ + --enable-snmp \ + --enable-auth \ + --enable-auth-basic \ + --enable-auth-digest \ + --enable-auth-negotiate \ + --enable-auth-ntlm \ + --enable-log-daemon-helpers \ + --enable-url-rewrite-helpers \ + --enable-build-info \ + --enable-eui \ + --with-pthreads \ + --with-dl \ + --with-filedescriptors=$$(( 16384 * 64 )) \ + --with-large-files \ + --with-aio \ + --enable-async-io=8 \ + --enable-unlinkd \ + --enable-internal-dns \ + --enable-epoll \ + --disable-kqueue \ + --enable-select \ + --enable-cache-digests \ + --enable-forw-via-db \ + --enable-htcp \ + --enable-linux-netfilter \ + --enable-kill-parent-hack \ + --disable-wccpv2 \ + --enable-icap-client \ + --disable-esi \ + --enable-zph-qos \ + --disable-arch-native 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 chown squid:squid /var/log/squid ln -sf /usr/lib/squid /usr/lib/squid/auth @@ -128,5 +173,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)