Development September 2020

development@lists.ipfire.org

10 participants
55 discussions

[PATCH v2] Ship testsuite of BorgBackup
by Jonatan Schlag 26 Sep '20

26 Sep '20

BorgBackup seems to need this testsuite on all systems, because it does some selftests when starting a backup. Fixes: #12438 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- config/rootfiles/packages/borgbackup | 56 ++++++++++++++-------------- lfs/borgbackup | 2 +- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/config/rootfiles/packages/borgbackup b/config/rootfiles/packages/borgbackup index 6fbe61429..7fed290a0 100644 --- a/config/rootfiles/packages/borgbackup +++ b/config/rootfiles/packages/borgbackup @@ -50,34 +50,34 @@ usr/lib/python3.8/site-packages/borg/repository.py usr/lib/python3.8/site-packages/borg/selftest.py usr/lib/python3.8/site-packages/borg/shellpattern.py #usr/lib/python3.8/site-packages/borg/testsuite -#usr/lib/python3.8/site-packages/borg/testsuite/__init__.py -#usr/lib/python3.8/site-packages/borg/testsuite/archive.py -#usr/lib/python3.8/site-packages/borg/testsuite/archiver.py -#usr/lib/python3.8/site-packages/borg/testsuite/attic.tar.gz -#usr/lib/python3.8/site-packages/borg/testsuite/benchmark.py -#usr/lib/python3.8/site-packages/borg/testsuite/cache.py -#usr/lib/python3.8/site-packages/borg/testsuite/checksums.py -#usr/lib/python3.8/site-packages/borg/testsuite/chunker.py -#usr/lib/python3.8/site-packages/borg/testsuite/compress.py -#usr/lib/python3.8/site-packages/borg/testsuite/crypto.py -#usr/lib/python3.8/site-packages/borg/testsuite/file_integrity.py -#usr/lib/python3.8/site-packages/borg/testsuite/hashindex.py -#usr/lib/python3.8/site-packages/borg/testsuite/helpers.py -#usr/lib/python3.8/site-packages/borg/testsuite/item.py -#usr/lib/python3.8/site-packages/borg/testsuite/key.py -#usr/lib/python3.8/site-packages/borg/testsuite/locking.py -#usr/lib/python3.8/site-packages/borg/testsuite/logger.py -#usr/lib/python3.8/site-packages/borg/testsuite/lrucache.py -#usr/lib/python3.8/site-packages/borg/testsuite/nanorst.py -#usr/lib/python3.8/site-packages/borg/testsuite/nonces.py -#usr/lib/python3.8/site-packages/borg/testsuite/patterns.py -#usr/lib/python3.8/site-packages/borg/testsuite/platform.py -#usr/lib/python3.8/site-packages/borg/testsuite/remote.py -#usr/lib/python3.8/site-packages/borg/testsuite/repository.py -#usr/lib/python3.8/site-packages/borg/testsuite/shellpattern.py -#usr/lib/python3.8/site-packages/borg/testsuite/upgrader.py -#usr/lib/python3.8/site-packages/borg/testsuite/version.py -#usr/lib/python3.8/site-packages/borg/testsuite/xattr.py +usr/lib/python3.8/site-packages/borg/testsuite/__init__.py +usr/lib/python3.8/site-packages/borg/testsuite/archive.py +usr/lib/python3.8/site-packages/borg/testsuite/archiver.py +usr/lib/python3.8/site-packages/borg/testsuite/attic.tar.gz +usr/lib/python3.8/site-packages/borg/testsuite/benchmark.py +usr/lib/python3.8/site-packages/borg/testsuite/cache.py +usr/lib/python3.8/site-packages/borg/testsuite/checksums.py +usr/lib/python3.8/site-packages/borg/testsuite/chunker.py +usr/lib/python3.8/site-packages/borg/testsuite/compress.py +usr/lib/python3.8/site-packages/borg/testsuite/crypto.py +usr/lib/python3.8/site-packages/borg/testsuite/file_integrity.py +usr/lib/python3.8/site-packages/borg/testsuite/hashindex.py +usr/lib/python3.8/site-packages/borg/testsuite/helpers.py +usr/lib/python3.8/site-packages/borg/testsuite/item.py +usr/lib/python3.8/site-packages/borg/testsuite/key.py +usr/lib/python3.8/site-packages/borg/testsuite/locking.py +usr/lib/python3.8/site-packages/borg/testsuite/logger.py +usr/lib/python3.8/site-packages/borg/testsuite/lrucache.py +usr/lib/python3.8/site-packages/borg/testsuite/nanorst.py +usr/lib/python3.8/site-packages/borg/testsuite/nonces.py +usr/lib/python3.8/site-packages/borg/testsuite/patterns.py +usr/lib/python3.8/site-packages/borg/testsuite/platform.py +usr/lib/python3.8/site-packages/borg/testsuite/remote.py +usr/lib/python3.8/site-packages/borg/testsuite/repository.py +usr/lib/python3.8/site-packages/borg/testsuite/shellpattern.py +usr/lib/python3.8/site-packages/borg/testsuite/upgrader.py +usr/lib/python3.8/site-packages/borg/testsuite/version.py +usr/lib/python3.8/site-packages/borg/testsuite/xattr.py usr/lib/python3.8/site-packages/borg/upgrader.py usr/lib/python3.8/site-packages/borg/version.py usr/lib/python3.8/site-packages/borg/xattr.py diff --git a/lfs/borgbackup b/lfs/borgbackup index ea87cf5ce..66e35c71a 100644 --- a/lfs/borgbackup +++ b/lfs/borgbackup @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = borgbackup -PAK_VER = 6 +PAK_VER = 7 DEPS = python3-llfuse python3-msgpack -- 2.20.1

