X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fsquid;h=38675f3f3e354fba4010006e72e1d4ce5f861f23;hb=f2ccb35fa4b233da3e25b43c7464b2a202a9a1fc;hp=92392ea2199dfe69d5cb79b9bd17041fe602ffc0;hpb=83809af1fb7bb648851547b7589171d326766eaa;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/squid b/lfs/squid
index 92392ea219..38675f3f3e 100644
--- 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-2021  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        = 4.15
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -38,6 +38,10 @@ ifeq "$(BUILD_ARCH)" "armv5tel"
 	LDFLAGS += -latomic
 endif
 
+ifeq "$(BUILD_ARCH)" "riscv64"
+	LDFLAGS += -latomic
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -46,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ec7be696032b962eac9ba5726940a3aa
+$(DL_FILE)_MD5 = a593de9dc888dfeca4f1f7db2cd7d3b9
 
 install : $(TARGET)
 
@@ -145,7 +149,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 +171,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 +187,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