From: Matthias Fischer <matthias.fischer@ipfire.org>
Date: Fri, 24 May 2019 18:46:59 +0000 (+0200)
Subject: squid: Update to 4.7
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=d2b5f0363118741a84a01826499a2d3eecf369e0

squid: Update to 4.7

For details see:

http://www.squid-cache.org/Versions/v4/changesets/

Fixes among other things the old 'filedescriptors' problem, so this patch was deleted.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/squid b/lfs/squid
index 780f16548a..92392ea219 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.6
+VER        = 4.7
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e25e7cc37754ad14d8aa368c0c210e54
+$(DL_FILE)_MD5 = ec7be696032b962eac9ba5726940a3aa
 
 install : $(TARGET)
 
@@ -76,7 +76,6 @@ $(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/squid-4.6-fix-max-file-descriptors.patch
 
 	cd $(DIR_APP) && autoreconf -vfi
 	cd $(DIR_APP)/libltdl && autoreconf -vfi
diff --git a/src/patches/squid/squid-4.6-fix-max-file-descriptors.patch b/src/patches/squid/squid-4.6-fix-max-file-descriptors.patch
deleted file mode 100644
index 57fd0a6a63..0000000000
--- a/src/patches/squid/squid-4.6-fix-max-file-descriptors.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.ac.~	Wed Apr 20 14:26:07 2016
-+++ configure.ac	Fri Apr 22 17:20:46 2016
-@@ -3160,6 +3160,9 @@
-     ;;
- esac
- 
-+SQUID_CHECK_DEFAULT_FD_SETSIZE
-+SQUID_CHECK_MAXFD
-+
- dnl --with-maxfd present for compatibility with Squid-2.
- dnl undocumented in ./configure --help  to encourage using the Squid-3 directive
- AC_ARG_WITH(maxfd,,
-@@ -3190,8 +3193,6 @@
-     esac
- ])
- 
--SQUID_CHECK_DEFAULT_FD_SETSIZE
--SQUID_CHECK_MAXFD
- if test "x$squid_filedescriptors_num" != "x"; then
-   AC_MSG_NOTICE([Default number of fieldescriptors: $squid_filedescriptors_num])
- fi