From patchwork Sat May 25 04:46:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 2263 Return-Path: Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail01.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web07.i.ipfire.org (Postfix) with ESMTPS id 3DF878170FB for ; Fri, 24 May 2019 19:47:07 +0100 (BST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 459b2L0VpPz51tcF; Fri, 24 May 2019 19:47:06 +0100 (BST) Received: from Devel.localdomain (p4FF5627B.dip0.t-ipconnect.de [79.245.98.123]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 459b2G6lp8z51tbs for ; Fri, 24 May 2019 19:47:02 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201904rsa; t=1558723623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=wCz5a06JpUJRS96UqdkouIAjyW/8wImcl2V0o6mg1nA=; b=JZXPS3S+G/Envfg6Hrd9Rg6hcbtvdpaQuwkyg2Nx2fzTfplyxwO4ibIACbKWLQrf0DYSPr XEqLs1KzLq7XPLVGmegewwHow0s0bDjKFS6uqjVVq0faKYXGcu8m/0vUMM1GYaCYcI/eDd fSYfwUyjmLBsA9z+RncW8QKRLS4B/X3TdFqhWXoM9TAV7kSKiBWHeb+pue5zApUcVRAy8r vUsYGnMxJjk6EjlcKNJUfPVLvOwP0zghUk+N1rrQXIb7l9ktgOvXbaKdRGu1THP5pJ+AvW D8hVDQb/O56CMduNgm29SMmaj1Txz+idUqA2miPUQdJMXNC7GtMeuXzcnfG9Qg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201904ed25519; t=1558723623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=wCz5a06JpUJRS96UqdkouIAjyW/8wImcl2V0o6mg1nA=; b=3R277YL1hy8tLbUX8tNABLf/ps0hgd2BfdxV5jFb6d5LRscGXktKttcDR0eSIF/WMESJYR Ydjfc8JRtkovGrAA== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] squid: Update to 4.7 Date: Fri, 24 May 2019 20:46:59 +0200 Message-Id: <20190524184659.2209-1-matthias.fischer@ipfire.org> X-Mailer: git-send-email 2.18.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=mfischer smtp.mailfrom=matthias.fischer@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 --- 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