:xMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-switch...

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>

diff --combined config/rootfiles/common/aarch64/initscripts
index 7c81fe765bb66e599ff001380d9e1da7ed7c051e,330bb532e01b600e4833ddb1fa837d127c2dcb98..69fef394bf0baeaa1bfabf72734425e7932ed82b
--- 1/config/rootfiles/common/aarch64/initscripts
--- 2/config/rootfiles/common/aarch64/initscripts
+++ b/config/rootfiles/common/aarch64/initscripts
@@@ -3,6 -3,7 +3,7 @@@ etc/init.
  #etc/rc.d/helper
  etc/rc.d/helper/aws-setup
  etc/rc.d/helper/azure-setup
+ etc/rc.d/helper/gcp-setup
  etc/rc.d/helper/getdnsfromdhcpc.pl
  #etc/rc.d/init.d
  etc/rc.d/init.d/acpid
@@@ -65,6 -66,7 +66,6 @@@ etc/rc.d/init.d/networking/red.up/50-ov
  etc/rc.d/init.d/networking/red.up/98-leds
  etc/rc.d/init.d/networking/red.up/99-beep
  etc/rc.d/init.d/networking/red.up/99-fireinfo
 -etc/rc.d/init.d/networking/red.up/99-geoip-database
  etc/rc.d/init.d/networking/red.up/99-pakfire-update
  etc/rc.d/init.d/networking/wpa_supplicant.exe
  etc/rc.d/init.d/ntp

diff --combined config/rootfiles/common/armv5tel/initscripts
index 7c81fe765bb66e599ff001380d9e1da7ed7c051e,330bb532e01b600e4833ddb1fa837d127c2dcb98..69fef394bf0baeaa1bfabf72734425e7932ed82b
--- 1/config/rootfiles/common/armv5tel/initscripts
--- 2/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@@ -3,6 -3,7 +3,7 @@@ etc/init.
  #etc/rc.d/helper
  etc/rc.d/helper/aws-setup
  etc/rc.d/helper/azure-setup
+ etc/rc.d/helper/gcp-setup
  etc/rc.d/helper/getdnsfromdhcpc.pl
  #etc/rc.d/init.d
  etc/rc.d/init.d/acpid
@@@ -65,6 -66,7 +66,6 @@@ etc/rc.d/init.d/networking/red.up/50-ov
  etc/rc.d/init.d/networking/red.up/98-leds
  etc/rc.d/init.d/networking/red.up/99-beep
  etc/rc.d/init.d/networking/red.up/99-fireinfo
 -etc/rc.d/init.d/networking/red.up/99-geoip-database
  etc/rc.d/init.d/networking/red.up/99-pakfire-update
  etc/rc.d/init.d/networking/wpa_supplicant.exe
  etc/rc.d/init.d/ntp

diff --combined config/rootfiles/common/configroot
index 52fcc77b360a54315a699c7aaec715d6a900231e,664247b12c4749133a520a6b5677d28bfc84b68d..1027b5139e952ef8180dbb65dce8414799ac30b2
--- 1/config/rootfiles/common/configroot
--- 2/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@@ -9,7 -9,6 +9,6 @@@ usr/sbin/firewall-polic
  var/ipfire/addon-lang
  var/ipfire/auth
  #var/ipfire/auth/users
- var/ipfire/aws-functions.pl
  #var/ipfire/backup
  var/ipfire/backup/exclude.user
  var/ipfire/backup/include.user
@@@ -60,15 -59,15 +59,15 @@@ var/ipfire/extrah
  #var/ipfire/extrahd/settings
  var/ipfire/firewall
  #var/ipfire/firewall/config
 -#var/ipfire/firewall/geoipblock
  #var/ipfire/firewall/input
 +#var/ipfire/firewall/locationblock
  #var/ipfire/firewall/outgoing
  #var/ipfire/firewall/p2protocols
  #var/ipfire/firewall/settings
  var/ipfire/fwhosts
 -#var/ipfire/fwhosts/customgeoipgrp
  #var/ipfire/fwhosts/customgroups
  #var/ipfire/fwhosts/customhosts
 +#var/ipfire/fwhosts/customlocationgrp
  #var/ipfire/fwhosts/customnetworks
  #var/ipfire/fwhosts/customservicegrp
  #var/ipfire/fwhosts/customservices
@@@ -78,9 -77,9 +77,9 @@@ var/ipfire/fwlog
  #var/ipfire/fwlogs/ipsettings
  #var/ipfire/fwlogs/portsettings
  var/ipfire/general-functions.pl
 -var/ipfire/geoip-functions.pl
  var/ipfire/graphs.pl
  var/ipfire/header.pl
 +var/ipfire/location-functions.pl
  var/ipfire/ids-functions.pl
  var/ipfire/isdn
  #var/ipfire/isdn/settings

diff --combined config/rootfiles/common/i586/initscripts
index d04eadf722e85211b6d40efa5963ff07149405f5,c0fc18705fb94bbaa13db695eb17fd81ca992f39..b4e944342880e59bb43a0a09cc0262777b3f4fd3
--- 1/config/rootfiles/common/i586/initscripts
--- 2/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@@ -3,6 -3,7 +3,7 @@@ etc/init.
  #etc/rc.d/helper
  etc/rc.d/helper/aws-setup
  etc/rc.d/helper/azure-setup
+ etc/rc.d/helper/gcp-setup
  etc/rc.d/helper/getdnsfromdhcpc.pl
  #etc/rc.d/init.d
  etc/rc.d/init.d/acpid
@@@ -65,6 -66,7 +66,6 @@@ etc/rc.d/init.d/networking/red.up/50-ov
  etc/rc.d/init.d/networking/red.up/98-leds
  etc/rc.d/init.d/networking/red.up/99-beep
  etc/rc.d/init.d/networking/red.up/99-fireinfo
 -etc/rc.d/init.d/networking/red.up/99-geoip-database
  etc/rc.d/init.d/networking/red.up/99-pakfire-update
  etc/rc.d/init.d/networking/wpa_supplicant.exe
  etc/rc.d/init.d/ntp

diff --combined config/rootfiles/common/x86_64/initscripts
index d04eadf722e85211b6d40efa5963ff07149405f5,c0fc18705fb94bbaa13db695eb17fd81ca992f39..b4e944342880e59bb43a0a09cc0262777b3f4fd3
--- 1/config/rootfiles/common/x86_64/initscripts
--- 2/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@@ -3,6 -3,7 +3,7 @@@ etc/init.
  #etc/rc.d/helper
  etc/rc.d/helper/aws-setup
  etc/rc.d/helper/azure-setup
