glibc: Import patches from upstream

[people/mlorenz/ipfire-2.x.git] / lfs / squidguard

diff --git a/lfs/squidguard b/lfs/squidguard
index 0aea8dbb6db81b3b05346bd263f92ece7bc73d5b..c5decc79f0b3152a2284d49615f26461c985e0e8 100644 (file)
--- a/lfs/squidguard
+++ b/lfs/squidguard
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  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        #
@@ -32,15 +32,17 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+CFLAGS    += -fcommon
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) 
+objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ebf207accc6da4ad07de2db6e71ce8dc
+$(DL_FILE)_BLAKE2 = 36b422fb2424c79532e0d9dc237b4a60b7817190a45de3646a50031b341c5e94540f55adea7b3e8241b8d87fdec551c5c40d1f60ea90e25347305ef9e473b5d3
 
 install : $(TARGET)
 
@@ -48,10 +50,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)) :
@@ -60,8 +62,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -102,7 +104,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cp -f  $(DIR_CONF)/urlfilter/autoupdate.pl /var/ipfire/urlfilter/bin/autoupdate.pl
        chmod 755 /var/ipfire/urlfilter/bin/autoupdate.pl
        echo "1.5-beta" > /var/ipfire/urlfilter/version
-       
+
        # Wrapper
        cp -f  $(DIR_CONF)/urlfilter/redirect_wrapper /usr/sbin
        chmod 755 /usr/sbin/redirect_wrapper
@@ -111,6 +113,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        /usr/bin/perl $(DIR_CONF)/urlfilter/makeconf.pl
        touch /var/ipfire/urlfilter/settings
        chown -R nobody:nobody /var/ipfire/urlfilter
+       chown -R root:root /var/ipfire/urlfilter/bin
        chmod 755 /srv/web/ipfire/html/images/urlfilter
        chmod 644 /srv/web/ipfire/html/images/urlfilter/*
        chown -R nobody:nobody /var/urlrepo