1 0

[PATCH] Ship testsuite of BorgBackup
by Jonatan Schlag 25 Sep '20

25 Sep '20

BorgBackup seems to need this testsuite on all systems, because it does some selftests when starting a backup. Fixes: #12438 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- config/rootfiles/packages/borgbackup | 56 ++++++++++++++-------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/config/rootfiles/packages/borgbackup b/config/rootfiles/packages/borgbackup index 6fbe61429..7fed290a0 100644 --- a/config/rootfiles/packages/borgbackup +++ b/config/rootfiles/packages/borgbackup @@ -50,34 +50,34 @@ usr/lib/python3.8/site-packages/borg/repository.py usr/lib/python3.8/site-packages/borg/selftest.py usr/lib/python3.8/site-packages/borg/shellpattern.py #usr/lib/python3.8/site-packages/borg/testsuite -#usr/lib/python3.8/site-packages/borg/testsuite/__init__.py -#usr/lib/python3.8/site-packages/borg/testsuite/archive.py -#usr/lib/python3.8/site-packages/borg/testsuite/archiver.py -#usr/lib/python3.8/site-packages/borg/testsuite/attic.tar.gz -#usr/lib/python3.8/site-packages/borg/testsuite/benchmark.py -#usr/lib/python3.8/site-packages/borg/testsuite/cache.py -#usr/lib/python3.8/site-packages/borg/testsuite/checksums.py -#usr/lib/python3.8/site-packages/borg/testsuite/chunker.py -#usr/lib/python3.8/site-packages/borg/testsuite/compress.py -#usr/lib/python3.8/site-packages/borg/testsuite/crypto.py -#usr/lib/python3.8/site-packages/borg/testsuite/file_integrity.py -#usr/lib/python3.8/site-packages/borg/testsuite/hashindex.py -#usr/lib/python3.8/site-packages/borg/testsuite/helpers.py -#usr/lib/python3.8/site-packages/borg/testsuite/item.py -#usr/lib/python3.8/site-packages/borg/testsuite/key.py -#usr/lib/python3.8/site-packages/borg/testsuite/locking.py -#usr/lib/python3.8/site-packages/borg/testsuite/logger.py -#usr/lib/python3.8/site-packages/borg/testsuite/lrucache.py -#usr/lib/python3.8/site-packages/borg/testsuite/nanorst.py -#usr/lib/python3.8/site-packages/borg/testsuite/nonces.py -#usr/lib/python3.8/site-packages/borg/testsuite/patterns.py -#usr/lib/python3.8/site-packages/borg/testsuite/platform.py -#usr/lib/python3.8/site-packages/borg/testsuite/remote.py -#usr/lib/python3.8/site-packages/borg/testsuite/repository.py -#usr/lib/python3.8/site-packages/borg/testsuite/shellpattern.py -#usr/lib/python3.8/site-packages/borg/testsuite/upgrader.py -#usr/lib/python3.8/site-packages/borg/testsuite/version.py -#usr/lib/python3.8/site-packages/borg/testsuite/xattr.py +usr/lib/python3.8/site-packages/borg/testsuite/__init__.py +usr/lib/python3.8/site-packages/borg/testsuite/archive.py +usr/lib/python3.8/site-packages/borg/testsuite/archiver.py +usr/lib/python3.8/site-packages/borg/testsuite/attic.tar.gz +usr/lib/python3.8/site-packages/borg/testsuite/benchmark.py +usr/lib/python3.8/site-packages/borg/testsuite/cache.py +usr/lib/python3.8/site-packages/borg/testsuite/checksums.py +usr/lib/python3.8/site-packages/borg/testsuite/chunker.py +usr/lib/python3.8/site-packages/borg/testsuite/compress.py +usr/lib/python3.8/site-packages/borg/testsuite/crypto.py +usr/lib/python3.8/site-packages/borg/testsuite/file_integrity.py +usr/lib/python3.8/site-packages/borg/testsuite/hashindex.py +usr/lib/python3.8/site-packages/borg/testsuite/helpers.py +usr/lib/python3.8/site-packages/borg/testsuite/item.py +usr/lib/python3.8/site-packages/borg/testsuite/key.py +usr/lib/python3.8/site-packages/borg/testsuite/locking.py +usr/lib/python3.8/site-packages/borg/testsuite/logger.py +usr/lib/python3.8/site-packages/borg/testsuite/lrucache.py +usr/lib/python3.8/site-packages/borg/testsuite/nanorst.py +usr/lib/python3.8/site-packages/borg/testsuite/nonces.py +usr/lib/python3.8/site-packages/borg/testsuite/patterns.py +usr/lib/python3.8/site-packages/borg/testsuite/platform.py +usr/lib/python3.8/site-packages/borg/testsuite/remote.py +usr/lib/python3.8/site-packages/borg/testsuite/repository.py +usr/lib/python3.8/site-packages/borg/testsuite/shellpattern.py +usr/lib/python3.8/site-packages/borg/testsuite/upgrader.py +usr/lib/python3.8/site-packages/borg/testsuite/version.py +usr/lib/python3.8/site-packages/borg/testsuite/xattr.py usr/lib/python3.8/site-packages/borg/upgrader.py usr/lib/python3.8/site-packages/borg/version.py usr/lib/python3.8/site-packages/borg/xattr.py -- 2.20.1