+ etc/rc.d/helper/gcp-setup
  etc/rc.d/helper/getdnsfromdhcpc.pl
  #etc/rc.d/init.d
  etc/rc.d/init.d/acpid
@@@ -65,6 -66,7 +66,6 @@@ etc/rc.d/init.d/networking/red.up/50-ov
  etc/rc.d/init.d/networking/red.up/98-leds
  etc/rc.d/init.d/networking/red.up/99-beep
  etc/rc.d/init.d/networking/red.up/99-fireinfo
 -etc/rc.d/init.d/networking/red.up/99-geoip-database
  etc/rc.d/init.d/networking/red.up/99-pakfire-update
  etc/rc.d/init.d/networking/wpa_supplicant.exe
  etc/rc.d/init.d/ntp

diff --combined doc/language_issues.en
index 0b5cd663b19aeb4b0e7dfd3003b61efacc7e3326,f651e76aa292d6a8c1f16e19f29e3304ec7394a5..5a96482c844519eef309e8542fafef575c93c059
--- 1/doc/language_issues.en
--- 2/doc/language_issues.en
+++ b/doc/language_issues.en
@@@ -128,6 -128,7 +128,7 @@@ WARNING: untranslated string: advproxy 
  WARNING: untranslated string: advproxy AUTH no auth = Domains without authentication (one per line)
  WARNING: untranslated string: advproxy AUTH number of auth processes = Number of authentication processes
  WARNING: untranslated string: advproxy AUTH realm = Authentication realm prompt
+ WARNING: untranslated string: advproxy AUTH user IP cache TTL = User/IP cache TTL (in minutes)
  WARNING: untranslated string: advproxy IDENT authorized users = Authorized users (one per line)
  WARNING: untranslated string: advproxy IDENT aware hosts = Ident aware hosts (one per line)
  WARNING: untranslated string: advproxy IDENT identd settings = Common identd settings
@@@ -206,6 -207,7 +207,7 @@@ WARNING: untranslated string: advproxy 
  WARNING: untranslated string: advproxy errmsg auth cache ttl = Invalid value for authentication cache TTL
  WARNING: untranslated string: advproxy errmsg auth children = Invalid number of authentication processes
  WARNING: untranslated string: advproxy errmsg auth ipcache may not be null = Authentication cache TTL may not be 0 when using IP address limits
+ WARNING: untranslated string: advproxy errmsg auth ipcache ttl = Invalid value for user/IP cache TTL
  WARNING: untranslated string: advproxy errmsg cache = The RAM cache size is greater than the harddisk cache size:
  WARNING: untranslated string: advproxy errmsg hdd cache size = Invalid value for harddisk cache size (min 10 MB required)
  WARNING: untranslated string: advproxy errmsg ident timeout = Invalid ident timeout
@@@ -890,7 -892,7 +892,7 @@@ WARNING: untranslated string: fwdfw wd_
  WARNING: untranslated string: fwdfw wd_tue = Tue
  WARNING: untranslated string: fwdfw wd_wed = Wed
  WARNING: untranslated string: fwhost OpenVPN N-2-N = OpenVPN Net-to-Net
 -WARNING: untranslated string: fwhost addgeoipgrp = Add new GeoIP group
 +WARNING: untranslated string: fwhost addgeoipgrp = Add new Location group
  WARNING: untranslated string: fwhost addgrp = Add new network/host group
  WARNING: untranslated string: fwhost addgrpname = Group name:
  WARNING: untranslated string: fwhost addhost = Add new host
@@@ -903,9 -905,9 +905,9 @@@ WARNING: untranslated string: fwhost cc
  WARNING: untranslated string: fwhost ccdnet = OpenVPN networks:
  WARNING: untranslated string: fwhost change = Modify
  WARNING: untranslated string: fwhost cust addr = Hosts
 -WARNING: untranslated string: fwhost cust geoipgroup = GeoIP Groups
 +WARNING: untranslated string: fwhost cust geoipgroup = Location Groups
  WARNING: untranslated string: fwhost cust geoipgrp = unknown string
 -WARNING: untranslated string: fwhost cust geoiplocation = GeoIP Locations
 +WARNING: untranslated string: fwhost cust geoiplocation = Location Locations
  WARNING: untranslated string: fwhost cust grp = Network/Host Groups
  WARNING: untranslated string: fwhost cust net = Networks
  WARNING: untranslated string: fwhost cust service = Services
@@@ -945,7 -947,7 +947,7 @@@ WARNING: untranslated string: fwhost ip
  WARNING: untranslated string: fwhost ipsec net = IPsec networks:
  WARNING: untranslated string: fwhost menu = Firewall Groups
  WARNING: untranslated string: fwhost netaddress = Network address
 -WARNING: untranslated string: fwhost newgeoipgrp = GeoIP Groups
 +WARNING: untranslated string: fwhost newgeoipgrp = Location Groups
  WARNING: untranslated string: fwhost newgrp = Network/Host Groups
  WARNING: untranslated string: fwhost newhost = Hosts
  WARNING: untranslated string: fwhost newnet = Networks
@@@ -970,13 -972,13 +972,13 @@@ WARNING: untranslated string: generate 
  WARNING: untranslated string: generate root/host certificates = Generate root/host certificates
  WARNING: untranslated string: generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient = Generating the root and host certificates may take a long time.  It can take up to several minutes on older hardware. Please be patient.
  WARNING: untranslated string: genre = Genre
 -WARNING: untranslated string: geoip = GeoIP
 -WARNING: untranslated string: geoipblock = GeoIP Block
 +WARNING: untranslated string: geoip = Location
 +WARNING: untranslated string: geoipblock = Location Block
  WARNING: untranslated string: geoipblock block countries = Block countries
 -WARNING: untranslated string: geoipblock configuration = GeoIP Configuration
 +WARNING: untranslated string: geoipblock configuration = Location Configuration
  WARNING: untranslated string: geoipblock country is allowed = Incoming traffic from this country is allowed
  WARNING: untranslated string: geoipblock country is blocked = Incoming traffic from this country will be blocked
 -WARNING: untranslated string: geoipblock enable feature = Enable GeoIP based blocking:
 +WARNING: untranslated string: geoipblock enable feature = Enable Location based blocking:
  WARNING: untranslated string: global settings = Global Settings
  WARNING: untranslated string: gpl i accept these terms and conditions = I accept these terms and conditions
  WARNING: untranslated string: gpl license agreement = License Agreement
