X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fsquid;h=4a71b4da2007a0f6679f588f74b7b691641b74f8;hp=81118c2c39663bb2cdf5280b316a3c47ead22124;hb=754f508b5bf7ff3f89de369f2148f03bc7ee66c3;hpb=82c0cd6ae0ebefb3503c7bc2c8bf2e47b08f5698

diff --git a/lfs/squid b/lfs/squid
index 81118c2c3..4a71b4da2 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 3.1.23
+VER        = 3.3.8
 
 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 = e15fdb8c615cf1f9525be0a2b75c60a7
+$(DL_FILE)_MD5 = 6a8fa0075f2fbdd899ac4c9d95fe67cb
 
 install : $(TARGET)
 
@@ -69,47 +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) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.1-10486.patch
-	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.1-10487.patch
-
-	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="65536" \
-	   --with-filedescriptors=65536 \
-	   --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 \
-	   --enable-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