X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fsquid;h=2e3fd3d50d10f1d3d76660685b03231d7b258ac2;hp=7c0c5c930e3a0ec64a6bf5ff9352094a0b9b5599;hb=0e4f36aee459a4e4f7dca4037c8bbdc181d74836;hpb=f3b0222e3f85921f3792b03a2428f611c50b339c

diff --git a/lfs/squid b/lfs/squid
index 7c0c5c930..2e3fd3d50 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 3.1.22
+VER        = 3.3.9
 
 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 = a25ce5937875990c950cc8cd1b120a5e
+$(DL_FILE)_MD5 = 6c4ba0d63c3a6d94de2da689f361cdab
 
 install : $(TARGET)
 
@@ -69,44 +69,56 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@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 \
-	   --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,PAM,squid_radius_auth" \
-	   --enable-useragent-log \
-	   --enable-referer-log \
-	      --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 \
-	   --enable-icap-client \
-	   --disable-esi
+	@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-maxfd="65536" \
+		--with-filedescriptors=65536 \
+		--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-ipf-transparent \
+		--enable-kill-parent-hack \
+		--disable-wccpv2 \
+		--enable-icap-client \
+		--disable-esi
 
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install