@@@ -1663,6 -1665,7 +1665,7 @@@ WARNING: untranslated string: speaker o
  WARNING: untranslated string: spectre variant 1 = Spectre Variant 1
  WARNING: untranslated string: spectre variant 2 = Spectre Variant 2
  WARNING: untranslated string: spectre variant 4 = Spectre Variant 4
+ WARNING: untranslated string: srbds = Special register buffer data sampling
  WARNING: untranslated string: src port = Src Port
  WARNING: untranslated string: ssh = SSH
  WARNING: untranslated string: ssh access = SSH Access

diff --combined doc/language_issues.es
index 76ef41d203354593609ecc65243a284ae31f34ce,885b44f6288dc6191f268af43e7763686e39c8d2..cdd11338c53014bf5aad35fea15b9cbbb4157c14
--- 1/doc/language_issues.es
--- 2/doc/language_issues.es
+++ b/doc/language_issues.es
@@@ -24,7 -24,6 +24,6 @@@ WARNING: translation string unused: ad
  WARNING: translation string unused: add-route
  WARNING: translation string unused: admin user password has been changed
  WARNING: translation string unused: administrator user password
- WARNING: translation string unused: advproxy AUTH user IP cache TTL
  WARNING: translation string unused: advproxy LDAP auth
  WARNING: translation string unused: advproxy NTLM BDC hostname
  WARNING: translation string unused: advproxy NTLM PDC hostname
@@@ -50,7 -49,6 +49,6 @@@ WARNING: translation string unused: adv
  WARNING: translation string unused: advproxy chgwebpwd old password
  WARNING: translation string unused: advproxy chgwebpwd username
  WARNING: translation string unused: advproxy content based throttling
- WARNING: translation string unused: advproxy errmsg auth ipcache ttl
  WARNING: translation string unused: advproxy errmsg change fail
  WARNING: translation string unused: advproxy errmsg change success
  WARNING: translation string unused: advproxy errmsg invalid bdc
@@@ -1002,7 -1000,7 +1000,7 @@@ WARNING: untranslated string: fwdfw wd_
  WARNING: untranslated string: fwdfw wd_tue = Tue
  WARNING: untranslated string: fwdfw wd_wed = Wed
  WARNING: untranslated string: fwhost OpenVPN N-2-N = OpenVPN Net-to-Net
 -WARNING: untranslated string: fwhost addgeoipgrp = Add new GeoIP group
 +WARNING: untranslated string: fwhost addgeoipgrp = Add new Location group
  WARNING: untranslated string: fwhost addgrp = Add new network/host group
  WARNING: untranslated string: fwhost addgrpname = Group name:
  WARNING: untranslated string: fwhost addhost = Add new host
@@@ -1015,9 -1013,9 +1013,9 @@@ WARNING: untranslated string: fwhost cc
  WARNING: untranslated string: fwhost ccdnet = OpenVPN networks:
  WARNING: untranslated string: fwhost change = Modify
  WARNING: untranslated string: fwhost cust addr = Hosts
 -WARNING: untranslated string: fwhost cust geoipgroup = GeoIP Groups
 +WARNING: untranslated string: fwhost cust geoipgroup = Location Groups
  WARNING: untranslated string: fwhost cust geoipgrp = unknown string
 -WARNING: untranslated string: fwhost cust geoiplocation = GeoIP Locations
 +WARNING: untranslated string: fwhost cust geoiplocation = Location Locations
  WARNING: untranslated string: fwhost cust grp = Network/Host Groups
  WARNING: untranslated string: fwhost cust net = Networks
  WARNING: untranslated string: fwhost cust service = Services
@@@ -1057,7 -1055,7 +1055,7 @@@ WARNING: untranslated string: fwhost ip
  WARNING: untranslated string: fwhost ipsec net = IPsec networks:
  WARNING: untranslated string: fwhost menu = Firewall Groups
  WARNING: untranslated string: fwhost netaddress = Network address
 -WARNING: untranslated string: fwhost newgeoipgrp = GeoIP Groups
 +WARNING: untranslated string: fwhost newgeoipgrp = Location Groups
  WARNING: untranslated string: fwhost newgrp = Network/Host Groups
  WARNING: untranslated string: fwhost newhost = Hosts
  WARNING: untranslated string: fwhost newnet = Networks
@@@ -1282,6 -1280,7 +1280,7 @@@ WARNING: untranslated string: source i
  WARNING: untranslated string: spectre variant 1 = Spectre Variant 1
  WARNING: untranslated string: spectre variant 2 = Spectre Variant 2
  WARNING: untranslated string: spectre variant 4 = Spectre Variant 4
+ WARNING: untranslated string: srbds = Special register buffer data sampling
  WARNING: untranslated string: ssh = SSH
  WARNING: untranslated string: ssh active sessions = Active logins
  WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding

diff --combined doc/language_issues.it
index 57fb94aa4808d7feab10cab532f59c2b15bdc1b8,fa7a842dc0ad87e603613d6a589e51cfeb7fc959..444a2c9c874b81d67336dd802931305f7950aed9
--- 1/doc/language_issues.it
--- 2/doc/language_issues.it
+++ b/doc/language_issues.it
@@@ -26,7 -26,6 +26,6 @@@ WARNING: translation string unused: add
  WARNING: translation string unused: admin user password has been changed
  WARNING: translation string unused: administrator user password
  WARNING: translation string unused: advproxy AUTH method ntlm
- WARNING: translation string unused: advproxy AUTH user IP cache TTL
  WARNING: translation string unused: advproxy LDAP auth
  WARNING: translation string unused: advproxy NTLM BDC hostname
  WARNING: translation string unused: advproxy NTLM PDC hostname
@@@ -52,7 -51,6 +51,6 @@@ WARNING: translation string unused: adv
  WARNING: translation string unused: advproxy chgwebpwd old password
  WARNING: translation string unused: advproxy chgwebpwd username
  WARNING: translation string unused: advproxy content based throttling
- WARNING: translation string unused: advproxy errmsg auth ipcache ttl
  WARNING: translation string unused: advproxy errmsg change fail
  WARNING: translation string unused: advproxy errmsg change success
  WARNING: translation string unused: advproxy errmsg invalid bdc
