[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7b77ed8c9432c0f550904e5a1c6d049d12517e04
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 7b77ed8c9432c0f550904e5a1c6d049d12517e04 (commit) via 0deeec6dd905162e83538ebff6411d36956190be (commit) via 7ec26cb4979943eb94a40402b402986715e182ba (commit) via 6f6c9f6b6a957e470814488c6b99aafa46baebca (commit) via 31b10034e91ca21a6f37a47f1dda8016027eb5d8 (commit) via d54846e0a2dc482751239a4e84b9f3c04c84dfea (commit) via 4e40a3e23fe1ad61b98c54617fa27f192720f463 (commit) from cf4b9118e32d9d4546cbeac7b63462bdd4de77b5 (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 7b77ed8c9432c0f550904e5a1c6d049d12517e04 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Aug 3 09:44:02 2024 +0000
core188: Ship the VLAN hotplug script
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0deeec6dd905162e83538ebff6411d36956190be Author: Adolf Belka adolf.belka@ipfire.org Date: Mon Jul 29 16:01:12 2024 +0200
network-hotplug-vlan: Fix for bug 12676
- https://bugzilla.ipfire.org/show_bug.cgi?id=12676#c3
Suggested-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7ec26cb4979943eb94a40402b402986715e182ba Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Aug 3 09:42:15 2024 +0000
core188: Ship rrdtool
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6f6c9f6b6a957e470814488c6b99aafa46baebca Author: Matthias Fischer matthias.fischer@ipfire.org Date: Tue Jul 30 18:23:55 2024 +0200
rrdtool: Update tp 1.9.0
For details see: https://github.com/oetiker/rrdtool-1.x/releases/tag/v1.9.0
"RRDtool 1.9.0 — 2024-07-29 Bugfixes
Fix ytop and ybase adjustments for overlaping area issue on transparent areas @turban Suppress warnings of implicit fall through @youpong Update tarball download link in doc @c72578 Fix unsigned integer overflow in rrdtool first. Add test for rrd_first() @c72578 Fix tests under MSYS2 (Windows) @c72578 Fix BUILD_DATE in rrdtool help output @c72578 acinclude.m4: Include <stdlib.h> when using exit @ryandesign rrdtool-release: Create NUMVERS from VERSION file @c72578 Avoids leaking of file descriptors in multi threaded programs by @ensc Avoids potential unterminated string because of fixed PATH_MAX buffer Fix extra reference of parameters of rrd_fetch_dbi_{long,double} @jamborm"
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 31b10034e91ca21a6f37a47f1dda8016027eb5d8 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Jul 26 14:32:24 2024 +0200
bird: Update to version 2.15.1
- Update from version 2.14 to 2.15.1 - Update of rootfile not required - Changelog 2.15.1 o OSPF: Fix regression in handling PtP links o RPKI: Handle connection resets properly o Static: Reject invalid combination of options o Fix builds with limited set of protocols 2.15 o BGP: Send hold timer o BGP: New options to specify required BGP capabilities o BFD: Improvements to 'show bfd sessions' command o RPKI: New 'local address' configuration option o Linux: Support for more route attributes, including TCP congestion control algorithm o Support for UDP logging o Static routes can have both nexthop and interface specified o Completion of command options in BIRD client o Many bugfixes and improvements
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d54846e0a2dc482751239a4e84b9f3c04c84dfea Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Aug 3 09:41:46 2024 +0000
core188: Ship nasm
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4e40a3e23fe1ad61b98c54617fa27f192720f463 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Jul 14 00:22:05 2024 +0200
nasm: Update to 2.16.03
For details see: https://nasm.us/doc/nasmdocc.html
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/rrdtool | 196 ++++++++++----------- config/rootfiles/core/188/filelists/files | 1 + config/rootfiles/core/188/filelists/nasm | 1 + .../{oldcore/111 => core/188}/filelists/rrdtool | 0 config/udev/network-hotplug-vlan | 42 +++-- lfs/bird | 6 +- lfs/nasm | 6 +- lfs/rrdtool | 6 +- 8 files changed, 129 insertions(+), 129 deletions(-) create mode 120000 config/rootfiles/core/188/filelists/nasm copy config/rootfiles/{oldcore/111 => core/188}/filelists/rrdtool (100%)
Difference in files: diff --git a/config/rootfiles/common/rrdtool b/config/rootfiles/common/rrdtool index d7503ba154..67d9ea93ec 100644 --- a/config/rootfiles/common/rrdtool +++ b/config/rootfiles/common/rrdtool @@ -20,104 +20,104 @@ usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/RRDs.pm #usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/RRDs/.packlist usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/RRDs/RRDs.so #usr/lib/pkgconfig/librrd.pc -#usr/share/doc/rrdtool-1.8.0 -#usr/share/doc/rrdtool-1.8.0/html -#usr/share/doc/rrdtool-1.8.0/html/RRDp.html -#usr/share/doc/rrdtool-1.8.0/html/RRDs.html -#usr/share/doc/rrdtool-1.8.0/html/bin_dec_hex.html -#usr/share/doc/rrdtool-1.8.0/html/cdeftutorial.html -#usr/share/doc/rrdtool-1.8.0/html/index.html -#usr/share/doc/rrdtool-1.8.0/html/librrd.html -#usr/share/doc/rrdtool-1.8.0/html/rpntutorial.html -#usr/share/doc/rrdtool-1.8.0/html/rrd-beginners.html -#usr/share/doc/rrdtool-1.8.0/html/rrd_pdpcalc.html -#usr/share/doc/rrdtool-1.8.0/html/rrdbuild.html -#usr/share/doc/rrdtool-1.8.0/html/rrdcached.html -#usr/share/doc/rrdtool-1.8.0/html/rrdcgi.html -#usr/share/doc/rrdtool-1.8.0/html/rrdcreate.html -#usr/share/doc/rrdtool-1.8.0/html/rrddump.html -#usr/share/doc/rrdtool-1.8.0/html/rrdfetch.html -#usr/share/doc/rrdtool-1.8.0/html/rrdfirst.html -#usr/share/doc/rrdtool-1.8.0/html/rrdflushcached.html -#usr/share/doc/rrdtool-1.8.0/html/rrdgraph.html -#usr/share/doc/rrdtool-1.8.0/html/rrdgraph_data.html -#usr/share/doc/rrdtool-1.8.0/html/rrdgraph_examples.html -#usr/share/doc/rrdtool-1.8.0/html/rrdgraph_graph.html -#usr/share/doc/rrdtool-1.8.0/html/rrdgraph_rpn.html -#usr/share/doc/rrdtool-1.8.0/html/rrdinfo.html -#usr/share/doc/rrdtool-1.8.0/html/rrdlast.html -#usr/share/doc/rrdtool-1.8.0/html/rrdlastupdate.html -#usr/share/doc/rrdtool-1.8.0/html/rrdlist.html -#usr/share/doc/rrdtool-1.8.0/html/rrdresize.html -#usr/share/doc/rrdtool-1.8.0/html/rrdrestore.html -#usr/share/doc/rrdtool-1.8.0/html/rrdthreads.html -#usr/share/doc/rrdtool-1.8.0/html/rrdtool.html -#usr/share/doc/rrdtool-1.8.0/html/rrdtune.html -#usr/share/doc/rrdtool-1.8.0/html/rrdtutorial.html -#usr/share/doc/rrdtool-1.8.0/html/rrdupdate.html -#usr/share/doc/rrdtool-1.8.0/html/rrdxport.html -#usr/share/doc/rrdtool-1.8.0/txt -#usr/share/doc/rrdtool-1.8.0/txt/bin_dec_hex.pod -#usr/share/doc/rrdtool-1.8.0/txt/bin_dec_hex.txt -#usr/share/doc/rrdtool-1.8.0/txt/cdeftutorial.pod -#usr/share/doc/rrdtool-1.8.0/txt/cdeftutorial.txt -#usr/share/doc/rrdtool-1.8.0/txt/librrd.txt -#usr/share/doc/rrdtool-1.8.0/txt/rpntutorial.pod -#usr/share/doc/rrdtool-1.8.0/txt/rpntutorial.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrd-beginners.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrd-beginners.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrd_pdpcalc.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrd_pdpcalc.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdbuild.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdbuild.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdcached.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdcached.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdcgi.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdcgi.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdcreate.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdcreate.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrddump.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrddump.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdfetch.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdfetch.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdfirst.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdfirst.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdflushcached.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdflushcached.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdgraph.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdgraph.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdgraph_data.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdgraph_data.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdgraph_examples.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdgraph_examples.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdgraph_graph.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdgraph_graph.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdgraph_rpn.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdgraph_rpn.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdinfo.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdinfo.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdlast.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdlast.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdlastupdate.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdlastupdate.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdlist.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdlist.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdresize.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdresize.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdrestore.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdrestore.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdthreads.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdthreads.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdtool.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdtool.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdtune.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdtune.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdtutorial.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdtutorial.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdupdate.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdupdate.txt -#usr/share/doc/rrdtool-1.8.0/txt/rrdxport.pod -#usr/share/doc/rrdtool-1.8.0/txt/rrdxport.txt +#usr/share/doc/rrdtool-1.9.0 +#usr/share/doc/rrdtool-1.9.0/html +#usr/share/doc/rrdtool-1.9.0/html/RRDp.html +#usr/share/doc/rrdtool-1.9.0/html/RRDs.html +#usr/share/doc/rrdtool-1.9.0/html/bin_dec_hex.html +#usr/share/doc/rrdtool-1.9.0/html/cdeftutorial.html +#usr/share/doc/rrdtool-1.9.0/html/index.html +#usr/share/doc/rrdtool-1.9.0/html/librrd.html +#usr/share/doc/rrdtool-1.9.0/html/rpntutorial.html +#usr/share/doc/rrdtool-1.9.0/html/rrd-beginners.html +#usr/share/doc/rrdtool-1.9.0/html/rrd_pdpcalc.html +#usr/share/doc/rrdtool-1.9.0/html/rrdbuild.html +#usr/share/doc/rrdtool-1.9.0/html/rrdcached.html +#usr/share/doc/rrdtool-1.9.0/html/rrdcgi.html +#usr/share/doc/rrdtool-1.9.0/html/rrdcreate.html +#usr/share/doc/rrdtool-1.9.0/html/rrddump.html +#usr/share/doc/rrdtool-1.9.0/html/rrdfetch.html +#usr/share/doc/rrdtool-1.9.0/html/rrdfirst.html +#usr/share/doc/rrdtool-1.9.0/html/rrdflushcached.html +#usr/share/doc/rrdtool-1.9.0/html/rrdgraph.html +#usr/share/doc/rrdtool-1.9.0/html/rrdgraph_data.html +#usr/share/doc/rrdtool-1.9.0/html/rrdgraph_examples.html +#usr/share/doc/rrdtool-1.9.0/html/rrdgraph_graph.html +#usr/share/doc/rrdtool-1.9.0/html/rrdgraph_rpn.html +#usr/share/doc/rrdtool-1.9.0/html/rrdinfo.html +#usr/share/doc/rrdtool-1.9.0/html/rrdlast.html +#usr/share/doc/rrdtool-1.9.0/html/rrdlastupdate.html +#usr/share/doc/rrdtool-1.9.0/html/rrdlist.html +#usr/share/doc/rrdtool-1.9.0/html/rrdresize.html +#usr/share/doc/rrdtool-1.9.0/html/rrdrestore.html +#usr/share/doc/rrdtool-1.9.0/html/rrdthreads.html +#usr/share/doc/rrdtool-1.9.0/html/rrdtool.html +#usr/share/doc/rrdtool-1.9.0/html/rrdtune.html +#usr/share/doc/rrdtool-1.9.0/html/rrdtutorial.html +#usr/share/doc/rrdtool-1.9.0/html/rrdupdate.html +#usr/share/doc/rrdtool-1.9.0/html/rrdxport.html +#usr/share/doc/rrdtool-1.9.0/txt +#usr/share/doc/rrdtool-1.9.0/txt/bin_dec_hex.pod +#usr/share/doc/rrdtool-1.9.0/txt/bin_dec_hex.txt +#usr/share/doc/rrdtool-1.9.0/txt/cdeftutorial.pod +#usr/share/doc/rrdtool-1.9.0/txt/cdeftutorial.txt +#usr/share/doc/rrdtool-1.9.0/txt/librrd.txt +#usr/share/doc/rrdtool-1.9.0/txt/rpntutorial.pod +#usr/share/doc/rrdtool-1.9.0/txt/rpntutorial.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrd-beginners.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrd-beginners.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrd_pdpcalc.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrd_pdpcalc.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdbuild.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdbuild.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdcached.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdcached.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdcgi.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdcgi.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdcreate.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdcreate.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrddump.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrddump.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdfetch.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdfetch.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdfirst.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdfirst.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdflushcached.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdflushcached.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdgraph.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdgraph.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdgraph_data.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdgraph_data.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdgraph_examples.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdgraph_examples.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdgraph_graph.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdgraph_graph.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdgraph_rpn.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdgraph_rpn.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdinfo.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdinfo.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdlast.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdlast.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdlastupdate.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdlastupdate.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdlist.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdlist.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdresize.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdresize.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdrestore.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdrestore.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdthreads.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdthreads.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdtool.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdtool.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdtune.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdtune.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdtutorial.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdtutorial.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdupdate.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdupdate.txt +#usr/share/doc/rrdtool-1.9.0/txt/rrdxport.pod +#usr/share/doc/rrdtool-1.9.0/txt/rrdxport.txt #usr/share/locale/fr/LC_MESSAGES/rrdtool.mo #usr/share/locale/hu/LC_MESSAGES/rrdtool.mo #usr/share/man/man1/bin_dec_hex.1 diff --git a/config/rootfiles/core/188/filelists/files b/config/rootfiles/core/188/filelists/files index f28980d47b..f8447de557 100644 --- a/config/rootfiles/core/188/filelists/files +++ b/config/rootfiles/core/188/filelists/files @@ -2,6 +2,7 @@ etc/rc.d/init.d/connectd etc/rc.d/init.d/functions etc/rc.d/init.d/networking/functions.network etc/rc.d/init.d/networking/red +lib/udev/network-hotplug-vlan srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/system.cgi srv/web/ipfire/cgi-bin/vulnerabilities.cgi diff --git a/config/rootfiles/core/188/filelists/nasm b/config/rootfiles/core/188/filelists/nasm new file mode 120000 index 0000000000..94ced66441 --- /dev/null +++ b/config/rootfiles/core/188/filelists/nasm @@ -0,0 +1 @@ +../../../common/nasm \ No newline at end of file diff --git a/config/rootfiles/core/188/filelists/rrdtool b/config/rootfiles/core/188/filelists/rrdtool new file mode 120000 index 0000000000..7a82e414b6 --- /dev/null +++ b/config/rootfiles/core/188/filelists/rrdtool @@ -0,0 +1 @@ +../../../common/rrdtool \ No newline at end of file diff --git a/config/udev/network-hotplug-vlan b/config/udev/network-hotplug-vlan index 178e1a67ba..07ae5a61c0 100644 --- a/config/udev/network-hotplug-vlan +++ b/config/udev/network-hotplug-vlan @@ -1,25 +1,23 @@ #!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2015 IPFire Team info@ipfire.org # -# # -############################################################################ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2015-2024 IPFire Team info@ipfire.org # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# 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/. # +# # +###############################################################################
[ -n "${INTERFACE}" ] || exit 2
@@ -62,7 +60,7 @@ for interface in green0 red0 blue0 orange0; do
# If the parent device (MAC or name) does not match the interface that # has just come up, we will go on for the next one. - [ "${PARENT_DEV}" = "${INTERFACE}" ] || [ "${PARENT_DEV}" = "$(</sys/class/net/${INTERFACE}/address)" ] || continue + [ "${PARENT_DEV}" = "${INTERFACE}" -o "${PARENT_DEV}" = "$(</sys/class/net/${INTERFACE}/address)" ] || continue
# If the current zone is operating in bridge mode, give the VLAN interface a generic name (e.g. eth0.99 for VLAN 99 on eth0) if [ "${ZONE_MODE}" = "bridge" ]; then diff --git a/lfs/bird b/lfs/bird index e9dc6c5f8d..eae26ffbea 100644 --- a/lfs/bird +++ b/lfs/bird @@ -26,7 +26,7 @@ include Config
SUMMARY = The BIRD Internet Routing Daemon
-VER = 2.14 +VER = 2.15.1
THISAPP = bird-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = bird -PAK_VER = 13 +PAK_VER = 14
DEPS =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = fe16b89c7f0ff35c5126366920960e0c55f57fe343380b2c32230122cf24f9abc3eb4d6ed9f37d2176f9e9340a83dffd1e68fed276b59b86cf1bdf5b8bd3c169 +$(DL_FILE)_BLAKE2 = c3fe95ae2b8a3dca036278c8014f3ce2d1fd224c65c10abcc77b2cc1dbdfaa1b5766e8643b873a12ac33f00cd5e866aa7ce853ead78150ec4314b53457ad554a
install : $(TARGET)
diff --git a/lfs/nasm b/lfs/nasm index 635597c4a6..2eef65eaed 100644 --- a/lfs/nasm +++ b/lfs/nasm @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2024 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 2.15.05 +VER = 2.16.03
THISAPP = nasm-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = a41434965c2125577b762d907a0a3c251c75d9f9beac230fba4099182c7f7beb08c6d2c05c2432b0dc8ba829f24077f44c3096faea9bd0a533250e6dbbfaef35 +$(DL_FILE)_BLAKE2 = 742cbf330341fde9f778d8ca13e8c06199f48796d47028ac973d39e3d9e434450cdfebe89f6ab248d372bdaeb0c88a25eb7153a39b66fc05e770523d4c9e11e9
install : $(TARGET)
diff --git a/lfs/rrdtool b/lfs/rrdtool index abf2b50b39..4777f3afe3 100644 --- a/lfs/rrdtool +++ b/lfs/rrdtool @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2024 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 1.8.0 +VER = 1.9.0
THISAPP = rrdtool-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = d821d662af432c53760bc0e9636b84d9209933a810fa71091fc4c2b44518c89c7ad509bde7955d952279ee41464c3bfa4f631662dde61b6fff46699bb382653f +$(DL_FILE)_BLAKE2 = a5633b1bcacf53823f95f7899872e67d9941faec235c56546de8b66faf15a958a7c0d6a86d569c078e11a478dc272b1fbe784c3d3d9d45e8c3de696f0d6e378a
install : $(TARGET)
hooks/post-receive -- IPFire 2.x development tree
-
Michael Tremer