1 0

[PATCH 01/11] location-functions.pl: Refactor get_locations() function to use the Location module.
by Stefan Schantl 22 Sep '20

22 Sep '20

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- config/cfgroot/location-functions.pl | 30 +++++++++------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/config/cfgroot/location-functions.pl b/config/cfgroot/location-functions.pl index ab99e71d3..a94d5909e 100644 --- a/config/cfgroot/location-functions.pl +++ b/config/cfgroot/location-functions.pl @@ -38,6 +38,9 @@ my %not_iso_3166_location = ( "fx" => "France, Metropolitan" ); +# Array which contains special country codes. +my @special_locations = ( "A1", "A2", "A3" ); + # Directory where the libloc database and keyfile lives. our $location_dir = "/var/lib/location/"; @@ -167,29 +170,14 @@ sub get_full_country_name($) { # Function to get all available locations. sub get_locations() { - my @locations = (); - - # Get listed country codes from ISO 3166-1. - my @locations_lc = &Locale::Codes::Country::all_country_codes(); - - # The Codes::Country module provides the country codes only in lower case. - # So we have to loop over the array and convert them into upper case format. - foreach my $ccode (@locations_lc) { - # Convert the country code to uppercase. - my $ccode_uc = uc($ccode); + # Create libloc database handle. + my $db_handle = &init(); - # Add the converted ccode to the locations array. - push(@locations, $ccode_uc); - } - - # Add locations from not_iso_3166_locations. - foreach my $location (keys %not_iso_3166_location) { - # Convert the location into uppercase. - my $location_uc = uc($location); + # Get locations which are stored in the location database. + my @database_locations = &Location::database_countries($db_handle); - # Add the location to the locations array. - push(@locations, $location_uc); - } + # Merge special locations array and the database locations array. + my @locations = (@special_locations, @database_locations); # Sort locations array in alphabetical order. my @sorted_locations = sort(@locations); -- 2.20.1