@@@ -905,20 -903,20 +903,20 @@@ WARNING: untranslated string: fwdfw lim
  WARNING: untranslated string: fwdfw maxconcon = Max. concurrent connections
  WARNING: untranslated string: fwdfw numcon = Number of connections
  WARNING: untranslated string: fwdfw ratelimit = Rate-limit new connections
 -WARNING: untranslated string: fwhost addgeoipgrp = Add new GeoIP group
 -WARNING: untranslated string: fwhost cust geoipgroup = GeoIP Groups
 +WARNING: untranslated string: fwhost addgeoipgrp = Add new Location group
 +WARNING: untranslated string: fwhost cust geoipgroup = Location Groups
  WARNING: untranslated string: fwhost cust geoipgrp = unknown string
 -WARNING: untranslated string: fwhost cust geoiplocation = GeoIP Locations
 +WARNING: untranslated string: fwhost cust geoiplocation = Location Locations
  WARNING: untranslated string: fwhost err hostip = unknown string
 -WARNING: untranslated string: fwhost newgeoipgrp = GeoIP Groups
 +WARNING: untranslated string: fwhost newgeoipgrp = Location Groups
  WARNING: untranslated string: generate ptr = Generate PTR
 -WARNING: untranslated string: geoip = GeoIP
 -WARNING: untranslated string: geoipblock = GeoIP Block
 +WARNING: untranslated string: geoip = Location
 +WARNING: untranslated string: geoipblock = Location Block
  WARNING: untranslated string: geoipblock block countries = Block countries
 -WARNING: untranslated string: geoipblock configuration = GeoIP Configuration
 +WARNING: untranslated string: geoipblock configuration = Location Configuration
  WARNING: untranslated string: geoipblock country is allowed = Incoming traffic from this country is allowed
  WARNING: untranslated string: geoipblock country is blocked = Incoming traffic from this country will be blocked
 -WARNING: untranslated string: geoipblock enable feature = Enable GeoIP based blocking:
 +WARNING: untranslated string: geoipblock enable feature = Enable Location based blocking:
  WARNING: untranslated string: guaranteed bandwith = Guaranteed bandwith
  WARNING: untranslated string: guardian = Guardian
  WARNING: untranslated string: guardian block a host = unknown string
@@@ -1048,6 -1046,7 +1046,7 @@@ WARNING: untranslated string: smt not s
  WARNING: untranslated string: spectre variant 1 = Spectre Variant 1
  WARNING: untranslated string: spectre variant 2 = Spectre Variant 2
  WARNING: untranslated string: spectre variant 4 = Spectre Variant 4
+ WARNING: untranslated string: srbds = Special register buffer data sampling
  WARNING: untranslated string: ssh active sessions = Active logins
  WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding
  WARNING: untranslated string: ssh login time = Logged in since

diff --combined doc/language_issues.nl
index 33c77e8a0db182d087486a01d9c74e3d4e0a3072,dec6d6a79a8656b5b951ee4efc022ae1a5c0a49c..3d226cd368d5a94db654bae76bfb133a821bbb47
--- 1/doc/language_issues.nl
--- 2/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@@ -25,7 -25,6 +25,6 @@@ WARNING: translation string unused: ad
  WARNING: translation string unused: add-route
  WARNING: translation string unused: admin user password has been changed
  WARNING: translation string unused: administrator user password
- WARNING: translation string unused: advproxy AUTH user IP cache TTL
  WARNING: translation string unused: advproxy LDAP auth
  WARNING: translation string unused: advproxy NTLM BDC hostname
  WARNING: translation string unused: advproxy NTLM PDC hostname
@@@ -51,7 -50,6 +50,6 @@@ WARNING: translation string unused: adv
  WARNING: translation string unused: advproxy chgwebpwd old password
  WARNING: translation string unused: advproxy chgwebpwd username
  WARNING: translation string unused: advproxy content based throttling
- WARNING: translation string unused: advproxy errmsg auth ipcache ttl
  WARNING: translation string unused: advproxy errmsg change fail
  WARNING: translation string unused: advproxy errmsg change success
  WARNING: translation string unused: advproxy errmsg invalid bdc
@@@ -911,22 -909,22 +909,22 @@@ WARNING: untranslated string: fwdfw lim
  WARNING: untranslated string: fwdfw maxconcon = Max. concurrent connections
  WARNING: untranslated string: fwdfw numcon = Number of connections
  WARNING: untranslated string: fwdfw ratelimit = Rate-limit new connections
 -WARNING: untranslated string: fwhost addgeoipgrp = Add new GeoIP group
 -WARNING: untranslated string: fwhost cust geoipgroup = GeoIP Groups
 +WARNING: untranslated string: fwhost addgeoipgrp = Add new Location group
 +WARNING: untranslated string: fwhost cust geoipgroup = Location Groups
  WARNING: untranslated string: fwhost cust geoipgrp = unknown string
 -WARNING: untranslated string: fwhost cust geoiplocation = GeoIP Locations
 +WARNING: untranslated string: fwhost cust geoiplocation = Location Locations
  WARNING: untranslated string: fwhost err hostip = unknown string
 -WARNING: untranslated string: fwhost newgeoipgrp = GeoIP Groups
 +WARNING: untranslated string: fwhost newgeoipgrp = Location Groups
  WARNING: untranslated string: gen dh = Generate new Diffie-Hellman parameters
  WARNING: untranslated string: generate dh key = Generate Diffie-Hellman parameters
  WARNING: untranslated string: generate ptr = Generate PTR
 -WARNING: untranslated string: geoip = GeoIP
 -WARNING: untranslated string: geoipblock = GeoIP Block
 +WARNING: untranslated string: geoip = Location
 +WARNING: untranslated string: geoipblock = Location Block
  WARNING: untranslated string: geoipblock block countries = Block countries
 -WARNING: untranslated string: geoipblock configuration = GeoIP Configuration
 +WARNING: untranslated string: geoipblock configuration = Location Configuration
  WARNING: untranslated string: geoipblock country is allowed = Incoming traffic from this country is allowed
  WARNING: untranslated string: geoipblock country is blocked = Incoming traffic from this country will be blocked
 -WARNING: untranslated string: geoipblock enable feature = Enable GeoIP based blocking:
 +WARNING: untranslated string: geoipblock enable feature = Enable Location based blocking:
  WARNING: untranslated string: guardian = Guardian
  WARNING: untranslated string: guardian block a host = unknown string
  WARNING: untranslated string: guardian block httpd brute-force = unknown string
@@@ -1085,6 -1083,7 +1083,7 @@@ WARNING: untranslated string: source i
  WARNING: untranslated string: spectre variant 1 = Spectre Variant 1
  WARNING: untranslated string: spectre variant 2 = Spectre Variant 2
  WARNING: untranslated string: spectre variant 4 = Spectre Variant 4
+ WARNING: untranslated string: srbds = Special register buffer data sampling
  WARNING: untranslated string: ssh active sessions = Active logins
  WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding
  WARNING: untranslated string: ssh login time = Logged in since

