Development April 2022

development@lists.ipfire.org

18 participants
154 discussions

[PATCH] libseccomp: Update to 2.5.4
by Peter Müller 23 Apr '22

23 Apr '22

Full changelog as per https://github.com/seccomp/libseccomp/releases/tag/v2.5.4: Version 2.5.4 - April 21, 2022 Update the syscall table for Linux v5.17 Fix minor issues with binary tree testing and with empty binary trees Minor documentation improvements including retiring the mailing list Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- config/rootfiles/packages/libseccomp | 2 +- lfs/libseccomp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/packages/libseccomp b/config/rootfiles/packages/libseccomp index e7f19721a..ff8d4dcae 100644 --- a/config/rootfiles/packages/libseccomp +++ b/config/rootfiles/packages/libseccomp @@ -4,7 +4,7 @@ usr/bin/scmp_sys_resolver #usr/lib/libseccomp.la #usr/lib/libseccomp.so usr/lib/libseccomp.so.2 -usr/lib/libseccomp.so.2.5.3 +usr/lib/libseccomp.so.2.5.4 #usr/lib/pkgconfig/libseccomp.pc #usr/share/man/man1/scmp_sys_resolver.1 #usr/share/man/man3/seccomp_api_get.3 diff --git a/lfs/libseccomp b/lfs/libseccomp index 89b71e8dd..ada345c2f 100644 --- a/lfs/libseccomp +++ b/lfs/libseccomp @@ -26,7 +26,7 @@ include Config SUMMARY = A Seccomp (mode 2) helper library -VER = 2.5.3 +VER = 2.5.4 THISAPP = libseccomp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libseccomp -PAK_VER = 7 +PAK_VER = 8 DEPS = @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = cedf04b3a926f9fe5202e6169ddac6b983e755009c14fc1d645157b9c0bcdf65d4085f8ea7abad90f3a0c13ae4d66b5d8306e725168490863aad15976de1eae7 +$(DL_FILE)_BLAKE2 = 38b134cb578f9355667546f92950ebcf8c53ccaf98db568db9aadfa9629c054136849e03d4bf9f09f73998fe66a5e8a9038573d19740b2bddf5518a8a0119229 install : $(TARGET) -- 2.34.1

1 0

[PATCH] fribidi: Update to version 1.0.12
by Adolf Belka 23 Apr '22

23 Apr '22

- Update from 1.0.11 to 1.0.12 - Update of rootfile not required - Changelog Overview of changes between 1.0.11 and 1.0.12 * Various fuzzing fixes. - Looking at the details in the commits it looks like fribidi's use of the word fuzzing fixes basically means bug fixes. Included are fixes for a segmentation violation and a stack buffer overflow Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/fribidi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/fribidi b/lfs/fribidi index e9c362788..75ea2d148 100644 --- a/lfs/fribidi +++ b/lfs/fribidi @@ -24,7 +24,7 @@ include Config -VER = 1.0.11 +VER = 1.0.12 THISAPP = fribidi-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 9de3e170e2b6cf90623c711e16f6595f6ca91e14707cbfd36dda7df92689ea79ec36c4b658199e9046eedd07c9ebfde18617525c83cf4b0e9e2ccb4d9f82ed84 +$(DL_FILE)_BLAKE2 = f76f9d28f738f0cc9790ccdf0fe419cb0e7d70b24aa825844d23c4b31ad51c33f09c88ad4876fa6a52523f2a52d5eb7a4b50deeb70f9db750c69ac236ecfa8f5 install : $(TARGET) -- 2.36.0

2 1

[PATCH] Postfix: Update to 3.7.1
by Peter Müller 23 Apr '22

23 Apr '22

