core166: Ship changes files

[people/mfischer/ipfire-2.x.git] / lfs / squid

diff --git a/lfs/squid b/lfs/squid
index 98034651c37a559f87c730ad6b8d2552af62d4ce..47c70fc6401695fec5ac28b5053d18ea4b41ed45 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.15
+VER        = 5.4.1
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a593de9dc888dfeca4f1f7db2cd7d3b9
+$(DL_FILE)_MD5 = a6d55b34ee8d32052026db1db98f4d0d
 
 install : $(TARGET)
 
@@ -77,7 +77,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
 
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squid-gcc11.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squid/01_squid-gcc11.patch
+
        cd $(DIR_APP) && autoreconf -vfi
        cd $(DIR_APP)/libltdl && autoreconf -vfi
 
@@ -127,7 +128,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --enable-icap-client \
                --enable-zph-qos \
                --with-dl \
-               --with-filedescriptors=$$(( 16384 * 64 )) \
                --with-large-files \
                --without-gnutls \
                --without-netfilter-conntrack
@@ -178,7 +178,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chmod 775 /var/updatecache/metadata
        chmod 755 /var/log/updatexlrator
        chmod 755 /srv/web/ipfire/html/images/updbooster
-       
+
        chown squid:squid /var/log/squid
        ln -sf /usr/lib/squid /usr/lib/squid/auth
        cp -f $(DIR_SRC)/config/proxy/proxy.pac /srv/web/ipfire/html/proxy.pac