squid: Update to 4.5

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

diff --git a/lfs/squid b/lfs/squid
index 22659ed84238763fefa2a3f3bfc7577d7a3fc111..6033ab3948a5bf943e4805d20656951639e3ac0b 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2017  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,7 +24,7 @@
 
 include Config
 
-VER        = 3.5.26
+VER        = 4.5
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -32,6 +32,8 @@ 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 = 510e2c84773879c00d0e7ced997864d9
+$(DL_FILE)_MD5 = 8275da5846f9f2243ad2625e5aef2ee0
 
 install : $(TARGET)
 
@@ -70,12 +72,12 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.26-fix-max-file-descriptors.patch
+       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) && ./configure \
+       cd $(DIR_APP) && CXXFLAGS="$(CXXFLAGS)" ./configure \
                --prefix=/usr \
                --sysconfdir=/etc/squid \
                --datadir=/usr/lib/squid \
@@ -121,7 +123,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --enable-zph-qos \
                --with-dl \
                --with-filedescriptors=$$(( 16384 * 64 )) \
-               --with-large-files
+               --with-large-files \
+               --without-gnutls \
+               --without-netfilter-conntrack
 
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install