From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0742f6eda5838897abd4b5cc66bf2cf5c040951a Date: Tue, 30 Jan 2024 17:51:20 +0000 Message-ID: <4TPXlr4zP8z2xP9@people01.haj.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6689602535193878488==" List-Id: --===============6689602535193878488== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 0742f6eda5838897abd4b5cc66bf2cf5c040951a (commit) via 353e7b95be2453556cf50e2d9ffc2ea7005f112c (commit) via 10851f7ffab24ebd708e0ef2dc773642d3ebb612 (commit) from 65f2f43b0a920615ec0db41aa1a99b3f72f1b690 (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 0742f6eda5838897abd4b5cc66bf2cf5c040951a Author: Michael Tremer Date: Tue Jan 30 17:50:20 2024 +0000 core184: Ship vnstat =20 Signed-off-by: Michael Tremer commit 353e7b95be2453556cf50e2d9ffc2ea7005f112c Author: Matthias Fischer Date: Mon Jan 29 17:25:55 2024 +0100 vnstat: Update to 2.12 =20 For details see: https://humdi.net/vnstat/CHANGES =20 "2.12 / 21-Jan-2024 =20 - Fixed - QueryMode documentation in configuration file didn't match implement= ation or man page description - Daemon didn't try to import legacy databases when --noadd was used a= nd no current version database initially existed resulting in the process exiting even when something could have been done - Daemon didn't try to import legacy databases when --initdb was used = and no current version database initially existed, this behaviour can st= ill be enabled by using --noadd in combination with --initdb - Using --nodaemon and --initdb at the same time didn't result in an e= rror being shown - New - Add 95th percentile output as --95th, also available via --alert, --= json, --xml and image output, requires 5MinuteHours configuration to be se= t to at least 744 for storing all the necessary data - Add --json support for --alert - Database queries resulting in error exit with status 1 - Show spinning animation at the beginning of -l / --live output line, visibility configurable using LiveSpinner configuration option - Add -ic / --invert-colors option to image output for facilitating for example dark mode switching without needing to have multiple separate color configurations - Add dark mode option to image output example cgi (examples/vnstat.cg= i) - Add option 4 to QueryMode for selecting summary output of single interface regardless of the number of interfaces in the database - Add optional mode parameter to -q / --query for overriding QueryMode for summary output and for enabling control of summary output style regardless of the number of interfaces in the database - Add --startempty option to daemon for starting and keeping the daemon running even if no interfaces were discovered and the database is em= pty - Add --noremove option to daemon for disabling the automatic removal = of interfaces from database that aren't currently visible and haven't s= een any traffic - Add third mode option to --iflist and --dbiflist for getting only the interface count as output" =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit 10851f7ffab24ebd708e0ef2dc773642d3ebb612 Author: Matthias Fischer Date: Mon Jan 29 17:25:05 2024 +0100 mc: Update to 4.8.31 =20 For details see: https://midnight-commander.org/wiki/NEWS-4.8.31 =20 "Major changes since 4.8.30 =20 Core Minimal version of GLib is 2.32.0. =20 VFS fish: drop support of native FISH server and protocol. Rename VFS to = shell (#4232) extfs; uc1541 extfs: update up to 3.6 version (#4511) s3+: port to Python3 (#4324) Support for LZO/LZOP compression format (#4509) =20 ... =20 Skins: add color for non-printable characters in editor (#4433) =20 Fixes FTBFS on FreeBSD with ext2fs attribute support (#4493) Broken stickchars (-a) mode (#4498) Wrong timestamp after resuming of file copy operation (#4499) Editor: wrong deletion of marked column (#3761) Diff viewer: segfault when display of line numbers is enabled (#4500) Tar VFS: broken handling of hard links (#4494) Sftp VFS: failure establishing SSH session due hashed host names in ~= /.ssh/known_hosts (#4506) Shell VFS: incorrect file names with cyrillic or diacritic symbols (#= 4507) mc.ext.ini: incorrect description of of how multiple sections and key= s with same names are processed (#4497) mc.ext.ini: unescaped backslash \ is treated as invalid escape sequen= ce in glib-2.77.3 and glib-2.79 (#4502) mc.ext.ini: file "Makefile.zip" is handled as Makefile not as zip-arh= ive (#4419)" =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: .../{oldcore/111 =3D> core/184}/filelists/vnstat | 0 config/rootfiles/core/184/update.sh | 2 ++ config/rootfiles/packages/mc | 34 +++++++++++---------= -- lfs/mc | 8 ++--- lfs/vnstat | 6 ++-- 5 files changed, 26 insertions(+), 24 deletions(-) copy config/rootfiles/{oldcore/111 =3D> core/184}/filelists/vnstat (100%) Difference in files: diff --git a/config/rootfiles/core/184/filelists/vnstat b/config/rootfiles/co= re/184/filelists/vnstat new file mode 120000 index 000000000..2e2e6100b --- /dev/null +++ b/config/rootfiles/core/184/filelists/vnstat @@ -0,0 +1 @@ +../../../common/vnstat \ No newline at end of file diff --git a/config/rootfiles/core/184/update.sh b/config/rootfiles/core/184/= update.sh index 1059d1a1b..436984690 100644 --- a/config/rootfiles/core/184/update.sh +++ b/config/rootfiles/core/184/update.sh @@ -32,6 +32,7 @@ for (( i=3D1; i<=3D$core; i++ )); do done =20 # Stop services +/etc/init.d/vnstat stop =20 # Extract files extract_files @@ -51,6 +52,7 @@ ldconfig /usr/local/bin/sshctrl =20 # Start services +/etc/init.d/vnstat start =20 # This update needs a reboot... #touch /var/run/need_reboot diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc index 77951ceb5..572d42746 100644 --- a/config/rootfiles/packages/mc +++ b/config/rootfiles/packages/mc @@ -63,27 +63,27 @@ usr/libexec/mc/extfs.d/urar usr/libexec/mc/extfs.d/uwim usr/libexec/mc/extfs.d/uzip usr/libexec/mc/extfs.d/uzoo -#usr/libexec/mc/fish -#usr/libexec/mc/fish/README.fish -usr/libexec/mc/fish/append -usr/libexec/mc/fish/chmod -usr/libexec/mc/fish/chown -usr/libexec/mc/fish/fexists -usr/libexec/mc/fish/get -usr/libexec/mc/fish/hardlink -usr/libexec/mc/fish/info -usr/libexec/mc/fish/ln -usr/libexec/mc/fish/ls -usr/libexec/mc/fish/mkdir -usr/libexec/mc/fish/mv -usr/libexec/mc/fish/rmdir -usr/libexec/mc/fish/send -usr/libexec/mc/fish/unlink -usr/libexec/mc/fish/utime usr/libexec/mc/mc-wrapper.csh usr/libexec/mc/mc-wrapper.sh usr/libexec/mc/mc.csh usr/libexec/mc/mc.sh +#usr/libexec/mc/shell +#usr/libexec/mc/shell/README.shell +usr/libexec/mc/shell/append +usr/libexec/mc/shell/chmod +usr/libexec/mc/shell/chown +usr/libexec/mc/shell/fexists +usr/libexec/mc/shell/get +usr/libexec/mc/shell/hardlink +usr/libexec/mc/shell/info +usr/libexec/mc/shell/ln +usr/libexec/mc/shell/ls +usr/libexec/mc/shell/mkdir +usr/libexec/mc/shell/mv +usr/libexec/mc/shell/rmdir +usr/libexec/mc/shell/send +usr/libexec/mc/shell/unlink +usr/libexec/mc/shell/utime #usr/share/man/man1/mc.1 #usr/share/man/man1/mcedit.1 #usr/share/man/man1/mcview.1 diff --git a/lfs/mc b/lfs/mc index 2aab53fa9..3fb3f6d49 100644 --- a/lfs/mc +++ b/lfs/mc @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2023 IPFire Team = # +# Copyright (C) 2007-2024 IPFire Team = # # = # # 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 = # @@ -26,7 +26,7 @@ include Config =20 SUMMARY =3D Midnight Commander =20 -VER =3D 4.8.30 +VER =3D 4.8.31 =20 THISAPP =3D mc-$(VER) DL_FILE =3D $(THISAPP).tar.xz @@ -34,7 +34,7 @@ DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D mc -PAK_VER =3D 25 +PAK_VER =3D 26 =20 DEPS =3D =20 @@ -48,7 +48,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_BLAKE2 =3D 2bf759314abae39db7596426cba22f6eaac0efc58e7025f1a7ef18= 63496ea7a3c00d298d101123b9defb109e76e31fe988227fb5c1112e06051b3c7a5b3dc1b6 +$(DL_FILE)_BLAKE2 =3D aa8406d7d68a7466f662f83730dfc157f6e4f444b62284d9b71ea1= 2def333996e298352f94526a3eb85491030f62373cf8d5621e449a7abf1fb5267a13a396fe =20 =20 install : $(TARGET) diff --git a/lfs/vnstat b/lfs/vnstat index ca61562c0..c47833a14 100644 --- a/lfs/vnstat +++ b/lfs/vnstat @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2023 IPFire Team = # +# Copyright (C) 2007-2024 IPFire Team = # # = # # 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 @@ =20 include Config =20 -VER =3D 2.11 +VER =3D 2.12 =20 THISAPP =3D vnstat-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_BLAKE2 =3D 6eeed45d628641c9d88cf33ae1fc14871109b1e9fd0ac4a46fe8e2= c194bb4600878b69408ed177bcde38ca859d0a3165d0095cab9b0bb6c036f7788fbfcb47e6 +$(DL_FILE)_BLAKE2 =3D af6982bc6da66ed2cebfe99e1b46a540528886d1c6e7a5174a3083= a315804cb42c2395f3a0f5df552e8fd6b7823a01873fc5f9fb2178529c53481a67552dab35 =20 install : $(TARGET) =20 hooks/post-receive -- IPFire 2.x development tree --===============6689602535193878488==--