diff --combined doc/language_issues.pl
index 76ef41d203354593609ecc65243a284ae31f34ce,885b44f6288dc6191f268af43e7763686e39c8d2..cdd11338c53014bf5aad35fea15b9cbbb4157c14
--- 1/doc/language_issues.pl
--- 2/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@@ -24,7 -24,6 +24,6 @@@ WARNING: translation string unused: ad
  WARNING: translation string unused: add-route
  WARNING: translation string unused: admin user password has been changed
  WARNING: translation string unused: administrator user password
- WARNING: translation string unused: advproxy AUTH user IP cache TTL
  WARNING: translation string unused: advproxy LDAP auth
  WARNING: translation string unused: advproxy NTLM BDC hostname
  WARNING: translation string unused: advproxy NTLM PDC hostname
@@@ -50,7 -49,6 +49,6 @@@ WARNING: translation string unused: adv
  WARNING: translation string unused: advproxy chgwebpwd old password
  WARNING: translation string unused: advproxy chgwebpwd username
  WARNING: translation string unused: advproxy content based throttling
- WARNING: translation string unused: advproxy errmsg auth ipcache ttl
  WARNING: translation string unused: advproxy errmsg change fail
  WARNING: translation string unused: advproxy errmsg change success
  WARNING: translation string unused: advproxy errmsg invalid bdc
@@@ -1002,7 -1000,7 +1000,7 @@@ WARNING: untranslated string: fwdfw wd_
  WARNING: untranslated string: fwdfw wd_tue = Tue
  WARNING: untranslated string: fwdfw wd_wed = Wed
  WARNING: untranslated string: fwhost OpenVPN N-2-N = OpenVPN Net-to-Net
 -WARNING: untranslated string: fwhost addgeoipgrp = Add new GeoIP group
 +WARNING: untranslated string: fwhost addgeoipgrp = Add new Location group
  WARNING: untranslated string: fwhost addgrp = Add new network/host group
  WARNING: untranslated string: fwhost addgrpname = Group name:
  WARNING: untranslated string: fwhost addhost = Add new host
@@@ -1015,9 -1013,9 +1013,9 @@@ WARNING: untranslated string: fwhost cc
  WARNING: untranslated string: fwhost ccdnet = OpenVPN networks:
  WARNING: untranslated string: fwhost change = Modify
  WARNING: untranslated string: fwhost cust addr = Hosts
 -WARNING: untranslated string: fwhost cust geoipgroup = GeoIP Groups
 +WARNING: untranslated string: fwhost cust geoipgroup = Location Groups
  WARNING: untranslated string: fwhost cust geoipgrp = unknown string
 -WARNING: untranslated string: fwhost cust geoiplocation = GeoIP Locations
 +WARNING: untranslated string: fwhost cust geoiplocation = Location Locations
  WARNING: untranslated string: fwhost cust grp = Network/Host Groups
  WARNING: untranslated string: fwhost cust net = Networks
  WARNING: untranslated string: fwhost cust service = Services
@@@ -1057,7 -1055,7 +1055,7 @@@ WARNING: untranslated string: fwhost ip
  WARNING: untranslated string: fwhost ipsec net = IPsec networks:
  WARNING: untranslated string: fwhost menu = Firewall Groups
  WARNING: untranslated string: fwhost netaddress = Network address
 -WARNING: untranslated string: fwhost newgeoipgrp = GeoIP Groups
 +WARNING: untranslated string: fwhost newgeoipgrp = Location Groups
  WARNING: untranslated string: fwhost newgrp = Network/Host Groups
  WARNING: untranslated string: fwhost newhost = Hosts
  WARNING: untranslated string: fwhost newnet = Networks
@@@ -1282,6 -1280,7 +1280,7 @@@ WARNING: untranslated string: source i
  WARNING: untranslated string: spectre variant 1 = Spectre Variant 1
  WARNING: untranslated string: spectre variant 2 = Spectre Variant 2
  WARNING: untranslated string: spectre variant 4 = Spectre Variant 4
+ WARNING: untranslated string: srbds = Special register buffer data sampling
  WARNING: untranslated string: ssh = SSH
  WARNING: untranslated string: ssh active sessions = Active logins
  WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding

diff --combined doc/language_issues.ru
index 1998b66ec5941f4ba954023262c2cb4a6eee9d65,d5433b37e26f12d394351d8db6cd478cd28aa548..86d960299bf1fc457dad0d835e78b15e936a402f
--- 1/doc/language_issues.ru
--- 2/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@@ -25,7 -25,6 +25,6 @@@ WARNING: translation string unused: ad
  WARNING: translation string unused: add-route
  WARNING: translation string unused: admin user password has been changed
  WARNING: translation string unused: administrator user password
- WARNING: translation string unused: advproxy AUTH user IP cache TTL
  WARNING: translation string unused: advproxy LDAP auth
  WARNING: translation string unused: advproxy NTLM BDC hostname
  WARNING: translation string unused: advproxy NTLM PDC hostname
@@@ -51,7 -50,6 +50,6 @@@ WARNING: translation string unused: adv
  WARNING: translation string unused: advproxy chgwebpwd old password
  WARNING: translation string unused: advproxy chgwebpwd username
  WARNING: translation string unused: advproxy content based throttling
- WARNING: translation string unused: advproxy errmsg auth ipcache ttl
  WARNING: translation string unused: advproxy errmsg change fail
  WARNING: translation string unused: advproxy errmsg change success
  WARNING: translation string unused: advproxy errmsg invalid bdc
@@@ -996,7 -994,7 +994,7 @@@ WARNING: untranslated string: fwdfw wd_
  WARNING: untranslated string: fwdfw wd_tue = Tue
  WARNING: untranslated string: fwdfw wd_wed = Wed
  WARNING: untranslated string: fwhost OpenVPN N-2-N = OpenVPN Net-to-Net
 -WARNING: untranslated string: fwhost addgeoipgrp = Add new GeoIP group
 +WARNING: untranslated string: fwhost addgeoipgrp = Add new Location group
  WARNING: untranslated string: fwhost addgrp = Add new network/host group
  WARNING: untranslated string: fwhost addgrpname = Group name:
  WARNING: untranslated string: fwhost addhost = Add new host
