suricata: drop unsupported JA3 rule provider

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

diff --git a/lfs/squid b/lfs/squid
index 92392ea2199dfe69d5cb79b9bd17041fe602ffc0..4b723a8e17b769279550a1912553f60796d4d135 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  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.7
+VER        = 5.4.1
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 
 CXXFLAGS+= -Wno-error=format-truncation
 
-ifeq "$(BUILD_ARCH)" "armv5tel"
+ifeq "$(BUILD_ARCH)" "riscv64"
        LDFLAGS += -latomic
 endif
 
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ec7be696032b962eac9ba5726940a3aa
+$(DL_FILE)_MD5 = a6d55b34ee8d32052026db1db98f4d0d
 
 install : $(TARGET)
 
@@ -77,6 +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/01_squid-gcc11.patch
+
        cd $(DIR_APP) && autoreconf -vfi
        cd $(DIR_APP)/libltdl && autoreconf -vfi
 
@@ -95,6 +97,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --disable-kqueue \
                --disable-esi \
                --disable-arch-native \
+               --disable-strict-error-checking \
                --enable-poll \
                --enable-ident-lookups \
                --enable-storeio=aufs,diskd,ufs \
@@ -125,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
@@ -145,7 +147,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chown -R squid:squid /var/log/squid /var/log/cache /var/log/updatexlrator
 
        cp /usr/lib/squid/cachemgr.cgi /srv/web/ipfire/cgi-bin/cachemgr.cgi
-       chown nobody.nobody /srv/web/ipfire/cgi-bin/cachemgr.cgi
+       chown root:root /srv/web/ipfire/cgi-bin/cachemgr.cgi
 
        cp -f $(DIR_SRC)/config/updxlrator/updxlrator /usr/sbin/updxlrator
        cp -f $(DIR_SRC)/config/updxlrator/checkup /var/ipfire/updatexlrator/bin/checkup
@@ -167,6 +169,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        ln -fs /bin/false /var/ipfire/updatexlrator/autocheck/cron.weekly
 
        chown -R nobody:nobody /var/ipfire/updatexlrator
+       chown -R root:root /var/ipfire/updatexlrator/bin
        chown nobody.squid /var/updatecache
        chown nobody.squid /var/updatecache/download
        chown nobody.squid /var/updatecache/metadata
@@ -182,7 +185,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chown nobody.nobody /srv/web/ipfire/html/proxy.pac
        ln -sf /srv/web/ipfire/html/proxy.pac /srv/web/ipfire/html/wpad.dat
 
-       #Copy stylesheets for the errorpages
+       # Copy stylesheets for the errorpages
        cp -f $(DIR_SRC)/config/proxy/errorpage-ipfire.css /var/ipfire/proxy/
        cp -f /etc/squid/errorpage.css /var/ipfire/proxy/errorpage-squid.css