IPFire-SCM July 2022

ipfire-scm@lists.ipfire.org

1 participants
22 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ef3ca7d6da60e1fd259a96ceadc338da3b2151b7
by Peter Müller 30 Jul '22

30 Jul '22

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 ef3ca7d6da60e1fd259a96ceadc338da3b2151b7 (commit) from 861080834df063b0dc1616c51451d3fe9bb577f6 (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 ef3ca7d6da60e1fd259a96ceadc338da3b2151b7 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Jul 30 11:03:53 2022 +0000 linux: Update kernel configuration for x86_64 Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.x86_64-ipfire | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index a5c5a4e29..40975b5fc 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.48-ipfire Kernel Configuration +# Linux/x86 5.15.57-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0" CONFIG_CC_IS_GCC=y @@ -322,9 +322,6 @@ CONFIG_X86_FEATURE_NAMES=y CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y # CONFIG_GOLDFISH is not set -CONFIG_RETPOLINE=y -CONFIG_CC_HAS_SLS=y -CONFIG_SLS=y # CONFIG_X86_CPU_RESCTRL is not set CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_VSMP is not set @@ -482,6 +479,16 @@ CONFIG_HAVE_LIVEPATCH=y # CONFIG_LIVEPATCH is not set # end of Processor type and features +CONFIG_CC_HAS_SLS=y +CONFIG_CC_HAS_RETURN_THUNK=y +CONFIG_SPECULATION_MITIGATIONS=y +CONFIG_PAGE_TABLE_ISOLATION=y +CONFIG_RETPOLINE=y +CONFIG_RETHUNK=y +CONFIG_CPU_UNRET_ENTRY=y +CONFIG_CPU_IBPB_ENTRY=y +CONFIG_CPU_IBRS_ENTRY=y +CONFIG_SLS=y CONFIG_ARCH_HAS_ADD_PAGES=y CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y @@ -6962,7 +6969,6 @@ CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY=y CONFIG_SECURITYFS=y # CONFIG_SECURITY_NETWORK is not set -CONFIG_PAGE_TABLE_ISOLATION=y # CONFIG_SECURITY_PATH is not set # CONFIG_INTEL_TXT is not set CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 861080834df063b0dc1616c51451d3fe9bb577f6
by Peter Müller 29 Jul '22

29 Jul '22

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 861080834df063b0dc1616c51451d3fe9bb577f6 (commit) via ec175339bf09a7d4c9d16e7b0e61fac4e1d8001a (commit) via 9375c96ff27e4342b427535487c5656a0cdae760 (commit) via 59c6ea57fa25f1d05ae1be92ee459e95ae4ec5e1 (commit) via ffce292e7a864e547de575d3b0b8be1a2b91cd5f (commit) via 21aac1a554cb6ec5caa387cea9079d12bca1b8ac (commit) from 3543c24f41027c6e4437b8d1b3d3ca75d47ed3c9 (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 861080834df063b0dc1616c51451d3fe9bb577f6 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Fri Jul 29 17:09:56 2022 +0000 linux: Update ARM rootfiles Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit ec175339bf09a7d4c9d16e7b0e61fac4e1d8001a Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Fri Jul 29 17:06:15 2022 +0000 logwatch: Fix rootfile Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 9375c96ff27e4342b427535487c5656a0cdae760 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Fri Jul 29 17:04:43 2022 +0000 Core Update 170: Ship kmod Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 59c6ea57fa25f1d05ae1be92ee459e95ae4ec5e1 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu Jul 28 10:26:46 2022 +0000 kmod: Update to 30 Please refer to the tarballs's NEWS file for release announcements. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ffce292e7a864e547de575d3b0b8be1a2b91cd5f Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu Jul 28 13:09:51 2022 +0000 CUPS: Update to 2.4.2 Please refer to https://github.com/OpenPrinting/cups/releases/tag/v2.4.2 for the release notes of this version. Most notably for IPFire, it comes with OpenSSL support again. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 21aac1a554cb6ec5caa387cea9079d12bca1b8ac Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu Jul 28 13:19:16 2022 +0000 Samba: Update to 4.16.4 This is a security release, please refer to https://www.samba.org/samba/latest_news.html#4.16.4 for the respective advisory. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/aarch64/linux | 1 + config/rootfiles/common/armv6l/linux | 1 + config/rootfiles/common/kmod | 2 +- config/rootfiles/common/logwatch | 1 + config/rootfiles/{oldcore/125 => core/170}/filelists/kmod | 0 config/rootfiles/packages/aarch64/samba | 2 ++ config/rootfiles/packages/armv6l/samba | 2 ++ config/rootfiles/packages/x86_64/samba | 2 ++ lfs/cups | 6 +++--- lfs/kmod | 4 ++-- lfs/samba | 8 ++++---- 11 files changed, 19 insertions(+), 10 deletions(-) copy config/rootfiles/{oldcore/125 => core/170}/filelists/kmod (100%) Difference in files: diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 906fde0c3..6de30d1a0 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -13021,6 +13021,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/linux/mmu_context.h #lib/modules/KVER-ipfire/build/include/linux/mmu_notifier.h #lib/modules/KVER-ipfire/build/include/linux/mmzone.h +#lib/modules/KVER-ipfire/build/include/linux/mnt_idmapping.h #lib/modules/KVER-ipfire/build/include/linux/mnt_namespace.h #lib/modules/KVER-ipfire/build/include/linux/mod_devicetable.h #lib/modules/KVER-ipfire/build/include/linux/mod_devicetable.h.orig diff --git a/config/rootfiles/common/armv6l/linux b/config/rootfiles/common/armv6l/linux index 81f30b9ff..79e4facfe 100644 --- a/config/rootfiles/common/armv6l/linux +++ b/config/rootfiles/common/armv6l/linux @@ -13471,6 +13471,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/linux/mmu_context.h #lib/modules/KVER-ipfire/build/include/linux/mmu_notifier.h #lib/modules/KVER-ipfire/build/include/linux/mmzone.h +#lib/modules/KVER-ipfire/build/include/linux/mnt_idmapping.h #lib/modules/KVER-ipfire/build/include/linux/mnt_namespace.h #lib/modules/KVER-ipfire/build/include/linux/mod_devicetable.h #lib/modules/KVER-ipfire/build/include/linux/mod_devicetable.h.orig diff --git a/config/rootfiles/common/kmod b/config/rootfiles/common/kmod index f46db860b..78971ea22 100644 --- a/config/rootfiles/common/kmod +++ b/config/rootfiles/common/kmod @@ -9,6 +9,6 @@ sbin/rmmod #usr/lib/libkmod.la #usr/lib/libkmod.so usr/lib/libkmod.so.2 -usr/lib/libkmod.so.2.3.7 +usr/lib/libkmod.so.2.4.0 #usr/lib/pkgconfig/libkmod.pc #usr/share/bash-completion/completions/kmod diff --git a/config/rootfiles/common/logwatch b/config/rootfiles/common/logwatch index 91e2d37b3..975ec40c1 100644 --- a/config/rootfiles/common/logwatch +++ b/config/rootfiles/common/logwatch @@ -97,6 +97,7 @@ usr/share/logwatch/default.conf/services/dhcpd.conf #usr/share/logwatch/default.conf/services/dpkg.conf #usr/share/logwatch/default.conf/services/emerge.conf #usr/share/logwatch/default.conf/services/evtapplication.conf +#usr/share/logwatch/default.conf/services/evtmswindows.conf #usr/share/logwatch/default.conf/services/evtsecurity.conf #usr/share/logwatch/default.conf/services/evtsystem.conf #usr/share/logwatch/default.conf/services/exim.conf diff --git a/config/rootfiles/core/170/filelists/kmod b/config/rootfiles/core/170/filelists/kmod new file mode 120000 index 000000000..0020e197e --- /dev/null +++ b/config/rootfiles/core/170/filelists/kmod @@ -0,0 +1 @@ +../../../common/kmod \ No newline at end of file diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba index 49d924537..a049902b0 100644 --- a/config/rootfiles/packages/aarch64/samba +++ b/config/rootfiles/packages/aarch64/samba @@ -186,6 +186,7 @@ usr/lib/libsmbclient.so.0 usr/lib/libsmbclient.so.0.7.0 usr/lib/libsmbconf.so usr/lib/libsmbconf.so.0 +usr/lib/libsmbconf.so.0.0.1 usr/lib/libsmbldap.so usr/lib/libsmbldap.so.2 usr/lib/libsmbldap.so.2.1.0 @@ -495,6 +496,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_base_test.py #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_tgs_tests.py +#usr/lib/python3.10/site-packages/samba/tests/krb5/kpasswd_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/pac_align_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/raw_testcase.py diff --git a/config/rootfiles/packages/armv6l/samba b/config/rootfiles/packages/armv6l/samba index 440f29cb2..dec46311b 100644 --- a/config/rootfiles/packages/armv6l/samba +++ b/config/rootfiles/packages/armv6l/samba @@ -186,6 +186,7 @@ usr/lib/libsmbclient.so.0 usr/lib/libsmbclient.so.0.7.0 usr/lib/libsmbconf.so usr/lib/libsmbconf.so.0 +usr/lib/libsmbconf.so.0.0.1 usr/lib/libsmbldap.so usr/lib/libsmbldap.so.2 usr/lib/libsmbldap.so.2.1.0 @@ -495,6 +496,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_base_test.py #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_tgs_tests.py +#usr/lib/python3.10/site-packages/samba/tests/krb5/kpasswd_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/pac_align_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/raw_testcase.py diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba index 8e355e873..66b210a08 100644 --- a/config/rootfiles/packages/x86_64/samba +++ b/config/rootfiles/packages/x86_64/samba @@ -186,6 +186,7 @@ usr/lib/libsmbclient.so.0 usr/lib/libsmbclient.so.0.7.0 usr/lib/libsmbconf.so usr/lib/libsmbconf.so.0 +usr/lib/libsmbconf.so.0.0.1 usr/lib/libsmbldap.so usr/lib/libsmbldap.so.2 usr/lib/libsmbldap.so.2.1.0 @@ -495,6 +496,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_base_test.py #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_tgs_tests.py +#usr/lib/python3.10/site-packages/samba/tests/krb5/kpasswd_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/pac_align_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/raw_testcase.py diff --git a/lfs/cups b/lfs/cups index 312f165d8..e500ac2e7 100644 --- a/lfs/cups +++ b/lfs/cups @@ -24,7 +24,7 @@ include Config -VER = 2.4.1 +VER = 2.4.2 SUMMARY = The Common UNIX Printing System THISAPP = cups-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 28 +PAK_VER = 29 DEPS = avahi cups-filters dbus ghostscript @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 690d9d92f9bc84c2bb360699191cd67e1489ffc3ab219376dfc1a8795379950c95bf58c2033a0dbd2918262c5d104e21e31c4585cb35d229b0fac6cf4967bfd7 +$(DL_FILE)_BLAKE2 = 97053feb502d4fdc28810b806000b6c84a6795d5adcec0789e73e5477d5802d46a99381366d16219f627166df088f6decde5c144bd0c38b5745815dc1e426bc5 install : $(TARGET) diff --git a/lfs/kmod b/lfs/kmod index ad12065c7..89e196252 100644 --- a/lfs/kmod +++ b/lfs/kmod @@ -24,7 +24,7 @@ include Config -VER = 29 +VER = 30 THISAPP = kmod-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a +$(DL_FILE)_BLAKE2 = c5cb690dbb8fad66ac603648ff330794b417ff2fa2f8f61b6e9cb76dab93f984128b3d83a826203f39f3fb94f174f0db7395db6a47e52e8b7c561486f9d00778 install : $(TARGET) diff --git a/lfs/samba b/lfs/samba index a48a0ecb1..87d192492 100644 --- a/lfs/samba +++ b/lfs/samba @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 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 = 4.16.0 +VER = 4.16.4 SUMMARY = A SMB/CIFS File, Print, and Authentication Server THISAPP = samba-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 85 +PAK_VER = 86 DEPS = avahi cups libtirpc perl-Parse-Yapp perl-JSON @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 6ea27634690d00779ec7f671e48b17246285c9576221d9b9b3f9238cd72310e8aaaeb646031212e65c239d2e959deef7bd9739932db0c716b7ea79cc11f2f7b8 +$(DL_FILE)_BLAKE2 = e685511a76770272cabd1292f36d2b005e2d21212e4782cdf4fd05039f7667b35501873cffa9a53547d523805b2a91ffeba0881aaee905304968c42efef22dfa install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3543c24f41027c6e4437b8d1b3d3ca75d47ed3c9
by Peter Müller 28 Jul '22

28 Jul '22

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 3543c24f41027c6e4437b8d1b3d3ca75d47ed3c9 (commit) via 5cc18f9c12bc4aaec6075af1a20c5f8ef0347bf4 (commit) via 2be67e384101f152b37b4bfc6dc1927414021d66 (commit) via e360a9cb136ba5d79bc89f20b48c4e6b360b3502 (commit) via 074b509724e1ffa334db275e594eeaebcca80164 (commit) via 2b921b796dd629a1fdee74cc8fd405e056e2b2a8 (commit) via 5e1dbc95f727d6f65b1ef55d139347945dd7774c (commit) via c6d055a85b79cd276928cd1c7da39e52b7ae9beb (commit) via 4bac9fdd12a7518815a5d1333ce124e739e1fbf4 (commit) via 2b25c029326c6651026499688a8ac283d2e2b63a (commit) via 0bd5b131956c2ceddf6954cf9bddb5321f58fb07 (commit) via f201005f460cec3cde06623556bd067d820071c5 (commit) via b3d408d8c8d016d6e8ca247b7e089b7ebbd81cfc (commit) via 5591a68c0580280432a52b7c22c308bf7867018c (commit) via 37895e21bf87885a012e9a196e59d6fa04b76740 (commit) via 533cfb1b7752aacf6fa735511b8c580dacb4feee (commit) via e404dab5e42db7fa47695e1b4a50365e18be0e10 (commit) from 14909d5fe9371231437b9b85a35adf4ae5e006f1 (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 3543c24f41027c6e4437b8d1b3d3ca75d47ed3c9 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu Jul 28 13:48:17 2022 +0000 Core Update 170: Ship Pakfire changes Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 5cc18f9c12bc4aaec6075af1a20c5f8ef0347bf4 Author: Robin Roevens <robin.roevens(a)disroot.org> Date: Thu Jul 28 13:21:36 2022 +0200 pakfire: Replace getmetadata duplicate code - Use getmetadata function in services.cgi to determine installed addon services to display. Removing code duplication and intel that should only be known by pakfire itself. - Removed hardcoded exclusions: - squid should show up correctly using the new metadata info - mdadm is part of core and will never show up here - alsa, unknown if this problem still exists, but if it is, this should be handled somewhere else. Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org> commit 2be67e384101f152b37b4bfc6dc1927414021d66 Author: Robin Roevens <robin.roevens(a)disroot.org> Date: Thu Jul 28 13:21:35 2022 +0200 pakfire: Add getmetadata function - Added new getmetadata function for easy access to all available metadata of a pak without knowledge about or need to parse pakfire internal db files. - Added new 'pakfire info' functionality for displaying all available metadata of (a) pak(s) to the user, using the new getmetadata. Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org> commit e360a9cb136ba5d79bc89f20b48c4e6b360b3502 Author: Robin Roevens <robin.roevens(a)disroot.org> Date: Thu Jul 28 13:21:34 2022 +0200 pakfire: Replace status duplicate code - Make use of renewed status function in pakfire.cgi removing duplicate code Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org> commit 074b509724e1ffa334db275e594eeaebcca80164 Author: Robin Roevens <robin.roevens(a)disroot.org> Date: Thu Jul 28 13:21:33 2022 +0200 pakfire: Refactor status seperating UI and logic - Removed UI code from status function now returning hash with status properties. - Removed function coreupdate_available as it is now not used anymore - Added UI code to pakfire status routine - Added meaningfull exitcode to status: - 2: Core update available - 3: Pak update available - 4: Reboot required - Error codes can be added together: 2+3 = 5 means both core update and pak update is available Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org> commit 2b921b796dd629a1fdee74cc8fd405e056e2b2a8 Author: Robin Roevens <robin.roevens(a)disroot.org> Date: Thu Jul 28 13:21:32 2022 +0200 pakfire: Add list upgrade functionality - Added possibility to list available upgrades from commandline using 'pakfire list upgrade'. - Added exitcode to 'pakfire list' - Moved 'Pakfire has finished' log message inside END block to always log when pakfire exited. - Fix: allow [options] between 'list' and [installed/notinstalled/ upgrade] parameters (Partly fixes Bug #12868) Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org> commit 5e1dbc95f727d6f65b1ef55d139347945dd7774c Author: Robin Roevens <robin.roevens(a)disroot.org> Date: Thu Jul 28 13:21:31 2022 +0200 pakfire: Optimize upgradecore function upgradecore function should just upgrade the core: Moved check if upgrade is necessary to pakfire upgrade code, removing code from upgradecore function duplicating codedbinfo workings. Also adding more vebosity to pakfire upgrade. Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org> commit c6d055a85b79cd276928cd1c7da39e52b7ae9beb Author: Robin Roevens <robin.roevens(a)disroot.org> Date: Thu Jul 28 13:21:30 2022 +0200 pakfire: Replace dbgetlist duplicate code Replace dbgetlist code duplicating dblist and getmetafile workings with call to actual dblist and getmetafile functions. Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org> commit 4bac9fdd12a7518815a5d1333ce124e739e1fbf4 Author: Robin Roevens <robin.roevens(a)disroot.org> Date: Thu Jul 28 13:21:29 2022 +0200 pakfire: Replace duplicate code with dblist functioncall Replace pakfire install code duplicating dblist working with call to actual dblist function. Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org> commit 2b25c029326c6651026499688a8ac283d2e2b63a Author: Robin Roevens <robin.roevens(a)disroot.org> Date: Thu Jul 28 13:21:28 2022 +0200 pakfire: Translate WUI header/footer text Add en/nl/fr/de translations for: - Traffic: In XXX bit/s Out XXX bit/s - IPFire X.XX (xxx) - Core Update XXX ... Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org> commit 0bd5b131956c2ceddf6954cf9bddb5321f58fb07 Author: Robin Roevens <robin.roevens(a)disroot.org> Date: Thu Jul 28 13:21:27 2022 +0200 pakfire: Refactor dblist seperating UI and logic - Removed UI code from dblist function and refactor it making it return a hash representing the pak db for easier handling of this data. - Moved core update check in dblist to new seperate dbcoreinfo function making it return a hash with current and possibly available core version info. - Update existing calls to dblist - Bring UI parts previously in dblist to pakfire program itself, pakfire.cgi and index.cgi with a few small enhancements: - Translations for 'Core-Update', 'Release', 'Update' and 'Version' - Add currently installed version numbers to installed paks list in pakfire.cgi - Add 'Installed: yes/no' to pakfire list output so people not using colors have this information too. (Partly fixes Bug #12868) - Add update available details to pakfire list output if package has updates available. Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org> commit f201005f460cec3cde06623556bd067d820071c5 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu Jul 28 13:42:48 2022 +0000 Core Update 170: Stop Suricata before extracting files Stopping services before potentially tampering with files they use is a more sane approach than doing the latter and hope the running service can cope with it. Suricata, at least, reportedly doesn't. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit b3d408d8c8d016d6e8ca247b7e089b7ebbd81cfc Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu Jul 28 13:41:12 2022 +0000 Core Update 170: Ship kernel and regenerate initial ramdisks locally Per https://lists.ipfire.org/pipermail/development/2022-July/013889.html, we ship the updated kernel in Core Update 170, but generate the initial ramdisks locally to save space. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 5591a68c0580280432a52b7c22c308bf7867018c Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Mon Jul 11 14:48:08 2022 +0000 linux: Enable Intel DMA Remapping Devices by default on x86_64 If available, the kernel will enable IOMMU (a/k/a DMA remapping) by default on boot. To tools making use of that, particularly hypervisors, this provides better security without any downsides. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 37895e21bf87885a012e9a196e59d6fa04b76740 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu Jul 28 13:24:56 2022 +0000 linux: Update to 5.15.57 Please refer to https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.57 for the changelog of this version. Since it introduces architecture-dependent rootfile changes due to CPU side-channel mitigations, changes to ARM rootfiles have been omitted due to the lack of hardware. Supposed hardening changes will be submitted separately. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 533cfb1b7752aacf6fa735511b8c580dacb4feee Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Wed Jul 13 19:46:38 2022 +0000 Core Update 170: Harden mount options of /boot on existing installations The second version of this patch uses @ instead of / for sed delimiters, which makes the command less hard to read. Since Core Update 170 already requires a reboot at this point, the respective directive is omitted. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit e404dab5e42db7fa47695e1b4a50365e18be0e10 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu Jul 28 13:28:42 2022 +0000 installer: Harden mount options of /boot partition Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.x86_64-ipfire | 2 +- config/rootfiles/common/x86_64/linux | 10 +- .../124 => core/170}/filelists/aarch64/linux | 0 .../159 => core/170}/filelists/armv6l/linux | 0 config/rootfiles/core/170/filelists/files | 4 + .../100 => core/170}/filelists/x86_64/linux | 0 config/rootfiles/core/170/update.sh | 83 ++++- html/cgi-bin/index.cgi | 6 +- html/cgi-bin/pakfire.cgi | 49 +-- html/cgi-bin/services.cgi | 74 +++-- html/html/themes/ipfire/include/functions.pl | 8 +- langs/de/cgi-bin/de.pl | 7 + langs/en/cgi-bin/en.pl | 7 + langs/fr/cgi-bin/fr.pl | 7 + langs/nl/cgi-bin/nl.pl | 7 + lfs/linux | 4 +- src/installer/hw.c | 4 +- src/pakfire/lib/functions.pl | 335 ++++++++++++--------- src/pakfire/pakfire | 248 ++++++++++++--- 19 files changed, 588 insertions(+), 267 deletions(-) copy config/rootfiles/{oldcore/124 => core/170}/filelists/aarch64/linux (100%) copy config/rootfiles/{oldcore/159 => core/170}/filelists/armv6l/linux (100%) copy config/rootfiles/{oldcore/100 => core/170}/filelists/x86_64/linux (100%) Difference in files: diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 06d98e325..a5c5a4e29 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -6488,7 +6488,7 @@ CONFIG_AMD_IOMMU_V2=y CONFIG_DMAR_TABLE=y CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IOMMU_SVM=y -# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set +CONFIG_INTEL_IOMMU_DEFAULT_ON=y CONFIG_INTEL_IOMMU_FLOPPY_WA=y # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set CONFIG_IRQ_REMAP=y diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index 326bc6c6e..b25f85a3a 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -6785,6 +6785,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/CC_HAS_INT128 #lib/modules/KVER-ipfire/build/include/config/CC_HAS_KASAN_GENERIC #lib/modules/KVER-ipfire/build/include/config/CC_HAS_NO_PROFILE_FN_ATTR +#lib/modules/KVER-ipfire/build/include/config/CC_HAS_RETURN_THUNK #lib/modules/KVER-ipfire/build/include/config/CC_HAS_SANCOV_TRACE_PC #lib/modules/KVER-ipfire/build/include/config/CC_HAS_SANE_STACKPROTECTOR #lib/modules/KVER-ipfire/build/include/config/CC_HAS_SLS @@ -6877,6 +6878,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/CPU_FREQ_GOV_SCHEDUTIL #lib/modules/KVER-ipfire/build/include/config/CPU_FREQ_GOV_USERSPACE #lib/modules/KVER-ipfire/build/include/config/CPU_FREQ_STAT +#lib/modules/KVER-ipfire/build/include/config/CPU_IBPB_ENTRY +#lib/modules/KVER-ipfire/build/include/config/CPU_IBRS_ENTRY #lib/modules/KVER-ipfire/build/include/config/CPU_IDLE #lib/modules/KVER-ipfire/build/include/config/CPU_IDLE_GOV_HALTPOLL #lib/modules/KVER-ipfire/build/include/config/CPU_IDLE_GOV_LADDER @@ -6889,6 +6892,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/CPU_SUP_HYGON #lib/modules/KVER-ipfire/build/include/config/CPU_SUP_INTEL #lib/modules/KVER-ipfire/build/include/config/CPU_SUP_ZHAOXIN +#lib/modules/KVER-ipfire/build/include/config/CPU_UNRET_ENTRY #lib/modules/KVER-ipfire/build/include/config/CRASH_DUMP #lib/modules/KVER-ipfire/build/include/config/CRC16 #lib/modules/KVER-ipfire/build/include/config/CRC32 @@ -8071,6 +8075,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/INTEL_INT0002_VGPIO #lib/modules/KVER-ipfire/build/include/config/INTEL_IOATDMA #lib/modules/KVER-ipfire/build/include/config/INTEL_IOMMU +#lib/modules/KVER-ipfire/build/include/config/INTEL_IOMMU_DEFAULT_ON #lib/modules/KVER-ipfire/build/include/config/INTEL_IOMMU_FLOPPY_WA #lib/modules/KVER-ipfire/build/include/config/INTEL_IOMMU_SVM #lib/modules/KVER-ipfire/build/include/config/INTEL_IPS @@ -9088,7 +9093,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/NFSD_V4_SECURITY_LABEL #lib/modules/KVER-ipfire/build/include/config/NFS_ACL_SUPPORT #lib/modules/KVER-ipfire/build/include/config/NFS_COMMON -#lib/modules/KVER-ipfire/build/include/config/NFS_DEBUG #lib/modules/KVER-ipfire/build/include/config/NFS_DISABLE_UDP_SUPPORT #lib/modules/KVER-ipfire/build/include/config/NFS_FS #lib/modules/KVER-ipfire/build/include/config/NFS_FSCACHE @@ -9586,6 +9590,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/RELOCATABLE #lib/modules/KVER-ipfire/build/include/config/RENESAS_PHY #lib/modules/KVER-ipfire/build/include/config/RESET_CONTROLLER +#lib/modules/KVER-ipfire/build/include/config/RETHUNK #lib/modules/KVER-ipfire/build/include/config/RETPOLINE #lib/modules/KVER-ipfire/build/include/config/RETU_WATCHDOG #lib/modules/KVER-ipfire/build/include/config/RFKILL @@ -10333,6 +10338,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/SPARSEMEM_VMEMMAP #lib/modules/KVER-ipfire/build/include/config/SPARSEMEM_VMEMMAP_ENABLE #lib/modules/KVER-ipfire/build/include/config/SPARSE_IRQ +#lib/modules/KVER-ipfire/build/include/config/SPECULATION_MITIGATIONS #lib/modules/KVER-ipfire/build/include/config/SPLIT_PTLOCK_CPUS #lib/modules/KVER-ipfire/build/include/config/SPMI #lib/modules/KVER-ipfire/build/include/config/SRCU @@ -10374,7 +10380,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/SUNGEM_PHY #lib/modules/KVER-ipfire/build/include/config/SUNRPC #lib/modules/KVER-ipfire/build/include/config/SUNRPC_BACKCHANNEL -#lib/modules/KVER-ipfire/build/include/config/SUNRPC_DEBUG #lib/modules/KVER-ipfire/build/include/config/SUNRPC_GSS #lib/modules/KVER-ipfire/build/include/config/SURFACE_HOTPLUG #lib/modules/KVER-ipfire/build/include/config/SURFACE_PLATFORMS @@ -13460,6 +13465,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/linux/mmu_context.h #lib/modules/KVER-ipfire/build/include/linux/mmu_notifier.h #lib/modules/KVER-ipfire/build/include/linux/mmzone.h +#lib/modules/KVER-ipfire/build/include/linux/mnt_idmapping.h #lib/modules/KVER-ipfire/build/include/linux/mnt_namespace.h #lib/modules/KVER-ipfire/build/include/linux/mod_devicetable.h #lib/modules/KVER-ipfire/build/include/linux/mod_devicetable.h.orig diff --git a/config/rootfiles/core/170/filelists/aarch64/linux b/config/rootfiles/core/170/filelists/aarch64/linux new file mode 120000 index 000000000..3a2532bc7 --- /dev/null +++ b/config/rootfiles/core/170/filelists/aarch64/linux @@ -0,0 +1 @@ +../../../../common/aarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/170/filelists/armv6l/linux b/config/rootfiles/core/170/filelists/armv6l/linux new file mode 120000 index 000000000..aee1f4d73 --- /dev/null +++ b/config/rootfiles/core/170/filelists/armv6l/linux @@ -0,0 +1 @@ +../../../../common/armv6l/linux \ No newline at end of file diff --git a/config/rootfiles/core/170/filelists/files b/config/rootfiles/core/170/filelists/files index 0b4fa2dcc..458aba96f 100644 --- a/config/rootfiles/core/170/filelists/files +++ b/config/rootfiles/core/170/filelists/files @@ -1,12 +1,16 @@ etc/rc.d/init.d/firewall opt/pakfire/lib/functions.pl +opt/pakfire/pakfire srv/web/ipfire/cgi-bin/aliases.cgi +srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/ipblocklist.cgi +srv/web/ipfire/cgi-bin/pakfire.cgi srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/logs.cgi/ids.dat srv/web/ipfire/cgi-bin/logs.cgi/ipblocklists.dat srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromblocklist.dat +srv/web/ipfire/html/themes/ipfire/include/functions.pl usr/lib/firewall/rules.pl usr/local/bin/setaliases usr/local/bin/update-ipblocklists diff --git a/config/rootfiles/core/170/filelists/x86_64/linux b/config/rootfiles/core/170/filelists/x86_64/linux new file mode 120000 index 000000000..0615b5b9a --- /dev/null +++ b/config/rootfiles/core/170/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/170/update.sh index 8dc99e5d8..cbac8572e 100644 --- a/config/rootfiles/core/170/update.sh +++ b/config/rootfiles/core/170/update.sh @@ -26,6 +26,18 @@ core=170 +exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + # force fsck at next boot, this may fix free space on xfs + touch /forcefsck + # don't start pakfire again at error + killall -KILL pak_update + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + # Remove old core updates from pakfire cache to save space... for (( i=1; i<=$core; i++ )); do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire @@ -33,6 +45,45 @@ done # Stop services /etc/init.d/rc.d/unbound stop +/etc/init.d/rc.d/suricata stop + +KVER="xxxKVERxxx" + +# Backup uEnv.txt if exist +if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org +fi + +# Do some sanity checks prior to the kernel update +case $(uname -r) in + *-ipfire*) + # Ok. + ;; + *) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 100000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 + exit 2 +fi + +# Remove the old kernel +rm -rvf \ + /boot/System.map-* \ + /boot/config-* \ + /boot/ipfirerd-* \ + /boot/initramfs-* \ + /boot/vmlinuz-* \ + /boot/uImage-* \ + /boot/zImage-* \ + /boot/uInit-* \ + /boot/dtb-* \ + /lib/modules # Remove files rm -rvf \ @@ -121,7 +172,23 @@ sed -i /etc/collectd.conf \ # Start services /etc/init.d/rc.d/unbound start -/etc/init.d/rc.d/suricata restart +/etc/init.d/rc.d/suricata start + +# Harden mount options of /boot +sed -e -i "s@[[:space:]]*\/boot[[:space:]]*auto[[:space:]]*defaults[[:space:]]*@ \/boot auto defaults,nodev,noexec,nosuid @g" /etc/fstab + +# Regenerate all initrds +dracut --regenerate-all --force +case "$(uname -m)" in + armv*) + mkimage -A arm -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire + rm /boot/initramfs-${KVER}-ipfire.img + ;; + aarch64) + mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire + # dont remove initramfs because grub need this to boot. + ;; +esac # This update needs a reboot... touch /var/run/need_reboot @@ -130,6 +197,20 @@ touch /var/run/need_reboot /etc/init.d/fireinfo start sendprofile +# remove lm_sensor config after collectd was started +# to reserch sensors at next boot with updated kernel +rm -f /etc/sysconfig/lm_sensors + +# Upadate Kernel version in uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# Call user update script (needed for some ARM boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + # Update grub config to display new core version if [ -e /boot/grub/grub.cfg ]; then grub-mkconfig -o /boot/grub/grub.cfg diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 18c26942e..6fecae1ff 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -604,7 +604,11 @@ if ($warnmessage) { &Header::closebox(); } -&Pakfire::dblist("upgrade", "notice"); +my %coredb = &Pakfire::coredbinfo(); +if (defined $coredb{'AvailableRelease'}) { + print "<br /><br /><br /><a href='pakfire.cgi'>$Lang::tr{'core notice 1'} $coredb{'Release'} $Lang::tr{'core notice 2'} $coredb{'AvailableRelease'} $Lang::tr{'core notice 3'}</a>"; +} + if ( -e "/var/run/need_reboot" ) { print "<div style='text-align:center; color:red;'>"; print "<br/><br/>$Lang::tr{'needreboot'}!"; diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 3e8dc5460..42c603c61 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -43,6 +43,9 @@ my $PM_DEFAULT = 'default'; # Default user interface with command processing my $PM_LOGREAD = 'logread'; # Log messages viewer (ignores all commands) my $pagemode = $PM_DEFAULT; +# Get Pakfire status +my %pakfire_status = &Pakfire::status(); + # Load general settings &General::readhash("${General::swroot}/main/settings", \%mainsettings); &General::readhash("${General::swroot}/pakfire/settings", \%pakfiresettings); @@ -84,7 +87,7 @@ if($cgiparams{'ACTION'} eq 'json-getstatus') { my %status = ( 'running' => &_is_pakfire_busy() || "0", 'running_since' => &General::age("$Pakfire::lockfile") || "0s", - 'reboot' => (-e "/var/run/need_reboot") || "0", + 'reboot' => ("$pakfire_status{'RebootRequired'}" eq "yes") || "0", 'failure' => $failure || "0" ); @@ -366,32 +369,26 @@ $selected{"TREE"}{"testing"} = ""; $selected{"TREE"}{"unstable"} = ""; $selected{"TREE"}{$pakfiresettings{"TREE"}} = "selected"; -my $core_release = `cat /opt/pakfire/db/core/mine 2>/dev/null`; -chomp($core_release); -my $core_update_age = &General::age("/opt/pakfire/db/core/mine"); -my $corelist_update_age = &General::age("/opt/pakfire/db/lists/core-list.db"); -my $server_update_age = &General::age("/opt/pakfire/db/lists/server-list.db"); -my $packages_update_age = &General::age("/opt/pakfire/db/lists/packages_list.db"); - &Header::openbox("100%", "center", "Pakfire"); print <<END; <table id="pfmain"> END -if ( -e "/var/run/need_reboot") { +if ("$pakfire_status{'RebootRequired'}" eq "yes") { print "\t\t<tr><td colspan='2'><a href='/cgi-bin/shutdown.cgi'>$Lang::tr{'needreboot'}!</a></td></tr>\n"; } + print <<END; <tr><td class="heading">$Lang::tr{'pakfire system state'}:</td> <td class="heading">$Lang::tr{'available updates'}:</td></tr> - <tr><td><strong>$Lang::tr{'pakfire core update level'}: $core_release</strong> + <tr><td><strong>$Lang::tr{'pakfire core update level'}: $pakfire_status{'Release'}</strong> <hr> <div class="pflist"> - $Lang::tr{'pakfire last update'} $core_update_age $Lang::tr{'pakfire ago'}<br> - $Lang::tr{'pakfire last serverlist update'} $server_update_age $Lang::tr{'pakfire ago'}<br> - $Lang::tr{'pakfire last core list update'} $corelist_update_age $Lang::tr{'pakfire ago'}<br> - $Lang::tr{'pakfire last package update'} $packages_update_age $Lang::tr{'pakfire ago'} + $Lang::tr{'pakfire last update'} $pakfire_status{'LastUpdate'} $Lang::tr{'pakfire ago'}<br> + $Lang::tr{'pakfire last serverlist update'} $pakfire_status{'LastServerListUpdate'} $Lang::tr{'pakfire ago'}<br> + $Lang::tr{'pakfire last core list update'} $pakfire_status{'LastCoreListUpdate'} $Lang::tr{'pakfire ago'}<br> + $Lang::tr{'pakfire last package update'} $pakfire_status{'LastPakListUpdate'} $Lang::tr{'pakfire ago'} </div> <form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='ACTION' value='update' /> @@ -403,7 +400,17 @@ print <<END; <select name="UPDPAKS" class="pflist" size="5" disabled> END - &Pakfire::dblist("upgrade", "forweb"); + if ("$pakfire_status{'CoreUpdateAvailable'}" eq "yes") { + print "<option value=\"core\">$Lang::tr{'core update'} -- $pakfire_status{'CoreVersion'} -- $Lang::tr{'release'}: $pakfire_status{'Release'} -> $pakfire_status{'AvailableRelease'}</option>\n"; + } + + if ($pakfire_status{'PakUpdatesAvailable'} > 0) { + my %upgradelist = &Pakfire::dblist("upgrade"); + foreach my $pak (sort keys %upgradelist) { + print "<option value=\"$pak\">$Lang::tr{'pak update'}: $pak -- $Lang::tr{'version'}: $upgradelist{$pak}{'ProgVersion'} -> $upgradelist{$pak}{'AvailableProgVersion'} -- $Lang::tr{'release'}: $upgradelist{$pak}{'Release'} -> $upgradelist{$pak}{'AvailableRelease'}</option>\n"; + } + } + print <<END; </select> <input type='hidden' name='ACTION' value='upgrade' /> @@ -419,7 +426,11 @@ END <select name="INSPAKS" class="pflist" size="10" multiple> END - &Pakfire::dblist("notinstalled", "forweb"); + my %notinstalledlist = &Pakfire::dblist("notinstalled"); + foreach my $pak (sort keys %notinstalledlist) { + print "<option value=\"$pak\">$pak-$notinstalledlist{$pak}{'ProgVersion'}-$notinstalledlist{$pak}{'Release'}</option>\n"; + } + print <<END; </select> <input type='hidden' name='ACTION' value='install' /> @@ -431,7 +442,11 @@ END <select name="DELPAKS" class="pflist" size="10" multiple> END - &Pakfire::dblist("installed", "forweb"); + my %installedlist = &Pakfire::dblist("installed"); + foreach my $pak (sort keys %installedlist) { + print "<option value=\"$pak\">$pak-$installedlist{$pak}{'ProgVersion'}-$installedlist{$pak}{'Release'}</option>\n"; + } + print <<END; </select> <input type='hidden' name='ACTION' value='remove' /> diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index a1dcfd57e..29926ecc3 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -29,6 +29,7 @@ require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; require "${General::swroot}/graphs.pl"; +require "/opt/pakfire/lib/functions.pl"; my %color = (); my %mainsettings = (); @@ -160,51 +161,44 @@ END my $lines=0; # Used to count the outputlines to make different bgcolor - # Generate list of installed addon pak's - opendir (DIR, "/opt/pakfire/db/installed") || die "Cannot opendir /opt/pakfire/db/installed/: $!"; - my @pak = sort readdir DIR; - closedir(DIR); - - foreach (@pak){ - chomp($_); - next unless (m/^meta-/); - s/^meta-//; - - # Check which of the paks are services - if (-e "/etc/init.d/$_") { - # blacklist some packages - # - # alsa has trouble with the volume saving and was not really stopped - # mdadm should not stopped with webif because this could crash the system - # - if ( $_ eq 'squid' ) { - next; - } - if ( ($_ ne "alsa") && ($_ ne "mdadm") ) { - $lines++; - if ($lines % 2){ - print "<tr>"; - $col="bgcolor='$color{'color22'}'"; - }else{ - print "<tr>"; - $col="bgcolor='$color{'color20'}'"; - } + my @paks; + my @addon_services; + + # Generate list of installed addon pak services + my %paklist = &Pakfire::dblist("installed"); - print "<td align='left' $col width='31%'>$_</td> "; - my $status = isautorun($_,$col); - print "$status "; - print "<td align='center' $col width='8%'><a href='services.cgi?$_!start'><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></a></td>"; - print "<td align='center' $col width='8%'><a href='services.cgi?$_!stop'><img alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' border='0' /></a></td> "; - my $status = &isrunningaddon($_,$col); - $status =~ s/\\[[0-1]\;[0-9]+m//g; - - chomp($status); - print "$status"; - print "</tr>"; + foreach my $pak (keys %paklist) { + my %metadata = &Pakfire::getmetadata($pak, "installed"); + + if ("$metadata{'Services'}") { + foreach my $service (split(/ /, "$metadata{'Services'}")) { + push(@addon_services, $service); } } } + foreach (@addon_services) { + $lines++; + if ($lines % 2){ + print "<tr>"; + $col="bgcolor='$color{'color22'}'"; + }else{ + print "<tr>"; + $col="bgcolor='$color{'color20'}'"; + } + print "<td align='left' $col width='31%'>$_</td> "; + my $status = isautorun($_,$col); + print "$status "; + print "<td align='center' $col width='8%'><a href='services.cgi?$_!start'><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></a></td>"; + print "<td align='center' $col width='8%'><a href='services.cgi?$_!stop'><img alt='$Lang::tr{'stop'}' title='$Lang::tr{'stop'}' src='/images/go-down.png' border='0' /></a></td> "; + my $status = isrunningaddon($_,$col); + $status =~ s/\\[[0-1]\;[0-9]+m//g; + + chomp($status); + print "$status"; + print "</tr>"; + } + print "</table></div>\n"; &Header::closebox(); diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index cc976e812..cbd05d109 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -67,9 +67,9 @@ sub showmenu() { if ($settings{'SPEED'} ne 'off') { print <<EOF; <div id='traffic'> - <strong>Traffic:</strong> - In <span id='rx_kbs'>--.-- bit/s</span>   - Out <span id='tx_kbs'>--.-- bit/s</span> + <strong>$Lang::tr{'traffic stat title'}:</strong> + $Lang::tr{'traffic stat in'} <span id='rx_kbs'>--.-- bit/s</span>   + $Lang::tr{'traffic stat out'} <span id='tx_kbs'>--.-- bit/s</span> </div> EOF } @@ -202,7 +202,7 @@ sub openpagewithoutmenu { sub closepage () { open(FILE, "</etc/system-release"); my $system_release = <FILE>; - $system_release =~ s/core/Core Update /; + $system_release =~ s/core/$Lang::tr{'core update'} /; close(FILE); print <<END; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 49c582a1e..6a5ce1117 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -653,6 +653,7 @@ 'core notice 1' => '<strong>Hinweis:</strong> Es steht eine Aktualisierung von Core-Update', 'core notice 2' => 'auf', 'core notice 3' => 'zur Verfügung.', +'core update' => 'Core-Update', 'could not be opened' => 'konnte nicht geöffnet werden', 'could not connect to' => 'Konnte keine Verbindung herstellen mit', 'could not connect to www ipcop org' => 'Keine Verbindung zu www.ipcop.org möglich', @@ -2012,6 +2013,7 @@ 'ovpnsys log' => 'OVPN-System-Protokoll', 'package failed to install' => 'Programmpaket konnte nicht installiert werden.', 'pagerefresh' => 'Seite wird aktualisiert. Bitte warten.', +'pak update' => 'Paketupdate', 'pakfire accept all' => 'Möchten Sie der Installation aller Pakete zustimmen?', 'pakfire ago' => 'her.', 'pakfire already busy' => 'Pakfire führt bereits eine Aufgabe aus. Bitte versuchen Sie es später erneut.', @@ -2157,6 +2159,7 @@ 'refresh index page while connected' => 'Aktualisiere index.cgi Seite während der Verbindung', 'refresh update list' => 'Aktualisiere Update-Liste', 'registered user rules' => 'Talos VRT-Regelsatz für registrierte Benutzer', +'release' => 'Release', 'released' => 'Freigegeben', 'reload' => 'neu laden', 'remark' => 'Anmerkung', @@ -2500,6 +2503,9 @@ 'traffic on' => 'Verkehr auf', 'traffic shaping' => 'Traffic Shaping', 'traffic shaping settings' => 'Einstellungen der Datenflußkontrolle', +'traffic stat title' => 'ROTER Traffic', +'traffic stat in' => 'Ein', +'traffic stat out' => 'Aus', 'traffic warn level bad' => 'Warnlevel ist nicht gültig', 'trafficblue' => 'WLAN', 'trafficdate' => 'Datum', @@ -2868,6 +2874,7 @@ 'valid till' => 'Gültig bis', 'vci number' => 'VCI-Nummer:', 'vendor' => 'Hersteller', +'version' => 'Version', 'view log' => 'Protokoll anzeigen', 'virtual address' => 'Virtuelle Addresse', 'virtual private networking' => 'Virtuelles Privates Netzwerk', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index ae233de8e..73aa4d04a 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -684,6 +684,7 @@ 'core notice 1' => '<strong>Notice:</strong> There is a core-update from', 'core notice 2' => 'to', 'core notice 3' => 'available.', +'core update' => 'Core-Update', 'could not be opened' => 'could not be opened.', 'could not connect to' => 'Could not connect to', 'could not connect to www ipcop org' => 'Could not connect to www.ipfire.org', @@ -2065,6 +2066,7 @@ 'ovpnsys log' => 'OVPN-System-Log', 'package failed to install' => 'Package failed to install.', 'pagerefresh' => 'Page is beeing refreshed, please wait.', +'pak update' => 'Update', 'pakfire accept all' => 'Do you want to install all packages?', 'pakfire ago' => 'ago.', 'pakfire already busy' => 'Pakfire is already performing a task. Please try again later.', @@ -2211,6 +2213,7 @@ 'refresh index page while connected' => 'Refresh index.cgi page while connected', 'refresh update list' => 'Refresh update list', 'registered user rules' => 'Talos VRT rules for registered users', +'release' => 'Release', 'released' => 'Released', 'reload' => 'reload', 'remark' => 'Remark', @@ -2564,6 +2567,9 @@ 'traffic on' => 'Traffic on', 'traffic shaping' => 'Traffic Shaping', 'traffic shaping settings' => 'Traffic Shaping Settings', +'traffic stat title' => 'RED Traffic', +'traffic stat in' => 'In', +'traffic stat out' => 'Out', 'traffic warn level bad' => 'Warnlevel is not correct', 'trafficblue' => 'WLAN', 'trafficdate' => 'Date', @@ -2935,6 +2941,7 @@ 'valid till' => 'Valid till', 'vci number' => 'VCI number:', 'vendor' => 'Vendor', +'version' => 'Version', 'view log' => 'view log', 'virtual address' => 'Virtual Address', 'virtual private networking' => 'Virtual Private Networking', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 245ec62b6..9e0bd3449 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -690,6 +690,7 @@ 'core notice 1' => '<strong>Remarque :</strong> Une mise à jour est disponible depuis la version', 'core notice 2' => 'vers', 'core notice 3' => '', +'core update' => 'Mise à jour du coeur', 'could not be opened' => 'ne peut pas être ouvert', 'could not connect to' => 'Impossible de se connecter à', 'could not connect to www ipcop org' => 'Impossible de se connecter à www.ipcop.org', @@ -2074,6 +2075,7 @@ 'ovpnsys log' => 'Journal système OVPN', 'package failed to install' => 'L\'installation du paquet a échoué.', 'pagerefresh' => 'La page est en cours d\'actualisation, veuillez patienter.', +'pak update' => 'Mise à jour', 'pakfire accept all' => 'Voulez-vous installer ce(s) paquet(s) ?', 'pakfire ago' => '', 'pakfire already busy' => 'Pakfire est déjà en train d\'effectuer une tâche. Veuillez réessayer plus tard.', @@ -2221,6 +2223,7 @@ 'refresh index page while connected' => 'Actualiser la page index.cgi pendant la connexion', 'refresh update list' => 'Actualiser la liste des mises à jour', 'registered user rules' => 'Règles Sourcefire VRT pour les utilisateurs enregistrés', +'release' => 'Révision', 'released' => 'Disponible', 'reload' => 'Recharger', 'remark' => 'Remarque ', @@ -2576,6 +2579,9 @@ 'traffic on' => 'Trafic en cours', 'traffic shaping' => 'Arrangement du trafic', 'traffic shaping settings' => 'Réglages de l\'arrangement du trafic', +'traffic stat title' => 'Trafic ROUGE', +'traffic stat in' => 'Entrée', +'traffic stat out' => 'Sortie', 'traffic warn level bad' => 'Le niveau d\'alerte n\'est pas correct', 'trafficblue' => 'WLAN', 'trafficdate' => 'Date', @@ -2946,6 +2952,7 @@ 'valid till' => 'Valide jusqu\'au', 'vci number' => 'Nombre VCI :', 'vendor' => 'Vendeur', +'version' => 'Version', 'view log' => 'Afficher log', 'virtual address' => 'Adresse virtuelle', 'virtual private networking' => 'Réseau privé virtuel (VPN)', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 5979873bb..7229a86ae 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -577,6 +577,7 @@ 'core notice 1' => '<strong>Let op:</strong> Er is een core-update van', 'core notice 2' => 'naar', 'core notice 3' => 'beschikbaar.', +'core update' => 'Core-Update', 'could not be opened' => 'kan niet worden geopend.', 'could not connect to' => 'Kan niet verbinden', 'could not connect to www ipcop org' => 'Kan niet verbinden met www.ipfire.org', @@ -1690,6 +1691,7 @@ 'ovpnsys log' => 'OVPN-Systeem-Log', 'package failed to install' => 'Pakket kon niet worden geïnstalleerd.', 'pagerefresh' => 'Pagina wordt ververst, wacht even a.u.b.', +'pak update' => 'Opwaardering', 'pakfire accept all' => 'Wilt u alle pakketten installeren?', 'pakfire ago' => 'geleden.', 'pakfire available addons' => 'Beschikbare extensies:', @@ -1817,6 +1819,7 @@ 'refresh index page while connected' => 'Ververs de index.cgi pagina terwijl verbonden', 'refresh update list' => 'Ververs update-lijst', 'registered user rules' => 'Talos VRT regels voor geregistreerde gebruikers', +'release' => 'Uitgave', 'released' => 'Released', 'reload' => 'herlaad', 'remark' => 'Opmerking', @@ -2128,6 +2131,9 @@ 'traffic on' => 'Verkeer op', 'traffic shaping' => 'Verkeersregeling', 'traffic shaping settings' => 'Verkeersregeling instellingen', +'traffic stat title' => 'ROOD Verkeer', +'traffic stat in' => 'In', +'traffic stat out' => 'Uit', 'traffic warn level bad' => 'Waarschuwingsniveau is onjuist', 'trafficblue' => 'WLAN', 'trafficdate' => 'Datum', @@ -2484,6 +2490,7 @@ 'valid root certificate already exists' => 'Er bestaat al een geldig root certificaat.', 'valid till' => 'Geldig tot', 'vci number' => 'VCI nummer:', +'version' => 'Versie', 'view log' => 'bekijk log', 'virtual address' => 'Virtueel adres', 'virtual private networking' => 'Virtual Private Networking', diff --git a/lfs/linux b/lfs/linux index 384ed9d89..07e838933 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 5.15.49 +VER = 5.15.57 ARM_PATCHES = 5.15-ipfire5 THISAPP = linux-$(VER) @@ -78,7 +78,7 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_BLAKE2 = 0f78d980b2d6ec189865a85f3bf65e015365034f797ffda88077a77162d3bc30aec5f44a5257aa2aee0a97ee12e4c38b796bc8fddbe9f6ff6067b0c17ff0207e +$(DL_FILE)_BLAKE2 = 9adea6b8ee97ead38ecab39b1ef08b2ee1647eebbb2a8ccd2ba253eeebfd6435c83a03e83e186809473a982a373185874c0082aa0c56f5928d304c7df56dfb86 arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 58a70e757a9121a0aac83604a37aa787ec7ac0ee4970c5a3ac3bcb2dbaca32b00089cae6c0da5cf2fe0a2e156427b5165c6a86e0371a3e896f4c7cdd699c34a0 install : $(TARGET) diff --git a/src/installer/hw.c b/src/installer/hw.c index 12f8e793d..0ed6050b3 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -1,7 +1,7 @@ /*############################################################################# # # # IPFire - An Open Source Firewall Distribution # -# Copyright (C) 2014 IPFire development team # +# 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 # @@ -1134,7 +1134,7 @@ int hw_write_fstab(struct hw_destination* dest) { uuid = hw_get_uuid(dest->part_boot); if (uuid) { - fprintf(f, FSTAB_FMT, uuid, "/boot", "auto", "defaults", 1, 2); + fprintf(f, FSTAB_FMT, uuid, "/boot", "auto", "defaults,nodev,noexec,nosuid", 1, 2); free(uuid); } } diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index 505988af9..1ebf98775 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -44,7 +44,7 @@ my @VALID_KEY_FINGERPRINTS = ( ); # A small color-hash :D -my %color; +our %color; $color{'normal'} = "\033[0m"; $color{'black'} = "\033[0;30m"; $color{'darkgrey'} = "\033[1;30m"; @@ -114,7 +114,8 @@ sub usage { &Pakfire::message("Usage: pakfire <install|remove> [options] <pak(s)>"); &Pakfire::message(" <update> - Contacts the servers for new lists of paks."); &Pakfire::message(" <upgrade> - Installs the latest version of all paks."); - &Pakfire::message(" <list> - Outputs a short list with all available paks."); + &Pakfire::message(" <list> [installed/notinstalled/upgrade] - Outputs a list with all, installed, available or upgradeable paks."); + &Pakfire::message(" <info> <pak> [<pak> ...] - Output pak metadata."); &Pakfire::message(" <status> - Outputs a summary about available core upgrades, updates and a required reboot"); &Pakfire::message(""); &Pakfire::message(" Global options:"); @@ -410,9 +411,7 @@ sub dbgetlist { my %metadata; my @templine; - open(FILE, "<$Conf::dbdir/lists/packages_list.db"); - my @db = <FILE>; - close(FILE); + my %paklist = &Pakfire::dblist("all"); opendir(DIR,"$Conf::dbdir/meta"); my @files = readdir(DIR); @@ -424,118 +423,123 @@ sub dbgetlist { next if ( $file =~ /^old/ ); %metadata = parsemetafile("$Conf::dbdir/meta/$file"); - foreach $prog (@db) { - @templine = split(/\;/,$prog); - if (("$metadata{'Name'}" eq "$templine[0]") && ("$metadata{'Release'}" ne "$templine[2]")) { - move("$Conf::dbdir/meta/meta-$metadata{'Name'}","$Conf::dbdir/meta/old_meta-$metadata{'Name'}"); - getmetafile($metadata{'Name'}); - } + if ((defined $paklist{"$metadata{'Name'}"}) && ( + ("$paklist{\"$metadata{'Name'}\"}{'Release'}" ne "$metadata{'Release'}") || + (defined $paklist{"$metadata{'Name'}"}{'AvailableRelease'})) + ) { + move("$Conf::dbdir/meta/meta-$metadata{'Name'}","$Conf::dbdir/meta/old_meta-$metadata{'Name'}"); + getmetafile($metadata{'Name'}); } } } +sub coredbinfo { + ### This subroutine returns core db version information in a hash. + # Usage is without arguments + + eval(`grep "core_" $Conf::dbdir/lists/core-list.db`); + + my %coredb = ( + CoreVersion => $Conf::version, + Release => $Conf::core_mine, + ); + + $coredb{'AvailableRelease'} = $core_release if ("$Conf::core_mine" < "$core_release"); + + return %coredb; +} + sub dblist { - ### This subroutine lists the packages. - # You may also pass a filter: &Pakfire::dblist(filter) - # Usage is always with two arguments. - # filter may be: all, notinstalled, installed + ### This subroutine returns the packages from the packages_list db in a hash. + # It uses the currently cached version of packages_list. To ensure latest + # data, run Pakfire::dbgetlist first. + # You may also pass a filter: &Pakfire::dblist(filter) + # Usage is always with one argument. + # filter may be: + # - "all": list all known paks, + # - "notinstalled": list only not installed paks, + # - "installed": list only installed paks + # - "upgrade": list only upgradable paks + # + # Returned hash format: + # ( "<pak name>" => ( + # "Installed" => "Yes" or "No" wether the pak is installed, + # "ProgVersion" => Installed program version when "Installed" => "Yes" or + # Available version when "Installed" => No, + # "Release" => Installed pak release number when "Installed" => "Yes" or + # Available pak release number when "Installed" => No, + # "AvailableProgVersion" => Available program version. + # Only defined if an upgrade to a higher version is available, + # "AvailableRelease" => Available pak release version. + # Only defined if an upgrade to a higher version is available + # ), + # ... + # ) + my $filter = shift; - my $forweb = shift; - my @updatepaks; + my %paklist = (); my $file; my $line; - my $prog; my %metadata; my @templine; - - ### Make sure that the list is not outdated. - #dbgetlist("noforce"); - + open(FILE, "<$Conf::dbdir/lists/packages_list.db"); my @db = <FILE>; close(FILE); - if ("$filter" eq "upgrade") { - if ("$forweb" ne "forweb" && "$forweb" ne "notice" ) {getcoredb("noforce");} - eval(`grep "core_" $Conf::dbdir/lists/core-list.db`); - if ("$core_release" > "$Conf::core_mine") { - if ("$forweb" eq "forweb") { - print "<option value=\"core\">Core-Update -- $Conf::version -- Release: $Conf::core_mine -> $core_release</option>\n"; - } - elsif ("$forweb" eq "notice") { - print "<br /><br /><br /><a href='pakfire.cgi'>$Lang::tr{'core notice 1'} $Conf::core_mine $Lang::tr{'core notice 2'} $core_release $Lang::tr{'core notice 3'}</a>"; - } else { - my $command = "Core-Update $Conf::version\nRelease: $Conf::core_mine -> $core_release\n"; - if ("$Pakfire::enable_colors" eq "1") { - print "$color{'lila'}$command$color{'normal'}\n"; - } else { - print "$command\n"; - } - } - } - + if ("$filter" ne "notinstalled") { opendir(DIR,"$Conf::dbdir/installed"); my @files = readdir(DIR); closedir(DIR); + foreach $file (@files) { next if ( $file eq "." ); next if ( $file eq ".." ); next if ( $file =~ /^old/ ); %metadata = parsemetafile("$Conf::dbdir/installed/$file"); - foreach $prog (@db) { - @templine = split(/\;/,$prog); - if (("$metadata{'Name'}" eq "$templine[0]") && ("$metadata{'Release'}" < "$templine[2]" && "$forweb" ne "notice")) { - push(@updatepaks,$metadata{'Name'}); - if ("$forweb" eq "forweb") { - print "<option value=\"$metadata{'Name'}\">Update: $metadata{'Name'} -- Version: $metadata{'ProgVersion'} -> $templine[1] -- Release: $metadata{'Release'} -> $templine[2]</option>\n"; - } else { - my $command = "Update: $metadata{'Name'}\nVersion: $metadata{'ProgVersion'} -> $templine[1]\nRelease: $metadata{'Release'} -> $templine[2]\n"; - if ("$Pakfire::enable_colors" eq "1") { - print "$color{'lila'}$command$color{'normal'}\n"; - } else { - print "$command\n"; - } - } + foreach $line (@db) { + next unless ($line =~ /.*;.*;.*;/ ); + @templine = split(/\;/,$line); + if (("$metadata{'Name'}" eq "$templine[0]") && ("$metadata{'Release'}" < "$templine[2]")) { + # Add all upgradable paks to list + $paklist{"$metadata{'Name'}"} = { + ProgVersion => $metadata{'ProgVersion'}, + Release => $metadata{'Release'}, + AvailableProgVersion => $templine[1], + AvailableRelease => $templine[2], + Installed => "yes" + }; + last; + } elsif (("$metadata{'Name'}" eq "$templine[0]") && ("$filter" ne "upgrade")) { + # Add installed paks without an upgrade available to list + $paklist{"$metadata{'Name'}"} = { + ProgVersion => $metadata{'ProgVersion'}, + Release => $metadata{'Release'}, + Installed => "yes" + }; + last; } } } - return @updatepaks; - } else { - my $line; - my $use_color; - my @templine; - my $count; - foreach $line (sort @db) { + } + + # Add all not installed paks to list + if (("$filter" ne "upgrade") && ("$filter" ne "installed")) { + foreach $line (@db) { next unless ($line =~ /.*;.*;.*;/ ); - $use_color = ""; @templine = split(/\;/,$line); - if ("$filter" eq "notinstalled") { - next if ( -e "$Conf::dbdir/installed/meta-$templine[0]" ); - } elsif ("$filter" eq "installed") { - next unless ( -e "$Conf::dbdir/installed/meta-$templine[0]" ); - } - $count++; - if ("$forweb" eq "forweb") - { - if ("$filter" eq "notinstalled") { - print "<option value=\"$templine[0]\">$templine[0]-$templine[1]-$templine[2]</option>\n"; - } else { - print "<option value=\"$templine[0]\">$templine[0]</option>\n"; - } - } else { - if ("$Pakfire::enable_colors" eq "1") { - if (&isinstalled("$templine[0]")) { - $use_color = "$color{'red'}" - } else { - $use_color = "$color{'green'}" - } - } - print "${use_color}Name: $templine[0]\nProgVersion: $templine[1]\nRelease: $templine[2]$color{'normal'}\n\n"; - } + next if ((defined $paklist{"$templine[0]"}) || (&isinstalled($templine[0]) == 0)); + + $paklist{"$templine[0]"} = { + ProgVersion => "$templine[1]", + Release => "$templine[2]", + Installed => "no" + }; } - print "$count packages total.\n" unless ("$forweb" eq "forweb"); } + + return %paklist; } sub resolvedeps_one { @@ -703,6 +707,60 @@ sub parsemetafile { return %metadata; } +sub getmetadata { + ### This subroutine returns a hash of available info for a package + # Pass package name and type of info as argument: Pakfire::getmetadata(package, type_of_info) + # Type_of_info can be "latest" or "installed" + # Usage is always with two argument. + my ($pak, $type) = @_; + + my %metadata = ( + Name => $pak, + Installed => "no", + Available => "no"); + my %installed_metadata = (); + + my @templine; + my @file; + + ### Get available version information + if ("$type" eq "latest") { + ### Check if package is in packages_list and get latest available version + my %db = Pakfire::dblist("all"); + + if (defined $db{$pak}) { + ### Get and parse latest available metadata + if (getmetafile("$pak")) { + %metadata = parsemetafile("$Conf::dbdir/meta/meta-$pak"); + + $metadata{'Available'} = "yes"; + ### Rename version info fields + $metadata{'AvailableProgVersion'} = delete $metadata{'ProgVersion'}; + $metadata{'AvailableRelease'} = delete $metadata{'Release'}; + } + } + } + + ### Parse installed pak metadata + if (&isinstalled($pak) == 0) { + %installed_metadata = parsemetafile("$Conf::dbdir/installed/meta-$pak"); + + if ("$type" eq "latest" && exists($metadata{'AvailableProgVersion'})) { + ### Add installed version info to latest metadata + $metadata{'ProgVersion'} = $installed_metadata{'ProgVersion'}; + $metadata{'Release'} = $installed_metadata{'Release'}; + } else { + ### Use metadata of installed pak + %metadata = %installed_metadata; + } + $metadata{'Installed'} = 'yes'; + } else { + $metadata{'Installed'} = 'no'; + } + + return %metadata; +} + sub decryptpak { my $pak = shift; @@ -770,35 +828,28 @@ sub setuppak { } sub upgradecore { - getcoredb("noforce"); - eval(`grep "core_" $Conf::dbdir/lists/core-list.db`); - if ("$core_release" > "$Conf::core_mine") { - # Safety check for lazy testers: - # Before we upgrade to the latest release, we re-install the previous release - # to make sure that the tester has always been on the latest version. - my $tree = &get_tree(); - $Conf::core_mine-- if ($tree eq "testing" || $tree eq "unstable"); - - message("CORE UPGR: Upgrading from release $Conf::core_mine to $core_release"); - - my @seq = `seq $Conf::core_mine $core_release`; - shift @seq; - my $release; - foreach $release (@seq) { - chomp($release); - getpak("core-upgrade-$release"); - } - - foreach $release (@seq) { - chomp($release); - upgradepak("core-upgrade-$release"); - } - - system("echo $core_release > $Conf::coredir/mine"); + # Safety check for lazy testers: + # Before we upgrade to the latest release, we re-install the previous release + # to make sure that the tester has always been on the latest version. + my $tree = &get_tree(); + $Conf::core_mine-- if ($tree eq "testing" || $tree eq "unstable"); - } else { - message("CORE INFO: No new upgrades available. You are on release $Conf::core_mine."); + message("CORE UPGR: Upgrading from release $Conf::core_mine to $core_release"); + + my @seq = ($Conf::core_mine .. $core_release); + shift @seq; + my $release; + foreach $release (@seq) { + chomp($release); + getpak("core-upgrade-$release"); + } + + foreach $release (@seq) { + chomp($release); + upgradepak("core-upgrade-$release"); } + + system("echo $core_release > $Conf::coredir/mine"); } sub isinstalled { @@ -910,24 +961,14 @@ sub progress_bar { sub updates_available { # Get packets with updates available - my @upgradepaks = &Pakfire::dblist("upgrade", "noweb"); + my %upgradepaks = &Pakfire::dblist("upgrade"); - # Get the length of the returned array - my $updatecount = scalar @upgradepaks; + # Get the length of the returned hash + my $updatecount = keys %upgradepaks; return "$updatecount"; } -sub coreupdate_available { - eval(`grep "core_" $Conf::dbdir/lists/core-list.db`); - if ("$core_release" > "$Conf::core_mine") { - return "yes ($core_release)"; - } - else { - return "no"; - } -} - sub reboot_required { if ( -e "/var/run/need_reboot" ) { return "yes"; @@ -938,26 +979,26 @@ sub reboot_required { } sub status { - # General info - my $return = "Core-Version: $Conf::version\n"; - $return .= "Core-Update-Level: $Conf::core_mine\n"; - $return .= "Last update: " . &General::age("/opt/pakfire/db/core/mine") . " ago\n"; - $return .= "Last core-list update: " . &General::age("/opt/pakfire/db/lists/core-list.db") . " ago\n"; - $return .= "Last server-list update: " . &General::age("/opt/pakfire/db/lists/server-list.db") . " ago\n"; - $return .= "Last packages-list update: " . &General::age("/opt/pakfire/db/lists/packages_list.db") . " ago\n"; - - # Get availability of core updates - $return .= "Core-Update available: " . &Pakfire::coreupdate_available() . "\n"; - - # Get availability of package updates - $return .= "Package-Updates available: " . &Pakfire::updates_available() . "\n"; - - # Test if reboot is required - $return .= "Reboot required: " . &Pakfire::reboot_required() . "\n"; - - # Return status text - print "$return"; - exit 1; + ### This subroutine returns pakfire status information in a hash. + # Usage is without arguments + + # Add core version info + my %status = &Pakfire::coredbinfo(); + + # Add last update info + $status{'LastUpdate'} = &General::age("/opt/pakfire/db/core/mine"); + $status{'LastCoreListUpdate'} = &General::age("/opt/pakfire/db/lists/core-list.db"); + $status{'LastServerListUpdate'} = &General::age("/opt/pakfire/db/lists/server-list.db"); + $status{'LastPakListUpdate'} = &General::age("/opt/pakfire/db/lists/packages_list.db"); + + # Add number of available package updates + $status{'CoreUpdateAvailable'} = (defined $status{'AvailableRelease'}) ? "yes" : "no"; + $status{'PakUpdatesAvailable'} = &Pakfire::updates_available(); + + # Add if reboot is required + $status{'RebootRequired'} = &Pakfire::reboot_required(); + + return %status; } sub get_arch() { diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire index 6c77695c8..389c1399d 100644 --- a/src/pakfire/pakfire +++ b/src/pakfire/pakfire @@ -107,42 +107,30 @@ ### Make sure that the list is not outdated. &Pakfire::dbgetlist("noforce"); - open(FILE, "<$Conf::dbdir/lists/packages_list.db"); - my @db = <FILE>; - close(FILE); + my %paklist = &Pakfire::dblist("all"); my $dep; my @deps; my $pak; my @paks; my @temp; - my @templine; - my $found = 0; my $return; my @all; foreach $pak (@ARGV) { unless ("$pak" =~ "^-") { - $return = &Pakfire::isinstalled($pak); - if ($return eq 0) { - &Pakfire::message("PAKFIRE INFO: $pak is already installed"); - next; - } - $found = 0; - foreach (@db) { - @templine = split(/;/,$_); - if ("$templine[0]" eq "$pak" ) { - push(@paks,$pak); - push(@all,$pak); - @temp = &Pakfire::resolvedeps("$pak"); - foreach $dep (@temp) { - push(@deps,$dep) if $dep; - push(@all,$dep) if $dep; - } - $found = 1; - break; + if (defined $paklist{$pak}) { + if ("$paklist{$pak}{'Installed'}" eq "yes") { + &Pakfire::message("PAKFIRE INFO: $pak is already installed"); + next; } - } - if ($found == 0) { + push(@paks,$pak); + push(@all,$pak); + @temp = &Pakfire::resolvedeps("$pak"); + foreach $dep (@temp) { + push(@deps,$dep) if $dep; + push(@all,$dep) if $dep; + } + } else { &Pakfire::message(""); &Pakfire::message("PAKFIRE WARN: The pak \"$pak\" is not known. Please try running \"pakfire update\"."); } @@ -270,14 +258,39 @@ &Pakfire::getcoredb("$force"); } elsif ("$ARGV[0]" eq "upgrade") { - &Pakfire::upgradecore(); - my @upgradepaks = &Pakfire::dblist("upgrade", "noweb"); - my @deps = (); + my $use_color = ""; + my $reset_color = ""; + + if ("$Pakfire::enable_colors" eq "1") { + $reset_color = "$Pakfire::color{'normal'}"; + $use_color = "$Pakfire::color{'lightpurple'}"; + } - if (@upgradepaks) { + &Pakfire::message("CORE INFO: Checking for Core-Updates..."); + + ### Make sure that the core db is not outdated. + &Pakfire::getcoredb("noforce"); + my %coredb = &Pakfire::coredbinfo(); + + if (defined $coredb{'AvailableRelease'}) { + &Pakfire::upgradecore(); + } else { + &Pakfire::message("CORE INFO: No new Core-Updates available. You are on release ".$coredb{'Release'}); + } + + &Pakfire::message("PAKFIRE INFO: Checking for package updates..."); + ### Make sure that the package list is not outdated. + &Pakfire::dbgetlist("noforce"); + + my @deps = (); + if (my %upgradepaks = &Pakfire::dblist("upgrade")) { # Resolve the dependencies of the to be upgraded packages - @deps = &Pakfire::resolvedeps_recursive(@upgradepaks); + @deps = &Pakfire::resolvedeps_recursive(keys %upgradepaks); + foreach $pak (sort keys %upgradepaks) { + print "${use_color}Update: $pak\nVersion: $upgradepaks{$pak}{'ProgVersion'} -> $upgradepaks{$pak}{'AvailableProgVersion'}\n"; + print "Release: $upgradepaks{$pak}{'Release'} -> $upgradepaks{$pak}{'AvailableRelease'}${reset_color}\n"; + } &Pakfire::message(""); &Pakfire::message("PAKFIRE UPGR: We are going to install all packages listed above."); if ($interactive) { @@ -290,34 +303,152 @@ exit 1; } } + + # Download packages + foreach $pak (sort keys %upgradepaks) { + &Pakfire::getpak("$pak", ""); + } + + # Download dependencies + foreach $pak (@deps) { + &Pakfire::getpak("$pak", ""); + } + + # Install dependencies first + foreach $pak (@deps) { + &Pakfire::setuppak("$pak"); + } + + # Install all upgrades + foreach $pak (sort keys %upgradepaks) { + &Pakfire::upgradepak("$pak"); + } + } else { + &Pakfire::message("PAKFIRE WARN: No new package upgrades available."); } - # Download packages - foreach $pak (@upgradepaks) { - &Pakfire::getpak("$pak", ""); + } elsif ("$ARGV[0]" eq "list") { + my $count; + my $coreupdate = 0; + my $use_color = ""; + my $reset_color = ""; + my $filter = "all"; + + shift if ("$ARGV[1]" =~ "^-"); + + if ("$ARGV[1]" =~ /installed|notinstalled|upgrade/) { + $filter = "$ARGV[1]"; + } elsif ($ARGV[1]) { + &Pakfire::message("PAKFIRE ERROR: Not a known option $ARGV[1]"); + exit 1; } - # Download dependencies - foreach $pak (@deps) { - &Pakfire::getpak("$pak", ""); + my $pak; + my %paklist = &Pakfire::dblist($filter); + + if ("$Pakfire::enable_colors" eq "1") { + $reset_color = "$Pakfire::color{'normal'}"; + $use_color = "$Pakfire::color{'lightgreen'}"; } - # Install dependencies first - foreach $pak (@deps) { - &Pakfire::setuppak("$pak"); + # Check for available core upgrade first if list of upgrades is requested + if ("$filter" eq "upgrade") { + my %coredb = &Pakfire::coredbinfo(); + + if (defined $coredb{'AvailableRelease'}) { + print "${use_color}Core-Update $coredb{'CoreVersion'}\n"; + print "Release: $coredb{'Release'} -> $coredb{'AvailableRelease'}${reset_color}\n\n"; + $coreupdate = 1; + } } - # Install all upgrades - foreach $pak (@upgradepaks) { - &Pakfire::upgradepak("$pak"); + foreach $pak (sort keys %paklist) { + if ("$Pakfire::enable_colors" eq "1") { + if ("$paklist{$pak}{'Installed'}" eq "yes") { + if (defined $paklist{$pak}{'AvailableProgVersion'}) { + $use_color = "$Pakfire::color{'lightgreen'}"; + } else { + $use_color = "$Pakfire::color{'green'}"; + } + } else { + $use_color = "$Pakfire::color{'red'}"; + } + } + + print "${use_color}Name: $pak\nProgVersion: $paklist{$pak}{'ProgVersion'}\n"; + print "Release: $paklist{$pak}{'Release'}\nInstalled: $paklist{$pak}{'Installed'}\n"; + if (defined $paklist{$pak}{'AvailableProgVersion'}) { + print "Update available:\n Version: $paklist{$pak}{'ProgVersion'} -> $paklist{$pak}{'AvailableProgVersion'}\n Release: $paklist{$pak}{'Release'} -> $paklist{$pak}{'AvailableRelease'}\n"; + } + print "${reset_color}\n"; + } - } elsif ("$ARGV[0]" eq "list") { - if ("$ARGV[1]" =~ /installed|notinstalled/) { - &Pakfire::dblist("$ARGV[1]", "noweb"); + $count = keys %paklist; + if ($count > 0) { + print "$count packages total.\n"; } else { - &Pakfire::message("PAKFIRE WARN: Not a known option $ARGV[1]") if ($ARGV[1]); - &Pakfire::dblist("all", "noweb"); + if (! $coreupdate) { + &Pakfire::message("PAKFIRE WARN: No packages where found using filter $filter."); + exit 1; + } + } + } elsif ("$ARGV[0]" eq "info") { + shift; + + my @paks; + my $pak; + foreach $pak (@ARGV) { + unless ("$pak" =~ "^-") { + push(@paks,$pak); + } + } + + unless ("@paks") { + Pakfire::message("PAKFIRE ERROR: missing package name"); + Pakfire::usage; + exit 1; + } + + foreach $pak (@paks) { + my %metadata = Pakfire::getmetadata($pak, "latest"); + + ### Check if pakfile was actually found + if ($metadata{'Installed'} eq "no" && $metadata{'Available'} eq "no") { + Pakfire::message("PAKFIRE WARN: Pak '$pak' not found."); + last; + } + + unless (defined $metadata{'Available'}) { + Pakfire::message("PAKFIRE WARN: Unable to retrieve latest metadata for $pak. Information may be outdated.") + } + + ### Printout metadata in a user friendly format + print "Name: $metadata{'Name'}\n"; + print "Summary: $metadata{'Summary'}\n"; + if ($metadata{'Available'} eq "yes") { + print "Version: $metadata{'AvailableProgVersion'}-$metadata{'AvailableRelease'}\n"; + } else { + print "Version: $metadata{'ProgVersion'}-$metadata{'Release'}\n"; + } + print "Size: " . Pakfire::beautifysize("$metadata{'Size'}") . "\n"; + print "Dependencies: $metadata{'Dependencies'}\n"; + print "Pakfile: $metadata{'File'}\n"; + print "Service InitScripts: $metadata{'Services'}\n"; + print "Installed: $metadata{'Installed'}\n"; + ### Generate a pak status message + if (! defined $metadata{'Available'}) { + print "Status: unknown (an error occured retrieving latest pak metadata)"; + } elsif ($metadata{'Available'} eq "no") { + print "Status: obsolete (version $metadata{'ProgVersion'}-$metadata{'Release'} is installed)\n"; + } elsif ($metadata{'Installed'} eq "yes" && "$metadata{'Release'}" < "$metadata{'AvailableRelease'}") { + print "Status: outdated (version $metadata{'ProgVersion'}-$metadata{'Release'} is installed)\n"; + } elsif ($metadata{'Installed'} eq "yes") { + print "Status: up-to-date\n"; + } else { + print "Status: not installed\n"; + } + print "\n"; } } elsif ("$ARGV[0]" eq "resolvedeps") { @@ -339,14 +470,31 @@ system("rm -f /etc/fcron.daily/pakfire-upgrade"); } } elsif ("$ARGV[0]" eq "status") { - &Pakfire::status; + my $exitcode = 0; + my %status = &Pakfire::status; + + print "Core-Version: $status{'CoreVersion'}\n"; + print "Core-Update-Level: $status{'Release'}\n"; + print "Last update: $status{'LastUpdate'} ago\n"; + print "Last core-list update: $status{'LastCoreListUpdate'} ago\n"; + print "Last server-list update: $status{'LastServerListUpdate'} ago\n"; + print "Last packages-list update: $status{'LastPakListUpdate'} ago\n"; + print "Core-Update available: $status{'CoreUpdateAvailable'}"; + print " ($status{'AvailableRelease'})" if ("$status{'CoreUpdateAvailable'}" eq "yes"); + print "\nPackage-Updates available: $status{'PakUpdatesAvailable'}\n"; + print "Reboot required: $status{'RebootRequired'}\n"; + + $exitcode += 2 if ($status{'CoreUpdateAvailable'} eq "yes"); + $exitcode += 3 if ($status{'PakUpdatesAvailable'} eq "yes"); + $exitcode += 4 if ($status{'RebootRequired'} eq "yes"); + exit $exitcode; } else { &Pakfire::usage; } - &Pakfire::logger("PAKFIRE INFO: Pakfire has finished. Closing."); - END { + &Pakfire::logger("PAKFIRE INFO: Pakfire has finished. Closing."); + # Check if pakfire has been locked in this session. if ($locked) { # Remove lockfile. hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 14909d5fe9371231437b9b85a35adf4ae5e006f1
by Michael Tremer 27 Jul '22

27 Jul '22

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 14909d5fe9371231437b9b85a35adf4ae5e006f1 (commit) from b2ab2f4cccb0792e7444e87bd5ea18590ed6272c (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 14909d5fe9371231437b9b85a35adf4ae5e006f1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jul 27 09:49:36 2022 +0000 cups-pdf: Fix applying patch Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/cups-pdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/lfs/cups-pdf b/lfs/cups-pdf index efa40e87b..5e9f86562 100644 --- a/lfs/cups-pdf +++ b/lfs/cups-pdf @@ -81,7 +81,7 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/cups-pdf-setpdfwrite.patch + cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/cups-pdf-setpdfwrite.patch # Compile backend cd $(DIR_APP)/src && gcc $(CFLAGS) cups-pdf.c -o cups-pdf -lcups hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b2ab2f4cccb0792e7444e87bd5ea18590ed6272c
by Michael Tremer 27 Jul '22

27 Jul '22

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 00e8b1541f6ed4aeb7b6f6ef5f3ee49d70fad0f4
by Peter Müller 24 Jul '22

24 Jul '22

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 00e8b1541f6ed4aeb7b6f6ef5f3ee49d70fad0f4 (commit) via 731d2a06ce4616b7d95a971dcd289d30efecb275 (commit) from b244d9b0d63f13f396c8a060767f9d86b96e9d5e (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 00e8b1541f6ed4aeb7b6f6ef5f3ee49d70fad0f4 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sun Jul 24 13:02:13 2022 +0000 Core Update 170: Ship bind Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 731d2a06ce4616b7d95a971dcd289d30efecb275 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Jul 24 13:06:46 2022 +0200 bind: Update to 9.16.31 For details see: https://downloads.isc.org/isc/bind9/9.16.31/doc/arm/html/notes.html#notes-f… Excerpt from changelog: " --- 9.16.31 released --- 5917. [bug] Update ifconfig.sh script as is miscomputed interface identifiers when destroying interfaces. [GL #3061] 5915. [bug] Detect missing closing brace (}) and computational overflows in $GENERATE directives. [GL #3429] 5913. [bug] Fix a race between resolver query timeout and validation in resolver.c:validated(). Remove resolver.c:maybe_destroy() as it is no loger needed. [GL #3398] 5909. [bug] The server-side destination port was missing from dnstap captures of client traffic. [GL #3309] 5905. [bug] When the TCP connection would be closed/reset between the connect/accept and the read, the uv_read_start() return value would be unexpected and cause an assertion failure. [GL #3400] 5903. [bug] When named checks that the OPCODE in a response matches that of the request, if there is a mismatch named logs an error. Some of those error messages incorrectly used RCODE instead of OPCODE to lookup the nemonic. This has been corrected. [GL !6420]" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/bind | 14 +++++++------- config/rootfiles/{oldcore/100 => core/170}/filelists/bind | 0 config/rootfiles/core/170/update.sh | 7 +++++++ lfs/bind | 4 ++-- 4 files changed, 16 insertions(+), 9 deletions(-) copy config/rootfiles/{oldcore/100 => core/170}/filelists/bind (100%) Difference in files: diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index 60ec36f45..bdb0fb7e4 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.30.so +usr/lib/libbind9-9.16.31.so #usr/lib/libbind9.la #usr/lib/libbind9.so -usr/lib/libdns-9.16.30.so +usr/lib/libdns-9.16.31.so #usr/lib/libdns.la #usr/lib/libdns.so -usr/lib/libirs-9.16.30.so +usr/lib/libirs-9.16.31.so #usr/lib/libirs.la #usr/lib/libirs.so -usr/lib/libisc-9.16.30.so +usr/lib/libisc-9.16.31.so #usr/lib/libisc.la #usr/lib/libisc.so -usr/lib/libisccc-9.16.30.so +usr/lib/libisccc-9.16.31.so #usr/lib/libisccc.la #usr/lib/libisccc.so -usr/lib/libisccfg-9.16.30.so +usr/lib/libisccfg-9.16.31.so #usr/lib/libisccfg.la #usr/lib/libisccfg.so -usr/lib/libns-9.16.30.so +usr/lib/libns-9.16.31.so #usr/lib/libns.la #usr/lib/libns.so diff --git a/config/rootfiles/core/170/filelists/bind b/config/rootfiles/core/170/filelists/bind new file mode 120000 index 000000000..48a0ebaef --- /dev/null +++ b/config/rootfiles/core/170/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/170/update.sh index aaa42cbb4..8dc99e5d8 100644 --- a/config/rootfiles/core/170/update.sh +++ b/config/rootfiles/core/170/update.sh @@ -62,14 +62,21 @@ rm -rvf \ /usr/bin/x86_64 \ /usr/lib/libbfd-2.36.* \ /usr/lib/libbind9-9.16.2* \ + /usr/lib/libbind9-9.16.30.so \ /usr/lib/libdnet* \ + /usr/lib/libdns-9.16.30.so \ /usr/lib/libirs-9.16.2* \ + /usr/lib/libirs-9.16.30.so \ /usr/lib/libisc-9.16.2* \ + /usr/lib/libisc-9.16.30.so \ /usr/lib/libisccc-9.16.2* \ + /usr/lib/libisccc-9.16.30.so \ /usr/lib/libisccfg-9.16.2* \ + /usr/lib/libisccfg-9.16.30.so \ /usr/lib/libldap-* \ /usr/lib/libldap_r-* \ /usr/lib/libns-9.16.2* \ + /usr/lib/libns-9.16.30.so \ /usr/lib/libopenjp2.so.2.3.* \ /usr/lib/libpoppler.so.11* \ /usr/lib/perl5/site_perl/5.32.1/Bundle/LWP.pm \ diff --git a/lfs/bind b/lfs/bind index a492624f8..6b2fe87fe 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.16.30 +VER = 9.16.31 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 35fe14b58a018df25563e58a9632b4431f740bc7a708eb823117541548d23b1855e43058cf7323361ca904d5e59d687e282abb73dc8b617e4eb25ef113168e93 +$(DL_FILE)_BLAKE2 = 75c9038c00fe289161a15a8e4fdadaef5a6a7f3ca03068ec24e82aa9f30ac82d0ded9cf73df83219058cd81b198ea8f561211a323e31b41407294f6932dc61d3 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b244d9b0d63f13f396c8a060767f9d86b96e9d5e
by Peter Müller 24 Jul '22

24 Jul '22

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 b244d9b0d63f13f396c8a060767f9d86b96e9d5e (commit) from 901f6b7c292da9829a7ff4cf04caad48128bf87e (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 b244d9b0d63f13f396c8a060767f9d86b96e9d5e Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sun Jul 24 10:23:17 2022 +0000 Core Update 170: Ship krb5 Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/169 => core/170}/filelists/krb5 | 0 1 file changed, 0 insertions(+), 0 deletions(-) copy config/rootfiles/{oldcore/169 => core/170}/filelists/krb5 (100%) Difference in files: diff --git a/config/rootfiles/core/170/filelists/krb5 b/config/rootfiles/core/170/filelists/krb5 new file mode 120000 index 000000000..082c3cbcd --- /dev/null +++ b/config/rootfiles/core/170/filelists/krb5 @@ -0,0 +1 @@ +../../../common/krb5 \ No newline at end of file hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 901f6b7c292da9829a7ff4cf04caad48128bf87e
by Michael Tremer 21 Jul '22

21 Jul '22

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 901f6b7c292da9829a7ff4cf04caad48128bf87e (commit) from efd00f07f96ff4074427de7089a25c5b34738d3a (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 901f6b7c292da9829a7ff4cf04caad48128bf87e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 21 07:59:43 2022 +0000 ncurses: Ship tmux terminfo Fixes: #12905 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/ncurses | 6 +++--- config/rootfiles/core/170/filelists/files | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/rootfiles/common/ncurses b/config/rootfiles/common/ncurses index 323c5c055..edd73b219 100644 --- a/config/rootfiles/common/ncurses +++ b/config/rootfiles/common/ncurses @@ -3056,9 +3056,9 @@ usr/share/terminfo/t/teraterm2.3 #usr/share/terminfo/t/ti931 #usr/share/terminfo/t/ti_ansi #usr/share/terminfo/t/tkterm -#usr/share/terminfo/t/tmux -#usr/share/terminfo/t/tmux-256color -#usr/share/terminfo/t/tmux-direct +usr/share/terminfo/t/tmux +usr/share/terminfo/t/tmux-256color +usr/share/terminfo/t/tmux-direct #usr/share/terminfo/t/tn1200 #usr/share/terminfo/t/tn300 #usr/share/terminfo/t/trs16 diff --git a/config/rootfiles/core/170/filelists/files b/config/rootfiles/core/170/filelists/files index cdfb44946..25f262eb7 100644 --- a/config/rootfiles/core/170/filelists/files +++ b/config/rootfiles/core/170/filelists/files @@ -8,6 +8,9 @@ srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromblocklist.dat usr/lib/firewall/rules.pl usr/local/bin/setaliases usr/local/bin/update-ipblocklists +usr/share/terminfo/t/tmux +usr/share/terminfo/t/tmux-256color +usr/share/terminfo/t/tmux-direct var/ipfire/backup/bin/backup.pl var/ipfire/backup/include var/ipfire/ipblocklist-functions.pl hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. efd00f07f96ff4074427de7089a25c5b34738d3a
by Michael Tremer 20 Jul '22

20 Jul '22

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 efd00f07f96ff4074427de7089a25c5b34738d3a (commit) from 57a61862f9abab7bc72cc737f826958fe9ef635d (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 efd00f07f96ff4074427de7089a25c5b34738d3a Author: Stéphane Pautrel <steph78630(a)gmail.com> Date: Wed Jul 20 15:04:14 2022 +0000 lang: Update of French translation - 29 strings have been added (otp qrcode, ipblocklist, cve mmio stale data) - 8 strings have been improved - 3 strings have been removed (rdrand and hwrng system, hardware support) Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: doc/language_issues.fr | 30 ++++++++---------------------- doc/language_missings | 30 ------------------------------ langs/fr/cgi-bin/fr.pl | 46 ++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 46 insertions(+), 60 deletions(-) Difference in files: diff --git a/doc/language_issues.fr b/doc/language_issues.fr index b0f231184..eac59397c 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -449,6 +449,13 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: invalid users WARNING: translation string unused: invert WARNING: translation string unused: ip address in use +WARNING: translation string unused: ipblocklist category application +WARNING: translation string unused: ipblocklist category attacker +WARNING: translation string unused: ipblocklist category c and c +WARNING: translation string unused: ipblocklist category composite +WARNING: translation string unused: ipblocklist category invalid +WARNING: translation string unused: ipblocklist category reputation +WARNING: translation string unused: ipblocklist category scanner WARNING: translation string unused: ipfire side WARNING: translation string unused: ipsec no connections WARNING: translation string unused: iptable rules @@ -662,6 +669,7 @@ WARNING: translation string unused: proxy port WARNING: translation string unused: psk WARNING: translation string unused: qos add subclass WARNING: translation string unused: quick control +WARNING: translation string unused: random number generator daemon WARNING: translation string unused: read list WARNING: translation string unused: reboot ask WARNING: translation string unused: reboot question @@ -906,8 +914,6 @@ WARNING: translation string unused: zoneconf val vlan amount assignment error WARNING: translation string unused: zoneconf val vlan tag assignment error WARNING: translation string unused: zoneconf val vlan tag range error WARNING: translation string unused: zoneconf val zoneslave amount error -WARNING: untranslated string: aliases default interface = - Default Interface - -WARNING: untranslated string: enable otp = Enable OTP WARNING: untranslated string: error message = unknown string WARNING: untranslated string: fwhost cust locationgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string @@ -941,27 +947,7 @@ WARNING: untranslated string: guardian logtarget_file = unknown string WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string -WARNING: untranslated string: ipblocklist = IP Address Blocklists -WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings -WARNING: untranslated string: ipblocklist category = Category -WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist -WARNING: untranslated string: ipblocklist download error = A download error occured. -WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received. -WARNING: untranslated string: ipblocklist enable = Enable -WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for -WARNING: untranslated string: ipblocklist id = Blocklist -WARNING: untranslated string: ipblocklist input = Packets dropped (IN) -WARNING: untranslated string: ipblocklist log = Log dropped packets -WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist) -WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs -WARNING: untranslated string: ipblocklist name = Name -WARNING: untranslated string: ipblocklist output = Packets dropped (OUT) -WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists -WARNING: untranslated string: mmio stale data = MMIO Stale Data -WARNING: untranslated string: otp qrcode = OTP QRCode WARNING: untranslated string: pakfire ago = ago. WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string -WARNING: untranslated string: secret = Secret -WARNING: untranslated string: show otp qrcode = Show OTP QRCode diff --git a/doc/language_missings b/doc/language_missings index b49ddcbaa..57bb3e848 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -1026,42 +1026,12 @@ ############################################################################ # Checking cgi-bin translations for language: fr # ############################################################################ -< aliases default interface < ansi t1.483 < bewan adsl pci st < bewan adsl usb -< enable otp < g.dtm < g.lite < guaranteed bandwidth -< ipblocklist -< ipblocklist blocklist settings -< ipblocklist category -< ipblocklist category application -< ipblocklist category attacker -< ipblocklist category c and c -< ipblocklist category composite -< ipblocklist category invalid -< ipblocklist category reputation -< ipblocklist category scanner -< ipblocklist could not download blocklist -< ipblocklist download error -< ipblocklist empty blocklist received -< ipblocklist enable -< ipblocklist hits -< ipblocklist id -< ipblocklist input -< ipblocklist log -< ipblocklist log list -< ipblocklist logs -< ipblocklist name -< ipblocklist output -< ipblocklist use ipblocklists -< mmio stale data -< otp qrcode -< random number generator daemon -< secret -< show otp qrcode < upload fcdsl.o ############################################################################ # Checking cgi-bin translations for language: it # diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 994ff9a21..245ec62b6 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -206,7 +206,7 @@ 'advproxy LDAP binddn settings' => 'Paramètres lien nom utilisateur et mot de passe LDAP', 'advproxy LDAP binddn username' => 'Nom utilisateur Bind DN ', 'advproxy LDAP common settings' => 'Paramètres communs LDAP', -'advproxy LDAP group access control' => 'Contrôle d\accès basé sur le groupe', +'advproxy LDAP group access control' => 'Contrôle d\'accès basé sur le groupe', 'advproxy LDAP group required' => 'Groupe requis ', 'advproxy LDAP port' => 'Port ', 'advproxy LDAP server' => 'Serveur LDAP ', @@ -429,6 +429,7 @@ 'alcatelusb upload' => 'Charger le firmware Speedtouch USB', 'alias ip' => 'Alias IP ', 'aliases' => 'Alias', +'aliases default interface' => '- Interface par défaut -', 'aliases not active' => 'Les alias ne seront pas actifs tant que votre interface ROUGE est en mode STATIQUE', 'all' => 'Tous', 'all interfaces' => 'Toutes les interfaces', @@ -946,7 +947,7 @@ 'download host certificate' => 'Télécharger le certificat de l\'hôte', 'download new ruleset' => 'Télécharger de nouvelles règles', 'download pkcs12 file' => 'Télécharger le fichier PKCS12', -'download root certificate' => 'Télécharger le certificat Root', +'download root certificate' => 'Télécharger le certificat racine', 'download tls-auth key' => 'Télécharger la clé tls-auth', 'dpd action' => 'Détection du pair mort', 'dpd delay' => 'Retard', @@ -1026,6 +1027,7 @@ 'enable' => 'Activer', 'enable ignore filter' => 'Activer le filtre d\'exclusion ', 'enable javascript' => 'Activer Javascript', +'enable otp' => 'Activer OTP', 'enable smt' => 'Activer le partage d\'un cœur de processeur (SMT)', 'enable wildcards' => 'Activer les cartes d\'invitations :', 'enabled' => 'Activé :', @@ -1359,7 +1361,7 @@ 'gateway ip' => 'IP passerelle', 'gen dh' => 'Générer nouveaux paramètres Diffie-Hellman ', 'gen static key' => 'Générer une clef statique', -'generate' => 'Générer un certificat root / hôte', +'generate' => 'Générer un certificat racine / hôte', 'generate a certificate' => 'Générer un certificat :', 'generate dh key' => 'Générer paramètres Diffie-Hellman', 'generate iso' => 'Générer ISO', @@ -1369,7 +1371,7 @@ 'generatekeys' => 'Générer des clefs', 'generatepolicy' => 'Générer une nouvelle politique', 'generatereport' => 'Générer un nouveau rapport', -'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Générer le certificat root et le certificat hôte peut prendre du temps. Cela peut prendre plusieurs minutes sur du matériel ancien, veuillez patienter.', +'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Générer le certificat racine et le certificat hôte peut prendre du temps. Cela peut prendre plusieurs minutes sur du matériel ancien, veuillez patienter.', 'genkey' => 'Générer PSK', 'genre' => 'Genre', 'global settings' => 'Configuration générale', @@ -1590,6 +1592,29 @@ 'ip basic info' => 'Information IP basique', 'ip info' => 'Information IP', 'ip info for' => 'Information IP pour', +'ipblocklist' => 'Listes de blocage adresses IP', +'ipblocklist blocklist settings' => 'Paramètres listes de blocage', +'ipblocklist category' => 'Catégorie', +'ipblocklist category application' => 'Application', +'ipblocklist category attacker' => 'Attaquant', +'ipblocklist category c and c' => 'Malware C&C', +'ipblocklist category composite' => 'Composite', +'ipblocklist category invalid' => 'Adresse invalide', +'ipblocklist category reputation' => 'Réputation', +'ipblocklist category scanner' => 'Scanner', +'ipblocklist could not download blocklist' => 'Ne peut pas télécharger la liste de blocage', +'ipblocklist download error' => 'Une erreur de téléchargement s\'est produite.', +'ipblocklist empty blocklist received' => 'Une liste de blocage vide a été reçue.', +'ipblocklist enable' => 'Activer', +'ipblocklist hits' => 'Nombre total d\'accès à la liste de blocage pour', +'ipblocklist id' => 'Nom liste de blocage', +'ipblocklist input' => 'Paquets rejetés en entrée', +'ipblocklist log' => 'Rapport de paquets rejetés', +'ipblocklist log list' => 'Rapport du pare-feu (liste de blocage)', +'ipblocklist logs' => 'Rapports liste de blocage adresses IP', +'ipblocklist name' => 'Détails', +'ipblocklist output' => 'Paquets rejetés en sortie', +'ipblocklist use ipblocklists' => 'Activer listes de blocage IP', 'ipfire has now rebooted' => 'IPFire va à présent redémarrer.', 'ipfire has now shutdown' => 'IPFire va à présent s\'arrêter.', 'ipfire side' => 'Côté IPFire :', @@ -1780,6 +1805,7 @@ 'missing dat' => 'Archive chiffrée introuvable', 'missing gz' => 'Archive déchiffrée introuvable', 'mitigated' => 'Modéré', +'mmio stale data' => 'Données obsolètes MMIO - proc. Intel', 'mode' => 'Mode', 'model' => 'Modèle', 'modem' => 'Modem', @@ -1962,6 +1988,7 @@ 'other login script' => 'Autres scripts d\'identification', 'otherip' => 'Autres IPs', 'otherport' => 'Autres ports', +'otp qrcode' => 'QRCode OTP', 'our donors' => 'Nos donateurs', 'out' => 'sortie', 'outgoing' => 'sortant', @@ -1996,7 +2023,7 @@ 'ovpn dh' => 'Longueur de paramètres Diffie-Hellman ', 'ovpn dh new key' => 'Générer de nouveaux paramètres Diffie-Hellman ', 'ovpn dh parameters' => 'Options de paramètres Diffie-Hellman', -'ovpn dh upload' => 'Mettre à jour de nouveaux paramètres Diffie-Hellman ', +'ovpn dh upload' => 'Mettre à jour nouveaux paramètres Diffie-Hellman ', 'ovpn dl' => 'Télécharger Config OVPN', 'ovpn engines' => 'Moteur Crypto', 'ovpn errmsg green already pushed' => 'La route pour le réseau VERT est toujours activée', @@ -2170,6 +2197,7 @@ 'quick control' => 'Contrôle rapide', 'quick playlist' => 'Liste de lecture rapide', 'ram' => 'RAM', +'random number generator daemon' => 'Service génération de nombres aléatoires', 'rdns' => 'rDNS', 'read bytes' => 'Octets lus', 'read list' => 'liste des hôtes en lecture seule', @@ -2231,7 +2259,7 @@ 'restore settings' => 'Réinitialiser les paramètres', 'reverse sort' => 'Trier dans l\'ordre chronologique inverse', 'root' => 'Root', -'root certificate' => 'Certificat root', +'root certificate' => 'Certificat racine', 'root path' => 'Répertoire root', 'root user password' => 'Mot de passe root', 'route config changed' => '', @@ -2263,6 +2291,7 @@ 'secondary ntp server' => 'Serveur NTP secondaire ', 'secondary wins server address' => 'Serveur WINS secondaire ', 'seconds' => 'Secondes', +'secret' => 'Secret', 'section' => 'Section ', 'secure shell server' => 'Serveur Shell Sécurisé', 'security' => 'Sécurité', @@ -2291,7 +2320,7 @@ 'services settings' => 'Pare-feu - Paramètres des services', 'set' => 'défini', 'set time now' => 'Synchronisation heure', -'set time now help' => 'A tout moment, pour placer un événement de synchronisation dans la file d\'attente (même si vous utilisez un calendrier répété), cliquez sur le bouton <i>Synchronisation heure</i>. Il se peut que vous ayez à attendre cinq minutes ou plus, avant qu\'une synchronisation se produise.', +'set time now help' => 'A tout moment, pour placer un évènement de synchronisation dans la file d\'attente (même si vous utilisez un calendrier répété), cliquez sur le bouton <i>Synchronisation heure</i>. Il se peut que vous ayez à attendre cinq minutes ou plus, avant qu\'une synchronisation se produise.', 'settings' => 'Paramètres ', 'shaping add options' => 'Ajouter un service', 'shaping list options' => 'Services de mise en forme du trafic', @@ -2307,7 +2336,8 @@ 'show host certificate' => 'Afficher le certificat hôte', 'show last x lines' => 'Montrer les dernières x lignes', 'show lines' => 'Montrer les lignes', -'show root certificate' => 'Afficher le certificat root', +'show otp qrcode' => 'Afficher QRCode OTP', +'show root certificate' => 'Afficher le certificat racine', 'show share options' => 'Montrer les options partagées', 'show tls-auth key' => 'Afficher clef tls-auth', 'shuffle' => 'Mélanger', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a7c5d12bbd16ce98080ab344e2829b9c1fea1163
by Michael Tremer 19 Jul '22

19 Jul '22

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 a7c5d12bbd16ce98080ab344e2829b9c1fea1163 (commit) via 950d00b2c2b930921a1b7d52a2c149592ac9f5f4 (commit) via c003727a4beba0e07dc9ad45a4df1f153f3b168e (commit) via bcdeb1461f6a712eca4769fba64d39ab1c570476 (commit) via 8251f301c477226e85f49a4d5bc4aa9706ee20ce (commit) via 96000482b7e58a6006ec344f0403344f61f15466 (commit) via 65fe7161c807864e7f5c8ab8df0988d4e7790180 (commit) via bda851172f1b924a0cb4c1d22ab95ccdf79dcd2b (commit) via 35e8a57e34c9857946c840d1ae4abdd703cacacf (commit) from a702353e262542fd5becc930e42b2a47caca2a00 (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 a7c5d12bbd16ce98080ab344e2829b9c1fea1163 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 19 07:54:00 2022 +0000 Run "./make.sh lang" Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 950d00b2c2b930921a1b7d52a2c149592ac9f5f4 Author: Leo-Andres Hofmann <hofmann(a)leo-andres.de> Date: Mon Jul 18 18:48:54 2022 +0200 pakfire/functions.pl: Adjust log level The informative pakfire message "No new upgrades available. You are on release ..." does not mean that an error has happened. This patch adjusts the log level prefix to "info" accordingly. Reported-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c003727a4beba0e07dc9ad45a4df1f153f3b168e Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Jul 15 14:45:43 2022 +0200 ipblocklist: Fixed typo in 'sources' Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Acked-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit bcdeb1461f6a712eca4769fba64d39ab1c570476 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Jul 15 14:28:27 2022 +0200 ipblocklist: Removed another unused(?) message string Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Acked-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8251f301c477226e85f49a4d5bc4aa9706ee20ce Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Jul 15 14:26:58 2022 +0200 ipblocklist: Suggested german translation Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Acked-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 96000482b7e58a6006ec344f0403344f61f15466 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Jul 15 14:21:45 2022 +0200 ipblocklist: Suggestions for 'en.pl' - Removed unused translation strings - Tuned some messages for better readability Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Acked-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 65fe7161c807864e7f5c8ab8df0988d4e7790180 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Jul 15 14:10:07 2022 +0200 ipblocklist: Fixed typo in 'en.pl' Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Acked-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit bda851172f1b924a0cb4c1d22ab95ccdf79dcd2b Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Jul 15 14:04:45 2022 +0200 ipblocklist.cgi: Theme fix Themes have been dropped - 'ipblocklist.cgi' refused to start. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Acked-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 35e8a57e34c9857946c840d1ae4abdd703cacacf Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu Jul 14 10:27:59 2022 +0000 krb5: Update to 1.20 Please refer to https://web.mit.edu/kerberos/krb5-1.20/ for the release notes of this version. No rootfile changes were necessary. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/ipblocklist/sources | 4 +- doc/language_issues.de | 10 ++ doc/language_issues.en | 19 ++- doc/language_issues.es | 19 ++- doc/language_issues.fr | 19 +++ doc/language_issues.it | 19 +++ doc/language_issues.nl | 19 +++ doc/language_issues.pl | 19 ++- doc/language_issues.ru | 19 ++- doc/language_issues.tr | 19 +++ doc/language_missings | 169 +++++++++++++++++++++ html/cgi-bin/ipblocklist.cgi | 2 +- langs/de/cgi-bin/de.pl | 23 +++ langs/en/cgi-bin/en.pl | 14 +- lfs/krb5 | 9 +- src/pakfire/lib/functions.pl | 2 +- .../krb5-1.18.3_prevent_spurious_text.patch | 18 --- 17 files changed, 362 insertions(+), 41 deletions(-) delete mode 100644 src/patches/krb5-1.18.3_prevent_spurious_text.patch Difference in files: diff --git a/config/ipblocklist/sources b/config/ipblocklist/sources index 4d42ad974..c750dcd58 100644 --- a/config/ipblocklist/sources +++ b/config/ipblocklist/sources @@ -42,7 +42,7 @@ our %sources = ( 'EMERGING_FWRULE' => { 'name' => 'Emerging Threats Blocklis 'parser' => 'ip-or-net-list', 'rate' => '1h', 'category' => 'composite', - 'disable' => ['FEODO_RECOMMENDED', 'FEODO_IP', 'FEODO_AGGRESIVE', 'SPAMHAUS_DROP', 'DSHIELD'] }, + 'disable' => ['FEODO_RECOMMENDED', 'FEODO_IP', 'FEODO_AGGRESSIVE', 'SPAMHAUS_DROP', 'DSHIELD'] }, 'EMERGING_COMPROMISED' => { 'name' => 'Emerging Threats Compromised IPs', 'url' => 'https://rules.emergingthreats.net/blockrules/compromised-ips.txt', 'info' => 'https://doc.emergingthreats.net/bin/view/Main/CompromisedHost', @@ -80,7 +80,7 @@ our %sources = ( 'EMERGING_FWRULE' => { 'name' => 'Emerging Threats Blocklis 'rate' => '5m', 'category' => 'c and c', 'disable' => 'FEODO_RECOMMENDED' }, - 'FEODO_AGGRESIVE' => { 'name' => 'Feodo Trojan IP Blocklist (Aggresive)', + 'FEODO_AGGRESSIVE' => { 'name' => 'Feodo Trojan IP Blocklist (Aggressive)', 'url' => 'https://feodotracker.abuse.ch/downloads/ipblocklist_aggressive.txt', 'info' => 'https://feodotracker.abuse.ch/blocklist', 'parser' => 'ip-or-net-list', diff --git a/doc/language_issues.de b/doc/language_issues.de index 15db223fe..6a0354451 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -273,6 +273,7 @@ WARNING: translation string unused: enable wildcards WARNING: translation string unused: enabledtitle WARNING: translation string unused: encrypted WARNING: translation string unused: enter ack class +WARNING: translation string unused: entropy graphs WARNING: translation string unused: err bk 1 WARNING: translation string unused: err bk 10 password WARNING: translation string unused: err bk 2 key @@ -417,6 +418,13 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: invalid users WARNING: translation string unused: invert WARNING: translation string unused: ip address in use +WARNING: translation string unused: ipblocklist category application +WARNING: translation string unused: ipblocklist category attacker +WARNING: translation string unused: ipblocklist category c and c +WARNING: translation string unused: ipblocklist category composite +WARNING: translation string unused: ipblocklist category invalid +WARNING: translation string unused: ipblocklist category reputation +WARNING: translation string unused: ipblocklist category scanner WARNING: translation string unused: ipfire side WARNING: translation string unused: ipsec no connections WARNING: translation string unused: iptable rules @@ -863,6 +871,7 @@ WARNING: translation string unused: zoneconf val vlan amount assignment error WARNING: translation string unused: zoneconf val vlan tag assignment error WARNING: translation string unused: zoneconf val vlan tag range error WARNING: translation string unused: zoneconf val zoneslave amount error +WARNING: untranslated string: aliases default interface = - Default Interface - WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes) WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes) WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes) @@ -882,6 +891,7 @@ WARNING: untranslated string: desired = Desired WARNING: untranslated string: disable = Disable WARNING: untranslated string: download apple profile = Download Apple Configuration Profile WARNING: untranslated string: enable = Enable +WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! WARNING: untranslated string: fwhost cust locationgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string diff --git a/doc/language_issues.en b/doc/language_issues.en index 56ad0af4f..420b5df75 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -309,6 +309,7 @@ WARNING: untranslated string: aktiv = Active WARNING: untranslated string: album = Album WARNING: untranslated string: alias ip = Alias IP WARNING: untranslated string: aliases = Aliases +WARNING: untranslated string: aliases default interface = - Default Interface - WARNING: untranslated string: aliases not active = Aliases will not be active unless your RED interface is STATIC WARNING: untranslated string: all = All WARNING: untranslated string: all services = All Services @@ -733,9 +734,9 @@ WARNING: untranslated string: encryption = Encryption: WARNING: untranslated string: end address = End address: WARNING: untranslated string: enter data = Enter your settings <br /> and then press <i>Save</i>. WARNING: untranslated string: entropy = Entropy -WARNING: untranslated string: entropy graphs = Entropy Graphs WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk. WARNING: untranslated string: error = Error +WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error messages = Error messages WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! WARNING: untranslated string: esp keylife should be between 1 and 24 hours = ESP keylife should be between 1 and 24 hours. @@ -1170,6 +1171,22 @@ WARNING: untranslated string: ip alias removed = External IP alias removed WARNING: untranslated string: ip basic info = Basic IP information WARNING: untranslated string: ip info = IP information WARNING: untranslated string: ip info for = IP information for +WARNING: untranslated string: ipblocklist = IP Address Blocklists +WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings +WARNING: untranslated string: ipblocklist category = Category +WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist +WARNING: untranslated string: ipblocklist download error = A download error occured. +WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received. +WARNING: untranslated string: ipblocklist enable = Enable +WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for +WARNING: untranslated string: ipblocklist id = Blocklist +WARNING: untranslated string: ipblocklist input = Packets dropped (IN) +WARNING: untranslated string: ipblocklist log = Log dropped packets +WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist) +WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs +WARNING: untranslated string: ipblocklist name = Name +WARNING: untranslated string: ipblocklist output = Packets dropped (OUT) +WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists WARNING: untranslated string: ipfire has now rebooted = IPFire is rebooting now. WARNING: untranslated string: ipfire has now shutdown = IPFire is shutting down now. WARNING: untranslated string: ipfire side is invalid = IPFire side is invalid. diff --git a/doc/language_issues.es b/doc/language_issues.es index 09e7c0ad6..f248f2298 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -828,6 +828,7 @@ WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to wor WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: age second = second +WARNING: untranslated string: aliases default interface = - Default Interface - WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: atm device = Device: WARNING: untranslated string: attention = ATTENTION @@ -985,9 +986,9 @@ WARNING: untranslated string: enable otp = Enable OTP WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: encryption = Encryption: WARNING: untranslated string: entropy = Entropy -WARNING: untranslated string: entropy graphs = Entropy Graphs WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk. WARNING: untranslated string: error = Error +WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! WARNING: untranslated string: fallout zombieload ridl = Fallout/ZombieLoad/RIDL WARNING: untranslated string: fifteen minutes = 15 Minutes @@ -1273,6 +1274,22 @@ WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hos WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol WARNING: untranslated string: ip basic info = Basic IP information WARNING: untranslated string: ip info for = IP information for +WARNING: untranslated string: ipblocklist = IP Address Blocklists +WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings +WARNING: untranslated string: ipblocklist category = Category +WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist +WARNING: untranslated string: ipblocklist download error = A download error occured. +WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received. +WARNING: untranslated string: ipblocklist enable = Enable +WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for +WARNING: untranslated string: ipblocklist id = Blocklist +WARNING: untranslated string: ipblocklist input = Packets dropped (IN) +WARNING: untranslated string: ipblocklist log = Log dropped packets +WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist) +WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs +WARNING: untranslated string: ipblocklist name = Name +WARNING: untranslated string: ipblocklist output = Packets dropped (OUT) +WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists WARNING: untranslated string: ipsec = IPsec WARNING: untranslated string: ipsec connection = IPsec Connection WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es) diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 114837a4d..b0f231184 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -301,6 +301,7 @@ WARNING: translation string unused: enable wildcards WARNING: translation string unused: enabledtitle WARNING: translation string unused: encrypted WARNING: translation string unused: enter ack class +WARNING: translation string unused: entropy graphs WARNING: translation string unused: err bk 1 WARNING: translation string unused: err bk 10 password WARNING: translation string unused: err bk 2 key @@ -905,7 +906,9 @@ WARNING: translation string unused: zoneconf val vlan amount assignment error WARNING: translation string unused: zoneconf val vlan tag assignment error WARNING: translation string unused: zoneconf val vlan tag range error WARNING: translation string unused: zoneconf val zoneslave amount error +WARNING: untranslated string: aliases default interface = - Default Interface - WARNING: untranslated string: enable otp = Enable OTP +WARNING: untranslated string: error message = unknown string WARNING: untranslated string: fwhost cust locationgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string WARNING: untranslated string: guaranteed bandwidth = Guaranteed bandwidth @@ -938,6 +941,22 @@ WARNING: untranslated string: guardian logtarget_file = unknown string WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string +WARNING: untranslated string: ipblocklist = IP Address Blocklists +WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings +WARNING: untranslated string: ipblocklist category = Category +WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist +WARNING: untranslated string: ipblocklist download error = A download error occured. +WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received. +WARNING: untranslated string: ipblocklist enable = Enable +WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for +WARNING: untranslated string: ipblocklist id = Blocklist +WARNING: untranslated string: ipblocklist input = Packets dropped (IN) +WARNING: untranslated string: ipblocklist log = Log dropped packets +WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist) +WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs +WARNING: untranslated string: ipblocklist name = Name +WARNING: untranslated string: ipblocklist output = Packets dropped (OUT) +WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists WARNING: untranslated string: mmio stale data = MMIO Stale Data WARNING: untranslated string: otp qrcode = OTP QRCode WARNING: untranslated string: pakfire ago = ago. diff --git a/doc/language_issues.it b/doc/language_issues.it index d87ef8b1f..2e4407c69 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -267,6 +267,7 @@ WARNING: translation string unused: enable wildcards WARNING: translation string unused: enabledtitle WARNING: translation string unused: encrypted WARNING: translation string unused: enter ack class +WARNING: translation string unused: entropy graphs WARNING: translation string unused: err bk 1 WARNING: translation string unused: err bk 10 password WARNING: translation string unused: err bk 2 key @@ -913,6 +914,7 @@ WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File +WARNING: untranslated string: aliases default interface = - Default Interface - WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: autonomous system = Autonomous System WARNING: untranslated string: available = available @@ -997,6 +999,7 @@ WARNING: untranslated string: enable otp = Enable OTP WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk. WARNING: untranslated string: error = Error +WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! WARNING: untranslated string: fallout zombieload ridl = Fallout/ZombieLoad/RIDL WARNING: untranslated string: fifteen minutes = 15 Minutes @@ -1111,6 +1114,22 @@ WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hos WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol WARNING: untranslated string: ip basic info = Basic IP information WARNING: untranslated string: ip info for = IP information for +WARNING: untranslated string: ipblocklist = IP Address Blocklists +WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings +WARNING: untranslated string: ipblocklist category = Category +WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist +WARNING: untranslated string: ipblocklist download error = A download error occured. +WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received. +WARNING: untranslated string: ipblocklist enable = Enable +WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for +WARNING: untranslated string: ipblocklist id = Blocklist +WARNING: untranslated string: ipblocklist input = Packets dropped (IN) +WARNING: untranslated string: ipblocklist log = Log dropped packets +WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist) +WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs +WARNING: untranslated string: ipblocklist name = Name +WARNING: untranslated string: ipblocklist output = Packets dropped (OUT) +WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists WARNING: untranslated string: ipsec connection = IPsec Connection WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es) WARNING: untranslated string: ipsec interface mode gre = GRE diff --git a/doc/language_issues.nl b/doc/language_issues.nl index a3a70b621..5268d47dc 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -265,6 +265,7 @@ WARNING: translation string unused: enable wildcards WARNING: translation string unused: enabledtitle WARNING: translation string unused: encrypted WARNING: translation string unused: enter ack class +WARNING: translation string unused: entropy graphs WARNING: translation string unused: err bk 1 WARNING: translation string unused: err bk 10 password WARNING: translation string unused: err bk 2 key @@ -911,6 +912,7 @@ WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File +WARNING: untranslated string: aliases default interface = - Default Interface - WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: atm device = Device: WARNING: untranslated string: autonomous system = Autonomous System @@ -1007,6 +1009,7 @@ WARNING: untranslated string: enable otp = Enable OTP WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk. WARNING: untranslated string: error = Error +WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! WARNING: untranslated string: fallout zombieload ridl = Fallout/ZombieLoad/RIDL WARNING: untranslated string: fifteen minutes = 15 Minutes @@ -1125,6 +1128,22 @@ WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hos WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol WARNING: untranslated string: ip basic info = Basic IP information WARNING: untranslated string: ip info for = IP information for +WARNING: untranslated string: ipblocklist = IP Address Blocklists +WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings +WARNING: untranslated string: ipblocklist category = Category +WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist +WARNING: untranslated string: ipblocklist download error = A download error occured. +WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received. +WARNING: untranslated string: ipblocklist enable = Enable +WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for +WARNING: untranslated string: ipblocklist id = Blocklist +WARNING: untranslated string: ipblocklist input = Packets dropped (IN) +WARNING: untranslated string: ipblocklist log = Log dropped packets +WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist) +WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs +WARNING: untranslated string: ipblocklist name = Name +WARNING: untranslated string: ipblocklist output = Packets dropped (OUT) +WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists WARNING: untranslated string: ipsec connection = IPsec Connection WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es) WARNING: untranslated string: ipsec interface mode gre = GRE diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 9bf42e649..247e06a59 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -840,6 +840,7 @@ WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to wor WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: age second = second +WARNING: untranslated string: aliases default interface = - Default Interface - WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: atm device = Device: WARNING: untranslated string: attention = ATTENTION @@ -996,9 +997,9 @@ WARNING: untranslated string: enable otp = Enable OTP WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: encryption = Encryption: WARNING: untranslated string: entropy = Entropy -WARNING: untranslated string: entropy graphs = Entropy Graphs WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk. WARNING: untranslated string: error = Error +WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! WARNING: untranslated string: extrahd because there is already a device mounted = , because there is already a device mounted WARNING: untranslated string: extrahd cant umount = Can't umount @@ -1274,6 +1275,22 @@ WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hos WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol WARNING: untranslated string: ip basic info = Basic IP information WARNING: untranslated string: ip info for = IP information for +WARNING: untranslated string: ipblocklist = IP Address Blocklists +WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings +WARNING: untranslated string: ipblocklist category = Category +WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist +WARNING: untranslated string: ipblocklist download error = A download error occured. +WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received. +WARNING: untranslated string: ipblocklist enable = Enable +WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for +WARNING: untranslated string: ipblocklist id = Blocklist +WARNING: untranslated string: ipblocklist input = Packets dropped (IN) +WARNING: untranslated string: ipblocklist log = Log dropped packets +WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist) +WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs +WARNING: untranslated string: ipblocklist name = Name +WARNING: untranslated string: ipblocklist output = Packets dropped (OUT) +WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists WARNING: untranslated string: ipsec = IPsec WARNING: untranslated string: ipsec connection = IPsec Connection WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es) diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 62dd92044..eb2ceb954 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -836,6 +836,7 @@ WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to wor WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: age second = second +WARNING: untranslated string: aliases default interface = - Default Interface - WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: atm device = Device: WARNING: untranslated string: attention = ATTENTION @@ -993,9 +994,9 @@ WARNING: untranslated string: enable otp = Enable OTP WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: encryption = Encryption: WARNING: untranslated string: entropy = Entropy -WARNING: untranslated string: entropy graphs = Entropy Graphs WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk. WARNING: untranslated string: error = Error +WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! WARNING: untranslated string: extrahd because there is already a device mounted = , because there is already a device mounted WARNING: untranslated string: extrahd cant umount = Can't umount @@ -1272,6 +1273,22 @@ WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hos WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol WARNING: untranslated string: ip basic info = Basic IP information WARNING: untranslated string: ip info for = IP information for +WARNING: untranslated string: ipblocklist = IP Address Blocklists +WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings +WARNING: untranslated string: ipblocklist category = Category +WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist +WARNING: untranslated string: ipblocklist download error = A download error occured. +WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received. +WARNING: untranslated string: ipblocklist enable = Enable +WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for +WARNING: untranslated string: ipblocklist id = Blocklist +WARNING: untranslated string: ipblocklist input = Packets dropped (IN) +WARNING: untranslated string: ipblocklist log = Log dropped packets +WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist) +WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs +WARNING: untranslated string: ipblocklist name = Name +WARNING: untranslated string: ipblocklist output = Packets dropped (OUT) +WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists WARNING: untranslated string: ipsec = IPsec WARNING: untranslated string: ipsec connection = IPsec Connection WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es) diff --git a/doc/language_issues.tr b/doc/language_issues.tr index da549f52b..080e3abfe 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -294,6 +294,7 @@ WARNING: translation string unused: enable wildcards WARNING: translation string unused: enabledtitle WARNING: translation string unused: encrypted WARNING: translation string unused: enter ack class +WARNING: translation string unused: entropy graphs WARNING: translation string unused: err bk 1 WARNING: translation string unused: err bk 10 password WARNING: translation string unused: err bk 2 key @@ -901,6 +902,7 @@ WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File +WARNING: untranslated string: aliases default interface = - Default Interface - WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: autonomous system = Autonomous System WARNING: untranslated string: available = available @@ -960,6 +962,7 @@ WARNING: untranslated string: enable otp = Enable OTP WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk. WARNING: untranslated string: error = Error +WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! WARNING: untranslated string: fallout zombieload ridl = Fallout/ZombieLoad/RIDL WARNING: untranslated string: force enable = Forced @@ -1048,6 +1051,22 @@ WARNING: untranslated string: invalid input for subscription code = Invalid inpu WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname WARNING: untranslated string: ip basic info = Basic IP information WARNING: untranslated string: ip info for = IP information for +WARNING: untranslated string: ipblocklist = IP Address Blocklists +WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings +WARNING: untranslated string: ipblocklist category = Category +WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist +WARNING: untranslated string: ipblocklist download error = A download error occured. +WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received. +WARNING: untranslated string: ipblocklist enable = Enable +WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for +WARNING: untranslated string: ipblocklist id = Blocklist +WARNING: untranslated string: ipblocklist input = Packets dropped (IN) +WARNING: untranslated string: ipblocklist log = Log dropped packets +WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist) +WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs +WARNING: untranslated string: ipblocklist name = Name +WARNING: untranslated string: ipblocklist output = Packets dropped (OUT) +WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists WARNING: untranslated string: ipsec connection = IPsec Connection WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es) WARNING: untranslated string: ipsec interface mode gre = GRE diff --git a/doc/language_missings b/doc/language_missings index b8c6665f3..b49ddcbaa 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -2,6 +2,7 @@ # Checking cgi-bin translations for language: de # ############################################################################ < advproxy update information +< aliases default interface < ansi t1.483 < backup archive < backup clear archive @@ -130,6 +131,7 @@ < age shour < age sminute < age ssecond +< aliases default interface < asn lookup failed < Async logging enabled < atm device @@ -609,6 +611,29 @@ < invalid ip or hostname < invalid logserver protocol < ip basic info +< ipblocklist +< ipblocklist blocklist settings +< ipblocklist category +< ipblocklist category application +< ipblocklist category attacker +< ipblocklist category c and c +< ipblocklist category composite +< ipblocklist category invalid +< ipblocklist category reputation +< ipblocklist category scanner +< ipblocklist could not download blocklist +< ipblocklist download error +< ipblocklist empty blocklist received +< ipblocklist enable +< ipblocklist hits +< ipblocklist id +< ipblocklist input +< ipblocklist log +< ipblocklist log list +< ipblocklist logs +< ipblocklist name +< ipblocklist output +< ipblocklist use ipblocklists < ip info for < ipsec < ipsec connection @@ -1001,6 +1026,7 @@ ############################################################################ # Checking cgi-bin translations for language: fr # ############################################################################ +< aliases default interface < ansi t1.483 < bewan adsl pci st < bewan adsl usb @@ -1008,6 +1034,29 @@ < g.dtm < g.lite < guaranteed bandwidth +< ipblocklist +< ipblocklist blocklist settings +< ipblocklist category +< ipblocklist category application +< ipblocklist category attacker +< ipblocklist category c and c +< ipblocklist category composite +< ipblocklist category invalid +< ipblocklist category reputation +< ipblocklist category scanner +< ipblocklist could not download blocklist +< ipblocklist download error +< ipblocklist empty blocklist received +< ipblocklist enable +< ipblocklist hits +< ipblocklist id +< ipblocklist input +< ipblocklist log +< ipblocklist log list +< ipblocklist logs +< ipblocklist name +< ipblocklist output +< ipblocklist use ipblocklists < mmio stale data < otp qrcode < random number generator daemon @@ -1041,6 +1090,7 @@ < advproxy wpad notice < advproxy wpad title < advproxy wpad view pac +< aliases default interface < asn lookup failed < autonomous system < available @@ -1272,6 +1322,29 @@ < invalid ip or hostname < invalid logserver protocol < ip basic info +< ipblocklist +< ipblocklist blocklist settings +< ipblocklist category +< ipblocklist category application +< ipblocklist category attacker +< ipblocklist category c and c +< ipblocklist category composite +< ipblocklist category invalid +< ipblocklist category reputation +< ipblocklist category scanner +< ipblocklist could not download blocklist +< ipblocklist download error +< ipblocklist empty blocklist received +< ipblocklist enable +< ipblocklist hits +< ipblocklist id +< ipblocklist input +< ipblocklist log +< ipblocklist log list +< ipblocklist logs +< ipblocklist name +< ipblocklist output +< ipblocklist use ipblocklists < ip info for < ipsec connection < ipsec dns server address is invalid @@ -1504,6 +1577,7 @@ < advproxy wpad notice < advproxy wpad title < advproxy wpad view pac +< aliases default interface < asn lookup failed < atm device < autonomous system @@ -1754,6 +1828,29 @@ < invalid ip or hostname < invalid logserver protocol < ip basic info +< ipblocklist +< ipblocklist blocklist settings +< ipblocklist category +< ipblocklist category application +< ipblocklist category attacker +< ipblocklist category c and c +< ipblocklist category composite +< ipblocklist category invalid +< ipblocklist category reputation +< ipblocklist category scanner +< ipblocklist could not download blocklist +< ipblocklist download error +< ipblocklist empty blocklist received +< ipblocklist enable +< ipblocklist hits +< ipblocklist id +< ipblocklist input +< ipblocklist log +< ipblocklist log list +< ipblocklist logs +< ipblocklist name +< ipblocklist output +< ipblocklist use ipblocklists < ip info for < ipsec connection < ipsec dns server address is invalid @@ -2031,6 +2128,7 @@ < age shour < age sminute < age ssecond +< aliases default interface < asn lookup failed < atm device < attention @@ -2555,6 +2653,29 @@ < invalid ip or hostname < invalid logserver protocol < ip basic info +< ipblocklist +< ipblocklist blocklist settings +< ipblocklist category +< ipblocklist category application +< ipblocklist category attacker +< ipblocklist category c and c +< ipblocklist category composite +< ipblocklist category invalid +< ipblocklist category reputation +< ipblocklist category scanner +< ipblocklist could not download blocklist +< ipblocklist download error +< ipblocklist empty blocklist received +< ipblocklist enable +< ipblocklist hits +< ipblocklist id +< ipblocklist input +< ipblocklist log +< ipblocklist log list +< ipblocklist logs +< ipblocklist name +< ipblocklist output +< ipblocklist use ipblocklists < ip info for < ipsec < ipsec connection @@ -2983,6 +3104,7 @@ < age shour < age sminute < age ssecond +< aliases default interface < asn lookup failed < atm device < attention @@ -3513,6 +3635,29 @@ < invalid ip or hostname < invalid logserver protocol < ip basic info +< ipblocklist +< ipblocklist blocklist settings +< ipblocklist category +< ipblocklist category application +< ipblocklist category attacker +< ipblocklist category c and c +< ipblocklist category composite +< ipblocklist category invalid +< ipblocklist category reputation +< ipblocklist category scanner +< ipblocklist could not download blocklist +< ipblocklist download error +< ipblocklist empty blocklist received +< ipblocklist enable +< ipblocklist hits +< ipblocklist id +< ipblocklist input +< ipblocklist log +< ipblocklist log list +< ipblocklist logs +< ipblocklist name +< ipblocklist output +< ipblocklist use ipblocklists < ip info for < ipsec < ipsec connection @@ -3920,6 +4065,7 @@ < advproxy wpad notice < advproxy wpad title < advproxy wpad view pac +< aliases default interface < asn lookup failed < autonomous system < available @@ -4041,6 +4187,29 @@ < invalid input for subscription code < invalid ip or hostname < ip basic info +< ipblocklist +< ipblocklist blocklist settings +< ipblocklist category +< ipblocklist category application +< ipblocklist category attacker +< ipblocklist category c and c +< ipblocklist category composite +< ipblocklist category invalid +< ipblocklist category reputation +< ipblocklist category scanner +< ipblocklist could not download blocklist +< ipblocklist download error +< ipblocklist empty blocklist received +< ipblocklist enable +< ipblocklist hits +< ipblocklist id +< ipblocklist input +< ipblocklist log +< ipblocklist log list +< ipblocklist logs +< ipblocklist name +< ipblocklist output +< ipblocklist use ipblocklists < ip info for < ipsec connection < ipsec dns server address is invalid diff --git a/html/cgi-bin/ipblocklist.cgi b/html/cgi-bin/ipblocklist.cgi index 431ff1a37..bb438129c 100644 --- a/html/cgi-bin/ipblocklist.cgi +++ b/html/cgi-bin/ipblocklist.cgi @@ -62,7 +62,7 @@ my %settings = ( # Read all parameters &Header::getcgihash( \%cgiparams); &General::readhash( "${General::swroot}/main/settings", \%mainsettings ); -&General::readhash( "/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color ); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color); # Get list of supported blocklists. my @blocklists = &IPblocklist::get_blocklists(); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 3285f1bfa..49c582a1e 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1539,6 +1539,29 @@ 'ip basic info' => 'Grundlegende IP-Informationen', 'ip info' => 'IP-Informationen', 'ip info for' => 'IP-Informationen für', +'ipblocklist' => 'IP-Address-Blocklisten', +'ipblocklist blocklist settings' => 'Blocklist-Einstellungen', +'ipblocklist category' => 'Kategorie', +'ipblocklist category application' => 'Application', +'ipblocklist category attacker' => 'Attacker', +'ipblocklist category c and c' => 'Malware C&C', +'ipblocklist category composite' => 'Composite', +'ipblocklist category invalid' => 'Invalid Address', +'ipblocklist category reputation' => 'Reputation', +'ipblocklist category scanner' => 'Scanner', +'ipblocklist could not download blocklist' => 'Konnte Blockliste nicht herunterladen', +'ipblocklist download error' => 'Es ist ein Fehler beim Download aufgetreten.', +'ipblocklist empty blocklist received' => 'Es wurde eine leere Blockliste heruntergeladen.', +'ipblocklist enable' => 'Aktivieren', +'ipblocklist hits' => 'Gesamtanzahl der Blocklist-Treffer für', +'ipblocklist id' => 'Blocklist', +'ipblocklist input' => 'Verworfene Pakete (IN)', +'ipblocklist log' => 'Verworfene Pakete protokollieren', +'ipblocklist log list' => 'Firewallprotokoll (Blocklisten)', +'ipblocklist logs' => 'IP-Address-Blocklisten-Protokolle', +'ipblocklist name' => 'Name', +'ipblocklist output' => 'Verworfene Pakete (OUT)', +'ipblocklist use ipblocklists' => 'Aktiviere IP-Blocklisten', 'ipfire has now rebooted' => 'IPFire wird neu gestartet.', 'ipfire has now shutdown' => 'IPFire wird heruntergefahren.', 'ipfire side' => 'IPFire Seite:', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 87cc679a5..ae233de8e 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1596,21 +1596,17 @@ 'ipblocklist category reputation' => 'Reputation', 'ipblocklist category scanner' => 'Scanner', 'ipblocklist could not download blocklist' => 'Could not download blocklist', -'ipblocklist disable mid' => 'because it is included in', -'ipblocklist disable post' => '', -'ipblocklist disable pre' => 'Disabling', -'ipblocklist download error' => 'A download error occurs.', -'ipblocklist empyt blocklist received' => 'An empty blocklist has been received.', +'ipblocklist download error' => 'A download error occured.', +'ipblocklist empty blocklist received' => 'An empty blocklist has been received.', 'ipblocklist enable' => 'Enable', -'ipblocklist entries' => 'Entries', 'ipblocklist hits' => 'Total number of blocklist hits for', 'ipblocklist id' => 'Blocklist', -'ipblocklist input' => 'Packets Dropped In', -'ipblocklist log list' => 'Firewall log (blocklist)', +'ipblocklist input' => 'Packets dropped (IN)', 'ipblocklist log' => 'Log dropped packets', +'ipblocklist log list' => 'Firewall log (blocklist)', 'ipblocklist logs' => 'IP Address Blocklist Logs', 'ipblocklist name' => 'Name', -'ipblocklist output' => 'Packets Dropped Out', +'ipblocklist output' => 'Packets dropped (OUT)', 'ipblocklist use ipblocklists' => 'Enable IP Blocklists', 'ipfire has now rebooted' => 'IPFire is rebooting now.', 'ipfire has now shutdown' => 'IPFire is shutting down now.', diff --git a/lfs/krb5 b/lfs/krb5 index e08948005..ce7d52d11 100644 --- a/lfs/krb5 +++ b/lfs/krb5 @@ -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 = Kerberos -VER = 1.19.2 +VER = 1.20 THISAPP = krb5-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 963722721201e75381c91a2af6e982f569a5b1602beb2d1ded83d35f6f914235a6ed91e5d54f56c97e94921a32ed27c49aded258327966ee13d39485208c38d8 +$(DL_FILE)_BLAKE2 = fdaaab6c16dbe073c4308f312e321536b582b75fad10e5450be66b6b828825c8c775e56f5287d4a7df819d20889e5c0d9cc1d179d861c9caba185332c0db7387 install : $(TARGET) @@ -77,10 +77,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_SRC)/$(THISAPP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - - cd $(DIR_APP) && patch -Np2 -i $(DIR_SRC)/src/patches/krb5-1.18.3_prevent_spurious_text.patch cd $(DIR_APP) && patch -Np2 -i $(DIR_SRC)/src/patches/krb5-1.18.3_remove_known_failed_test.patch - cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index 24c55fd4a..505988af9 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -797,7 +797,7 @@ sub upgradecore { system("echo $core_release > $Conf::coredir/mine"); } else { - message("CORE ERROR: No new upgrades available. You are on release $Conf::core_mine."); + message("CORE INFO: No new upgrades available. You are on release $Conf::core_mine."); } } diff --git a/src/patches/krb5-1.18.3_prevent_spurious_text.patch b/src/patches/krb5-1.18.3_prevent_spurious_text.patch deleted file mode 100644 index 0e3015379..000000000 --- a/src/patches/krb5-1.18.3_prevent_spurious_text.patch +++ /dev/null @@ -1,18 +0,0 @@ -Submitted By: linuxfromscratch DOT org -Date: 2020-11-19 -Initial Package Version: 1.18.3 -Origin: http://www.linuxfromscratch.org/blfs/view/svn/postlfs/mitkrb.html -Description: Patch increases the width of the virtual terminal used for some tests to prevent some spurious text in the output which is taken as a failure. - -diff --color -Nur krb5-1.18.3.orig/src/tests/dejagnu/config/default.exp krb5-1.18.3/src/tests/dejagnu/config/default.exp ---- krb5-1.18.3.orig/src/tests/dejagnu/config/default.exp 2020-12-07 04:51:12.997708618 +0100 -+++ krb5-1.18.3/src/tests/dejagnu/config/default.exp 2020-12-07 04:56:29.805839425 +0100 -@@ -12,7 +12,7 @@ - # realm name, defaulting to KRBTEST.COM. - - set timeout 100 --set stty_init {erase \^h kill \^u} -+set stty_init {erase \^h kill \^u cols 300} - set env(TERM) dumb - - set des3_krbtgt 0 hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM July 2022