Please refer to https://www.postfix.org/announcements/postfix-3.7.1.html for this versions' release notes. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- lfs/postfix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/postfix b/lfs/postfix index 2fec602f3..6fe12c9c8 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -26,7 +26,7 @@ include Config SUMMARY = A fast, secure, and flexible mailer -VER = 3.7.0 +VER = 3.7.1 THISAPP = postfix-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = postfix -PAK_VER = 34 +PAK_VER = 35 DEPS = @@ -70,7 +70,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 7388ad49862c97e20179a2d3ed26069f21e8a578790fcb8adc9f5b648202269bd4c07905931237dab905d991002bcfd9f03d11e6a85b46fcf0e3b72412d852eb +$(DL_FILE)_BLAKE2 = d0bfdbc5105407e5143823e8e14b49e60d5c248eac435279a5fe803b370b46a56de9aff39fdf94398758863f753e43e889e2dffbb393ab63cf486d4fd3f5cf99 install : $(TARGET) -- 2.34.1

1 0

[PATCH] efibootmgr: Update to 17
by Peter Müller 22 Apr '22

22 Apr '22

Full changelog as per https://github.com/rhboot/efibootmgr/releases/tag/17: various CI updates Make.defaults: fix pkg-config invocation for LDFLAGS make_linux_load_option(): add some more efi_error() calls Change the default partition choice. Don't set LIBEFIBOOT_REPORT_GPT_ERRORS=1 Make it easier to build with a devel branch of efivar efibootmgr -e: improve parsing for efivar-36 compat Fix an invalid free() Propogate verbosity to libefivar 36's internal logging facility Add a bit more logging Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- lfs/efibootmgr | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lfs/efibootmgr b/lfs/efibootmgr index 9eb9a5304..2b399349c 100644 --- a/lfs/efibootmgr +++ b/lfs/efibootmgr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2022 IPFire Team <info(a)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,10 +24,10 @@ include Config -VER = 16 +VER = 17 THISAPP = efibootmgr-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 3d09a9d3c4ecd48010315fccae60ab408c0d08e9c734e86a944130ea03e038835fa08745819f5353efbbe36f5017be64faded4b625ef0a0b55d4ca0d612ef232 +$(DL_FILE)_BLAKE2 = a1995a5df74766f762d2eb971fd6095edea8d0a498c9dd1100515866b40c38ae2f299aae51f12767850ec23fbe4709c2c7428dd48755fbec499669b69f6432c9 install : $(TARGET) @@ -72,6 +72,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + # Compile fix + cd $(DIR_APP) && sed -e '/extern int efi_set_verbose/d' -i src/efibootmgr.c + cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ EFIDIR=$(SNAME) $(MAKETUNING) cd $(DIR_APP) && make install EFIDIR=$(SNAME) -- 2.34.1

2 1

[PATCH] lynis: Update to 3.0.7
by Peter Müller 22 Apr '22

22 Apr '22

Full changelog as retrieved from https://cisofy.com/changelog/lynis/#307: - MALW-3290 - Show status of malware components - OS detection for RHEL 6 and Funtoo Linux - Added service manager openrc - DBS-1804 - Added alias for MariaDB - FINT-4316 - Support for newer Ubuntu versions - MALW-3280 - Added Trend Micro malware agent - NETW-3200 - Allow unknown number of spaces in modprobe blacklists - PKGS-7320 - Support for Garuda Linux and arch-audit - Several improvements for busybox shell - Russian translation of Lynis extended Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- lfs/lynis | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lfs/lynis b/lfs/lynis index c2fa262b0..bc6b29297 100644 --- a/lfs/lynis +++ b/lfs/lynis @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2022 IPFire Team <info(a)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 # @@ -26,7 +26,7 @@ include Config SUMMARY = Security and System auditing tool -VER = 3.0.6 +VER = 3.0.7 THISAPP = lynis-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -35,7 +35,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = lynis -PAK_VER = 10 +PAK_VER = 11 DEPS = @@ -49,7 +49,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 49abad8af63e4eeb3585a241d34433f85f84719a0bbd0c2c1f87a2ab45fc0f88193236f3b10261a59e1c6efd9352134a29b8f311c5a5a749eccede2c8353c6e7 +$(DL_FILE)_BLAKE2 = d9cddcba9c83ddee08ea38c8e80bf6f0a78179ad102673a876a1fe3d4544612e945d8637a8d026ce7bff72b09d6274223031e1cb6fc74596b2c65f0380fecd67 install : $(TARGET) -- 2.34.1

