This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 9efdbe103b8d98b80125407443e906373c534269 (commit) via 8b97a537f5f9e798a1ab307b2c32bd9a8b0f6913 (commit) via 2f908d96489d6de9f1acc783c23f7fbe0057ed1d (commit) via f02dc11a38c1144fcef322cf34fc6417aae4355f (commit) from 3421b1abd824d680c68948a83123469737b1bbfa (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 9efdbe103b8d98b80125407443e906373c534269 Author: Peter Müller peter.mueller@ipfire.org Date: Fri Apr 29 19:48:26 2022 +0000
Core Update 168: Ship changed rules.pl
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit 8b97a537f5f9e798a1ab307b2c32bd9a8b0f6913 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Apr 25 21:04:53 2022 +0200
rules.pl: Fix automatic ipset sets cleanup.
The array of used/loaded ipsets needs to be reloaded before the cleanup can be started to also handle sets which are loaded during runtime.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Acked-by: Peter Müller peter.mueller@ipfire.org
commit 2f908d96489d6de9f1acc783c23f7fbe0057ed1d Author: Peter Müller peter.mueller@ipfire.org Date: Fri Apr 29 19:47:31 2022 +0000
Core Update 168: Ship libinih
Signed-off-by: Peter Müller peter.mueller@ipfire.org
commit f02dc11a38c1144fcef322cf34fc6417aae4355f Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Apr 27 19:17:42 2022 +0200
libinih: Update to version r55
- Update from version r53 to r55 - Update of rootfile not required - Changelog inih version 55 Added "version" to meson.build config: #135 (but bumped up to 55 in a subsequent commit, for this release). inih version 54 Mainly #134, adding the visibility symbols to the Meson build config, but also other small tweaks to tests and so on.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Peter Müller peter.mueller@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/firewall/rules.pl | 14 +++++++++++--- config/rootfiles/core/168/filelists/files | 1 + config/rootfiles/core/168/filelists/libinih | 1 + lfs/libinih | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) create mode 120000 config/rootfiles/core/168/filelists/libinih
Difference in files: diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index 19dc7a6d1..432619184 100644 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -122,7 +122,7 @@ undef (@dummy);
sub main { # Get currently used ipset sets. - &ipset_get_sets(); + @ipset_used_sets = &ipset_get_sets();
# Flush all chains. &flush(); @@ -922,6 +922,8 @@ sub firewall_is_in_subnet { }
sub ipset_get_sets () { + my @sets; + # Get all currently used ipset lists and store them in an array. my @output = `$IPSET -n list`;
@@ -931,14 +933,17 @@ sub ipset_get_sets () { chomp($set);
# Add the set the array of used sets. - push(@ipset_used_sets, $set); + push(@sets, $set); }
# Display used sets in debug mode. if($DEBUG) { print "Used ipset sets:\n"; - print "@ipset_used_sets\n\n"; + print "@sets\n\n"; } + + # Return the array of sets. + return @sets; }
sub ipset_restore ($) { @@ -998,6 +1003,9 @@ sub ipset_call_restore ($) { }
sub ipset_cleanup () { + # Reload the array of used sets. + @ipset_used_sets = &ipset_get_sets(); + # Loop through the array of used sets. foreach my $set (@ipset_used_sets) { # Check if this set is still in use. diff --git a/config/rootfiles/core/168/filelists/files b/config/rootfiles/core/168/filelists/files index 95bae91db..858809caf 100644 --- a/config/rootfiles/core/168/filelists/files +++ b/config/rootfiles/core/168/filelists/files @@ -390,6 +390,7 @@ lib/firmware/rtw88/rtw8821c_fw.bin lib/firmware/rtw88/rtw8822c_fw.bin lib/firmware/rtw89/rtw8852a_fw.bin lib/firmware/wfx/wfm_wf200_C0.sec +usr/lib/firewall/rules.pl srv/web/ipfire/cgi-bin/media.cgi srv/web/ipfire/cgi-bin/wakeonlan.cgi srv/web/ipfire/html/themes/ipfire/include/functions.pl diff --git a/config/rootfiles/core/168/filelists/libinih b/config/rootfiles/core/168/filelists/libinih new file mode 120000 index 000000000..7f703bed7 --- /dev/null +++ b/config/rootfiles/core/168/filelists/libinih @@ -0,0 +1 @@ +../../../common/libinih \ No newline at end of file diff --git a/lfs/libinih b/lfs/libinih index df46d5218..0b4793d5d 100644 --- a/lfs/libinih +++ b/lfs/libinih @@ -24,7 +24,7 @@
include Config
-VER = r53 +VER = r55
THISAPP = inih-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 1242e6273c9dd9a11ea026a3495a487b2aa72d8e01f34304d8568c88897ae9c9bb425246f992dc16f4dc2210ec14c597d0ef595cec84ff98a5d6101ee5a643b9 +$(DL_FILE)_BLAKE2 = 28b5e04e54e31b3e0392b44799a2c2e75c1fe00527491a857480b7e960302f2438d29652b131dae5147487c863d93f577b67aeff3ab5f863546d3661628d8236
install : $(TARGET)
hooks/post-receive -- IPFire 2.x development tree