X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fsquid;h=cae56407c7a04734715a4c6758088f69bdf3e644;hb=28b252145a3240caea81d586d3e63db72c573c87;hp=ae4d7ea4493fcc78fa72ede11be9559181a44699;hpb=101765c0fd828f285ba60b1e6068faaa45589a68;p=ipfire-2.x.git

diff --git a/lfs/squid b/lfs/squid
index ae4d7ea449..cae56407c7 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.5.27
+VER        = 3.5.28
 
 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 = 39ef8199675d48a314b540f92c00c545
+$(DL_FILE)_MD5 = 9367e0375ea53ba0e99f77054d4402c5
 
 install : $(TARGET)
 
@@ -70,13 +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 -Np1 -i $(DIR_SRC)/src/patches/squid/SQUID-2018_1.patch
-	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5.27-fix-max-file-descriptors.patch
+	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5.28-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 \