Enabled identd lookup for squid.

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

diff --git a/lfs/squid b/lfs/squid
index db45600addc658269fd48601327323c2239c3dad..f895307d6a9c59643371d0f79f56db2770376967 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.6.STABLE20
+VER        = 2.7.STABLE7
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6e1d87e9ae47f825c814a954a6febc36
+$(DL_FILE)_MD5 = c18b0371fca813d5e7c7e0baf87baa22
 
 install : $(TARGET)
 
@@ -75,9 +75,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
           --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,coss,diskd,ufs,null" --enable-ssl \
           --enable-underscores --enable-ntlm-fail-open --enable-arp-acl \
           --enable-http-violations --enable-auth=basic,ntlm \
           --enable-removal-policies="heap,lru" \
@@ -86,13 +86,17 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
           --enable-ntlm-auth-helpers="SMB" \
           --enable-useragent-log \
           --enable-referer-log \
-          --with-pthreads --with-dl
+             --enable-snmp \
+          --with-pthreads --with-dl \
+          --with-maxfd="16384"
 
        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
 
@@ -100,13 +104,25 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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
+
+       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/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
@@ -120,6 +136,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