@@@ -1009,9 -1007,9 +1007,9 @@@ WARNING: untranslated string: fwhost cc
  WARNING: untranslated string: fwhost ccdnet = OpenVPN networks:
  WARNING: untranslated string: fwhost change = Modify
  WARNING: untranslated string: fwhost cust addr = Hosts
 -WARNING: untranslated string: fwhost cust geoipgroup = GeoIP Groups
 +WARNING: untranslated string: fwhost cust geoipgroup = Location Groups
  WARNING: untranslated string: fwhost cust geoipgrp = unknown string
 -WARNING: untranslated string: fwhost cust geoiplocation = GeoIP Locations
 +WARNING: untranslated string: fwhost cust geoiplocation = Location Locations
  WARNING: untranslated string: fwhost cust grp = Network/Host Groups
  WARNING: untranslated string: fwhost cust net = Networks
  WARNING: untranslated string: fwhost cust service = Services
@@@ -1051,7 -1049,7 +1049,7 @@@ WARNING: untranslated string: fwhost ip
  WARNING: untranslated string: fwhost ipsec net = IPsec networks:
  WARNING: untranslated string: fwhost menu = Firewall Groups
  WARNING: untranslated string: fwhost netaddress = Network address
 -WARNING: untranslated string: fwhost newgeoipgrp = GeoIP Groups
 +WARNING: untranslated string: fwhost newgeoipgrp = Location Groups
  WARNING: untranslated string: fwhost newgrp = Network/Host Groups
  WARNING: untranslated string: fwhost newhost = Hosts
  WARNING: untranslated string: fwhost newnet = Networks
@@@ -1069,13 -1067,13 +1067,13 @@@ WARNING: untranslated string: fwhost we
  WARNING: untranslated string: gen dh = Generate new Diffie-Hellman parameters
  WARNING: untranslated string: generate dh key = Generate Diffie-Hellman parameters
  WARNING: untranslated string: generate ptr = Generate PTR
 -WARNING: untranslated string: geoip = GeoIP
 -WARNING: untranslated string: geoipblock = GeoIP Block
 +WARNING: untranslated string: geoip = Location
 +WARNING: untranslated string: geoipblock = Location Block
  WARNING: untranslated string: geoipblock block countries = Block countries
 -WARNING: untranslated string: geoipblock configuration = GeoIP Configuration
 +WARNING: untranslated string: geoipblock configuration = Location Configuration
  WARNING: untranslated string: geoipblock country is allowed = Incoming traffic from this country is allowed
  WARNING: untranslated string: geoipblock country is blocked = Incoming traffic from this country will be blocked
 -WARNING: untranslated string: geoipblock enable feature = Enable GeoIP based blocking:
 +WARNING: untranslated string: geoipblock enable feature = Enable Location based blocking:
  WARNING: untranslated string: grouptype = Grouptype:
  WARNING: untranslated string: guardian = Guardian
  WARNING: untranslated string: guardian block a host = unknown string
@@@ -1278,6 -1276,7 +1276,7 @@@ WARNING: untranslated string: source i
  WARNING: untranslated string: spectre variant 1 = Spectre Variant 1
  WARNING: untranslated string: spectre variant 2 = Spectre Variant 2
  WARNING: untranslated string: spectre variant 4 = Spectre Variant 4
+ WARNING: untranslated string: srbds = Special register buffer data sampling
  WARNING: untranslated string: ssh = SSH
  WARNING: untranslated string: ssh active sessions = Active logins
  WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding

diff --combined html/cgi-bin/credits.cgi
index 84866653561a6a2c39f9627e2e15b1e8f0f65058,08d5a98fbffaea29f07e5016e6da3edcf683fd96..2f3ee3b4a31d4c5491805214e60157bacbe8d378
--- 1/html/cgi-bin/credits.cgi
--- 2/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@@ -78,8 -78,8 +78,8 @@@ Peter Pfeiffer
  Daniel Glanzmann,
  Daniel Weismüller,
  Heiner Schmeling,
- Timo Eissler,
  Stephan Feddersen,
+ Timo Eissler,
  Jan Lentfer,
  Marcus Scholz,
  Ersan Yildirim,
@@@ -110,6 -110,7 +110,7 @@@ Jorrit de Jonge
  Jörn-Ingo Weigert,
  Przemek Zdroik,
  Ramax Lo,
+ Adolf Belka,
  Alexander Rudolf Gruber,
  Andrew Bellows,
  Axel Gembe,
@@@ -146,6 -147,16 +147,6 @@@ EN
  ;
  &Header::closebox();
  
 -&Header::openbox("100%", "left", $Lang::tr{'other'});
 -print <<END
 -      <p>
 -              This product includes GeoLite data created by MaxMind, available from
 -              <a href='http://www.maxmind.com/' target="_blank">http://www.maxmind.com/</a>.
 -      </p>
 -END
 -;
 -&Header::closebox();
 -
  &Header::closebigbox();
  
  &Header::closepage();

diff --combined langs/de/cgi-bin/de.pl
index b3f42bd7d18ff7712c478f46c0cd9dfdf91ef006,26ad2ab1e95ddf1fc1f09584ea4731a95abb2b6a..93fbc2d18855dbe8b38d8b261091fa866cb6a1ee
--- 1/langs/de/cgi-bin/de.pl
--- 2/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@@ -1211,7 -1211,7 +1211,7 @@@
  'fwhost OpenVPN static host' => 'OpenVPN statischer Host',
  'fwhost OpenVPN static network' => 'OpenVPN statisches Netzwerk',
  'fwhost Standard Network' => 'Standard-Netzwerk',
 -'fwhost addgeoipgrp' => 'Neue GeoIP-Gruppe hinzufügen',
 +'fwhost addlocationgrp' => 'Neue Location-Gruppe hinzufügen',
  'fwhost addgrp' => 'Neue Gruppe hinzufügen',
  'fwhost addgrpname' => 'Gruppenname:',
  'fwhost addhost' => 'Neuen Host hinzufügen',
@@@ -1227,9 -1227,9 +1227,9 @@@
  'fwhost change' => 'Ändern',
  'fwhost changeremark' => 'Es wurde nur die Bemerkung angepasst.',
  'fwhost cust addr' => 'Hosts',
 -'fwhost cust geoip' => 'GeoIP-Gruppen',
 -'fwhost cust geoipgroup' => 'GeoIP-Gruppen',
 -'fwhost cust geoiplocation' => 'GeoIP-Ländercodes',
 +'fwhost cust location' => 'Location-Gruppen',
 +'fwhost cust locationgroup' => 'Location-Gruppen',
 +'fwhost cust locationlocation' => 'Location-Ländercodes',
  'fwhost cust grp' => 'Gruppen',
  'fwhost cust net' => 'Netzwerke',
  'fwhost cust service' => 'Dienste',
