From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] squid: Update to 4.7
Date: Fri, 24 May 2019 20:46:59 +0200 [thread overview]
Message-ID: <20190524184659.2209-1-matthias.fischer@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2247 bytes --]
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(a)ipfire.org>
---
lfs/squid | 5 ++---
.../squid-4.6-fix-max-file-descriptors.patch | 21 -------------------
2 files changed, 2 insertions(+), 24 deletions(-)
delete mode 100644 src/patches/squid/squid-4.6-fix-max-file-descriptors.patch
diff --git a/lfs/squid b/lfs/squid
index 780f16548..92392ea21 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 57fd0a6a6..000000000
--- 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
--
2.18.0
next reply other threads:[~2019-05-24 18:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-24 18:46 Matthias Fischer [this message]
2019-05-26 11:01 ` Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190524184659.2209-1-matthias.fischer@ipfire.org \
--to=matthias.fischer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox