* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5eb3380fb78459fa85e573fc739a74ff2c990bc9
@ 2026-02-06 10:44 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2026-02-06 10:44 UTC (permalink / raw)
To: ipfire-scm
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 5eb3380fb78459fa85e573fc739a74ff2c990bc9 (commit)
via e5c6f0fce96558d43dbc1af226318558b6cee496 (commit)
via 89ee8dbbe0aed201c3eca5c156516a54342c66f8 (commit)
via e2c01f2f643ada16d04726469c1949c65af74552 (commit)
via 544b31e57b6f7dd59775c7dfb0acf21c52b0e462 (commit)
via 40359ac2c1e37cff06720cfe65e3fc82200cf978 (commit)
via 2bae22a5e5ad036ced0973729128ab9cb1df060f (commit)
via 4e6dd5e25c6898a30c81fcda5781f7b2380df9ef (commit)
via 2b5ba1cd837bb0b941217afe13e259cb7fcfb41e (commit)
via 86256575d3b357c131f53ec37aa765a66daf0aaf (commit)
via 292e36cadc353bcd93b9b36648214891ac904cab (commit)
via 818ab000e130d5bfe7df246a1fa0679557cd6ba1 (commit)
via 844862d90751bfc56012fffd0e6eee635c72a1fa (commit)
from c242eb15bd1d589cfbcb97f7b16e7a8222f37d48 (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 5eb3380fb78459fa85e573fc739a74ff2c990bc9
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri Feb 6 10:41:55 2026 +0000
core201: Ship ovpnmain.cgi
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit e5c6f0fce96558d43dbc1af226318558b6cee496
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Feb 5 23:00:55 2026 +0100
core201: Ship procps
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 89ee8dbbe0aed201c3eca5c156516a54342c66f8
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Feb 5 23:00:59 2026 +0100
procps: Update to version 4.0.6
- Update from version 4.0.5 to 4.0.6
- Update of rootfile
- Changelog
4.0.6
* library
version: inc revision to 1 now 1:1:0
internal: Use openat for files under /proc/<PID>
internal: Don't check for sd_booted Debian #1108549
internal: Address potential race leading to segfault issues #380, #390
* local: guard SIGPOLL for MacOS merge !246
* pgrep: Fix unhex breakage for signal numbers issue #369
* pgrep: Match on process ID Debian #612146
* pgrep: Add process_mrelease merge !250
* pgrep: Add shell quoting merge !248
* pgrep: Use pidfd_send_signal() issue #207
* pgrep.1: Note that we can only go to 100th of second issue #376
* pgrep: Add --quiet option issue #404
* pmap: add -k option to print raw names from kernel merge !251
* ps: parse --help correctly issue #381
* ps: Add --delimiter option issue #118
* ps: ps f forest works under pid 1 issue #102
* ps: no longer fails with many pids & the 'p' option issue #387
* ps.1: cols and collums alias width option Debian #926361
* ps.1: Add format equivalents Debian #925437
* ps: avoid potential segfault due to library race issue #380
* ps: Fix -ad option conflict issue #395
* ps: ppid of 0 is ok, fix parser issue #405
* slabtop: Increase column width Debian #959375
* sysctl: Return error if EPERM or EISDIR merge !228
* sysctl: Use options after --system Debian #978989
* top: provides for ignoring configuration file(s) issue #365
* top: fix legacy configuration file vulnerability issue #384
* top: added a new help screen for specialized keys
* top: avoid potential segfault due to library race issue #390
* top: new feature to show physical core percentages
* w: Add terminal mode to show all terminal sessions issue #375
* w: Use process TTY as backup for user TTY Debian #1080335
* w: Use correct return value for sd_get_sessions Debian #1068904
* w: Don't check for sd_booted Debian #1108549
* w: Don't crash with pids in terminal mode issue #407
* watch: Add --follow option Debian #469156
* watch: 256 color support issue #44
* watch.1: Warn about -d permanent option Debian #883638
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit e2c01f2f643ada16d04726469c1949c65af74552
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Feb 5 23:00:54 2026 +0100
core201: Ship libetfilter_conntrack
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 544b31e57b6f7dd59775c7dfb0acf21c52b0e462
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Feb 5 23:00:58 2026 +0100
libnetfilter_conntrack: Update to version 1.1.1
- Update from version 1.1.0 to 1.1.1
- No change to rootfile
- Changelog
1.1.1
- Support for the new CTA_TIMESTAMP_EVENT attribute, available since
Linux kernel >= 6.14
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 40359ac2c1e37cff06720cfe65e3fc82200cf978
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Feb 5 23:00:53 2026 +0100
core201: Ship gettext
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 2bae22a5e5ad036ced0973729128ab9cb1df060f
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Feb 5 23:00:57 2026 +0100
gettext: Update to version 1.0
- Update from version 0.26 to 1.0
- Update of rootfile
- Changelog
1.0
Improvements for maintainers and distributors:
* In a po/ directory, the PO files are now exactly those that the
translators submitted or committed in version control, or a
translation project's daemon committed on behalf of the translators.
They are no longer regularly updated with respect to the POT file
in the same directory.
The advantage for maintainers is that the maintainer may commit the
PO files in version control, without getting
- lots of modified files shown by "git status",
- frequent merge conflicts when merging between branches,
- a voluminous version control history.
The advantage for distributors is that the role of files in a
release tarball are clearer: The PO files are source code, whereas
the POT file and the *.gmo files are generated files.
ATTENTION translators!
Translators who work directly on a package's source code (without
going through a translation project) now need to run "msginit"
before starting work on a PO file.
* A new program 'po-fetch' is provided, that fetches the translated
PO files from a translation project's site on the internet, and
updates the LINGUAS file accordingly.
* In a po/ directory, a new script 'fetch-po' is now added by 'gettextize'.
It provides the standard interface for fetching the translated PO files.
It typically either invokes the 'po-fetch' program or does nothing.
Improvements for translators:
* msginit:
- When the PO file already exists, 'msginit' now updates it w.r.t. the
POT file, like 'msgmerge' would do. Previously, 'msginit' failed with
an error message in this situation.
* Pretranslation:
- Two new programs, 'msgpre' and 'spit', are provided, that implement
machine translation through a locally installed Large Language Model
(LLM). 'msgpre' applies to an entire PO file, 'spit' to a single
message.
- The documentation has a new chapter "Pretranslation".
Improvements for maintainers:
* xgettext:
- The refactoring suggestion when a translatable string contains an URL
or email address can now be inhibited through a command-line option
'--no-check=url' or '--no-check=email', or through a comment in the
source code of the form
/* xgettext: no-url-check */
or
/* xgettext: no-email-check */
Programming languages support:
* OCaml:
- xgettext now supports OCaml.
- 'msgfmt -c' now verifies the syntax of translations of OCaml format
strings.
- A new example 'hello-ocaml' has been added.
* Rust:
- xgettext now recognizes 'gettextrs::gettext' invocations, like 'gettext'
invocations.
libgettextpo library:
* The function 'po_message_get_format' now supports distinguishing whether
a negative format string mark, such as 'no-c-format', is set or not.
* The new functions
po_message_has_workflow_flag
po_message_set_workflow_flag
po_message_workflow_flags_iterator, po_flag_next, po_flag_iterator_free
can be used to manipulate or inspect the workflow flags of a message.
* The new functions
po_message_has_sticky_flag
po_message_set_sticky_flag
po_message_sticky_flags_iterator, po_flag_next, po_flag_iterator_free
can be used to manipulate or inspect the sticky flags of a messsage.
Emacs PO mode:
Restore syntax highlighting in Emacs version 30 or newer.
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 4e6dd5e25c6898a30c81fcda5781f7b2380df9ef
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Feb 5 23:00:52 2026 +0100
core201: Ship fuse
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 2b5ba1cd837bb0b941217afe13e259cb7fcfb41e
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Feb 5 23:00:56 2026 +0100
fuse: Update to version 3.18.1
- Update from version 3.17.4 to 3.18.1
- Update of rootfile
- Changelog
3.18.1
* Fix a critical ABI issue compared to libfuse-3.17.3+
* Note: This breaks ABI compatibility to libfuse-3.18.0
(given that 3.18.0 is out for 2 days only, probably the lesser evil)
3.18.0
New Features
* fuse-over-io-uring communication
* statx support
* Request timeouts: Prevent hung operations
* FUSE_NOTIFY_INC_EPOCH: New notification mechanism for epoch counters
Important Fixes
* Fixed double unmount on FUSE_DESTROY
* Fixed junk readdirplus results when filesystem doesn't fill stat info
* Fixed memory deallocation in fuse_session_loop_remember
* Fixed COPY_FILE_RANGE interface
Platform Support
* Improved FreeBSD support (mount error reporting, test runner, build fixes)
* Fixed 32-bit architecture builds
* Fixed build with musl libc and older kernels (< 5.9)
Other Improvements
* Added PanFS to fusermount whitelist
* Thread naming support for easier debugging
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 86256575d3b357c131f53ec37aa765a66daf0aaf
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Feb 5 23:00:51 2026 +0100
core201: Ship conntrack-tools
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 292e36cadc353bcd93b9b36648214891ac904cab
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Feb 5 23:00:50 2026 +0100
conntrack-tools: Update to version 1.4.9
- Update from version 1.4.8 to 1.4.9
- No change to rootfile
- Changelog
1.4.9
This release contains bugfixes, for the conntrack cli:
- skip ENOSPC on updates when ct label is not available
- don't print [USERSPACE] information in case of XML output
- fix parsing of tuple-port-src and tuple-port-dst
- improve --secmark,--id,--zone parser
- improve --mark parser
- fix for ENOENT in delete to align behaviour with updates
- fix compiler warnings with -Wcalloc-transposed-args
- prefer kernel-provided event timestamp via CTA_TIMESTAMP_EVENT
if it is available
- introduce --labelmap option to specify connlabel.conf path
- Extend error message for EBUSY when registering userspace helper
and the conntrackd daemon:
- don't add expectation table entry for RPC portmap port
- fix signal handler race-condition
- restrict multicast reception, otherwise multicast sync messages
can be received from any interface if your firewall policy does
not restrict the interface used for sending and receiving them.
- remove double close() in multicast resulting in EBADFD
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 818ab000e130d5bfe7df246a1fa0679557cd6ba1
Author: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Thu Feb 5 19:51:34 2026 +0100
ovpnmain.cgi: Re-implement iscertlegacy function
Re-implement the iscertlegacy function to proper detect any kind
of legacy certificate by using the openssl legacy switch.
Fixes #13936
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 844862d90751bfc56012fffd0e6eee635c72a1fa
Author: Matthias Fischer <matthias.fischer@ipfire.org>
Date: Wed Feb 4 22:42:26 2026 +0100
nano: Update to 8.7.1
For details see:
https://www.nano-editor.org/news.php
"2026 February 4 - GNU nano 8.7.1 "Tende Samnug"
A build failure when compiling against glibc-2.43 is fixed."
This update reverts commit
https://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=ebbf705e257cd51e8d45075f483bab3cfc2eddf0
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/fuse | 2 +-
config/rootfiles/common/gettext | 104 +++++++++++++++++----
config/rootfiles/common/procps | 3 +-
.../110 => core/201}/filelists/conntrack-tools | 0
config/rootfiles/core/201/filelists/files | 1 +
.../{oldcore/112 => core/201}/filelists/fuse | 0
.../{oldcore/103 => core/201}/filelists/gettext | 0
.../201}/filelists/libnetfilter_conntrack | 0
.../{oldcore/103 => core/201}/filelists/procps | 0
html/cgi-bin/ovpnmain.cgi | 32 +++++--
lfs/conntrack-tools | 9 +-
lfs/fuse | 6 +-
lfs/gettext | 6 +-
lfs/libnetfilter_conntrack | 9 +-
lfs/nano | 8 +-
lfs/procps | 6 +-
16 files changed, 137 insertions(+), 49 deletions(-)
copy config/rootfiles/{oldcore/110 => core/201}/filelists/conntrack-tools (100%)
copy config/rootfiles/{oldcore/112 => core/201}/filelists/fuse (100%)
copy config/rootfiles/{oldcore/103 => core/201}/filelists/gettext (100%)
copy config/rootfiles/{oldcore/106 => core/201}/filelists/libnetfilter_conntrack (100%)
copy config/rootfiles/{oldcore/103 => core/201}/filelists/procps (100%)
Difference in files:
diff --git a/config/rootfiles/common/fuse b/config/rootfiles/common/fuse
index 6bb109f6f..db16cea63 100644
--- a/config/rootfiles/common/fuse
+++ b/config/rootfiles/common/fuse
@@ -11,7 +11,7 @@ usr/bin/fusermount3
#usr/include/fuse3/fuse_opt.h
#usr/include/fuse3/libfuse_config.h
#usr/lib/libfuse3.so
-usr/lib/libfuse3.so.3.17.4
+usr/lib/libfuse3.so.3.18.1
usr/lib/libfuse3.so.4
#usr/lib/pkgconfig/fuse3.pc
usr/lib/udev/rules.d/99-fuse3.rules
diff --git a/config/rootfiles/common/gettext b/config/rootfiles/common/gettext
index 6e9a05841..28451c089 100644
--- a/config/rootfiles/common/gettext
+++ b/config/rootfiles/common/gettext
@@ -15,18 +15,20 @@ usr/bin/gettext.sh
#usr/bin/msggrep
#usr/bin/msginit
#usr/bin/msgmerge
+#usr/bin/msgpre
#usr/bin/msgunfmt
#usr/bin/msguniq
#usr/bin/ngettext
+#usr/bin/po-fetch
#usr/bin/printf_gettext
#usr/bin/printf_ngettext
#usr/bin/recode-sr-latin
+#usr/bin/spit
#usr/bin/xgettext
#usr/include/autosprintf.h
#usr/include/gettext-po.h
#usr/include/textstyle
#usr/include/textstyle.h
-#usr/include/textstyle/stdbool.h
#usr/include/textstyle/version.h
#usr/include/textstyle/woe32dll.h
#usr/lib/gettext
@@ -34,20 +36,20 @@ usr/bin/gettext.sh
#usr/lib/libasprintf.so
usr/lib/libasprintf.so.0
usr/lib/libasprintf.so.0.0.0
-usr/lib/libgettextlib-0.26.so
+usr/lib/libgettextlib-1.0.so
#usr/lib/libgettextlib.la
#usr/lib/libgettextlib.so
#usr/lib/libgettextpo.la
#usr/lib/libgettextpo.so
usr/lib/libgettextpo.so.0
-usr/lib/libgettextpo.so.0.5.15
-usr/lib/libgettextsrc-0.26.so
+usr/lib/libgettextpo.so.0.6.0
+usr/lib/libgettextsrc-1.0.so
#usr/lib/libgettextsrc.la
usr/lib/libgettextsrc.so
#usr/lib/libtextstyle.la
#usr/lib/libtextstyle.so
usr/lib/libtextstyle.so.0
-usr/lib/libtextstyle.so.0.2.6
+usr/lib/libtextstyle.so.0.2.7
usr/lib/preloadable_libintl.so
#usr/libexec/gettext
#usr/libexec/gettext/cldr-plurals
@@ -1749,6 +1751,64 @@ usr/lib/preloadable_libintl.so
#usr/share/doc/gettext/examples/hello-objc/po/zh_CN.po
#usr/share/doc/gettext/examples/hello-objc/po/zh_HK.po
#usr/share/doc/gettext/examples/hello-objc/po/zh_TW.po
+#usr/share/doc/gettext/examples/hello-ocaml
+#usr/share/doc/gettext/examples/hello-ocaml/INSTALL
+#usr/share/doc/gettext/examples/hello-ocaml/Makefile.am
+#usr/share/doc/gettext/examples/hello-ocaml/autoclean.sh
+#usr/share/doc/gettext/examples/hello-ocaml/autogen.sh
+#usr/share/doc/gettext/examples/hello-ocaml/configure.ac
+#usr/share/doc/gettext/examples/hello-ocaml/dune-project.in
+#usr/share/doc/gettext/examples/hello-ocaml/dune.in
+#usr/share/doc/gettext/examples/hello-ocaml/hello.ml.in
+#usr/share/doc/gettext/examples/hello-ocaml/m4
+#usr/share/doc/gettext/examples/hello-ocaml/m4/Makefile.am
+#usr/share/doc/gettext/examples/hello-ocaml/po
+#usr/share/doc/gettext/examples/hello-ocaml/po/LINGUAS
+#usr/share/doc/gettext/examples/hello-ocaml/po/Makefile.am
+#usr/share/doc/gettext/examples/hello-ocaml/po/af.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/ast.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/bg.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/ca.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/cs.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/da.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/de.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/el.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/eo.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/es.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/fi.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/fr.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/ga.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/gl.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/hr.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/hu.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/id.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/it.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/ja.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/ka.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/ky.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/lv.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/ms.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/mt.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/nb.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/nl.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/nn.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/pl.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/pt.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/pt_BR.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/ro.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/ru.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/sk.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/sl.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/sq.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/sr.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/sv.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/ta.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/tr.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/uk.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/vi.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/zh_CN.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/zh_HK.po
+#usr/share/doc/gettext/examples/hello-ocaml/po/zh_TW.po
#usr/share/doc/gettext/examples/hello-pascal
#usr/share/doc/gettext/examples/hello-pascal/INSTALL
#usr/share/doc/gettext/examples/hello-pascal/Makefile.am
@@ -2399,6 +2459,7 @@ usr/lib/preloadable_libintl.so
#usr/share/doc/gettext/gettext_3.html
#usr/share/doc/gettext/gettext_30.html
#usr/share/doc/gettext/gettext_31.html
+#usr/share/doc/gettext/gettext_32.html
#usr/share/doc/gettext/gettext_4.html
#usr/share/doc/gettext/gettext_5.html
#usr/share/doc/gettext/gettext_6.html
@@ -2438,13 +2499,16 @@ usr/lib/preloadable_libintl.so
#usr/share/doc/gettext/msggrep.1.html
#usr/share/doc/gettext/msginit.1.html
#usr/share/doc/gettext/msgmerge.1.html
+#usr/share/doc/gettext/msgpre.1.html
#usr/share/doc/gettext/msgunfmt.1.html
#usr/share/doc/gettext/msguniq.1.html
#usr/share/doc/gettext/ngettext.1.html
#usr/share/doc/gettext/ngettext.3.html
+#usr/share/doc/gettext/po-fetch.1.html
#usr/share/doc/gettext/printf_gettext.1.html
#usr/share/doc/gettext/printf_ngettext.1.html
#usr/share/doc/gettext/recode-sr-latin.1.html
+#usr/share/doc/gettext/spit.1.html
#usr/share/doc/gettext/textdomain.3.html
#usr/share/doc/gettext/tutorial.html
#usr/share/doc/gettext/xgettext.1.html
@@ -2461,19 +2525,19 @@ usr/lib/preloadable_libintl.so
#usr/share/doc/libtextstyle/libtextstyle_abt.html
#usr/share/doc/libtextstyle/libtextstyle_toc.html
#usr/share/gettext
-#usr/share/gettext-0.26
-#usr/share/gettext-0.26/its
-#usr/share/gettext-0.26/its/docbook.loc
-#usr/share/gettext-0.26/its/docbook4.its
-#usr/share/gettext-0.26/its/docbook5.its
-#usr/share/gettext-0.26/its/glade.loc
-#usr/share/gettext-0.26/its/glade1.its
-#usr/share/gettext-0.26/its/glade2.its
-#usr/share/gettext-0.26/its/gsettings.its
-#usr/share/gettext-0.26/its/gsettings.loc
-#usr/share/gettext-0.26/its/gtkbuilder.its
-#usr/share/gettext-0.26/its/metainfo.its
-#usr/share/gettext-0.26/its/metainfo.loc
+#usr/share/gettext-1.0
+#usr/share/gettext-1.0/its
+#usr/share/gettext-1.0/its/docbook.loc
+#usr/share/gettext-1.0/its/docbook4.its
+#usr/share/gettext-1.0/its/docbook5.its
+#usr/share/gettext-1.0/its/glade.loc
+#usr/share/gettext-1.0/its/glade1.its
+#usr/share/gettext-1.0/its/glade2.its
+#usr/share/gettext-1.0/its/gsettings.its
+#usr/share/gettext-1.0/its/gsettings.loc
+#usr/share/gettext-1.0/its/gtkbuilder.its
+#usr/share/gettext-1.0/its/metainfo.its
+#usr/share/gettext-1.0/its/metainfo.loc
#usr/share/gettext/ABOUT-NLS
#usr/share/gettext/archive.dir.tar.xz
#usr/share/gettext/config.rpath
@@ -2500,6 +2564,7 @@ usr/lib/preloadable_libintl.so
#usr/share/gettext/po/boldquot.sed
#usr/share/gettext/po/en@boldquot.header
#usr/share/gettext/po/en@quot.header
+#usr/share/gettext/po/fetch-po
#usr/share/gettext/po/insert-header.sed
#usr/share/gettext/po/quot.sed
#usr/share/gettext/po/remove-potcdate.sed
@@ -2553,12 +2618,15 @@ usr/lib/preloadable_libintl.so
#usr/share/man/man1/msggrep.1
#usr/share/man/man1/msginit.1
#usr/share/man/man1/msgmerge.1
+#usr/share/man/man1/msgpre.1
#usr/share/man/man1/msgunfmt.1
#usr/share/man/man1/msguniq.1
#usr/share/man/man1/ngettext.1
+#usr/share/man/man1/po-fetch.1
#usr/share/man/man1/printf_gettext.1
#usr/share/man/man1/printf_ngettext.1
#usr/share/man/man1/recode-sr-latin.1
+#usr/share/man/man1/spit.1
#usr/share/man/man1/xgettext.1
#usr/share/man/man3/bind_textdomain_codeset.3
#usr/share/man/man3/bindtextdomain.3
diff --git a/config/rootfiles/common/procps b/config/rootfiles/common/procps
index 9b57be43f..81724f9eb 100644
--- a/config/rootfiles/common/procps
+++ b/config/rootfiles/common/procps
@@ -3,7 +3,7 @@ bin/ps
#lib/libproc2.la
#lib/libproc2.so
lib/libproc2.so.1
-lib/libproc2.so.1.0.0
+lib/libproc2.so.1.0.1
#lib/pkgconfig
#lib/pkgconfig/libproc2.pc
sbin/sysctl
@@ -52,7 +52,6 @@ usr/bin/watch
#usr/share/man/man1/pgrep.1
#usr/share/man/man1/pidof.1
#usr/share/man/man1/pidwait.1
-#usr/share/man/man1/pkill.1
#usr/share/man/man1/pmap.1
#usr/share/man/man1/ps.1
#usr/share/man/man1/pwdx.1
diff --git a/config/rootfiles/core/201/filelists/conntrack-tools b/config/rootfiles/core/201/filelists/conntrack-tools
new file mode 120000
index 000000000..88fbe061e
--- /dev/null
+++ b/config/rootfiles/core/201/filelists/conntrack-tools
@@ -0,0 +1 @@
+../../../common/conntrack-tools
\ No newline at end of file
diff --git a/config/rootfiles/core/201/filelists/files b/config/rootfiles/core/201/filelists/files
index e69de29bb..f7a8b3297 100644
--- a/config/rootfiles/core/201/filelists/files
+++ b/config/rootfiles/core/201/filelists/files
@@ -0,0 +1 @@
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
diff --git a/config/rootfiles/core/201/filelists/fuse b/config/rootfiles/core/201/filelists/fuse
new file mode 120000
index 000000000..570edaade
--- /dev/null
+++ b/config/rootfiles/core/201/filelists/fuse
@@ -0,0 +1 @@
+../../../common/fuse
\ No newline at end of file
diff --git a/config/rootfiles/core/201/filelists/gettext b/config/rootfiles/core/201/filelists/gettext
new file mode 120000
index 000000000..b6c6c6f4f
--- /dev/null
+++ b/config/rootfiles/core/201/filelists/gettext
@@ -0,0 +1 @@
+../../../common/gettext
\ No newline at end of file
diff --git a/config/rootfiles/core/201/filelists/libnetfilter_conntrack b/config/rootfiles/core/201/filelists/libnetfilter_conntrack
new file mode 120000
index 000000000..6ef5cc439
--- /dev/null
+++ b/config/rootfiles/core/201/filelists/libnetfilter_conntrack
@@ -0,0 +1 @@
+../../../common/libnetfilter_conntrack
\ No newline at end of file
diff --git a/config/rootfiles/core/201/filelists/procps b/config/rootfiles/core/201/filelists/procps
new file mode 120000
index 000000000..e17e8ed70
--- /dev/null
+++ b/config/rootfiles/core/201/filelists/procps
@@ -0,0 +1 @@
+../../../common/procps
\ No newline at end of file
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index e53bd6e28..b435d9e1b 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -143,12 +143,32 @@ my $col="";
sub iscertlegacy
{
my $file=$_[0];
- my @certinfo = &General::system_output("/usr/bin/openssl", "pkcs12", "-info", "-nodes",
- "-in", "$file.p12", "-noout", "-passin", "pass:''");
- if (index ($certinfo[0], "MAC: sha1") != -1) {
- return 1;
- }
- return 0;
+ my @openssl_cmd = ("/usr/bin/openssl", "pkcs12", "-info", "-nodes",
+ "-in", "$file.p12", "-noout", "-passin", "pass:");
+ my $ret;
+
+ # Execute the openssl command.
+ $ret = &General::safe_system(@openssl_cmd);
+
+ # Early exit if the openssl return code is zero and we do not have a
+ # lecacy certificate.
+ return 0 if ($ret eq "0");
+
+ # In case we got an return code of one, retry with enabled legacy option.
+ #
+ # Add option to enable legacy ciphers to the openssl command.
+ push(@openssl_cmd, "-legacy");
+
+ # Re-execute the openssl command with legacy option.
+ $ret = &General::safe_system(@openssl_cmd);
+
+ # Exit and return 1 if the return code of the openssl command is zero
+ # with enabled legay option, which indicates a legacy certificate.
+ return 1 if ($ret eq "0");
+
+ # If we got here, the openssl command was not able to detect
+ # which kind of certificate is used.
+ return undef;
}
sub is_cert_rfc3280_compliant($) {
diff --git a/lfs/conntrack-tools b/lfs/conntrack-tools
index 65f8b02b7..5872d73b1 100644
--- a/lfs/conntrack-tools
+++ b/lfs/conntrack-tools
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2026 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.4.8
+VER = 1.4.9
THISAPP = conntrack-tools-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 2f8a7d7facf4890a8ca7dec54d5faa1383ad5e449a0599707578567e9c8ed6fd63ca308538afc34e99121e39e80c1ce686c8dda89247abdf4699bb420b52c4fb
+$(DL_FILE)_BLAKE2 = afa7aa685e20be510d7a7a916625d83f34d305212b8b86d4de94976d2212886391a45acdba3e906a7b6614b6476e61ead6648ee567458d3a90ebbe2eccbd3e7b
install : $(TARGET)
@@ -72,7 +72,8 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
diff --git a/lfs/fuse b/lfs/fuse
index c16094972..aa6e3103c 100644
--- a/lfs/fuse
+++ b/lfs/fuse
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2025 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2026 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 = 3.17.4
+VER = 3.18.1
THISAPP = fuse-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = eb9dfd5c446a35f7ef0b6b58c52fe22d306782f5a8b56dc54b00829aa8a59700bd2b03755cc58221d154b88cbdb3da59913700b3d7efa67a586bfaa8fef00e9d
+$(DL_FILE)_BLAKE2 = b0a38794b8eb932f7b23314afdaeacbdd302e9f9037794f5dceb87b22f19de8d125ec0112ee28751b94063324c872e03c26e3128c6cd817858245f7df5acd7ef
install : $(TARGET)
diff --git a/lfs/gettext b/lfs/gettext
index 71c1183f0..fe19951c9 100644
--- a/lfs/gettext
+++ b/lfs/gettext
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2025 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2026 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 = 0.26
+VER = 1.0
THISAPP = gettext-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -56,7 +56,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = b182e5fdb9fc46868dc39b512ef300c54c8e77a766f2d2de69289f84966d4205f494b3ecedfb30c6df581947172411ae7eb4ccc0bb1f180b67dd8a83803832a8
+$(DL_FILE)_BLAKE2 = 052bd847c8cdb963437613583256e430b52e27e5ebe29a04df6ac549552ab0f85a1e637b991ebb57e82805fb6d2d23f37c4b70d7f711dc086f57a3a32ba3f00e
install : $(TARGET)
diff --git a/lfs/libnetfilter_conntrack b/lfs/libnetfilter_conntrack
index 8d724e4e9..8438dd257 100644
--- a/lfs/libnetfilter_conntrack
+++ b/lfs/libnetfilter_conntrack
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2026 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.1.0
+VER = 1.1.1
THISAPP = libnetfilter_conntrack-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = e1f8342b4edcbd81ab9995c9ac37818006c710f890b85120e5225936163d8ac24b5a487b468cb9f98cf3c86ab3534e1a9fc866b06633c82eb9bd81d0caf2ffa1
+$(DL_FILE)_BLAKE2 = 5b49c2b27b268fdce964767dc7ef1c87edeadcee4102103bc7045e98d27675b41a03dd707fceb53ea14e73951273398231d04e9f72f138911158c7d55d2135f5
install : $(TARGET)
@@ -70,7 +70,8 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
diff --git a/lfs/nano b/lfs/nano
index d6556f4b8..3072b1148 100644
--- a/lfs/nano
+++ b/lfs/nano
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2025 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2026 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 = 8.7
+VER = 8.7.1
THISAPP = nano-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 4a7a67f854969960c96d1e3b2c7184f9d9c9fb305a14ff9764a39a8103ca5f5878f9e344b0dc522e27643f93e57582881ea8e664ac9c6eaa99c3b2d9632febdc
+$(DL_FILE)_BLAKE2 = 25c73945c385c6615ad547cad65d6b7edc0098d5310951d09bd91991c93ef09ef2f58a5dec8a00a17c0326a64bce18a1819d2073af94a8afcf43df747843da3b
install : $(TARGET)
@@ -73,8 +73,6 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && sed -i 's/^\(_GL_EXTERN_C wchar_t \*\)wmemchr (/\1(wmemchr) (/' lib/wchar.in.h
- cd $(DIR_APP) && sed -i 's/^\(_GL_EXTERN_C void \*\)bsearch (/\1(bsearch) (/' lib/stdlib.in.h
cd $(DIR_APP) && ./configure \
--prefix=/usr \
--sysconfdir=/etc/nano \
diff --git a/lfs/procps b/lfs/procps
index 2f9f2ceab..26aa757f7 100644
--- a/lfs/procps
+++ b/lfs/procps
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2025 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2026 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 = 4.0.5
+VER = 4.0.6
THISAPP = procps-v$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = d028db29afba60b2678f8b790493a9425e3149b3699e463d2b789f7831d6942d59fcecfa18559477b304ad73112d2ea6279d40064b7b9a5ce3d2dcc6347ea421
+$(DL_FILE)_BLAKE2 = dbcbc76f544db055a5921cbe65d917ee7cdf5dae97ee9dc418d3969f68ebfa41e6adebb1369f5b07df5580504bf6881c27e2a8db0241a099b879e15337a8cb03
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-02-06 10:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-02-06 10:44 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5eb3380fb78459fa85e573fc739a74ff2c990bc9 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox