Development October 2021

development@lists.ipfire.org

12 participants
59 discussions

[PATCH] meson: Update to version 0.59.2
by Adolf Belka 21 Oct '21

21 Oct '21

- Update from 0.58.0 to 0.59.2 - Update rootfile - Changelog is too long to include here. Full details can be read at https://mesonbuild.com/Release-notes-for-0-59-0.html Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/meson | 44 ++++++++++++++++++++++++++++------- lfs/meson | 4 ++-- 2 files changed, 37 insertions(+), 11 deletions(-) diff --git a/config/rootfiles/common/meson b/config/rootfiles/common/meson index b655121f1..1abb13713 100644 --- a/config/rootfiles/common/meson +++ b/config/rootfiles/common/meson @@ -1,13 +1,15 @@ #usr/bin/meson -#usr/lib/python3.8/site-packages/meson-0.58.0-py3.8.egg-info -#usr/lib/python3.8/site-packages/meson-0.58.0-py3.8.egg-info/PKG-INFO -#usr/lib/python3.8/site-packages/meson-0.58.0-py3.8.egg-info/SOURCES.txt -#usr/lib/python3.8/site-packages/meson-0.58.0-py3.8.egg-info/dependency_links.txt -#usr/lib/python3.8/site-packages/meson-0.58.0-py3.8.egg-info/entry_points.txt -#usr/lib/python3.8/site-packages/meson-0.58.0-py3.8.egg-info/requires.txt -#usr/lib/python3.8/site-packages/meson-0.58.0-py3.8.egg-info/top_level.txt +#usr/lib/python3.8/site-packages/meson-0.59.2-py3.8.egg-info +#usr/lib/python3.8/site-packages/meson-0.59.2-py3.8.egg-info/PKG-INFO +#usr/lib/python3.8/site-packages/meson-0.59.2-py3.8.egg-info/SOURCES.txt +#usr/lib/python3.8/site-packages/meson-0.59.2-py3.8.egg-info/dependency_links.txt +#usr/lib/python3.8/site-packages/meson-0.59.2-py3.8.egg-info/entry_points.txt +#usr/lib/python3.8/site-packages/meson-0.59.2-py3.8.egg-info/requires.txt +#usr/lib/python3.8/site-packages/meson-0.59.2-py3.8.egg-info/top_level.txt #usr/lib/python3.8/site-packages/mesonbuild #usr/lib/python3.8/site-packages/mesonbuild/__init__.py +#usr/lib/python3.8/site-packages/mesonbuild/_pathlib.py +#usr/lib/python3.8/site-packages/mesonbuild/_typing.py #usr/lib/python3.8/site-packages/mesonbuild/arglist.py #usr/lib/python3.8/site-packages/mesonbuild/ast #usr/lib/python3.8/site-packages/mesonbuild/ast/__init__.py @@ -21,6 +23,8 @@ #usr/lib/python3.8/site-packages/mesonbuild/backend/backends.py #usr/lib/python3.8/site-packages/mesonbuild/backend/ninjabackend.py #usr/lib/python3.8/site-packages/mesonbuild/backend/vs2010backend.py +#usr/lib/python3.8/site-packages/mesonbuild/backend/vs2012backend.py +#usr/lib/python3.8/site-packages/mesonbuild/backend/vs2013backend.py #usr/lib/python3.8/site-packages/mesonbuild/backend/vs2015backend.py #usr/lib/python3.8/site-packages/mesonbuild/backend/vs2017backend.py #usr/lib/python3.8/site-packages/mesonbuild/backend/vs2019backend.py @@ -44,7 +48,9 @@ #usr/lib/python3.8/site-packages/mesonbuild/compilers/cpp.py #usr/lib/python3.8/site-packages/mesonbuild/compilers/cs.py #usr/lib/python3.8/site-packages/mesonbuild/compilers/cuda.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/cython.py #usr/lib/python3.8/site-packages/mesonbuild/compilers/d.py +#usr/lib/python3.8/site-packages/mesonbuild/compilers/detect.py #usr/lib/python3.8/site-packages/mesonbuild/compilers/fortran.py #usr/lib/python3.8/site-packages/mesonbuild/compilers/java.py #usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins @@ -73,12 +79,19 @@ #usr/lib/python3.8/site-packages/mesonbuild/dependencies/__init__.py #usr/lib/python3.8/site-packages/mesonbuild/dependencies/base.py #usr/lib/python3.8/site-packages/mesonbuild/dependencies/boost.py +#usr/lib/python3.8/site-packages/mesonbuild/dependencies/cmake.py #usr/lib/python3.8/site-packages/mesonbuild/dependencies/coarrays.py +#usr/lib/python3.8/site-packages/mesonbuild/dependencies/configtool.py #usr/lib/python3.8/site-packages/mesonbuild/dependencies/cuda.py +#usr/lib/python3.8/site-packages/mesonbuild/dependencies/detect.py #usr/lib/python3.8/site-packages/mesonbuild/dependencies/dev.py +#usr/lib/python3.8/site-packages/mesonbuild/dependencies/dub.py +#usr/lib/python3.8/site-packages/mesonbuild/dependencies/factory.py +#usr/lib/python3.8/site-packages/mesonbuild/dependencies/framework.py #usr/lib/python3.8/site-packages/mesonbuild/dependencies/hdf5.py #usr/lib/python3.8/site-packages/mesonbuild/dependencies/misc.py #usr/lib/python3.8/site-packages/mesonbuild/dependencies/mpi.py +#usr/lib/python3.8/site-packages/mesonbuild/dependencies/pkgconfig.py #usr/lib/python3.8/site-packages/mesonbuild/dependencies/platform.py #usr/lib/python3.8/site-packages/mesonbuild/dependencies/qt.py #usr/lib/python3.8/site-packages/mesonbuild/dependencies/scalapack.py @@ -89,11 +102,24 @@ #usr/lib/python3.8/site-packages/mesonbuild/interpreter #usr/lib/python3.8/site-packages/mesonbuild/interpreter/__init__.py #usr/lib/python3.8/site-packages/mesonbuild/interpreter/compiler.py +#usr/lib/python3.8/site-packages/mesonbuild/interpreter/dependencyfallbacks.py #usr/lib/python3.8/site-packages/mesonbuild/interpreter/interpreter.py #usr/lib/python3.8/site-packages/mesonbuild/interpreter/interpreterobjects.py +#usr/lib/python3.8/site-packages/mesonbuild/interpreter/kwargs.py #usr/lib/python3.8/site-packages/mesonbuild/interpreter/mesonmain.py -#usr/lib/python3.8/site-packages/mesonbuild/interpreterbase.py -#usr/lib/python3.8/site-packages/mesonbuild/linkers.py +#usr/lib/python3.8/site-packages/mesonbuild/interpreterbase +#usr/lib/python3.8/site-packages/mesonbuild/interpreterbase/__init__.py +#usr/lib/python3.8/site-packages/mesonbuild/interpreterbase/_unholder.py +#usr/lib/python3.8/site-packages/mesonbuild/interpreterbase/baseobjects.py +#usr/lib/python3.8/site-packages/mesonbuild/interpreterbase/decorators.py +#usr/lib/python3.8/site-packages/mesonbuild/interpreterbase/disabler.py +#usr/lib/python3.8/site-packages/mesonbuild/interpreterbase/exceptions.py +#usr/lib/python3.8/site-packages/mesonbuild/interpreterbase/helpers.py +#usr/lib/python3.8/site-packages/mesonbuild/interpreterbase/interpreterbase.py +#usr/lib/python3.8/site-packages/mesonbuild/linkers +#usr/lib/python3.8/site-packages/mesonbuild/linkers/__init__.py +#usr/lib/python3.8/site-packages/mesonbuild/linkers/detect.py +#usr/lib/python3.8/site-packages/mesonbuild/linkers/linkers.py #usr/lib/python3.8/site-packages/mesonbuild/mcompile.py #usr/lib/python3.8/site-packages/mesonbuild/mconf.py #usr/lib/python3.8/site-packages/mesonbuild/mdevenv.py diff --git a/lfs/meson b/lfs/meson index 73e73a44d..16b7737ec 100644 --- a/lfs/meson +++ b/lfs/meson @@ -24,7 +24,7 @@ include Config -VER = 0.58.0 +VER = 0.59.2 THISAPP = meson-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 18ac55e3d6a5acb17b5737eb2a15bb5b +$(DL_FILE)_MD5 = 9d65e09b53b1dfab6339a0982176935d install : $(TARGET) -- 2.33.0

2 1

[PATCH] make.sh: Rewrite uploadsrc with rsync
by Michael Tremer 20 Oct '21

20 Oct '21

Instead of having a very dodgy diff of filelists, this rsync call does everything automatically and only requires authentication once. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- make.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/make.sh b/make.sh index d9e560cf0..4a5442b8a 100755 --- a/make.sh +++ b/make.sh @@ -1903,24 +1903,24 @@ gettoolchain) fi ;; uploadsrc) - PWD=`pwd` if [ -z $IPFIRE_USER ]; then echo -n "You have to setup IPFIRE_USER first. See .config for details." print_status FAIL exit 1 fi - URL_SOURCE=$(grep URL_SOURCE lfs/Config | awk '{ print $3 }') - REMOTE_FILES=$(echo "ls -1" | sftp -C ${IPFIRE_USER}@${URL_SOURCE}) + URL_SOURCE="$(awk '/^URL_SOURCE/ { print $3 }' lfs/Config)" + + rsync \ + --recursive \ + --update \ + --ignore-existing \ + --progress \ + --human-readable \ + --exclude="toolchains/" \ + "${BASEDIR}/cache/" \ + "${IPFIRE_USER}@${URL_SOURCE}" - for file in ${BASEDIR}/cache/*; do - [ -d "${file}" ] && continue - grep -q "$(basename ${file})" <<<$REMOTE_FILES && continue - NEW_FILES="$NEW_FILES $file" - done - [ -n "$NEW_FILES" ] && scp -2 $NEW_FILES ${IPFIRE_USER}@${URL_SOURCE} - cd $BASEDIR - cd $PWD exit 0 ;; lang) -- 2.20.1

1 0

[PATCH 1/9] suricata: Set most significant bit as repeat marker
by Michael Tremer 19 Oct '21

19 Oct '21

I have no idea why some odd value was chosen here, but one bit should be enough. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- config/suricata/suricata.yaml | 4 ++-- src/initscripts/system/suricata | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/suricata/suricata.yaml b/config/suricata/suricata.yaml index 4e9e39967..1ce013dc7 100644 --- a/config/suricata/suricata.yaml +++ b/config/suricata/suricata.yaml @@ -346,8 +346,8 @@ logging: nfq: mode: repeat - repeat-mark: 1879048192 - repeat-mask: 1879048192 + repeat-mark: 2147483648 + repeat-mask: 2147483648 # bypass-mark: 1 # bypass-mask: 1 # route-queue: 2 diff --git a/src/initscripts/system/suricata b/src/initscripts/system/suricata index 33633ddf9..e327225d7 100644 --- a/src/initscripts/system/suricata +++ b/src/initscripts/system/suricata @@ -35,8 +35,8 @@ network_zones=( red green blue orange ovpn ) enabled_ips_zones=() # Mark and Mask options. -MARK="0x70000000" -MASK="0x70000000" +MARK="0x80000000" +MASK="0x80000000" # PID file of suricata. PID_FILE="/var/run/suricata.pid" -- 2.20.1

3 20

[PATCH] squid-asnbl: update to 0.2.3
by Peter Müller 18 Oct '21

18 Oct '21

Upstream commit 500b9137d0a9dd31e40f0d1effdba0aafeb94ca4 changes the behaviour of this script in case of invalid or unresolvable FQDNs, preventing Squid from eventually shutting down due to too many BH's per time. Since this allows (authenticated) users to run a DoS against the Squid instance, it is considered to be security relevant. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- lfs/squid-asnbl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/squid-asnbl b/lfs/squid-asnbl index 3fc001768..9bb7ef198 100644 --- a/lfs/squid-asnbl +++ b/lfs/squid-asnbl @@ -25,7 +25,7 @@ include Config -VER = 0.2.2 +VER = 0.2.3 THISAPP = squid-asnbl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = d62be77baa30b16d1c2362460123d6c0 +$(DL_FILE)_MD5 = cf0a269215f06f487d1ed488ea463d6b install : $(TARGET) -- 2.26.2

1 0

[PATCH] location-functions.pl: Recognise XD / LOC_NETWORK_FLAG_DROP
by Peter Müller 15 Oct '21

15 Oct '21

This enables creating firewall rules using the special country code "XD" for hostile networks safe to drop and ipinfo.cgi to display a meaningful text for IP addresses having this flag set. At the moment, the "LOC_NETWORK_FLAG_DROP" is not yet populated, but will be in the future (as soon as libloc 0.9.9 is released and running in production). Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- config/cfgroot/location-functions.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/cfgroot/location-functions.pl b/config/cfgroot/location-functions.pl index fb97eb589..4d44ce24d 100644 --- a/config/cfgroot/location-functions.pl +++ b/config/cfgroot/location-functions.pl @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 IPFire Team <info(a)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 # @@ -29,6 +29,7 @@ my %not_iso_3166_location = ( "A1" => "Anonymous Proxy", "A2" => "Satellite Provider", "A3" => "Worldwide Anycast Instance", + "XD" => "Hostile networks safe to drop", ); # Hash which contains possible network flags and their mapped location codes. @@ -36,10 +37,11 @@ my %network_flags = ( "LOC_NETWORK_FLAG_ANONYMOUS_PROXY" => "A1", "LOC_NETWORK_FLAG_SATELLITE_PROVIDER" => "A2", "LOC_NETWORK_FLAG_ANYCAST" => "A3", + "LOC_NETWORK_FLAG_DROP" => "XD", ); # Array which contains special country codes. -my @special_locations = ( "A1", "A2", "A3" ); +my @special_locations = ( "A1", "A2", "A3", "XD" ); # Directory where the libloc database and keyfile lives. our $location_dir = "/var/lib/location/"; -- 2.26.2

3 7

[PATCH] pakfire.cgi: Give pakfire time to write lockfile when update/upgrade.
by Stefan Schantl 15 Oct '21

15 Oct '21

In case the package list should be grabbed or the system should be upgraded, pakfire got called which writes a lock file to prevent from beeing launched multiple times and to lock the pakfire.cgi with the nice log output. In case update or upgrade has been performed via WUI, pakfire has been called and written the file in the background but the WUI script has been executed further and because of a race condition it did not recognize the lockfile at this moment because it was not present. So a simple sleep should to the trick and give pakfire the required time to write out it's lockfile. Fixes #12696. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- html/cgi-bin/pakfire.cgi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 0cf522ba1..aaf63d469 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -133,8 +133,10 @@ END } elsif (($cgiparams{'ACTION'} eq 'update') && (! -e $Pakfire::lockfile)) { &General::system_background("/usr/local/bin/pakfire", "update", "--force", "--no-colors"); + sleep(1); } elsif (($cgiparams{'ACTION'} eq 'upgrade') && (!-e $Pakfire::lockfile)) { &General::system_background("/usr/local/bin/pakfire", "upgrade", "-y", "--no-colors"); + sleep(1); } elsif ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") { $pakfiresettings{"TREE"} = $cgiparams{"TREE"}; -- 2.30.2

4 5

[PATCH] en.pl: Correct minor typo - bug#12701
by Adolf Belka 14 Oct '21

14 Oct '21

- Corrected minor typo in the en.pl file - bug#12701 Fixes: 12701 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- doc/language_issues.en | 2 +- doc/language_issues.es | 2 +- doc/language_issues.it | 2 +- doc/language_issues.nl | 2 +- doc/language_issues.pl | 2 +- doc/language_issues.ru | 2 +- doc/language_issues.tr | 2 +- langs/en/cgi-bin/en.pl | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/language_issues.en b/doc/language_issues.en index 3d10bebc6..fce67b8eb 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -299,7 +299,7 @@ WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.16 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org* WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line) WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line) -WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. +WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, further changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: age second = second diff --git a/doc/language_issues.es b/doc/language_issues.es index 2e58b5b02..60612f9df 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -814,7 +814,7 @@ WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.16 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org* WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line) WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line) -WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. +WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, further changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: age second = second diff --git a/doc/language_issues.it b/doc/language_issues.it index 4538461c6..af409c1db 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -903,7 +903,7 @@ WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.16 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org* WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line) WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line) -WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. +WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, further changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: asn lookup failed = AS lookup failed diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 85fdcbe44..e6ad0d425 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -898,7 +898,7 @@ WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.16 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org* WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line) WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line) -WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. +WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, further changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: asn lookup failed = AS lookup failed diff --git a/doc/language_issues.pl b/doc/language_issues.pl index a023bdbee..52b8bd4aa 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -829,7 +829,7 @@ WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.16 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org* WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line) WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line) -WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. +WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, further changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: age second = second diff --git a/doc/language_issues.ru b/doc/language_issues.ru index d1abbc4a8..7928cc948 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -825,7 +825,7 @@ WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.16 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org* WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line) WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line) -WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. +WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, further changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: age second = second diff --git a/doc/language_issues.tr b/doc/language_issues.tr index a882db069..6ec856e17 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -890,7 +890,7 @@ WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.16 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org* WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line) WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line) -WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. +WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, further changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: asn lookup failed = AS lookup failed diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 679588940..1a7c37294 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -400,7 +400,7 @@ 'advproxy wpad example dst_noproxy_url' => 'e.g. *.ipfire.org*', 'advproxy wpad label dst_noproxy_ip' => 'Excluded IP Subnets (one per line)', 'advproxy wpad label dst_noproxy_url' => 'Excluded URL s (one per line)', -'advproxy wpad notice' => 'Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.', +'advproxy wpad notice' => 'Notice: For WPAD/PAC to work properly, further changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.', 'advproxy wpad title' => 'Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)', 'advproxy wpad view pac' => 'Open PAC File', 'again' => 'Again:', -- 2.33.0

2 4

[PATCH] squid: Update to 5.2
by Matthias Fischer 14 Oct '21

14 Oct '21

For details see: http://www.squid-cache.org/Versions/v5/changesets/ Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/squid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/squid b/lfs/squid index c56dca7de..5e9648aba 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 5.1 +VER = 5.2 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 17be9709b54fe0146452113404be7b54 +$(DL_FILE)_MD5 = 102984f3ea382a1fa5bd917c2ee155ec install : $(TARGET) -- 2.18.0

3 6

[PATCH] pakfire: Allow pinning Pakfire to one mirror server
by Michael Tremer 14 Oct '21

14 Oct '21

This patch adds a new $mirror option to the configuration file which will cause Pakfire to only use this one to download any files. This feature is disabled by default but useful for development. Fixes: #12706 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- src/pakfire/lib/functions.pl | 12 ++++++++++++ src/pakfire/pakfire.conf | 3 +++ 2 files changed, 15 insertions(+) diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index f46c9acc1..4d9854a6f 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -30,6 +30,7 @@ use HTTP::Headers; use HTTP::Message; use HTTP::Request; use Net::Ping; +use URI; use Switch; @@ -297,6 +298,17 @@ sub valid_signature($) { } sub selectmirror { + if (defined ${Conf::mirror}) { + my $uri = URI->new("${Conf::mirror}"); + + # Only accept HTTPS mirrors + if ($uri->scheme eq "https") { + return ("HTTPS", $uri->host, $uri->path . "/" . ${Conf::version}); + } else { + message("MIRROR ERROR: Unsupported mirror: " . ${Conf::mirror}); + } + } + ### Check if there is a current server list and read it. # If there is no list try to get one. my $count = 0; diff --git a/src/pakfire/pakfire.conf b/src/pakfire/pakfire.conf index 9930f3771..bc54dcff4 100644 --- a/src/pakfire/pakfire.conf +++ b/src/pakfire/pakfire.conf @@ -23,6 +23,9 @@ package Conf; $mainserver = "pakfire.ipfire.org"; +# Only use this mirror +#$mirror = "https://mirror1.ipfire.org/pakfire2"; + $cachedir = "/opt/pakfire/cache"; $dbdir = "/opt/pakfire/db"; $coredir = "/opt/pakfire/db/core"; -- 2.20.1

1 0

[PATCH v2 1/3] squid-asnbl: New package
by Peter Müller 14 Oct '21

14 Oct '21

This package adds an ASNBL helper for detecting Fast Flux setups and selectively announced networks (i. e. FQDNs resolving to IP addresses not being announced by an Autonomous System) to the distribution. Afterwards, the helper script is located at /usr/bin/asnbl-helper.py . The second version of this patch updates squid-asnbl to upstream version 0.2.2, improving logging in case of detected Fast Flux setups. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- config/rootfiles/common/squid-asnbl | 1 + lfs/squid-asnbl | 83 +++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 85 insertions(+) create mode 100644 config/rootfiles/common/squid-asnbl create mode 100644 lfs/squid-asnbl diff --git a/config/rootfiles/common/squid-asnbl b/config/rootfiles/common/squid-asnbl new file mode 100644 index 000000000..f129f441e --- /dev/null +++ b/config/rootfiles/common/squid-asnbl @@ -0,0 +1 @@ +usr/bin/asnbl-helper.py diff --git a/lfs/squid-asnbl b/lfs/squid-asnbl new file mode 100644 index 000000000..3fc001768 --- /dev/null +++ b/lfs/squid-asnbl @@ -0,0 +1,83 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2021 IPFire Team <info(a)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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.2.2 + +THISAPP = squid-asnbl-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) + +DIR_APP = $(DIR_SRC)/$(THISAPP) + +TARGET = $(DIR_INFO)/$(THISAPP) + +DEPS = libloc squid python3 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = d62be77baa30b16d1c2362460123d6c0 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zvxf $(DIR_DL)/$(DL_FILE) + + # Install ASNBL helper script + cd $(DIR_APP) && install -o root -g root -m 0755 asnbl-helper.py /usr/bin/asnbl-helper.py + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index dabed5aa5..215e5c633 100755 --- a/make.sh +++ b/make.sh @@ -1613,6 +1613,7 @@ buildipfire() { lfsmake2 socat lfsmake2 libcdada lfsmake2 pmacct + lfsmake2 squid-asnbl } buildinstaller() { -- 2.26.2

2 7

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development October 2021