Ensure /var/ipfire/updatexlrator/updxlrator-lib.pl is not writable by "nobody"

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

diff --git a/lfs/squid b/lfs/squid
index b25f594a99745209dc281fad4e77dc766ce6df5f..7a7b775fffd118491cb232feb5ed9fc9de480770 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.2
+VER        = 5.7
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 102984f3ea382a1fa5bd917c2ee155ec
+$(DL_FILE)_BLAKE2 = 4a403ca4f94034356922ea1a4feffd5f5289e2aadbe1585bd04e83ee89712227ce04c53f7e05c10f7c8ac6be67a265a32b47032e7b56e929a172772fa41d5299
 
 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,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
 
@@ -169,6 +170,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        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
@@ -177,7 +179,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