1 10

[PATCH] htop: Update to 3.0.2
by Matthias Fischer 19 Sep '20

19 Sep '20

For details see: https://github.com/htop-dev/htop/blob/master/ChangeLog Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/htop | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lfs/htop b/lfs/htop index 272c8feb9..8bf588be9 100644 --- a/lfs/htop +++ b/lfs/htop @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 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 # @@ -24,7 +24,7 @@ include Config -VER = 2.2.0 +VER = 3.0.2 THISAPP = htop-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = htop -PAK_VER = 12 +PAK_VER = 13 DEPS = @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0d816b6beed31edc75babcfbf863ffa8 +$(DL_FILE)_MD5 = fb848a1c91871d134c785bccb560ca8d install : $(TARGET) -- 2.18.0

1 0

[PATCH] index.cgi: Fix CPU architecture check
by Michael Tremer 19 Sep '20

19 Sep '20

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- html/cgi-bin/index.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 8e7207d0c..5aec4c594 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -547,7 +547,7 @@ if ( ! -e "/var/ipfire/main/send_profile") { # Legacy architecture my ($sysname, $nodename, $release, $version, $machine) = &POSIX::uname(); -if ($machine =~ m/^i?86$/) { +if ($machine =~ m/^i.86$/) { $warnmessage .= "<li>$Lang::tr{'legacy architecture warning'}</li>"; } -- 2.20.1

1 0

[PATCH 0/1] Enable ACPI support on ARM64
by Mathew McBride 18 Sep '20

18 Sep '20

Hi all, It's been a while. This patch enables ACPI support for ARM64 which allows IPFire to boot on ARM "server" machines which use EFI/TianoCore to boot. One such example is the QEMU arm64 "virt" machine with an EFI firmware - https://releases.linaro.org/reference-platform/enterprise/latest/uefi/ The arm64 images from "standard" distros (Debian/Ubuntu/Fedora/etc.) are designed to work with this EFI+ACPI combination. There should be no regressions for any current arm64 hardware supported by IPFire - Linux will only use ACPI tables if present, if not fallback to device tree. The use case for this is to run our hardware[1] using the muvirt[2] VM host, which also allows some "blending" of OpenWrt functions on the host, e.g the host can manage bridging of Ethernet ports and WiFi hostapd so IPFire can work with simple Ethernet interfaces for the Red/Green/Blue/Orange. You can see the Fireinfo profile for the VM here - https://fireinfo.ipfire.org/profile/67aa9a9cff94f3ef8f61866197a57106ccdcea4b I have successfully speedtested ~1Gbps though this virtualized setup so this should provide more than adequate performance for most situations. It is not possible to run IPFire directly on our LS1088 (Ten64) platform at the moment as 4.14 does not have working Ethernet (DPAA2) and PCIe controller drivers. It is possible to backport them from later kernels (and I did have a go at this a few months ago) - but it is a very large patch (>1M lines) and that is before considering any of the features and fixes in more recent kernels (e.g backporting PHYLINK). When IPFire moves to a newer kernel that would be a good time to revisit this. [1] - https://traverse.com.au/products/ten64-networking-platform/ [2] - https://gitlab.com/traversetech/muvirt Mathew McBride (1): kernel: enable ACPI support on ARM64 config/kernel/kernel.config.aarch64-ipfire | 99 +++++++++++++++++++++- 1 file changed, 96 insertions(+), 3 deletions(-) -- 2.19.1

2 5

[PATCH] graphs: Fix rendering CPU graphs after number of cores decreased
by Michael Tremer 18 Sep '20

18 Sep '20

Fixes: #12193 - cpu graphs cannot created if smt is disabled Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- config/cfgroot/graphs.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index a7b82fed3..f6e6e25a3 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -172,7 +172,7 @@ sub updatecpugraph { } for(my $i = 2; $i < $cpucount; $i++) { - $addstring .= "+,"; + $addstring .= "ADDNAN,"; } if ( $cpucount > 1){ @@ -190,7 +190,7 @@ sub updatecpugraph { push(@command,$nice,$interrupt,$steal,$user,$system,$idle,$iowait,$irq); } - push(@command,"CDEF:total=user,system,idle,iowait,irq,nice,interrupt,steal,+,+,+,+,+,+,+" + push(@command,"CDEF:total=user,system,idle,iowait,irq,nice,interrupt,steal,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN" ,"CDEF:userpct=100,user,total,/,*" ,"CDEF:nicepct=100,nice,total,/,*" ,"CDEF:interruptpct=100,interrupt,total,/,*" -- 2.20.1

1 0

[PATCH] htop: Update to 3.0.1
by Matthias Fischer 17 Sep '20

17 Sep '20

For details see: https://htop.dev/downloads.html Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/htop | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lfs/htop b/lfs/htop index 272c8feb9..f31f47851 100644 --- a/lfs/htop +++ b/lfs/htop @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 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 # @@ -24,7 +24,7 @@ include Config -VER = 2.2.0 +VER = 3.0.1 THISAPP = htop-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = htop -PAK_VER = 12 +PAK_VER = 13 DEPS = @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0d816b6beed31edc75babcfbf863ffa8 +$(DL_FILE)_MD5 = 007907d7104b49d2d1b3e5679923552c install : $(TARGET) -- 2.18.0

2 2

[PATCH] logwatch: Update to 7.5.4
by Matthias Fischer 17 Sep '20

17 Sep '20

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/logwatch | 11 +++++++---- .../logwatch-7.3.6-date_manip6.patch | 0 ...logwatch-7.5.4-dhcpd_reuse_lease_entries.patch | 15 +++++++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) rename src/patches/{ => logwatch}/logwatch-7.3.6-date_manip6.patch (100%) create mode 100644 src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch diff --git a/lfs/logwatch b/lfs/logwatch index a980b1b40..abf1ba02f 100644 --- a/lfs/logwatch +++ b/lfs/logwatch @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 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 # @@ -24,7 +24,7 @@ include Config -VER = 7.5.3 +VER = 7.5.4 THISAPP = logwatch-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8bcf3edc5a4687c8aad1b9c01e2be54b +$(DL_FILE)_MD5 = 47b35a8e5efc415b4a775415255b8d1f install : $(TARGET) @@ -71,7 +71,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && sed -e "s/^TEMPDIR=.*/TEMPDIR=\"\/tmp\"/g" -i install_logwatch.sh - cd $(DIR_APP)/lib && patch < $(DIR_SRC)/src/patches/logwatch-7.3.6-date_manip6.patch + + cd $(DIR_APP)/lib && patch < $(DIR_SRC)/src/patches/logwatch/logwatch-7.3.6-date_manip6.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch + @cd $(DIR_APP) && chmod 755 install_logwatch.sh cd $(DIR_APP) && yes "" | ./install_logwatch.sh diff --git a/src/patches/logwatch-7.3.6-date_manip6.patch b/src/patches/logwatch/logwatch-7.3.6-date_manip6.patch similarity index 100% rename from src/patches/logwatch-7.3.6-date_manip6.patch rename to src/patches/logwatch/logwatch-7.3.6-date_manip6.patch diff --git a/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch b/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch new file mode 100644 index 000000000..a66170ae5 --- /dev/null +++ b/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch @@ -0,0 +1,15 @@ +diff --git a/scripts/services/dhcpd b/scripts/services/dhcpd +index 87312f7..bb5cd4c 100644 +--- a/scripts/services/dhcpd ++++ b/scripts/services/dhcpd +@@ -79,7 +79,9 @@ while (my $line = <STDIN>) { + ($line =~ /^Solicit message from/) or + ($line =~ /^Sending Advertise to/) or + ($line =~ /^pool [0-9a-f]+ /) or +- ($line =~ /^[^ ]* file: /) ++ ($line =~ /^[^ ]* file: /) or ++ ($line =~ /^reuse_lease: lease age \d+ $secs$ under \d+\% threshold, reply with unaltered, existing lease for/) or ++ 0 # noop, but makes diffs easier when appending ignore statements + ) { + # Ignore these lines + } elsif ($line =~ s/Listening on\s+//) { -- 2.18.0