@@@ -1276,7 -1276,7 +1276,7 @@@
  'fwhost ipsec net' => 'IPsec-Netzwerke:',
  'fwhost menu' => 'Firewallgruppen',
  'fwhost netaddress' => 'Netzwerkadresse',
 -'fwhost newgeoipgrp' => 'GeoIP-Gruppen',
 +'fwhost newlocationgrp' => 'Location-Gruppen',
  'fwhost newgrp' => 'Netzwerk-/Hostgruppen',
  'fwhost newhost' => 'Hosts',
  'fwhost newnet' => 'Netzwerke',
@@@ -1312,16 -1312,16 +1312,16 @@@
  'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Die Erzeugung der Root- und Host-Zertifikate kann eine Weile dauern.  Auf älterer Hardware kann dies mehrere Minuten in Anspruch nehmen. Bitte haben Sie etwas Geduld.',
  'genkey' => 'PSK erzeugen',
  'genre' => 'Genre',
 -'geoip' => 'Länderfilter konfigurieren',
 -'geoipblock' => 'GeoIP-Filter',
 -'geoipblock block countries' => 'Länderfilter',
 -'geoipblock configuration' => 'GeoIP-Konfiguration',
 -'geoipblock country code' => 'Ländercode',
 -'geoipblock country is allowed' => 'Eingehende Verbindungen aus diesem Land sind erlaubt.',
 -'geoipblock country is blocked' => 'Eingehende Verbindungen aus diesem Land werden blockiert.',
 -'geoipblock country name' => 'Ländername',
 -'geoipblock enable feature' => 'GeoIP-basierte Filterung aktivieren:',
 -'geoipblock flag' => 'Flagge',
 +'location' => 'Länderfilter konfigurieren',
 +'locationblock' => 'Location-Filter',
 +'locationblock block countries' => 'Länderfilter',
 +'locationblock configuration' => 'Location-Konfiguration',
 +'locationblock country code' => 'Ländercode',
 +'locationblock country is allowed' => 'Eingehende Verbindungen aus diesem Land sind erlaubt.',
 +'locationblock country is blocked' => 'Eingehende Verbindungen aus diesem Land werden blockiert.',
 +'locationblock country name' => 'Ländername',
 +'locationblock enable feature' => 'Location-basierte Filterung aktivieren:',
 +'locationblock flag' => 'Flagge',
  'global settings' => 'Globale Einstellungen',
  'gpl i accept these terms and conditions' => 'Ich akzeptiere diese Bedingungen und Konditionen',
  'gpl license agreement' => 'Lizenzvereinbarung',
@@@ -2256,6 -2256,7 +2256,7 @@@
  'squid extension methods' => 'Ihre <tt>extension_methods</tt> Liste',
  'squid extension methods invalid' => 'Ihre  \'extension_methods\' Liste darf nur Worte aus Großbuchstaben und Ziffer enthalten, die mittels eines Leerzeichens getrennt werden.',
  'squid fix cache' => 'Zwischenspeicher reparieren',
+ 'srbds' => 'Special Register Buffer Data Sampling',
  'src port' => 'Quellport',
  'srcprt range overlaps' => 'Quellportbereich überlappt mit einem bereits definierten Port.',
  'srcprt within existing' => 'Quellport befindet sich innnerhalb eines bereits definierten Portbereichs.',

diff --combined langs/en/cgi-bin/en.pl
index 09405bcf40147cb981cfb70fc26c9ad5a4bc4766,51483530bf599566991c34d0a48f9952dc198206..3fcd3691e078337a6ffc5b68d7d7158d717aedbf
--- 1/langs/en/cgi-bin/en.pl
--- 2/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@@ -1233,7 -1233,7 +1233,7 @@@
  'fwhost OpenVPN static host' => 'OpenVPN static host',
  'fwhost OpenVPN static network' => 'OpenVPN static network',
  'fwhost Standard Network' => 'Standard network',
 -'fwhost addgeoipgrp' => 'Add new GeoIP group',
 +'fwhost addlocationgrp' => 'Add new Location group',
  'fwhost addgrp' => 'Add new network/host group',
  'fwhost addgrpname' => 'Group name:',
  'fwhost addhost' => 'Add new host',
@@@ -1249,9 -1249,9 +1249,9 @@@
  'fwhost change' => 'Modify',
  'fwhost changeremark' => 'You modified just the remark',
  'fwhost cust addr' => 'Hosts',
 -'fwhost cust geoip' => 'GeoIP Groups',
 -'fwhost cust geoipgroup' => 'GeoIP Groups',
 -'fwhost cust geoiplocation' => 'GeoIP Locations',
 +'fwhost cust location' => 'Location Groups',
 +'fwhost cust locationgroup' => 'Location Groups',
 +'fwhost cust locationlocation' => 'Location Locations',
  'fwhost cust grp' => 'Network/Host Groups',
  'fwhost cust net' => 'Networks',
  'fwhost cust service' => 'Services',
@@@ -1298,7 -1298,7 +1298,7 @@@
  'fwhost ipsec net' => 'IPsec networks:',
  'fwhost menu' => 'Firewall Groups',
  'fwhost netaddress' => 'Network address',
 -'fwhost newgeoipgrp' => 'GeoIP Groups',
 +'fwhost newlocationgrp' => 'Location Groups',
  'fwhost newgrp' => 'Network/Host Groups',
  'fwhost newhost' => 'Hosts',
  'fwhost newnet' => 'Networks',
@@@ -1336,16 -1336,16 +1336,16 @@@
  'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Generating the root and host certificates may take a long time.  It can take up to several minutes on older hardware. Please be patient.',
  'genkey' => 'Generate PSK',
  'genre' => 'Genre',
 -'geoip' => 'GeoIP',
 -'geoipblock' => 'GeoIP Block',
 -'geoipblock block countries' => 'Block countries',
 -'geoipblock configuration' => 'GeoIP Configuration',
 -'geoipblock country code' => 'Country Code',
 -'geoipblock country is allowed' => 'Incoming traffic from this country is allowed',
 -'geoipblock country is blocked' => 'Incoming traffic from this country will be blocked',
 -'geoipblock country name' => 'Country Name',
 -'geoipblock enable feature' => 'Enable GeoIP based blocking:',
 -'geoipblock flag' => 'Flag',
 +'location' => 'Location',
 +'locationblock' => 'Location Block',
 +'locationblock block countries' => 'Block countries',
 +'locationblock configuration' => 'Location Configuration',
 +'locationblock country code' => 'Country Code',
 +'locationblock country is allowed' => 'Incoming traffic from this country is allowed',
 +'locationblock country is blocked' => 'Incoming traffic from this country will be blocked',
 +'locationblock country name' => 'Country Name',
 +'locationblock enable feature' => 'Enable Location based blocking:',
 +'locationblock flag' => 'Flag',
  'global settings' => 'Global Settings',
  'gpl i accept these terms and conditions' => 'I accept these terms and conditions',
  'gpl license agreement' => 'License Agreement',
