core128: Ship updated curl

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

diff --git a/lfs/squid b/lfs/squid
index 3ede976109819caa9d673c7cdeecc3c7e39027c8..6033ab3948a5bf943e4805d20656951639e3ac0b 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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,14 +24,16 @@
 
 include Config
 
-VER        = 3.1.23
+VER        = 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)
 
+CXXFLAGS+= -Wno-error=format-truncation
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -40,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e15fdb8c615cf1f9525be0a2b75c60a7
+$(DL_FILE)_MD5 = 8275da5846f9f2243ad2625e5aef2ee0
 
 install : $(TARGET)
 
@@ -69,44 +71,61 @@ $(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 \
-          --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) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-4.5-fix-max-file-descriptors.patch
+
+       cd $(DIR_APP) && autoreconf -vfi
+       cd $(DIR_APP)/libltdl && autoreconf -vfi
+
+       cd $(DIR_APP) && CXXFLAGS="$(CXXFLAGS)" ./configure \
+               --prefix=/usr \
+               --sysconfdir=/etc/squid \
+               --datadir=/usr/lib/squid \
+               --mandir=/usr/share/man \
+               --libexecdir=/usr/lib/squid \
+               --localstatedir=/var \
+               --disable-ssl \
+               --disable-icmp \
+               --disable-wccp \
+               --disable-wccpv2 \
+               --disable-kqueue \
+               --disable-esi \
+               --disable-arch-native \
+               --enable-ipv6 \
+               --enable-poll \
+               --enable-ident-lookups \
+               --enable-storeio=aufs,diskd,ufs \
+               --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 \
+               --enable-async-io=16 \
+               --enable-unlinkd \
+               --enable-internal-dns \
+               --enable-epoll \
+               --enable-select \
+               --enable-cache-digests \
+               --enable-forw-via-db \
+               --enable-htcp \
+               --enable-kill-parent-hack \
+               --enable-icap-client \
+               --enable-zph-qos \
+               --with-dl \
+               --with-filedescriptors=$$(( 16384 * 64 )) \
+               --with-large-files \
+               --without-gnutls \
+               --without-netfilter-conntrack
 
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
@@ -132,7 +151,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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
+       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 \