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 dcb3c4aaac5f572f0198d09a504b1cd8103d77b6 (commit) via 652da33c019a9ed4bab40670c88356b18ac9cccf (commit) via 7ab7066f747f224e1da247511c83129b4b1fc744 (commit) via 68f661180f6a6d2b27f6dddb03a77addd18bf82f (commit) from 678327a8fd166e611b6b7d2d9bc866897b787989 (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 dcb3c4aaac5f572f0198d09a504b1cd8103d77b6 Author: Peter Müller peter.mueller@ipfire.org Date: Mon Apr 4 05:36:06 2022 +0000

Core Update 167: Ship qos.cgi

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit 652da33c019a9ed4bab40670c88356b18ac9cccf Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Apr 3 18:04:04 2022 +0200

qos.cgi: Removed last two P2P lines

P2P "has left da house"...

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Reviewed-by: Peter Müller peter.mueller@ipfire.org

commit 7ab7066f747f224e1da247511c83129b4b1fc744 Author: Peter Müller peter.mueller@ipfire.org Date: Mon Apr 4 05:35:41 2022 +0000

Core Update 167: Ship nano

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit 68f661180f6a6d2b27f6dddb03a77addd18bf82f Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Apr 3 18:10:47 2022 +0200

nano: Update to 6.2

For details see: https://www.nano-editor.org/news.php

"The file browser clears the prompt bar also when using --minibar. Linting now works also with a newer 'pyflakes'."

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Reviewed-by: Peter Müller peter.mueller@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/167/filelists/files | 1 + config/rootfiles/core/167/filelists/nano | 1 + html/cgi-bin/qos.cgi | 2 -- lfs/nano | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) create mode 120000 config/rootfiles/core/167/filelists/nano

Difference in files: diff --git a/config/rootfiles/core/167/filelists/files b/config/rootfiles/core/167/filelists/files index 41871bbeb..5c6669d2e 100644 --- a/config/rootfiles/core/167/filelists/files +++ b/config/rootfiles/core/167/filelists/files @@ -5,6 +5,7 @@ lib/udev/network-hotplug-bridges srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/location-block.cgi +srv/web/ipfire/cgi-bin/qos.cgi usr/lib/firewall/rules.pl var/ipfire/backup/include var/ipfire/ids-functions.pl diff --git a/config/rootfiles/core/167/filelists/nano b/config/rootfiles/core/167/filelists/nano new file mode 120000 index 000000000..2f07279c0 --- /dev/null +++ b/config/rootfiles/core/167/filelists/nano @@ -0,0 +1 @@ +../../../common/nano \ No newline at end of file diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index f3bbd1bf4..6d1c61638 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -474,13 +474,11 @@ imq0;200;1;$DOWN[20];$DOWN[1];;;8;VoIP; imq0;203;4;$DOWN[20];$DOWN[1];;;0;VPN; imq0;204;5;$DOWN[20];$DOWN[1];;;8;Webtraffic; imq0;210;6;1;$DOWN[1];;;0;Default; -imq0;220;7;1;$DOWN[1];;;1;P2P; $qossettings{'RED_DEV'};101;1;$UP[10];$UP[1];;;8;ACKs; $qossettings{'RED_DEV'};102;2;$UP[10];$UP[1];;;8;VoIP; $qossettings{'RED_DEV'};103;4;$UP[10];$UP[1];;;2;VPN; $qossettings{'RED_DEV'};104;5;$UP[10];$UP[1];;;8;Webtraffic; $qossettings{'RED_DEV'};110;6;1;$UP[1];;;0;Default; -$qossettings{'RED_DEV'};120;7;1;$UP[1];;;1;P2P; END ; close FILE; diff --git a/lfs/nano b/lfs/nano index 25f62f5da..1d684d0b1 100644 --- a/lfs/nano +++ b/lfs/nano @@ -24,7 +24,7 @@

include Config

-VER = 6.1 +VER = 6.2

THISAPP = nano-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = ac52da22f70ebcc7f40f2c694ae10f4cdd802ca40afb0692951c53ca4a2d30d7ef86684bf63d6208e9872fa17a30a0cf80fff1d35c744adb6c24f16d6c4a7f3f +$(DL_FILE)_BLAKE2 = 89e75fdd222a4d5e5eceb164a3b4eaf8ad24622fae95dd142556e110a63ad1202d489b7881fc063ecc716d9a409021cd7184c70116f68aa7e188012c2510ecde

install : $(TARGET)

hooks/post-receive -- IPFire 2.x development tree