@@@ -2284,6 -2284,7 +2284,7 @@@
  'squid extension methods' => 'Your <tt>extension_methods</tt> list',
  'squid extension methods invalid' => 'Your \'extension_methods\' list can only contain uppercase words of letters and digits, separated with a space. ',
  'squid fix cache' => 'Repair cache',
+ 'srbds' => 'Special register buffer data sampling',
  'src port' => 'Src Port',
  'srcprt range overlaps' => 'Source port range overlaps an already defined port.',
  'srcprt within existing' => 'Source port is within an already defined port range.',

diff --combined lfs/configroot
index e8626c8129e3a0dd09c9c5a636a74640287d21ad,ee320d8cf2ab365b88ea9ede8bb3fbd2eb56c3eb..0afacebaf731cdef244d476a0e3f67741829bcc6
--- 1/lfs/configroot
--- 2/lfs/configroot
+++ b/lfs/configroot
@@@ -64,8 -64,8 +64,8 @@@ $(TARGET) 
        for i in auth/users backup/include.user backup/exclude.user \
            captive/settings captive/agb.txt captive/clients captive/voucher_out certs/index.txt certs/index.txt.attr ddns/config ddns/settings ddns/ipcache dhcp/settings \
            dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dns/servers dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
 -          ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/geoipblock firewall/input firewall/outgoing \
 -          fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customgeoipgrp fwlogs/ipsettings fwlogs/portsettings \
 +          ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/locationblock firewall/input firewall/outgoing \
 +          fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customlocationgrp fwlogs/ipsettings fwlogs/portsettings \
            isdn/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \
            ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
            ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
@@@ -78,8 -78,7 +78,7 @@@
        cp $(DIR_SRC)/config/cfgroot/header.pl                  $(CONFIG_ROOT)/
        cp $(DIR_SRC)/config/cfgroot/general-functions.pl       $(CONFIG_ROOT)/
        cp $(DIR_SRC)/config/cfgroot/network-functions.pl       $(CONFIG_ROOT)/
 -      cp $(DIR_SRC)/config/cfgroot/geoip-functions.pl         $(CONFIG_ROOT)/
 +      cp $(DIR_SRC)/config/cfgroot/location-functions.pl              $(CONFIG_ROOT)/
-       cp $(DIR_SRC)/config/cfgroot/aws-functions.pl           $(CONFIG_ROOT)/
        cp $(DIR_SRC)/config/cfgroot/ids-functions.pl           $(CONFIG_ROOT)/
        cp $(DIR_SRC)/config/cfgroot/lang.pl                    $(CONFIG_ROOT)/
        cp $(DIR_SRC)/config/cfgroot/countries.pl               $(CONFIG_ROOT)/

diff --combined make.sh
index fef920ef7ee7c0d849c122f44e8dfb309c59fd16,2e54cec28af4687f682abad5ac1c627fc767c772..21e84400bc4aca5f17a53df92b9d363e5b753c83
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -26,7 -26,7 +26,7 @@@ NAME="IPFire"                                                 # Software nam
  SNAME="ipfire"                                                        # Short name
  # If you update the version don't forget to update backupiso and add it to core update
  VERSION="2.25"                                                        # Version number
- CORE="146"                                                    # Core Level (Filename)
+ CORE="147"                                                    # Core Level (Filename)
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
  NICE=10                                                               # Nice level
@@@ -1346,6 -1346,8 +1346,6 @@@ buildipfire() 
    lfsmake2 python-daemon
    lfsmake2 python-ipaddress
    lfsmake2 glib
 -  lfsmake2 GeoIP
 -  lfsmake2 geoip-database
    lfsmake2 ntp
    lfsmake2 openssh
    lfsmake2 fontconfig
@@@ -1632,10 -1634,10 +1632,10 @@@
    lfsmake2 flashrom
    lfsmake2 firmware-update
    lfsmake2 tshark
 -  lfsmake2 geoip-generator
    lfsmake2 speedtest-cli
    lfsmake2 rfkill
    lfsmake2 amazon-ssm-agent
 +  lfsmake2 libloc
  }
  
  buildinstaller() {
@@@ -1988,4 -1990,3 +1988,4 @@@ find-dependencies
        cat doc/make.sh-usage
        ;;
  esac
 +

diff --combined src/initscripts/system/firewall
index 5d7f1c1b4be37257ae339aa68151c9e0b9508d03,ab3a0bbf9c9a6151b89686c2308dac5b8be11944..65f1c979bb4007f1987fbfe897b5e1d91ed30f23
--- 1/src/initscripts/system/firewall
--- 2/src/initscripts/system/firewall
+++ b/src/initscripts/system/firewall
@@@ -32,6 -32,10 +32,10 @@@ iptables_init() 
        iptables -P FORWARD DROP
        iptables -P OUTPUT ACCEPT
  
+       # Enable TRACE logging to syslog
+       modprobe nf_log_ipv4
+       sysctl -q -w net.netfilter.nf_log.2=nf_log_ipv4
+ 
        # Empty LOG_DROP and LOG_REJECT chains
        iptables -N LOG_DROP
        iptables -A LOG_DROP   -m limit --limit 10/second -j LOG
@@@ -96,6 -100,9 +100,9 @@@
  
        # Conntrack helpers (https://home.regit.org/netfilter-en/secure-use-of-helpers/)
  
+       # GRE (always enabled)
+       modprobe nf_conntrack_proto_gre
+ 
        # SIP
        if [ "${CONNTRACK_SIP}" = "on" ]; then
                modprobe nf_nat_sip
@@@ -269,10 -276,10 +276,10 @@@
                iptables -A OUTPUT -o "${BLUE_DEV}" -j DHCPBLUEOUTPUT
        fi
  
 -      # GeoIP block
 -      iptables -N GEOIPBLOCK
 -      iptables -A INPUT -j GEOIPBLOCK
 -      iptables -A FORWARD -j GEOIPBLOCK
 +      # Location Block
 +      iptables -N LOCATIONBLOCK
 +      iptables -A INPUT -j LOCATIONBLOCK
 +      iptables -A FORWARD -j LOCATIONBLOCK
  
        # trafic from ipsecX/TUN/TAP interfaces, before "-i GREEN_DEV" accept everything
        iptables -N IPSECINPUT