2 1

[PATCH] bind: Update to 9.16.28
by Matthias Fischer 22 Apr '22

22 Apr '22

For details see: https://downloads.isc.org/isc/bind9/9.16.28/doc/arm/html/notes.html#notes-f… "Notes for BIND 9.16.28 New Features Add a new configuration option reuseport to disable load balancing on sockets in situations where processing of Response Policy Zones (RPZ), Catalog Zones, or large zone transfers can cause service disruptions. See the BIND 9 ARM for more detail. [GL #3249] Bug Fixes Invalid dnssec-policy definitions, where the defined keys did not cover both KSK and ZSK roles for a given algorithm, were being accepted. These are now checked, and the dnssec-policy is rejected if both roles are not present for all algorithms in use. [GL #3142] Handling of TCP write timeouts has been improved to track the timeout for each TCP write separately, leading to a faster connection teardown in case the other party is not reading the data. [GL #3200]" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/bind | 14 +++++++------- lfs/bind | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index df3df4f47..0d41c90e5 100644 --- a/config/rootfiles/common/bind +++ b/config/rootfiles/common/bind @@ -274,24 +274,24 @@ usr/bin/nsupdate #usr/include/pk11/site.h #usr/include/pkcs11 #usr/include/pkcs11/pkcs11.h -usr/lib/libbind9-9.16.27.so +usr/lib/libbind9-9.16.28.so #usr/lib/libbind9.la #usr/lib/libbind9.so -usr/lib/libdns-9.16.27.so +usr/lib/libdns-9.16.28.so #usr/lib/libdns.la #usr/lib/libdns.so -usr/lib/libirs-9.16.27.so +usr/lib/libirs-9.16.28.so #usr/lib/libirs.la #usr/lib/libirs.so -usr/lib/libisc-9.16.27.so +usr/lib/libisc-9.16.28.so #usr/lib/libisc.la #usr/lib/libisc.so -usr/lib/libisccc-9.16.27.so +usr/lib/libisccc-9.16.28.so #usr/lib/libisccc.la #usr/lib/libisccc.so -usr/lib/libisccfg-9.16.27.so +usr/lib/libisccfg-9.16.28.so #usr/lib/libisccfg.la #usr/lib/libisccfg.so -usr/lib/libns-9.16.27.so +usr/lib/libns-9.16.28.so #usr/lib/libns.la #usr/lib/libns.so diff --git a/lfs/bind b/lfs/bind index c558cfa01..e3efc84a1 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.16.27 +VER = 9.16.28 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 37b49ce81aa5122493a4feb2bb7be53c5d46ff2ce28456aec31ce1332520a09c10bb2293c736bffe7badbc2bc3d156c05f83367678bd101e17b99ca3ff69bebf +$(DL_FILE)_BLAKE2 = 55932faa004c2021cd4c3384c14d4a58ca43d5a853602e271b58c9022256a5ec2eb1317168ac07c2b233b19407ddfb8c7f64a50d93169207cb3b4fe535a78afa install : $(TARGET) -- 2.25.1

2 1

[PATCH] knot: Update to 3.1.7
by Matthias Fischer 22 Apr '22

22 Apr '22

For changes since v3.1.1 see: https://gitlab.nic.cz/knot/knot-dns/raw/v3.1.7/NEWS Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/knot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/knot b/lfs/knot index e3a9924d4..0c0c033c0 100644 --- a/lfs/knot +++ b/lfs/knot @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2022 IPFire Team <info(a)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.1.1 +VER = 3.1.7 THISAPP = knot-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = d6f9d29de153b5bdea8a294ae3d65131a0bdcc339ecdc507a9e1429a9cc50752e91f14ea84a7446de76869c6f129d571e9b6b4f9b048618941c4f4c0d667dbff +$(DL_FILE)_BLAKE2 = d0e5c999c1b4bca89b86ad956dd91643f795fcba94757e34c44e3e6b925030c332da9cb0bfd72d6ae0f32b3016a8c50d821cfcc513268682dd6b5715714d9047 install : $(TARGET) -- 2.25.1

2 1

[PATCH 1/2] libhtp: Update to 0.5.40 - needed for 'suricata'
by Matthias Fischer 22 Apr '22

22 Apr '22

For details see: https://github.com/OISF/libhtp/releases/tag/0.5.40 "uri: optionally allows spaces in uri ints: integer handling improvements headers: continue on nul byte headers: consistent trailing space handling list: fix integer overflow util: remove unused htp_utf8_decode fix 100-continue with CL 0 lzma: don't do unnecessary realloc" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/libhtp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/libhtp b/lfs/libhtp index 3dad9955b..ffc82f8cd 100644 --- a/lfs/libhtp +++ b/lfs/libhtp @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2022 IPFire Team <info(a)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.5.39 +VER = 0.5.40 THISAPP = libhtp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = fec9e2b0dd867becde972e9e2bf572a21d90acc747a8ee8338e2fe68240d690706db01b12c3cf8c6bf1b5d4415da4e4a5bf92a056e1dff96f54a9ac569906712 +$(DL_FILE)_BLAKE2 = 37239d8d0afb6841c54bab1669a17ec7336b10998f8835ef91cf9556dd7449991ce6fb04a408d16b431ba6327b32f6f509a79a4c79ffc6e88e555fcf2e9f2cce install : $(TARGET) -- 2.25.1

2 3

[PATCH] mc: Update to 4.8.28
by Matthias Fischer 22 Apr '22

22 Apr '22

For details see: http://midnight-commander.org/wiki/NEWS-4.8.28 Summary: "Major changes since 4.8.27 Core VFS Remove SMB support (#1) Editor Add syntax highlighting: Ngspice/SPICE (http://ngspice.sourceforge.net/) (#4316, #4319) DOT/Graphviz (https://graphviz.org/doc/info/lang.html) (#4322) Viewer Support file/dir macros from mc.ect for standalone viewer (#4150) Misc Minimal version of "check" utility is 0.9.10. Code cleanup (#4270, #4330) Support Shift+Fn keys for KiTTY (#4325) Filehighlight: graphical formats: avif, jp2, jxl, heic, heif, psb, psd (#4328) Markdown (#4351) Fixes FTBFS with ncurses build with --disable-widec (#4200) There is no exit on Ubuntu PPC64 big endian (#3887) Segfault on change panel mode (#4323) Accelerator conflict in Left/Right? menu (#4284) move a lot of files across filesystems is slow (#4287) mc.ext: wrong order of rules: general matches are made before more specific ones (#4273) mc.ext: compressed man pages are shown unformatted (#4272) ext.d/misc.sh: invoking /bin/cat on systems that have no /bin/cat (like NixOS) (#4298) mcedit: errors in syntax definitions (#4286) VFS: FISH: when uploading a symbolic link, it creates both the link and its target (#4281) VFS: SFTP: timestamps are not preserved for uploaded symlink (#4285) VFS: EXTFS: incorrect test of isoinfo (#4326) Typo in skin files (#3146)" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/packages/mc | 4 +++- lfs/mc | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc index 1faf7ee76..9d063581b 100644 --- a/config/rootfiles/packages/mc +++ b/config/rootfiles/packages/mc @@ -158,6 +158,7 @@ usr/share/mc/syntax/debian-sources-list.syntax usr/share/mc/syntax/diff.syntax usr/share/mc/syntax/dlink.syntax usr/share/mc/syntax/dos.syntax +usr/share/mc/syntax/dot.syntax usr/share/mc/syntax/ebuild.syntax usr/share/mc/syntax/eiffel.syntax usr/share/mc/syntax/erlang.syntax @@ -173,9 +174,9 @@ usr/share/mc/syntax/idl.syntax usr/share/mc/syntax/ini.syntax usr/share/mc/syntax/j.syntax usr/share/mc/syntax/jal.syntax -usr/share/mc/syntax/json.syntax usr/share/mc/syntax/java.syntax usr/share/mc/syntax/js.syntax +usr/share/mc/syntax/json.syntax usr/share/mc/syntax/kotlin.syntax usr/share/mc/syntax/latex.syntax usr/share/mc/syntax/lisp.syntax @@ -211,6 +212,7 @@ usr/share/mc/syntax/sh.syntax usr/share/mc/syntax/slang.syntax usr/share/mc/syntax/smalltalk.syntax usr/share/mc/syntax/spec.syntax +usr/share/mc/syntax/spice.syntax usr/share/mc/syntax/sql.syntax usr/share/mc/syntax/strace.syntax usr/share/mc/syntax/swift.syntax diff --git a/lfs/mc b/lfs/mc index 36d60b416..5c77e544d 100644 --- a/lfs/mc +++ b/lfs/mc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2022 IPFire Team <info(a)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 # @@ -26,7 +26,7 @@ include Config SUMMARY = Midnight Commander -VER = 4.8.27 +VER = 4.8.28 THISAPP = mc-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mc -PAK_VER = 22 +PAK_VER = 23 DEPS = @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = efb0f3a8beb7285a793085a8e3b3a49619d0f8a4babff7de90f7a462cf6c013bbc08b92bc48e2c2e2204799332cd0160a86e201d9368cabde78e653b4306763f +$(DL_FILE)_BLAKE2 = f4218e6c166df85b7b3736f0fd1414c9507c72074f06001f12b114ce6c6fbbf3688ab850aa70f5063eb3920736f878e113eb39a5d261ccfc3ffa9dab473a8436 install : $(TARGET) -- 2.25.1

2 1

[PATCH] menu: Fix warnings, clean code
by Leo-Andres Hofmann 20 Apr '22

20 Apr '22

This patch adds default values and removes a missing translation to fix "uninitialized value" and "odd number of elements" warnings. Removes function calls from functions.pl that have already been handled by the header before it is loaded by eval(). Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de> --- config/cfgroot/header.pl | 4 +++- config/menu/20-status.menu | 4 ++-- config/menu/30-network.menu | 2 +- html/html/themes/ipfire/include/functions.pl | 16 +++++----------- langs/de/cgi-bin/de.pl | 1 - langs/fr/cgi-bin/fr.pl | 1 - 6 files changed, 11 insertions(+), 17 deletions(-) diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index 5ddea348e..65459cc92 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -46,7 +46,7 @@ my $menu = \%menuhash; %settings = (); %ethsettings = (); %pppsettings = (); -@URI = (); +my @URI = split('\?', $ENV{'REQUEST_URI'}); ### Make sure this is an SSL request if ($ENV{'SERVER_ADDR'} && $ENV{'HTTPS'} ne 'on') { @@ -573,3 +573,5 @@ sub get_manualpage_url() { # No manual page configured, return nothing return; } + +1; # End of package "Header" diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu index 2bcf0d5e8..f969a3b0b 100644 --- a/config/menu/20-status.menu +++ b/config/menu/20-status.menu @@ -49,7 +49,7 @@ $substatus->{'54.networkovpnsrv'} = { 'caption' => "$Lang::tr{'vpn statistic n2n'}", 'uri' => '/cgi-bin/netovpnsrv.cgi', - 'title' => "$Lang::tr{'vpn statistics n2n'}", + 'title' => "$Lang::tr{'vpn statistic n2n'}", 'enabled' => 1, }; $substatus->{'60.hardwaregraphs'} = { @@ -90,7 +90,7 @@ $substatus->{'75.atm-status'} = {'caption' => 'Atm-status', 'uri' => '/cgi-bin/atm-status.cgi', 'title' => 'Atm-status', - 'enabled' => `find /sys/class/atm/*/device 2>/dev/null`, + 'enabled' => (`find /sys/class/atm/*/device 2>/dev/null` ? 1 : 0), }; $substatus->{'76.mdstat'} = {'caption' => 'Mdstat', 'uri' => '/cgi-bin/mdstat.cgi', diff --git a/config/menu/30-network.menu b/config/menu/30-network.menu index 19571a870..4ef537ed4 100644 --- a/config/menu/30-network.menu +++ b/config/menu/30-network.menu @@ -67,7 +67,7 @@ 'caption' => $Lang::tr{'aliases'}, 'uri' => '/cgi-bin/aliases.cgi', 'title' => "$Lang::tr{'aliases'}", - 'enabled' => `grep "RED_TYPE=STATIC" /var/ipfire/ethernet/settings`, + 'enabled' => (`grep "RED_TYPE=STATIC" /var/ipfire/ethernet/settings` ? 1 : 0), }; $subnetwork->{'80.macadressmenu'} = { 'caption' => $Lang::tr{'mac address menu'}, diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index d74c962e4..f2b8e9925 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -31,8 +31,6 @@ # IPFire default theme. # ############################################################################### -require "${General::swroot}/lang.pl"; - ############################################################################### # # print menu html elements for submenu entries @@ -101,20 +99,15 @@ sub openpage { my $title = shift; my $boh = shift; my $extrahead = shift; - my $suppressMenu = shift; + my $suppressMenu = shift // 0; my @tmp = split(/\./, basename($0)); my $scriptName = @tmp[0]; - @URI=split ('\?', $ENV{'REQUEST_URI'} ); - &General::readhash("${swroot}/main/settings", \%settings); - &genmenu(); - my $headline = "IPFire"; if (($settings{'WINDOWWITHHOSTNAME'} eq 'on') || ($settings{'WINDOWWITHHOSTNAME'} eq '')) { $headline = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}"; } - print <<END; <!DOCTYPE html> <html> @@ -165,7 +158,10 @@ print <<END END ; -&showmenu() if ($suppressMenu != 1); +unless($suppressMenu) { + &genmenu(); + &showmenu(); +} print <<END <div class="bigbox fixed"> @@ -270,5 +266,3 @@ sub openbox { sub closebox { print "</div>"; } - -1; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 6094c191a..1145745e0 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2874,7 +2874,6 @@ 'vpn start action start' => 'Immer An', 'vpn statistic n2n' => 'OpenVPN: Netz-zu-Netz-Statistik', 'vpn statistic rw' => 'OpenVPN: Roadwarrior-Statistik', -'vpn statistics n2n' => 'OpenVPN: Netz-zu-Netz-Statistiken', 'vpn subjectaltname' => 'SubjectAlternativeName', 'vpn subjectaltname missing' => 'SubjectAlternativeName darf nicht leer bleiben.', 'vpn wait' => 'WARTE', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 03fc754df..23c01ddb8 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -2949,7 +2949,6 @@ 'vpn start action start' => 'Toujours démarré', 'vpn statistic n2n' => 'OpenVPN (site-à-site)', 'vpn statistic rw' => 'OpenVPN (client nomade)', -'vpn statistics n2n' => 'OpenVPN (site-à-site)', 'vpn subjectaltname' => 'Nom de l\'objet', 'vpn subjectaltname missing' => 'Le nom de l\'objet ne peut être vide.', 'vpn wait' => 'ATTENTE', -- 2.27.0.windows.1

2 1

← Newer
1
...
4
5
6
7
8
9
10
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development April 2022