webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-10 17:28:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

squid: Update to 4.7

Browse Source 
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>
This commit is contained in:
Matthias Fischer
2019-05-24 20:46:59 +02:00
committed by Michael Tremer
parent 53ef2a0ffe
commit d2b5f03631
2 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lfs/squid
View File

@@ -24,7 +24,7 @@
include Config include Config
VER = 4.6 VER = 4.7
THISAPP = squid-$(VER) THISAPP = squid-$(VER)
DL_FILE = $(THISAPP).tar.xz DL_FILE = $(THISAPP).tar.xz
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = e25e7cc37754ad14d8aa368c0c210e54 $(DL_FILE)_MD5 = ec7be696032b962eac9ba5726940a3aa
install : $(TARGET) install : $(TARGET)
@@ -76,7 +76,6 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) @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) && autoreconf -vfi
cd $(DIR_APP)/libltdl && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi

21
src/patches/squid/squid-4.6-fix-max-file-descriptors.patch
View File

@@ -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