suricata: Change midstream policy to "pass-flow"

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

diff --git a/lfs/squid b/lfs/squid
index 9c913b928c286033ec441de6b95fdb679d1f2289..882a8842eded7a9dd14d0cdafb58dba4dd9b67c1 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2024  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.11
+VER        = 6.8
 
 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 = 10f34e852153a9996aa4614670e2bda1
+$(DL_FILE)_BLAKE2 = 771de358d395a6b4bb5d94b02325755d1ba891c24f2cc1bdc80d91a73467a475c2cb7f0e1c24aed2f714c0de38858a24ac3864a5b772b6828beeb014da827d9d
 
 install : $(TARGET)
 
@@ -54,10 +54,10 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -66,8 +66,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -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 \
@@ -114,6 +117,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --enable-build-info \
                --enable-eui \
                --enable-async-io=16 \
+               --enable-translation \
                --enable-unlinkd \
                --enable-internal-dns \
                --enable-epoll \
@@ -125,7 +129,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 +148,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 +170,8 @@ $(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 root:root /var/ipfire/updatexlrator/updxlrator-lib.pl
        chown nobody.squid /var/updatecache
        chown nobody.squid /var/updatecache/download
        chown nobody.squid /var/updatecache/metadata
@@ -175,14 +180,14 @@ $(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
        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