###############################################################################
# #
# 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 #
include Config
-VER = 4.6
+VER = 5.7
THISAPP = squid-$(VER)
DL_FILE = $(THISAPP).tar.xz
CXXFLAGS+= -Wno-error=format-truncation
+ifeq "$(BUILD_ARCH)" "riscv64"
+ LDFLAGS += -latomic
+endif
+
###############################################################################
# Top-level Rules
###############################################################################
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e25e7cc37754ad14d8aa368c0c210e54
+$(DL_FILE)_BLAKE2 = 4a403ca4f94034356922ea1a4feffd5f5289e2aadbe1585bd04e83ee89712227ce04c53f7e05c10f7c8ac6be67a265a32b47032e7b56e929a172772fa41d5299
install : $(TARGET)
download :$(patsubst %,$(DIR_DL)/%,$(objects))
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
-$(subst %,%_MD5,$(objects)) :
- @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
###############################################################################
# Installation Details
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@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) && patch -Np1 < $(DIR_SRC)/src/patches/squid/01_squid-gcc11.patch
cd $(DIR_APP) && autoreconf -vfi
cd $(DIR_APP)/libltdl && autoreconf -vfi
- cd $(DIR_APP) && CXXFLAGS="$(CXXFLAGS)" ./configure \
+ cd $(DIR_APP) && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+ LDFLAGS="$(LDFLAGS)" ./configure \
--prefix=/usr \
--sysconfdir=/etc/squid \
--datadir=/usr/lib/squid \
--disable-kqueue \
--disable-esi \
--disable-arch-native \
+ --disable-strict-error-checking \
--enable-poll \
--enable-ident-lookups \
--enable-storeio=aufs,diskd,ufs \
--enable-icap-client \
--enable-zph-qos \
--with-dl \
- --with-filedescriptors=$$(( 16384 * 64 )) \
--with-large-files \
--without-gnutls \
--without-netfilter-conntrack
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
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
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