2 5

[PATCH] IPsec: Bring down connections after reloading configuration
by Michael Tremer 17 Sep '20

17 Sep '20

It could happen that the remote peer re-established the connection before "ipsec reload" removed it from the daemon. Now, we write the configuration files first, reload them and then bring down any connections that are still established. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- html/cgi-bin/vpnmain.cgi | 6 +++--- src/misc-progs/ipsecctrl.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index e0f2c7a5e..ae5e80d38 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -689,12 +689,12 @@ END my $test = `/usr/bin/openssl verify -CAfile ${General::swroot}/ca/$cahash{$cgiparams{'KEY'}}[0]cert.pem ${General::swroot}/certs/$confighash{$key}[1]cert.pem`; if ($test =~ /: OK/) { # Delete connection - system('/usr/local/bin/ipsecctrl', 'D', $key) if (&vpnenabled); unlink ("${General::swroot}/certs/$confighash{$key}[1]cert.pem"); unlink ("${General::swroot}/certs/$confighash{$key}[1].p12"); delete $confighash{$key}; &General::writehasharray("${General::swroot}/vpn/config", \%confighash); &writeipsecfiles(); + system('/usr/local/bin/ipsecctrl', 'D', $key) if (&vpnenabled); } } unlink ("${General::swroot}/ca/$cahash{$cgiparams{'KEY'}}[0]cert.pem"); @@ -1227,10 +1227,10 @@ END &writeipsecfiles(); system('/usr/local/bin/ipsecctrl', 'S', $cgiparams{'KEY'}) if (&vpnenabled); } else { - system('/usr/local/bin/ipsecctrl', 'D', $cgiparams{'KEY'}) if (&vpnenabled); $confighash{$cgiparams{'KEY'}}[0] = 'off'; &General::writehasharray("${General::swroot}/vpn/config", \%confighash); &writeipsecfiles(); + system('/usr/local/bin/ipsecctrl', 'D', $cgiparams{'KEY'}) if (&vpnenabled); } sleep $sleepDelay; } else { @@ -1261,12 +1261,12 @@ END &General::readhasharray("${General::swroot}/vpn/config", \%confighash); if ($confighash{$cgiparams{'KEY'}}) { - system('/usr/local/bin/ipsecctrl', 'D', $cgiparams{'KEY'}) if (&vpnenabled); unlink ("${General::swroot}/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem"); unlink ("${General::swroot}/certs/$confighash{$cgiparams{'KEY'}}[1].p12"); delete $confighash{$cgiparams{'KEY'}}; &General::writehasharray("${General::swroot}/vpn/config", \%confighash); &writeipsecfiles(); + system('/usr/local/bin/ipsecctrl', 'D', $cgiparams{'KEY'}) if (&vpnenabled); } else { $errormessage = $Lang::tr{'invalid key'}; } diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c index 2a64775f0..001587fca 100644 --- a/src/misc-progs/ipsecctrl.c +++ b/src/misc-progs/ipsecctrl.c @@ -141,14 +141,14 @@ void turn_connection_off (char *name) { */ char command[STRING_SIZE]; + // Reload, so the connection is dropped. + ipsec_reload(); + // Bring down the connection. snprintf(command, STRING_SIZE - 1, "/usr/sbin/ipsec down %s >/dev/null", name); safe_system(command); - // Reload, so the connection is dropped. - ipsec_reload(); - // Reload the IPsec firewall policy safe_system("/usr/lib/firewall/ipsec-policy >/dev/null"); -- 2.20.1

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development September 2020