IPFire-SCM February 2024

ipfire-scm@lists.ipfire.org

1 participants
39 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bff53f09ffb26cee1e410a2ee812efe4b83538d3
by Michael Tremer 29 Feb '24

29 Feb '24

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 bff53f09ffb26cee1e410a2ee812efe4b83538d3 (commit) via 670e7d6e363d1a51de623428620b5d50b0e814d8 (commit) via 5ef6f1dcaeea9b49c70d2bd4b2e80b17c64fffcf (commit) via 1c0e8ff9fcf7934fc5943a3b43aaef8c58d325d3 (commit) via cbc1c00ed909dea9bcd0e2b762505b80e33b211b (commit) via 90ea6fac35ac12a6fea9163ac71da166370856fe (commit) via 20e8c4739caf8f8e6b6f331d239025184b007926 (commit) via 272076e3c8f8d835816fb796cfb27501c7299e85 (commit) via 314315bee30ed6361ad628a25095e50ebbafd35c (commit) via 5fafff021f06f286e1605db48bde8bf762209cc8 (commit) via 9b2298d92f8d058ce5be6c84668e65c466cf8211 (commit) via f5a2b26bd180fc1b5e57345864bb866d82b2e6fc (commit) via 68cf137999dd22b56f094cbd725482bfe657db9d (commit) via 1087370d524d7ce690164c79cf941116994752db (commit) via ee2072fd20be1a3590e347bc59b1353aa7d69ba9 (commit) from bed265cc5ab80f97c4981f2ba5d4c1cb10c55f57 (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 bff53f09ffb26cee1e410a2ee812efe4b83538d3 Author: Robin Roevens <robin.roevens(a)disroot.org> Date: Wed Feb 28 19:58:36 2024 +0100 zabbix_agentd: Add OpenVPN certificates items - Adds Zabbix Agent userparameters `ipfire.ovpn.clientcert` and `ipfire.ovpn.cacert` for the agent to get details about openvpn client, server and ca certificates. - Moves all `ipfire.ovpn.*` userparameters to a separate config file `userparameter_ovpn.conf` to enable users to selectively disable openvpn items when not needed - Includes `ipfire_certificate_detail.sh` script in sudoers for Zabbix Agent as it needs root permission to read openvpn certificate details. - Adapts lfs install script to install new script and configfile - Adds new script and configfile to rootfiles Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 670e7d6e363d1a51de623428620b5d50b0e814d8 Author: Robin Roevens <robin.roevens(a)disroot.org> Date: Wed Feb 28 19:58:35 2024 +0100 zabbix_agentd: Add helper script to get and verify certificate details Add script to parse openssl output on certificates and return it as JSON for consumption by the Zabbix agent. Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5ef6f1dcaeea9b49c70d2bd4b2e80b17c64fffcf Author: Robin Roevens <robin.roevens(a)disroot.org> Date: Wed Feb 28 19:58:34 2024 +0100 zabbix_agentd: Update to 6.0.27 (LTS) - Update from version 6.0.22 to 6.0.27 - Update of rootfile not required Bugs fixed: - ZBX-23715: Fixed persistent directory path not following symlinks upon creation - ZBX-22933: Improved vfs.file.regmatch and vfs.file.regexp items to use buffered file read Full changelogs since 6.0.22: - https://www.zabbix.com/rn/rn6.0.23 - https://www.zabbix.com/rn/rn6.0.24 - https://www.zabbix.com/rn/rn6.0.25 - https://www.zabbix.com/rn/rn6.0.26 - https://www.zabbix.com/rn/rn6.0.27 Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1c0e8ff9fcf7934fc5943a3b43aaef8c58d325d3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 29 10:24:50 2024 +0000 core185: Ship shadow Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cbc1c00ed909dea9bcd0e2b762505b80e33b211b Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Feb 28 20:31:37 2024 +0100 shadow: Update to version 4.14.5 - Update from version 4.14.3 to 4.14.5 - Update of rootfile not required - Changelog 4.14.5 Build system: Fix regression introduced in 4.14.4, due to a typo. chgpasswd had been deleted from a Makefile variable, but it should have been chpasswd. 4.14.4 Build system: Link correctly with libdl. Install pam configs for chpasswd(8) and newusers(8) when using ./configure --with-libpam --disable-account-tools-setuid. libshadow: Fix build error (parameter name omitted). Fix off-by-one bug. Remove warning. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 90ea6fac35ac12a6fea9163ac71da166370856fe Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Feb 28 20:31:36 2024 +0100 samba: Update to version 4.19.5 - Update from version 4.19.3 to 4.19.5 - Update of rootfile not required - Changelog 4.19.5 * BUG 13688: Windows 2016 fails to restore previous version of a file from a shadow_copy2 snapshot. * BUG 15549: Symlinks on AIX are broken in 4.19 (and a few version before that). * BUG 12421: Fake directory create times has no effect. * BUG 15550: ctime mixed up with mtime by smbd. * BUG 15548: samba-gpupdate --rsop fails if machine is not in a site. * BUG 15557: gpupdate: The root cert import when NDES is not available is broken. * BUG 15552: samba-gpupdate should print a useful message if cepces-submit can't be found. * BUG 15558: samba-gpupdate logging doesn't work. * BUG 15555: smbpasswd reset permissions only if not 0600. 4.19.4 * BUG 13577: net changesecretpw cannot set the machine account password if secrets.tdb is empty. * BUG 15540: For generating doc, take, if defined, env XML_CATALOG_FILES. * BUG 15541: Trivial C typo in nsswitch/winbind_nss_netbsd.c. * BUG 15542: vfs_linux_xfs is incorrectly named. * BUG 15377: systemd stumbled over copyright-message at smbd startup. * BUG 15505: Following intermediate abolute share-local symlinks is broken. * BUG 15523: ctdb RELEASE_IP causes a crash in release_ip if a connection to a non-public address disconnects first. * BUG 15544: shadow_copy2 broken when current fileset's directories are removed. * BUG 15377: systemd stumbled over copyright-message at smbd startup. * BUG 15523: ctdb RELEASE_IP causes a crash in release_ip if a connection to a non-public address disconnects first. * BUG 15534: smbd does not detect ctdb public ipv6 addresses for multichannel exclusion. * BUG 15469: 'force user = localunixuser' doesn't work if 'allow trusted domains = no' is set. * BUG 15525: smbget debug logging doesn't work. * BUG 15532: smget: username in the smburl and interactive password entry doesn't work. * BUG 15538: smbget auth function doesn't set values for password prompt correctly. * BUG 15523: ctdb RELEASE_IP causes a crash in release_ip if a connection to a non-public address disconnects first. * BUG 15440: Unable to copy and write files from clients to Ceph cluster via SMB Linux gateway with Ceph VFS module. * BUG 15547: Multichannel refresh network information. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 20e8c4739caf8f8e6b6f331d239025184b007926 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 29 10:24:10 2024 +0000 core185: Ship libpng Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 272076e3c8f8d835816fb796cfb27501c7299e85 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Feb 28 20:31:35 2024 +0100 libpng: Update to version 1.6.42 - Update from version 1.4.61 to 1.4.62 - Update of rootfile not required - Changelog 1.6.42 Fixed the implementation of the macro function png_check_sig(). This was an API regression, introduced in libpng-1.6.41. (Reported by Matthieu Darbois) Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 314315bee30ed6361ad628a25095e50ebbafd35c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 29 10:23:17 2024 +0000 core185: Ship libgpg-error Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5fafff021f06f286e1605db48bde8bf762209cc8 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Feb 28 20:31:34 2024 +0100 libgpg-error: Update to version 1.48 - Update from version 1.47 to 1.48 - Update of rootfile - Changelog 1.48 * New configure option --with-libtool-modification. [T6619] * New option parser flag to detect commands given without a double dash. There is also the new meta command "command-mode" to set this flag via a config file. [T6978] * Added an es_fopen mode flag "sequential" with support on Windows. [rE7a42ff0ec9] * Added an es_fopen mode flag "wipe" to cleanup internal buffers at close time. [T6954] * New function gpgrt_wipememory. [T6964] * Improvements to setenv on Windows. [rE89e53ad90f] * Fixed call to estream-printf string filters. [T6737] * Many improvements to the yat2m tool. * Updates to the build system. * Interface changes relative to the 1.47 release: ARGPARSE_FLAG_COMMAND NEW. gpgrt_wipememory NEW. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9b2298d92f8d058ce5be6c84668e65c466cf8211 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 29 10:22:40 2024 +0000 core185: Ship libffi Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f5a2b26bd180fc1b5e57345864bb866d82b2e6fc Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Feb 28 20:31:33 2024 +0100 libffi: Update to version 3.4.6 - Update from version 3.4.4 to 3.4.6 - Update of rootfile - Changelog 3.4.6 Fix long double regression on mips64 and alpha. 3.4.5 Add support for wasm32. Add support for aarch64 branch target identification (bti). Add support for ARCv3: ARC32 & ARC64. Add support for HPPA64, and many HPPA fixes. Add support for Haikuos on PowerPC. Fixes for AIX, loongson, MIPS, power, sparc64, and x86 Darwin. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 68cf137999dd22b56f094cbd725482bfe657db9d Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Feb 28 20:31:32 2024 +0100 gptfdisk: Update to version 1.0.10 - Update from version 1.0.9 to 1.0.10 - Update of rootfile not required - Changelog 1.0.10 - Fixed problem that caused sgdisk to crash with errors about being unable to read the disk's partition table when compiled with the latest popt (commit 740, which is pre-release as I type; presumably version 1.19 and later once released). - Updated guid.cc to deal with minor change in libuuid. - Fixed potential NULL derefernce bug in sgdisk. Thanks to Damian Kurek for this fix. - The partition number of "0" can now be used to reference newly-created partitions when the --largest-new=0 option to sgdisk is used. Thanks to David Joaquín Shourabi Porcel for this improvement. - Make explicit casts in gptcurses.cc to eliminate compiler warnings about mis-matched types in printw() statements. - Minor code cleanup based on valgrind analysis. - In previous versions, GPT fdisk accepted only integer values for partition start points, end points, and sizes, and it interpreted decimal values incorrectly. That is, if you typed "+9.5G" as the partition end point, you'd end up with something just 9 sectors in size. This version now truncates decimal numbers to their integral values, so you'd get a 9 GiB partition instead. - Changes to optimize disk handling, particularly on Windows, courtesy of Frediano Ziglio. - Added numerous new partition type codes from Discoverable Partitions Specification (https://uapi-group.org/specifications/specs/discoverable_partitions_specifi…). - Added new sgdisk -k/--move-backup-table and gdisk k (on the experts' menu) option to relocate the backup partition table. This is the counterpart of the sgdisk -j/--move-main-table and gdisk j (on the experts' menu) option to move the main partition table. This code comes from Niklas Gollenstede. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1087370d524d7ce690164c79cf941116994752db Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Feb 28 20:31:31 2024 +0100 git: Update to version 2.44.0 - Update from version 2.43.0 to 2.44.0 - Update of rootfile - Changelog is too large to include here. See the files 2.43.1.txt, 2.43.2.txt, 2.43.3.txt & 2.44.0.txt in the source tarball in directory Documentation/RelNotes Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ee2072fd20be1a3590e347bc59b1353aa7d69ba9 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Feb 28 20:31:30 2024 +0100 en.pl: Correct typo of marsians instead of martians Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/libffi | 3 +- config/rootfiles/common/libgpg-error | 3 +- .../{oldcore/155 => core/185}/filelists/libffi | 0 .../106 => core/185}/filelists/libgpg-error | 0 .../{oldcore/109 => core/185}/filelists/libpng | 0 .../{oldcore/104 => core/185}/filelists/shadow | 0 config/rootfiles/packages/git | 2 + config/rootfiles/packages/zabbix_agentd | 3 + config/zabbix_agentd/ipfire_certificate_detail.sh | 91 ++++++++++++++++++++++ config/zabbix_agentd/sudoers | 1 + config/zabbix_agentd/userparameter_ipfire.conf | 8 +- ...rameter_ipfire.conf => userparameter_ovpn.conf} | 19 ++--- doc/language_issues.en | 2 +- doc/language_issues.it | 2 +- doc/language_issues.nl | 2 +- doc/language_issues.pl | 2 +- doc/language_issues.ru | 2 +- doc/language_issues.tr | 2 +- langs/en/cgi-bin/en.pl | 2 +- lfs/git | 8 +- lfs/gptfdisk | 8 +- lfs/libffi | 6 +- lfs/libgpg-error | 6 +- lfs/libpng | 4 +- lfs/samba | 8 +- lfs/shadow | 4 +- lfs/zabbix_agentd | 13 +++- 27 files changed, 148 insertions(+), 53 deletions(-) copy config/rootfiles/{oldcore/155 => core/185}/filelists/libffi (100%) copy config/rootfiles/{oldcore/106 => core/185}/filelists/libgpg-error (100%) copy config/rootfiles/{oldcore/109 => core/185}/filelists/libpng (100%) copy config/rootfiles/{oldcore/104 => core/185}/filelists/shadow (100%) create mode 100755 config/zabbix_agentd/ipfire_certificate_detail.sh copy config/zabbix_agentd/{userparameter_ipfire.conf => userparameter_ovpn.conf} (55%) Difference in files: diff --git a/config/rootfiles/common/libffi b/config/rootfiles/common/libffi index 02c161e54b..8028039050 100644 --- a/config/rootfiles/common/libffi +++ b/config/rootfiles/common/libffi @@ -4,10 +4,11 @@ #usr/lib/libffi.la #usr/lib/libffi.so usr/lib/libffi.so.8 -usr/lib/libffi.so.8.1.2 +usr/lib/libffi.so.8.1.4 #usr/lib/pkgconfig/libffi.pc #usr/share/info/libffi.info #usr/share/man/man3/ffi.3 #usr/share/man/man3/ffi_call.3 #usr/share/man/man3/ffi_prep_cif.3 #usr/share/man/man3/ffi_prep_cif_var.3 + diff --git a/config/rootfiles/common/libgpg-error b/config/rootfiles/common/libgpg-error index 08079ed9c5..7da745f1d2 100644 --- a/config/rootfiles/common/libgpg-error +++ b/config/rootfiles/common/libgpg-error @@ -6,7 +6,7 @@ usr/bin/gpg-error #usr/lib/libgpg-error.la #usr/lib/libgpg-error.so usr/lib/libgpg-error.so.0 -usr/lib/libgpg-error.so.0.34.0 +usr/lib/libgpg-error.so.0.35.0 #usr/lib/pkgconfig/gpg-error.pc #usr/share/aclocal/gpg-error.m4 #usr/share/aclocal/gpgrt.m4 @@ -42,3 +42,4 @@ usr/lib/libgpg-error.so.0.34.0 #usr/share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo #usr/share/locale/zh_TW/LC_MESSAGES/libgpg-error.mo #usr/share/man/man1/gpgrt-config.1 + diff --git a/config/rootfiles/core/185/filelists/libffi b/config/rootfiles/core/185/filelists/libffi new file mode 120000 index 0000000000..c391acd0cb --- /dev/null +++ b/config/rootfiles/core/185/filelists/libffi @@ -0,0 +1 @@ +../../../common/libffi \ No newline at end of file diff --git a/config/rootfiles/core/185/filelists/libgpg-error b/config/rootfiles/core/185/filelists/libgpg-error new file mode 120000 index 0000000000..cad431339f --- /dev/null +++ b/config/rootfiles/core/185/filelists/libgpg-error @@ -0,0 +1 @@ +../../../common/libgpg-error \ No newline at end of file diff --git a/config/rootfiles/core/185/filelists/libpng b/config/rootfiles/core/185/filelists/libpng new file mode 120000 index 0000000000..8ef96e2c13 --- /dev/null +++ b/config/rootfiles/core/185/filelists/libpng @@ -0,0 +1 @@ +../../../common/libpng \ No newline at end of file diff --git a/config/rootfiles/core/185/filelists/shadow b/config/rootfiles/core/185/filelists/shadow new file mode 120000 index 0000000000..c0824b7b99 --- /dev/null +++ b/config/rootfiles/core/185/filelists/shadow @@ -0,0 +1 @@ +../../../common/shadow \ No newline at end of file diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git index 306767e4b8..d0e7b707e2 100644 --- a/config/rootfiles/packages/git +++ b/config/rootfiles/packages/git @@ -133,6 +133,7 @@ usr/libexec/git-core/git-remote-http usr/libexec/git-core/git-remote-https usr/libexec/git-core/git-repack usr/libexec/git-core/git-replace +usr/libexec/git-core/git-replay usr/libexec/git-core/git-request-pull usr/libexec/git-core/git-rerere usr/libexec/git-core/git-reset @@ -355,3 +356,4 @@ usr/share/perl5/Git/SVN #usr/share/perl5/Git/SVN/Prompt.pm #usr/share/perl5/Git/SVN/Ra.pm #usr/share/perl5/Git/SVN/Utils.pm + diff --git a/config/rootfiles/packages/zabbix_agentd b/config/rootfiles/packages/zabbix_agentd index 729a47ac62..8e10cb4c8a 100644 --- a/config/rootfiles/packages/zabbix_agentd +++ b/config/rootfiles/packages/zabbix_agentd @@ -20,3 +20,6 @@ var/ipfire/zabbix_agentd/zabbix_agentd_ipfire_mandatory.conf var/ipfire/zabbix_agentd/userparameters var/ipfire/zabbix_agentd/userparameters/userparameter_pakfire.conf var/ipfire/zabbix_agentd/userparameters/userparameter_ipfire.conf +var/ipfire/zabbix_agentd/userparameters/userparameter_ovpn.conf +var/ipfire/zabbix_agentd/scripts +var/ipfire/zabbix_agentd/scripts/ipfire_certificate_detail.sh diff --git a/config/zabbix_agentd/ipfire_certificate_detail.sh b/config/zabbix_agentd/ipfire_certificate_detail.sh new file mode 100755 index 0000000000..9ca0ef5de9 --- /dev/null +++ b/config/zabbix_agentd/ipfire_certificate_detail.sh @@ -0,0 +1,91 @@ +#!/bin/bash +############################################################################### +# ipfire_certificate_detail.sh - Get certificate details and validation results +# in JSON format for use by Zabbix agent +# +# Author: robin.roevens (at) disroot.org +# Version: 1.0 +# +# Copyright (C) 2007-2024 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 +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +############################################################################### + +# Required binaries +OPENSSL=/usr/bin/openssl +DATE=/bin/date + +# Parameter checking +[[ $1 ]] || { echo "{\"error\":\"No CA certificate file given.\"}"; exit 1; } +[[ -f $1 ]] || { echo "{\"error\":\"CA certificate not found: $1.\"}"; exit 1; } +[[ -r $1 ]] || { echo "{\"error\":\"No read permission on CA certificate: $1.\"}"; exit 1; } +[[ $2 ]] || { echo "{\"error\":\"No certificate file given.\"}"; exit 1; } +[[ -f $2 ]] || { echo "{\"error\":\"Certificate not found: $2.\"}"; exit 1; } +[[ -r $2 ]] || { echo "{\"error\":\"No read permission on certificate $2.\"}"; exit 1; } +[[ -x $OPENSSL ]] || { echo "{\"error\":\"$OPENSSL binary not found or no permission.\"}"; exit 1; } +[[ -x $DATE ]] || { echo "{\"error\":\"$DATE binary not found or no permission.\"}"; exit 1; } + +cafile=$1 +cert=$2 + +# Parse certificate details +cert_details=$(${OPENSSL} x509 -in "${cert}" -noout -text -certopt no_header,no_sigdump) +version=$(echo "${cert_details}" | grep "Version:" | sed 's/^ \+Version: $[0-9]\+$ (.\+)$/\1/g') +serial_number=$(echo "${cert_details}" | grep -A1 "Serial Number:" | tr -d '\n' | sed 's/^ \+Serial Number:$\( \(.*$ ([0-9]\+x[0-9]\+).*\)\|$ \+\(.*$$\)\)/\3\5/g') +signature_algorithm=$(echo "${cert_details}" | grep "Signature Algorithm:" | sed 's/^ \+Signature Algorithm: //g') +issuer=$(echo "${cert_details}" | grep "Issuer:" | sed 's/^ \+Issuer: //g' | sed 's/"/\\"/g') +not_before_value=$(echo "${cert_details}" | grep "Not Before:" | sed 's/^ \+Not Before: //g') +not_before_timestamp=$(${DATE} -d "${not_before_value}" +%s) +not_after_value=$(echo "${cert_details}" | grep "Not After :" | sed 's/^ \+Not After : //g') +not_after_timestamp=$(${DATE} -d "${not_after_value}" +%s) +subject=$(echo "${cert_details}" | grep "Subject:" | sed 's/^ \+Subject: //g' | sed 's/"/\\"/g') +public_key_algorithm=$(echo "${cert_details}" | grep "Public Key Algorithm:" | sed 's/^ \+Public Key Algorithm: //g') + +# Verify certificate +cert_verify=$(${OPENSSL} verify -CAfile "${cafile}" "${cert}" 2>&1) +if [[ $? != 0 ]]; then + result_value="invalid" + result_message="failed to verify certificate: x509: $(echo "${cert_verify}" | grep -E "error [0-9]+" | sed 's/^.\+: $.\+$/\1/g')" +else + result_value="valid" + result_message="certificate verified successfully" +fi + +# Generate fingerprints +sha1_fingerprint=$(${OPENSSL} x509 -in "${cert}" -noout -fingerprint -sha1 | cut -d= -f2) +sha256_fingerprint=$(${OPENSSL} x509 -in "${cert}" -noout -fingerprint -sha256 | cut -d= -f2) + +# Print certificate details in JSON +echo -n "{\"x509\":{" +echo -n "\"version\":\"${version}\"," +echo -n "\"serial_number\":\"${serial_number}\"," +echo -n "\"signature_algorithm\":\"${signature_algorithm}\"," +echo -n "\"issuer\":\"${issuer}\"," +echo -n "\"not_before\":{" +echo -n "\"value\":\"${not_before_value}\"," +echo -n "\"timestamp\":\"${not_before_timestamp}\"}," +echo -n "\"not_after\":{" +echo -n "\"value\":\"${not_after_value}\"," +echo -n "\"timestamp\":\"${not_after_timestamp}\"}," +echo -n "\"subject\":\"${subject}\"," +echo -n "\"public_key_algorithm\":\"${public_key_algorithm}\"}," +echo -n "\"result\":{" +echo -n "\"value\":\"${result_value}\"," +echo -n "\"message\":\"${result_message}\"}," +echo -n "\"sha1_fingerprint\":\"${sha1_fingerprint}\"," +echo -n "\"sha256_fingerprint\":\"${sha256_fingerprint}\"" +echo -n "}" + +exit 0 \ No newline at end of file diff --git a/config/zabbix_agentd/sudoers b/config/zabbix_agentd/sudoers index d93ec5d556..138c75635a 100644 --- a/config/zabbix_agentd/sudoers +++ b/config/zabbix_agentd/sudoers @@ -9,3 +9,4 @@ # Defaults:zabbix !requiretty zabbix ALL=(ALL) NOPASSWD: /opt/pakfire/pakfire status, /usr/sbin/fping, /usr/local/bin/getipstat, /bin/cat /var/run/ovpnserver.log +zabbix ALL=(ALL) NOPASSWD: /var/ipfire/zabbix_agentd/scripts/ipfire_certificate_detail.sh diff --git a/config/zabbix_agentd/userparameter_ipfire.conf b/config/zabbix_agentd/userparameter_ipfire.conf index ba0c6c2ca3..d2d0c83078 100644 --- a/config/zabbix_agentd/userparameter_ipfire.conf +++ b/config/zabbix_agentd/userparameter_ipfire.conf @@ -9,10 +9,4 @@ UserParameter=ipfire.net.fw.hits.raw,sudo /usr/local/bin/getipstat -xf | grep "/ # Number of currently Active DHCP leases UserParameter=ipfire.dhcpd.clients,grep -s -E 'lease|bind' /var/state/dhcp/dhcpd.leases | sed ':a;/{$/{N;s/\n//;ba}' | grep "state active" | wc -l # Number of Captive Portal clients -UserParameter=ipfire.captive.clients,awk -F ',' 'length($2) == 17 {sum += 1} END {if (length(sum) == 0) print 0; else print sum}' /var/ipfire/captive/clients -# Discovery of configured ovpn clients -UserParameter=ipfire.ovpn.clients.discovery,cat /var/ipfire/ovpn/ovpnconfig 2>/dev/null | awk -F',' 'BEGIN { ORS = ""; print "[" } { printf "%s{\"{#NAME}\":\"%s\",\"{#COMMONNAME}\":\"%s\",\"{#STATE}\":\"%s\",\"{#REMARK}\":\"%s\",\"{#TYPE}\":\"%s\"}", separator, $3, $4, $2, $27, $5; separator = ","; } END { print "]" }' -# Get OpenVPN status report -UserParameter=ipfire.ovpn.statusreport.get,sudo cat /var/run/ovpnserver.log 2>/dev/null | awk -F"," 'function unixtime(t) { gsub(/[-:]/," ",t); return mktime(t) } BEGIN { ORS = ""; print "{" } /^Updated,.+/ { printf "\"timestamp\":%s,\"clients\":[",unixtime($2) } /^.+,[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:[0-9]+,[0-9]+,[0-9]+,.+/ { if ($1 != "Common Name") { printf "%s{\"common_name\":\"%s\",\"real_address\":\"%s\",\"bytes_in\":\"%s\",\"bytes_out\":\"%s\",\"connected_since\":\"%s\"}", separator, $1, $2, $3, $4, unixtime($5); separator = ","; } } /^ROUTING TABLE/ { print "],\"routing_table\":["; separator = "" } /^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+,.+,[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:[0-9]+,.+/ { if ($1 != "Virtual Address") { printf "%s{\"common_name\":\"%s\",\"virtual_address\":\"%s\",\"real_address\":\"%s\",\"last_ref\":\"%s\"}", separator, $2, $1, $3, unixtime($4); separator = "," } } END { print "]}" }' -# Allow item key to be called with (unused) parameters. This allows the #SINGLETON method of discovering this item only when openvpn service is active -Alias=ipfire.ovpn.statusreport.get[]:ipfire.ovpn.statusreport.get \ No newline at end of file +UserParameter=ipfire.captive.clients,awk -F ',' 'length($2) == 17 {sum += 1} END {if (length(sum) == 0) print 0; else print sum}' /var/ipfire/captive/clients \ No newline at end of file diff --git a/config/zabbix_agentd/userparameter_ovpn.conf b/config/zabbix_agentd/userparameter_ovpn.conf new file mode 100644 index 0000000000..a7a6d8535f --- /dev/null +++ b/config/zabbix_agentd/userparameter_ovpn.conf @@ -0,0 +1,13 @@ +# Parameters for monitoring IPFire OpenVPN specific metrics +# +# Discovery of configured ovpn clients +UserParameter=ipfire.ovpn.clients.discovery,cat /var/ipfire/ovpn/ovpnconfig 2>/dev/null | awk -F',' 'BEGIN { ORS = ""; print "[" } { printf "%s{\"{#NAME}\":\"%s\",\"{#COMMONNAME}\":\"%s\",\"{#STATE}\":\"%s\",\"{#REMARK}\":\"%s\",\"{#TYPE}\":\"%s\"}", separator, $3, $4, $2, $27, $5; separator = ","; } END { print "]" }' +# Get OpenVPN status report +UserParameter=ipfire.ovpn.statusreport.get,sudo cat /var/run/ovpnserver.log 2>/dev/null | awk -F"," 'function unixtime(t) { gsub(/[-:]/," ",t); return mktime(t) } BEGIN { ORS = ""; print "{" } /^Updated,.+/ { printf "\"timestamp\":%s,\"clients\":[",unixtime($2) } /^.+,[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:[0-9]+,[0-9]+,[0-9]+,.+/ { if ($1 != "Common Name") { printf "%s{\"common_name\":\"%s\",\"real_address\":\"%s\",\"bytes_in\":\"%s\",\"bytes_out\":\"%s\",\"connected_since\":\"%s\"}", separator, $1, $2, $3, $4, unixtime($5); separator = ","; } } /^ROUTING TABLE/ { print "],\"routing_table\":["; separator = "" } /^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+,.+,[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:[0-9]+,.+/ { if ($1 != "Virtual Address") { printf "%s{\"common_name\":\"%s\",\"virtual_address\":\"%s\",\"real_address\":\"%s\",\"last_ref\":\"%s\"}", separator, $2, $1, $3, unixtime($4); separator = "," } } END { print "]}" }' +# Get OpenVPN client certificate details +UserParameter=ipfire.ovpn.clientcert[*],sudo /var/ipfire/zabbix_agentd/scripts/ipfire_certificate_detail.sh /var/ipfire/ovpn/ca/cacert.pem /var/ipfire/ovpn/certs/$1cert.pem +UserParameter=ipfire.ovpn.cacert,sudo /var/ipfire/zabbix_agentd/scripts/ipfire_certificate_detail.sh /var/ipfire/ovpn/ca/cacert.pem /var/ipfire/ovpn/ca/cacert.pem + +# Allow item key to be called with (unused) parameters. This allows the #SINGLETON method of discovering this item only when openvpn service is active +Alias=ipfire.ovpn.statusreport.get[]:ipfire.ovpn.statusreport.get +Alias=ipfire.ovpn.cacert[]:ipfire.ovpn.cacert \ No newline at end of file diff --git a/doc/language_issues.en b/doc/language_issues.en index 86d5890f23..40f85a748f 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -687,7 +687,7 @@ WARNING: untranslated string: drop outgoing = Log dropped outgoing packets WARNING: untranslated string: drop portscan = Log dropped portscan packets WARNING: untranslated string: drop proxy = Drop all packets not addressed to proxy WARNING: untranslated string: drop samba = Drop all Microsoft ports 135,137,138,139,445,1025 -WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and marsians +WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and martians WARNING: untranslated string: drop wirelessforward = Log dropped wireless forward packets WARNING: untranslated string: drop wirelessinput = Log dropped wireless input packets WARNING: untranslated string: dst port = Dst Port diff --git a/doc/language_issues.it b/doc/language_issues.it index 24efece2b4..1aca878ff5 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -973,7 +973,7 @@ WARNING: untranslated string: dnsforward forward_servers = Nameservers WARNING: untranslated string: downfall gather data sampling = Downfall/Gather Data Sampling WARNING: untranslated string: download apple profile = Download Apple Configuration Profile WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.) -WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and marsians +WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and martians WARNING: untranslated string: duration = Duration WARNING: untranslated string: eight hours = 8 Hours WARNING: untranslated string: email config = Configuration diff --git a/doc/language_issues.nl b/doc/language_issues.nl index b6a65fad29..fde14ead1a 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -978,7 +978,7 @@ WARNING: untranslated string: download apple profile = Download Apple Configurat WARNING: untranslated string: download tls-auth key = Download tls-auth key WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.) WARNING: untranslated string: drop outgoing = Log dropped outgoing packets -WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and marsians +WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and martians WARNING: untranslated string: duration = Duration WARNING: untranslated string: eight hours = 8 Hours WARNING: untranslated string: email config = Configuration diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 1a4f62870f..454e3fcf3a 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -965,7 +965,7 @@ WARNING: untranslated string: drop action2 = Default behaviour of (input) firewa WARNING: untranslated string: drop forward = Log dropped forward packets WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.) WARNING: untranslated string: drop outgoing = Log dropped outgoing packets -WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and marsians +WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and martians WARNING: untranslated string: duration = Duration WARNING: untranslated string: eight hours = 8 Hours WARNING: untranslated string: email config = Configuration diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 8da6fe4b6d..0cb2765489 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -962,7 +962,7 @@ WARNING: untranslated string: drop action2 = Default behaviour of (input) firewa WARNING: untranslated string: drop forward = Log dropped forward packets WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.) WARNING: untranslated string: drop outgoing = Log dropped outgoing packets -WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and marsians +WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and martians WARNING: untranslated string: duration = Duration WARNING: untranslated string: eight hours = 8 Hours WARNING: untranslated string: email config = Configuration diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 96fe71f7b5..aeda8127a4 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -953,7 +953,7 @@ WARNING: untranslated string: dnsforward forward_servers = Nameservers WARNING: untranslated string: downfall gather data sampling = Downfall/Gather Data Sampling WARNING: untranslated string: download apple profile = Download Apple Configuration Profile WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.) -WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and marsians +WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and martians WARNING: untranslated string: duration = Duration WARNING: untranslated string: email recipient invalid = Invalid email recipient WARNING: untranslated string: email tls explicit = explicit (STARTTLS) diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 3246102ba5..667fb5d7ee 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -959,7 +959,7 @@ 'drop portscan' => 'Log dropped portscan packets', 'drop proxy' => 'Drop all packets not addressed to proxy', 'drop samba' => 'Drop all Microsoft ports 135,137,138,139,445,1025', -'drop spoofed martians' => 'Log dropped spoofed packets and marsians', +'drop spoofed martians' => 'Log dropped spoofed packets and martians', 'drop wirelessforward' => 'Log dropped wireless forward packets', 'drop wirelessinput' => 'Log dropped wireless input packets', 'dst port' => 'Dst Port', diff --git a/lfs/git b/lfs/git index 6489215255..d10ca469c2 100644 --- a/lfs/git +++ b/lfs/git @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 = 2.43.0 +VER = 2.44.0 SUMMARY = Fast, scalable, distributed revision control system THISAPP = git-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = git -PAK_VER = 31 +PAK_VER = 32 DEPS = perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 5da19211df56e306eb95cef65b2a987134d2f0853dc1db30e1cc99d0357b3f5ab7f1e434e73948d7b6ad6b7bfc44f75349479f46050ee63a6516c72b774b4eba +$(DL_FILE)_BLAKE2 = 6dc145e20e737763fb738ccb4a65ba2f8d6f35bb4e30520a0c79f4fcc0eaaaf4e99a9be00eaa9e14dec231ed122d54be7dfa9212a3e5a75707730256391896d4 install : $(TARGET) diff --git a/lfs/gptfdisk b/lfs/gptfdisk index eb1c60357f..9e6f4310a8 100644 --- a/lfs/gptfdisk +++ b/lfs/gptfdisk @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 # @@ -25,7 +25,7 @@ include Config -VER = 1.0.9 +VER = 1.0.10 THISAPP = gptfdisk-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = gptfdisk -PAK_VER = 2 +PAK_VER = 3 DEPS = @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 1939ffd75972a4d7f92af2bfab90c7b0223825b5478b6b808dd35af943c687d38ba81663cd7ba5e0f9400656db4dac019c13a9f75d90b7bd716568c676c24dd2 +$(DL_FILE)_BLAKE2 = 9047bf68a2c5c254bda9b2815488963dc19a9415c90fbf4a127268a37fe8a545b7d45a333e356bd9da22e37ef649d9f60896ffedfdc35b60c7642a48e4ed2e5a install : $(TARGET) diff --git a/lfs/libffi b/lfs/libffi index bfd02b57fd..ffe7803aa1 100644 --- a/lfs/libffi +++ b/lfs/libffi @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 3.4.4 +VER = 3.4.6 THISAPP = libffi-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 189fe1ffe9507f204581b0ab09995dc7e7b761bb4eac7e338e9f5ff81431aebcef6c182c1839c9f9acb2706697a260c67e6d1351cf7e2aed7c4eb5d694f6f8fd +$(DL_FILE)_BLAKE2 = af8402a09bdbd59b4e9400d2d71bd5ce98f6f1d981d35d1ab40d77a831b13b32c5bd34ca54ff75999e39f0d8a9c066381fae7a8d6c5216d955e064f929f08b88 install : $(TARGET) diff --git a/lfs/libgpg-error b/lfs/libgpg-error index f60f1ae820..c402d0bf81 100644 --- a/lfs/libgpg-error +++ b/lfs/libgpg-error @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 = 1.47 +VER = 1.48 THISAPP = libgpg-error-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = bc04efa0686b1b7d7cdce045fc080c090c1abec60349b673c2e1ce27900483aea090eb6ebcb3fb49a4eed36f18156a12413d5446f739475632f4ed2a2481ff27 +$(DL_FILE)_BLAKE2 = 4ced63058586558f4d001bcc468f4bd419b8ec29fbd7dbcaa1a21f959d847c9e12c10c548a0038fd4eac0bdfc9907b61e9f6be71c95fc61c964c649e2415dfd7 install : $(TARGET) diff --git a/lfs/libpng b/lfs/libpng index 3a0704e591..b22b64b65a 100644 --- a/lfs/libpng +++ b/lfs/libpng @@ -24,7 +24,7 @@ include Config -VER = 1.6.41 +VER = 1.6.42 THISAPP = libpng-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 43d8d1c563d9df46b663f706dca9563e31e6e47a2809a77a5d059de8cfa348721054df724d08ac24ef4717ffc101989941127df2d026c9537532375d9b432b68 +$(DL_FILE)_BLAKE2 = 8a8895b673ff90416a00c9ff775d7bdc38ab1ab0d83fd6e70cfffea2ed78bd42896950a64bf48ad9a00ea50d8c5d5702975b0bae7bb3300d4de4c82b334e513e install : $(TARGET) diff --git a/lfs/samba b/lfs/samba index 7ebac8ded2..76088abfad 100644 --- a/lfs/samba +++ b/lfs/samba @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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.19.3 +VER = 4.19.5 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 = 98 +PAK_VER = 99 DEPS = avahi cups perl-Parse-Yapp perl-JSON @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = f83af3b50d795bdc4a250fe96040721150acc3b8effddd473e3cfa3ef6eeec99928b1307a18a472be45049e1d0b74650b9f6dd4bf5c434277c94ab88cb493b3b +$(DL_FILE)_BLAKE2 = 0f0081380ad459cca914e5e4cf505a4783ce97f0fb8c0471a6e558c747c16b0b327e545358265f365599c3807540985bcddb68aa67d14136cee4dbcb5158090c install : $(TARGET) diff --git a/lfs/shadow b/lfs/shadow index a3495474aa..f88c6c2836 100644 --- a/lfs/shadow +++ b/lfs/shadow @@ -24,7 +24,7 @@ include Config -VER = 4.14.3 +VER = 4.14.5 THISAPP = shadow-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 6707cae41a0f8478cadd94ea5eaba95cdc6b1b23896b8dd903c62c931839a82b0538f04f8c12433f148da5b23c12a033963380be81f6fc97fa0e3f9399e51b21 +$(DL_FILE)_BLAKE2 = 885d2b23ed670cf26452eb208d561478b7410ffbb04a054feb65efb7da6f1d51eb992da61b72409f8991ee35efd7e7cf7a9bc770edec5f855ace32f82aaa7b55 install : $(TARGET) diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd index 0033d9a2c2..5f274c3098 100644 --- a/lfs/zabbix_agentd +++ b/lfs/zabbix_agentd @@ -26,7 +26,7 @@ include Config SUMMARY = Zabbix Agent -VER = 6.0.22 +VER = 6.0.27 THISAPP = zabbix-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = zabbix_agentd -PAK_VER = 11 +PAK_VER = 12 DEPS = fping @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = bba7911a24b00827c58d84938b5786d07f1eb44cbcad94cddf68b484ac9a2f514beb60225d006b8cefc5bbf92e51da27f26d9f6681e10f6322ed0841394e8d9d +$(DL_FILE)_BLAKE2 = 793bb887bd8f0d3c2f3d15a4ed9bb5b1fcfb13fcf80ea077672744a1bd8524e213eaf53291e0f9eecb9eb055fee6f1e29e91f890b54698906beac21ca54db4e9 install : $(TARGET) @@ -110,6 +110,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) /var/ipfire/zabbix_agentd/userparameters/userparameter_pakfire.conf install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/userparameter_ipfire.conf \ /var/ipfire/zabbix_agentd/userparameters/userparameter_ipfire.conf + install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/userparameter_ovpn.conf \ + /var/ipfire/zabbix_agentd/userparameters/userparameter_ovpn.conf + + # Install IPFire-specific Zabbix Agent scripts + -mkdir -pv /var/ipfire/zabbix_agentd/scripts + install -v -m 755 $(DIR_SRC)/config/zabbix_agentd/ipfire_certificate_detail.sh \ + /var/ipfire/zabbix_agentd/scripts/ipfire_certificate_detail.sh # Create directory for additional agent modules -mkdir -pv /usr/lib/zabbix hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bed265cc5ab80f97c4981f2ba5d4c1cb10c55f57
by Michael Tremer 28 Feb '24

28 Feb '24

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 bed265cc5ab80f97c4981f2ba5d4c1cb10c55f57 (commit) via 3ee04b3b8a4da3513d288c5e4dfd0d3139b2d7ea (commit) via c790899f7383dae7f734a44c1570da1c9246b778 (commit) via f433fdcd90cb406f1095e6c3d2fa6af7cd85efb3 (commit) via 033252e043de35cc1da36e0eb5dc198126abbae5 (commit) via 60a050768f1e3e4dd79c1696e249d426cdb9eab7 (commit) via bf93033801e5c7a1e6de05a073321e909f43a388 (commit) via 7c6ff5ff12331a53f416080a44c8d6145e78bfac (commit) via 84c599f55f2b85b0e3f6c9b058b132f2d39b0a46 (commit) via 2ee8edb81a1851ce6bab10dac383c36c67139917 (commit) via c082a0cc9a8f9faf0f7db38cda1641a1f34d74c9 (commit) via bf3f602e05df35b7619c39243c88d571c9309e8a (commit) via 06c2bfa3c4d54a6fc6c3edb834ccb65732850383 (commit) via 749b93c6e96d032a04a87ebaf3f4cbba7b34f5db (commit) via 43c2dc9318f5733006388563468ba75e39e8d997 (commit) via bb88fd1b69ae27e9c14b97d219879627a473a3d2 (commit) via cf70bd231a1ad7ba9507514722ce7f10f92af388 (commit) via b95afd6aca51723390d4cc14a9607e9333bca4b4 (commit) via 5cf3bc3507b841078d25852672931e8f49d59bb6 (commit) via 605217e96f9c4b99fe66ca8c610cdf58e7797947 (commit) from a809f932464a603af0bda13dfb558573ba58a483 (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 bed265cc5ab80f97c4981f2ba5d4c1cb10c55f57 Merge: 3ee04b3b8a 2ee8edb81a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 28 16:44:06 2024 +0000 Merge remote-tracking branch 'ms/wsdd' into next commit 3ee04b3b8a4da3513d288c5e4dfd0d3139b2d7ea Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 28 16:41:22 2024 +0000 core185: Ship backup.pl and ovpnmain.cgi Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c790899f7383dae7f734a44c1570da1c9246b778 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Feb 26 16:05:01 2024 +0100 backup.pl: Fixes bug#13404 - Clear out OpenVPN certs before doing restore - Existing situation is if four new client connections are created and then it is decided to restore to an earlier stage the new certficates will be in the certs directory but not usable from the WUI page as they are no longer shown in the client connection table as that now shows the ones from the restored backup. - This patch clears the /var/ipfire/ovpn/certs/ directory before restoring the contents of the backup so that the certs directory only holds what was in the backup. Fixes: Bug#13404 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f433fdcd90cb406f1095e6c3d2fa6af7cd85efb3 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Feb 26 16:05:00 2024 +0100 ovpnmain.cgi: Fixes bug#13404 - prevents certs being saved if common name is already used - This was fixed by moving the code for checking if the common name is already used, to the same location as the code for checking if the connection name is already used. - Tested out on vm testbed and confirmed that the certificates are not created and the index.txt not updated if the common name is flagged as already being used. If the entry is changed to use a new CN and Save pressed then the certs are saved and the index.txt updated. If Cancel is pressed then no certs are saved and index.txt is not updated. Fixes: Bug#13404 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 033252e043de35cc1da36e0eb5dc198126abbae5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 28 16:29:51 2024 +0000 core185: Ship dhcp.cgi Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 60a050768f1e3e4dd79c1696e249d426cdb9eab7 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sat Feb 24 15:51:14 2024 +0100 dhcp.cgi: Fixes bug#11774 - allows dhcp option of array of integer 8 - This v2 version is to correct the bug number. I entered a wronn bug number in the first version - This extends the allowed options from just array of ip-address to also include integer 8 or integer 16 or integer 32. - Tested out on vm testbed. The array of integer 8 (or 16 or 32) is acceptewd by the dhcp options section. I am not able to test out that the function actually works as I don't have any dhcp situation set up to use that capability. - Records or array of records is still not included. It was only an expansion of the array of section to include integers. Fixes: bug#11774 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit bf93033801e5c7a1e6de05a073321e909f43a388 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 28 16:11:04 2024 +0000 core185: Ship dns.cgi Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7c6ff5ff12331a53f416080a44c8d6145e78bfac Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Feb 28 14:35:26 2024 +0100 dns.cgi: Fixes bug#12395 - German umlauts not correctly displayed in remarks - If Freifunk München e.V. is entered as a remark it gets converted to Freifunk MÃ¼nchen e.V. - This is because cleanhtml is used on the remark text before saving it to the file and the HTML::Entities::encode_entities command that is run on that remark text encodes all higher bit characters as unsafe characters and replaces them with their HTML entity representation. - Have tested out the remark with a range of different characters with diacritical marks and all of the ones tested were re-written. - The use of the cleanhtml makes sense when used on URL's or on text that is going to be printed as part of the HTML code for a page but it doesn't seem to make sense for text used in a remark. - The cleanhtml function is only used on the remark text in dns.cgi and not on any other entries on the page. - Removing the call to the cleanhtml function results in the German umlauts being printed in the remark section. - Many of the WUI pages have the cleanhtml function used on remark or comment text. - fwhosts.cgi does not use cleanhtml anywhere. So all its remark sections work with characters with diacritical marks. - If this patch is accepted, I will then submit patches for the other WUI pages where characters with diacritical marks are re-written in remark or comment sections. Fixes: Bug#12395 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 84c599f55f2b85b0e3f6c9b058b132f2d39b0a46 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Feb 26 09:33:04 2024 +0100 Core Update 185: Ship elfutils Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2ee8edb81a1851ce6bab10dac383c36c67139917 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 11 16:18:46 2024 +0100 wsdd: Call it by its full name Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org> commit c082a0cc9a8f9faf0f7db38cda1641a1f34d74c9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 11 16:17:09 2024 +0100 wsdd: Add a restart command Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org> commit bf3f602e05df35b7619c39243c88d571c9309e8a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 11 16:15:43 2024 +0100 wsdd: Create the chroot directory only on start Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org> commit 06c2bfa3c4d54a6fc6c3edb834ccb65732850383 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 11 16:15:13 2024 +0100 wsdd: Compose the ARGS array only when we need it Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org> commit 749b93c6e96d032a04a87ebaf3f4cbba7b34f5db Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 11 16:14:11 2024 +0100 wsdd: Append --interface switches to the arguments array Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org> commit 43c2dc9318f5733006388563468ba75e39e8d997 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 11 16:11:53 2024 +0100 wsdd: Securely parse the workgroup name Because of a single variable being passwd with the workgroup, it would have been possible to inject shell commands here. Passing it in the array prevents that. Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org> commit bb88fd1b69ae27e9c14b97d219879627a473a3d2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 11 16:10:04 2024 +0100 wsdd: Collect static command line arguments in an array This is easier to handle than a large number of variables. Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org> commit cf70bd231a1ad7ba9507514722ce7f10f92af388 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 11 16:07:04 2024 +0100 wsdd: Use long options for clarity Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org> commit b95afd6aca51723390d4cc14a9607e9333bca4b4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 11 16:05:29 2024 +0100 wsdd: Reindent initscript No spaces. Just tabs. Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org> commit 5cf3bc3507b841078d25852672931e8f49d59bb6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jan 11 16:02:29 2024 +0100 wsdd: Simplify starting/stopping and checking wsdd Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org> commit 605217e96f9c4b99fe66ca8c610cdf58e7797947 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Jan 10 14:30:20 2024 +0100 wsdd: Install wsdd - fixes bug13445 - lfs and toorfile created for wsdd - wsdd added to make.sh script - created install/update/uninstall scripts for wsdd that create an unpriveleged user and group. - initscript created for wsdd. As wsdd is a python3 script, when it is run as a daemon the pidof command does not find any pid for wsdd. So a directory/file for a pid file was created. This is then passed to the loadproc and killproc commands. After the loadproc command has been created the pid is extracted from the ps aux command and put into the pid file. This then works when running the killproc command for it to know what to go and stop. The statusproc command does not have the ability to feed in the pid from a pid file and so it fails to find a running wsdd as it uses the pidof command. Code was added to the status section of the initscript to check if the pid file exists and if so to print the same command as used with the statusproc command, and also the same wording if the pid file does not exist because wsdd is not running. - info from the ethernet/settings file is used to identify if only green0 is available or if blue0 is also used and based on this the appropriate interface commands are added to the wsdd command. - wsdd is also set up to run in a chroot - Has been tested on my vm testbed, initially by editing the files on the vm clone. After everything confiremd to be working, the build was successfully carried out and the .ipfire package was copied to a new vm clone installed and shown to perform as expected. This test only confirms that wsdd is correctly installed and started. Shutsdown and restarts on reboot successfully. Confirmed from the ps aux info that wsdd has been started with the correct options. Thge testing can not evaluate if wsdd enables windows systems newer than version 7 top be able to detect the samba shares as I have no windows systems. Fixes: Bug13445 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/backup/backup.pl | 4 +++ config/rootfiles/core/185/filelists/elfutils | 1 + config/rootfiles/core/185/filelists/files | 4 +++ config/rootfiles/packages/wsdd | 2 ++ html/cgi-bin/dhcp.cgi | 4 +-- html/cgi-bin/dns.cgi | 2 -- html/cgi-bin/ovpnmain.cgi | 38 ++++++++++---------- lfs/{protobuf => wsdd} | 28 +++++++++------ make.sh | 1 + src/initscripts/packages/{mympd => wsdd} | 51 ++++++++++++++++++++------- src/paks/{alsa => wsdd}/install.sh | 20 ++++++----- src/paks/{transmission => wsdd}/uninstall.sh | 4 +-- src/paks/{amazon-ssm-agent => wsdd}/update.sh | 0 13 files changed, 102 insertions(+), 57 deletions(-) create mode 120000 config/rootfiles/core/185/filelists/elfutils create mode 100644 config/rootfiles/packages/wsdd copy lfs/{protobuf => wsdd} (86%) copy src/initscripts/packages/{mympd => wsdd} (65%) copy src/paks/{alsa => wsdd}/install.sh (82%) copy src/paks/{transmission => wsdd}/uninstall.sh (97%) copy src/paks/{amazon-ssm-agent => wsdd}/update.sh (100%) Difference in files: diff --git a/config/backup/backup.pl b/config/backup/backup.pl index 7992f21c5..b43420740 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -75,6 +75,10 @@ make_backup() { restore_backup() { local filename="${1}" + # remove all openvpn certs to prevent old unusable + # certificates being left in directory after a restore + rm -f /var/ipfire/ovpn/certs/* + # Extract backup if ! tar xvzpf "${filename}" -C / \ --exclude-from="/var/ipfire/backup/exclude" \ diff --git a/config/rootfiles/core/185/filelists/elfutils b/config/rootfiles/core/185/filelists/elfutils new file mode 120000 index 000000000..8367974bb --- /dev/null +++ b/config/rootfiles/core/185/filelists/elfutils @@ -0,0 +1 @@ +../../../common/elfutils \ No newline at end of file diff --git a/config/rootfiles/core/185/filelists/files b/config/rootfiles/core/185/filelists/files index c2af22632..8a0e5c49f 100644 --- a/config/rootfiles/core/185/filelists/files +++ b/config/rootfiles/core/185/filelists/files @@ -43,3 +43,7 @@ lib/firmware/netronome/flower/nic_AMDA0078-0012_8x10.nffw lib/firmware/nvidia/tegra124/vic.bin lib/firmware/nvidia/tegra186/vic.bin lib/firmware/nvidia/tegra210/vic.bin +srv/web/ipfire/cgi-bin/dhcp.cgi +srv/web/ipfire/cgi-bin/dns.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +var/ipfire/backup/bin/backup.pl diff --git a/config/rootfiles/packages/wsdd b/config/rootfiles/packages/wsdd new file mode 100644 index 000000000..ce225043a --- /dev/null +++ b/config/rootfiles/packages/wsdd @@ -0,0 +1,2 @@ +etc/rc.d/init.d/wsdd +usr/bin/wsdd diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index c079fe1ae..be00f199a 100644 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 # @@ -48,7 +48,7 @@ my @nosaved=(); my %color = (); #Basic syntax allowed for new Option definition. Not implemented: RECORDS & array of RECORDS -our $OptionTypes = 'boolean|((un)?signed )?integer (8|16|32)|ip-address|text|string|encapsulate \w+|array of ip-address'; +our $OptionTypes = 'boolean|((un)?signed )?integer (8|16|32)|ip-address|text|string|encapsulate \w+|array of (ip-address|integer (8|16|32))'; &Header::showhttpheaders(); our @ITFs=('GREEN'); diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi index 0a34d3fd6..f3dd5c7a9 100644 --- a/html/cgi-bin/dns.cgi +++ b/html/cgi-bin/dns.cgi @@ -141,8 +141,6 @@ if (($cgiparams{'SERVERS'} eq $Lang::tr{'save'}) || ($cgiparams{'SERVERS'} eq $L # Go further if there was no error. if ( ! $errormessage) { - # Check if a remark has been entered. - $cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'}); my %dns_servers = (); my $id; diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index eb89c5095..98900b277 100755 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -4216,15 +4216,25 @@ if ($cgiparams{'TYPE'} eq 'net') { } } - # Check for RW if client name is already set - if ($cgiparams{'TYPE'} eq 'host') { - foreach my $key (keys %confighash) { - if ($confighash{$key}[1] eq $cgiparams{'NAME'}) { - $errormessage = $Lang::tr{'a connection with this name already exists'}; - goto VPNCONF_ERROR; - } - } - } + # Check for RW if client name is already set + if ($cgiparams{'TYPE'} eq 'host') { + foreach my $key (keys %confighash) { + if ($confighash{$key}[1] eq $cgiparams{'NAME'}) { + $errormessage = $Lang::tr{'a connection with this name already exists'}; + goto VPNCONF_ERROR; + } + } + } + + # Check if there is no other entry with this common name + if ((! $cgiparams{'KEY'}) && ($cgiparams{'AUTH'} ne 'psk')) { + foreach my $key (keys %confighash) { + if ($confighash{$key}[2] eq $cgiparams{'CERT_NAME'}) { + $errormessage = $Lang::tr{'a connection with this common name already exists'}; + goto VPNCONF_ERROR; + } + } + } # Replace empty strings with a . (my $ou = $cgiparams{'CERT_OU'}) =~ s/^\s*$/\./; @@ -4309,16 +4319,6 @@ if ($cgiparams{'TYPE'} eq 'net') { goto VPNCONF_ERROR; } - # Check if there is no other entry with this common name - if ((! $cgiparams{'KEY'}) && ($cgiparams{'AUTH'} ne 'psk')) { - foreach my $key (keys %confighash) { - if ($confighash{$key}[2] eq $cgiparams{'CERT_NAME'}) { - $errormessage = $Lang::tr{'a connection with this common name already exists'}; - goto VPNCONF_ERROR; - } - } - } - # Save the config my $key = $cgiparams{'KEY'}; diff --git a/lfs/wsdd b/lfs/wsdd new file mode 100644 index 000000000..aa65e47ef --- /dev/null +++ b/lfs/wsdd @@ -0,0 +1,89 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2024 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.7.1 +SUMMARY = A Web Service Discovery host daemon. + +THISAPP = wsdd-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = wsdd +PAK_VER = 1 + +DEPS = + +SERVICES = wsdd + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = ce43022c3bd9f7ff1fd7169ac0d5ab6b2ff78d35c221c05b2e20908a5772d563ab2aca571d4e6ae48a55d19d4adcb9cde60f720ae47af8ee950198224fcfdb26 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && cp src/wsdd.py /usr/bin/wsdd + + #install initscripts + $(call INSTALL_INITSCRIPTS,$(SERVICES)) + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 7b56b7fc8..64dbef5c4 100755 --- a/make.sh +++ b/make.sh @@ -1711,6 +1711,7 @@ buildipfire() { lfsmake2 perl-URI-Encode lfsmake2 rsnapshot lfsmake2 mympd + lfsmake2 wsdd # Kernelbuild ... current we have no platform that need # multi kernel builds so KCFG is empty diff --git a/src/initscripts/packages/wsdd b/src/initscripts/packages/wsdd new file mode 100644 index 000000000..68e8f3de0 --- /dev/null +++ b/src/initscripts/packages/wsdd @@ -0,0 +1,78 @@ +#!/bin/sh +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2024 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +. /etc/sysconfig/rc +. $rc_functions + +eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) + +PIDFILE="/var/run/wsdd.pid" + +case "$1" in + start) + ARGS=( + # Launch as non-privileged user + "--user" "wsdd:wsdd" + + # Launch in chroot + "--chroot" "/var/run/wsdd" + + # Only use IPv4 + "--ipv4only" + + # Configure the workgroup + "--workgroup" "$(testparm -s --parameter-name workgroup 2>/dev/null)" + ) + + # Conditionally add the GREEN/BLUE interface + for intf in GREEN_DEV BLUE_DEV; do + if [ -n "${!intf}" ]; then + ARGS+=( "--interface" "${!intf}" ) + fi + done + + # Create chroot directory for wsdd + mkdir -p /var/run/wsdd + + boot_mesg "Starting Web Service Discovery Host Daemon..." + loadproc -b -p "${PIDFILE}" /usr/bin/wsdd "${ARGS[@]}" + ;; + + stop) + boot_mesg "Stopping Web Service Discovery Host Daemon..." + killproc -p "${PIDFILE}" /usr/bin/wsdd + ;; + + status) + statusproc /usr/bin/wsdd + ;; + + restart) + $0 stop + $0 start + ;; + + *) + echo "Usage: $0 (start|stop|status|restart)" + exit 1 + ;; +esac + diff --git a/src/paks/wsdd/install.sh b/src/paks/wsdd/install.sh new file mode 100644 index 000000000..181b84eb9 --- /dev/null +++ b/src/paks/wsdd/install.sh @@ -0,0 +1,40 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +# If the wsdd user does not exist yet, then create it and add to wsdd group. +if ! getent user wsdd >/dev/null; then + useradd -r -U -d / -s /bin/false -c "wsdd user" wsdd + usermod -a -G wsdd wsdd +fi + +extract_files +restore_backup ${NAME} + +# Create startlinks +ln -sf ../init.d/wsdd /etc/rc.d/rc0.d/K35wsdd +ln -sf ../init.d/wsdd /etc/rc.d/rc3.d/S65wsdd +ln -sf ../init.d/wsdd /etc/rc.d/rc6.d/K35wsdd +start_service ${NAME} +exit 0 diff --git a/src/paks/wsdd/uninstall.sh b/src/paks/wsdd/uninstall.sh new file mode 100644 index 000000000..4c52ee281 --- /dev/null +++ b/src/paks/wsdd/uninstall.sh @@ -0,0 +1,30 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} +make_backup ${NAME} +remove_files +# Remove all start links. +rm -rf /etc/rc.d/rc*.d/*wsdd +exit 0 diff --git a/src/paks/wsdd/update.sh b/src/paks/wsdd/update.sh new file mode 100644 index 000000000..99776659c --- /dev/null +++ b/src/paks/wsdd/update.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_backup_includes +./uninstall.sh +./install.sh hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a809f932464a603af0bda13dfb558573ba58a483
by Arne Fitzenreiter 25 Feb '24

25 Feb '24

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 a809f932464a603af0bda13dfb558573ba58a483 (commit) from e56646a748fda6d9143a6e7e1236e16fdf9eadaa (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 a809f932464a603af0bda13dfb558573ba58a483 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 25 18:14:56 2024 +0100 mympd/mpfire: restart mpd after instalation both addons need a restart of mpd after they are installed Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/paks/mpd/install.sh | 2 +- src/paks/mympd/install.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) Difference in files: diff --git a/src/paks/mpd/install.sh b/src/paks/mpd/install.sh index 05b0592c6a..5dd0aacb9f 100644 --- a/src/paks/mpd/install.sh +++ b/src/paks/mpd/install.sh @@ -29,4 +29,4 @@ ln -svf /etc/init.d/mpd /etc/rc.d/rc6.d/K35mpd ln -svf /var/ipfire/mpd/mpd.conf /etc/mpd.conf touch /var/log/mpd.log restore_backup ${NAME} -/etc/init.d/mpd start +/etc/init.d/mpd restart diff --git a/src/paks/mympd/install.sh b/src/paks/mympd/install.sh index 529f415e61..9c154b5b42 100644 --- a/src/paks/mympd/install.sh +++ b/src/paks/mympd/install.sh @@ -29,5 +29,6 @@ ln -svf /etc/init.d/mympd /etc/rc.d/rc6.d/K34mympd restore_backup ${NAME} # create/check config /usr/bin/mympd -u nobody -c -# start service +# start services +/etc/init.d/mpd restart /etc/init.d/mympd start hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e56646a748fda6d9143a6e7e1236e16fdf9eadaa
by Arne Fitzenreiter 25 Feb '24

25 Feb '24

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 e56646a748fda6d9143a6e7e1236e16fdf9eadaa (commit) from d29916135f6cb1874c789a1483e6923f16e2429b (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 e56646a748fda6d9143a6e7e1236e16fdf9eadaa Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 25 09:49:10 2024 +0100 mpd: fix database path in initskript i had forgotten this path after moving the database from /var/ipfire/mpfire to /var/ipfire/mpd Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/mpd | 2 +- src/initscripts/packages/mpd | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/mpd b/lfs/mpd index 351fe1942..c05d34d8e 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/${THISAPP} TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpd -PAK_VER = 36 +PAK_VER = 37 # SUP_ARCH = aarch64 x86_64 DEPS = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr fmt diff --git a/src/initscripts/packages/mpd b/src/initscripts/packages/mpd index 977001140..d42c0c549 100644 --- a/src/initscripts/packages/mpd +++ b/src/initscripts/packages/mpd @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 # @@ -25,7 +25,7 @@ case "$1" in start) boot_mesg "Starting MPD..." - chown -R root.nobody /var/ipfire/mpfire/db + chown -R root.nobody /var/ipfire/mpd/db /bin/nice --5 /usr/bin/mpd evaluate_retval ;; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d29916135f6cb1874c789a1483e6923f16e2429b
by Arne Fitzenreiter 24 Feb '24

24 Feb '24

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 d29916135f6cb1874c789a1483e6923f16e2429b (commit) from e3a8147c670b7033914d4243c166cb321c4c448c (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 d29916135f6cb1874c789a1483e6923f16e2429b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 25 02:05:10 2024 +0100 mympd: remove mpfire from deps Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/mympd | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/mympd b/lfs/mympd index cbde8936b..aa05a7019 100644 --- a/lfs/mympd +++ b/lfs/mympd @@ -34,10 +34,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mympd -PAK_VER = 2 +PAK_VER = 3 -# TODO move mpd initskript and config to mpd package to run without mpfire -DEPS = mpd libmpdclient mpfire +DEPS = mpd libmpdclient SERVICES = mympd hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e3a8147c670b7033914d4243c166cb321c4c448c
by Arne Fitzenreiter 24 Feb '24

24 Feb '24

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 e3a8147c670b7033914d4243c166cb321c4c448c (commit) via 5097f72d498f135560030918626acb1c9710fb67 (commit) via 362bb6862093da2d2764c9cfd271ad0642d48b4f (commit) via 39cd2fff5442994d4cf9776798be91c918f13ca6 (commit) from 3de42257d00724f578d2f374ce47a70082edf42a (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 e3a8147c670b7033914d4243c166cb321c4c448c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 25 02:03:24 2024 +0100 libmpdclient: update to 2.22 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 5097f72d498f135560030918626acb1c9710fb67 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 25 02:03:01 2024 +0100 mympd: update to 14.0.3 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 362bb6862093da2d2764c9cfd271ad0642d48b4f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 25 02:02:27 2024 +0100 mpc: update to 0.35 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 39cd2fff5442994d4cf9776798be91c918f13ca6 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Feb 24 21:08:06 2024 +0100 mpd: update to 0.23.15 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/libmpdclient | 12 +++++++----- lfs/libmpdclient | 8 ++++---- lfs/mpc | 8 ++++---- lfs/mpd | 6 +++--- lfs/mympd | 4 ++-- 5 files changed, 20 insertions(+), 18 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/libmpdclient b/config/rootfiles/packages/libmpdclient index 531afce82..1c9da51f9 100644 --- a/config/rootfiles/packages/libmpdclient +++ b/config/rootfiles/packages/libmpdclient @@ -1,6 +1,8 @@ #usr/include/mpd +#usr/include/mpd/albumart.h #usr/include/mpd/async.h #usr/include/mpd/audio_format.h +#usr/include/mpd/binary.h #usr/include/mpd/capabilities.h #usr/include/mpd/client.h #usr/include/mpd/compiler.h @@ -23,8 +25,10 @@ #usr/include/mpd/password.h #usr/include/mpd/player.h #usr/include/mpd/playlist.h +#usr/include/mpd/position.h #usr/include/mpd/protocol.h #usr/include/mpd/queue.h +#usr/include/mpd/readpicture.h #usr/include/mpd/recv.h #usr/include/mpd/replay_gain.h #usr/include/mpd/response.h @@ -40,13 +44,11 @@ #usr/include/mpd/version.h usr/lib/libmpdclient.so usr/lib/libmpdclient.so.2 -usr/lib/libmpdclient.so.2.19 +usr/lib/libmpdclient.so.2.22 #usr/lib/pkgconfig/libmpdclient.pc #usr/share/doc/libmpdclient #usr/share/doc/libmpdclient/AUTHORS -#usr/share/doc/libmpdclient/COPYING +#usr/share/doc/libmpdclient/BSD-2-Clause.txt +#usr/share/doc/libmpdclient/BSD-3-Clause.txt #usr/share/doc/libmpdclient/NEWS #usr/share/doc/libmpdclient/README.rst -#usr/share/vala -#usr/share/vala/vapi -#usr/share/vala/vapi/libmpdclient.vapi diff --git a/lfs/libmpdclient b/lfs/libmpdclient index 69e54803e..6335f1b4a 100644 --- a/lfs/libmpdclient +++ b/lfs/libmpdclient @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 = Library for interfacing the Music Player Daemon -VER = 2.19 +VER = 2.22 THISAPP = libmpdclient-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libmpdclient -PAK_VER = 5 +PAK_VER = 6 DEPS = @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = c045c4847d43f166a3e1549654784bd994fa4156e3ecebf7c02a412b34ca150940f3c43cdc385839cd7c281bd4ed4fd1935b757d8505133d146ea955ec2d0832 +$(DL_FILE)_BLAKE2 = 2ff692baaeb8160ce757e754ae08db57aca803628989e4dc3616f88eb02ebf1823d269d5a17afaa32bf32c7a384da0342db1ef083199f85ea7e0687cae0e8455 install : $(TARGET) diff --git a/lfs/mpc b/lfs/mpc index 78fd9488c..3bf4914e1 100644 --- a/lfs/mpc +++ b/lfs/mpc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 = Client for the Music Player Daemon -VER = 0.34 +VER = 0.35 THISAPP = mpc-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpc -PAK_VER = 9 +PAK_VER = 10 DEPS = mpd libmpdclient @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 709f54ceebd66f703e5b1bf6ff8deb890e484fdc29c0b2198922763e347caac89d6eec5f74101f9fa860436e7493e2b02cc6b1b26e800e783546fe5a0c6e0d8f +$(DL_FILE)_BLAKE2 = 7e47d78b762b7334f5fec13897bdf11859310932371a55c189c4554b347f097852e5fa17be3df03d047fabcc60699a3b310d0aa395aadd96a5ebff009a2ddba0 install : $(TARGET) diff --git a/lfs/mpd b/lfs/mpd index 06aea9e3d..351fe1942 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -26,7 +26,7 @@ include Config SUMMARY = Music Player Daemon -VER = 0.23.14 +VER = 0.23.15 THISAPP = mpd-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/${THISAPP} TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpd -PAK_VER = 35 +PAK_VER = 36 # SUP_ARCH = aarch64 x86_64 DEPS = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr fmt @@ -49,7 +49,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = c048f128111d1d65775c317182b91d113339a5b09d3005c320cc3b14a79b7c1da0d1ba3d53f6bf348a3a404ceea33c1ad2427225f4a1f3d1cde4a921e71d6e1c +$(DL_FILE)_BLAKE2 = 78036078b850afab900b5d50e44ce83cbbf900369f5028d4177fdbfc4128dd3c35c59a773528a1fcfcc0179d0e579566b827fe87ef780a88082dc3b7f70cd5e7 install : $(TARGET) diff --git a/lfs/mympd b/lfs/mympd index bc0cc4da9..cbde8936b 100644 --- a/lfs/mympd +++ b/lfs/mympd @@ -26,7 +26,7 @@ include Config SUMMARY = Webfrontend for Music Player Daemon -VER = 14.0.1 +VER = 14.0.3 THISAPP = myMPD-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -49,7 +49,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = adc78e430f6afa88e35712119ce7a1545a962204b62f44a895fac17527ee696060f2e71a9313792d7c89d47905e27c4b4b72c3d13471fab27b16421eb2d992a5 +$(DL_FILE)_BLAKE2 = 54a8f44d257e263470d80ea92a7fd5b6cfe8bd5523c258a04b4db9ac5031e3f4903a19671797424379ccfd96db1c6b5e47cb9427c71b2ff3c203959be2ede97d install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3de42257d00724f578d2f374ce47a70082edf42a
by Arne Fitzenreiter 24 Feb '24

24 Feb '24

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 3de42257d00724f578d2f374ce47a70082edf42a (commit) from db4977b30ab4a9424627a3cbe9415ed4f43b88fb (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 3de42257d00724f578d2f374ce47a70082edf42a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Feb 24 16:39:59 2024 +0100 mpd: move scripts and config from mpfire to mpd this allows to use mpd without mpfire installed. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/backup/includes/mpd | 4 ++++ config/backup/includes/mpfire | 4 ---- config/{mpfire => mpd}/mpd.conf | 15 +++------------ config/mpfire/mpfire.pl | 2 +- config/rootfiles/packages/gnump3d | 1 + config/rootfiles/packages/mpd | 7 +++++++ config/rootfiles/packages/mpfire | 6 ------ html/cgi-bin/mpfire.cgi | 4 ++-- lfs/mpd | 14 ++++++++++++-- lfs/mpfire | 14 ++++---------- src/paks/{mympd => mpd}/install.sh | 13 ++++++------- src/paks/{mpfire => mpd}/uninstall.sh | 2 +- src/paks/{mympd => mpd}/update.sh | 0 src/paks/mpfire/install.sh | 11 +---------- src/paks/mpfire/uninstall.sh | 4 +--- src/paks/mpfire/update.sh | 2 +- 16 files changed, 44 insertions(+), 59 deletions(-) create mode 100644 config/backup/includes/mpd rename config/{mpfire => mpd}/mpd.conf (93%) copy src/paks/{mympd => mpd}/install.sh (87%) copy src/paks/{mpfire => mpd}/uninstall.sh (96%) copy src/paks/{mympd => mpd}/update.sh (100%) Difference in files: diff --git a/config/backup/includes/mpd b/config/backup/includes/mpd new file mode 100644 index 0000000000..a570a8d1cf --- /dev/null +++ b/config/backup/includes/mpd @@ -0,0 +1,4 @@ +/etc/asound.state +/var/ipfire/mpd/db/ +/var/ipfire/mpd/mpd.conf +/var/ipfire/mpd/mpd_state diff --git a/config/backup/includes/mpfire b/config/backup/includes/mpfire index 4ea18a2a1a..a21e77a6f6 100644 --- a/config/backup/includes/mpfire +++ b/config/backup/includes/mpfire @@ -1,6 +1,2 @@ -/etc/asound.state -/var/ipfire/mpfire/db/ -/var/ipfire/mpfire/mpd.conf -/var/ipfire/mpfire/mpd_state /var/ipfire/mpfire/settings /var/ipfire/mpfire/webradio diff --git a/config/mpfire/mpd.conf b/config/mpd/mpd.conf similarity index 93% rename from config/mpfire/mpd.conf rename to config/mpd/mpd.conf index d66481ecfd..c4aabdf0b4 100644 --- a/config/mpfire/mpd.conf +++ b/config/mpd/mpd.conf @@ -5,7 +5,7 @@ ##################### REQUIRED ########################### port "6600" music_directory "/var/mp3" -playlist_directory "/var/ipfire/mpfire" +playlist_directory "/var/ipfire/mpd" log_file "/var/log/mpd.log" pid_file "/var/run/mpd.pid" ########################################################## @@ -18,7 +18,7 @@ pid_file "/var/run/mpd.pid" # # Location of DB file # -db_file "/var/ipfire/mpfire/db/mpd.db" +db_file "/var/ipfire/mpd/db/mpd.db" # # The state file (if set) will be a file # for storing all current information @@ -27,7 +27,7 @@ db_file "/var/ipfire/mpfire/db/mpd.db" # to recreate your last MPD session after # restart. # -state_file "/var/ipfire/mpfire/mpd_state" +state_file "/var/ipfire/mpd/mpd_state" # ########################################################## @@ -104,12 +104,6 @@ audio_output { # audio_buffer_size "2048" # -# This means exactly what it says, it will -# buffer your file up to the percentage of -# the buffer before it begins playing. -# -buffer_before_play "25%" -# ########################################################## @@ -189,9 +183,6 @@ connection_timeout "60" # filesystem_charset "UTF-8" # -# The encoding that ID3v1 tags should be converted from. -# -id3v1_encoding "UTF-8" metadata_to_use "artist,album,title,track,name,comment,date,genre" # ################################################################ diff --git a/config/mpfire/mpfire.pl b/config/mpfire/mpfire.pl index 66413145de..15abd78932 100644 --- a/config/mpfire/mpfire.pl +++ b/config/mpfire/mpfire.pl @@ -87,7 +87,7 @@ sub shuffle(){ } sub checkplaylist(){ - my $Datei = "/var/ipfire/mpfire/playlist.m3u"; + my $Datei = "/var/ipfire/mpd/playlist.m3u"; my @Info = stat($Datei); if ( $Info[7] eq '' || $Info[7] eq '0' ){print "There is no playlist";exit(1);} } diff --git a/config/rootfiles/packages/gnump3d b/config/rootfiles/packages/gnump3d index 4679c87b1b..ab1f0282cb 100644 --- a/config/rootfiles/packages/gnump3d +++ b/config/rootfiles/packages/gnump3d @@ -387,4 +387,5 @@ usr/share/gnump3d var/cache/gnump3d var/cache/gnump3d/serving var/log/gnump3d +#var/mp3 var/mp3/info diff --git a/config/rootfiles/packages/mpd b/config/rootfiles/packages/mpd index 85501238ba..828ae31e17 100644 --- a/config/rootfiles/packages/mpd +++ b/config/rootfiles/packages/mpd @@ -8,3 +8,10 @@ usr/bin/mpd #usr/share/icons/hicolor/scalable/apps/mpd.svg var/log/mpd.error.log var/log/mpd.log +var/ipfire/backup/addons/includes/mpd +#var/ipfire/mpd +#var/ipfire/mpd/db +var/ipfire/mpd/db/info +var/ipfire/mpd/mpd.conf +var/ipfire/mpd/playlist.m3u +var/mp3/info diff --git a/config/rootfiles/packages/mpfire b/config/rootfiles/packages/mpfire index ec0ea43959..ab12bde032 100644 --- a/config/rootfiles/packages/mpfire +++ b/config/rootfiles/packages/mpfire @@ -27,15 +27,9 @@ var/ipfire/menu.d/EX-mpfire.menu var/ipfire/mpfire var/ipfire/mpfire/bin var/ipfire/mpfire/bin/mpfire.pl -#var/ipfire/mpfire/db -var/ipfire/mpfire/db/info -var/ipfire/mpfire/mpd.conf -var/ipfire/mpfire/playlist.m3u var/ipfire/mpfire/settings var/ipfire/mpfire/webradio -var/mp3/info usr/local/bin/mpfirectrl srv/web/ipfire/cgi-bin/mpfire.cgi srv/web/ipfire/html/images/mpfire var/ipfire/menu.d/EX-mpfire.menu -#var/mp3 diff --git a/html/cgi-bin/mpfire.cgi b/html/cgi-bin/mpfire.cgi index ea83d1db17..5685053e66 100644 --- a/html/cgi-bin/mpfire.cgi +++ b/html/cgi-bin/mpfire.cgi @@ -214,11 +214,11 @@ if ( $mpfiresettings{'ACTION'} eq "scan" ){ delete $mpfiresettings{'PAGE'}; delete $mpfiresettings{'FRAME'}; &General::writehash("${General::swroot}/mpfire/settings", \%mpfiresettings); - open(DATEI, "<${General::swroot}/mpfire/mpd.conf") || die "Datei nicht gefunden"; + open(DATEI, "<${General::swroot}/mpd/mpd.conf") || die "Datei nicht gefunden"; my @Zeilen = <DATEI>; close(DATEI); - open(DATEI, ">${General::swroot}/mpfire/mpd.conf") || die "Datei nicht gefunden"; + open(DATEI, ">${General::swroot}/mpd/mpd.conf") || die "Datei nicht gefunden"; foreach (@Zeilen){ if ( $_ =~ /music_directory/){ print DATEI "music_directory \"".$mpfiresettings{'MUSICDIR'}."\"\n"; diff --git a/lfs/mpd b/lfs/mpd index a9807b3cda..06aea9e3dc 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 # @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/${THISAPP} TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpd -PAK_VER = 33 +PAK_VER = 35 # SUP_ARCH = aarch64 x86_64 DEPS = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr fmt @@ -105,6 +105,16 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) #install initscripts $(call INSTALL_INITSCRIPTS,$(SERVICES)) + -mkdir -p /var/ipfire/mpd/db + touch /var/ipfire/mpd/playlist.m3u + install -v -m 664 $(DIR_SRC)/config/mpd/mpd.conf /var/ipfire/mpd/ + echo "Folder for mpd database" > /var/ipfire/mpd/db/info + -mkdir -p /var/mp3 + echo "Folder for music files" > /var/mp3/info + chown root.nobody /var/ipfire/mpd/{mpd.conf,playlist.m3u} + chmod 664 /var/ipfire/mpd/playlist.m3u + install -v -m 644 $(DIR_SRC)/config/backup/includes/mpd /var/ipfire/backup/addons/includes/mpd + @rm -rf $(DIR_APP) touch /var/log/mpd.error.log touch /var/log/mpd.log diff --git a/lfs/mpfire b/lfs/mpfire index 590cf31ef3..54551a0b6d 100644 --- a/lfs/mpfire +++ b/lfs/mpfire @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 # @@ -32,7 +32,7 @@ THISAPP = mpfire-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpfire -PAK_VER = 16 +PAK_VER = 17 DEPS = mpd mpc @@ -61,17 +61,11 @@ dist: $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - -mkdir -p /var/ipfire/mpfire/{bin,db} - touch /var/ipfire/mpfire/{settings,playlist.m3u} + -mkdir -p /var/ipfire/mpfire/bin + touch /var/ipfire/mpfire/settings install -v -m 755 $(DIR_SRC)/config/mpfire/mpfire.pl /var/ipfire/mpfire/bin - install -v -m 664 $(DIR_SRC)/config/mpfire/mpd.conf /var/ipfire/mpfire/ install -v -m 644 $(DIR_SRC)/config/mpfire/webradio /var/ipfire/mpfire/ - echo "Folder for mpd database" > /var/ipfire/mpfire/db/info - -mkdir -p /var/mp3 - echo "Folder for music files" > /var/mp3/info - chown root.nobody /var/ipfire/mpfire/{mpd.conf,playlist.m3u} chown nobody.nobody /var/ipfire/mpfire/{settings,webradio} - chmod 664 /var/ipfire/mpfire/playlist.m3u chmod 755 /srv/web/ipfire/html/images/mpfire install -v -m 644 $(DIR_SRC)/config/backup/includes/mpfire /var/ipfire/backup/addons/includes/mpfire -mkdir -p /usr/lib/perl5/site_perl/5.36.0/Audio/ diff --git a/src/paks/mpd/install.sh b/src/paks/mpd/install.sh new file mode 100644 index 0000000000..05b0592c6a --- /dev/null +++ b/src/paks/mpd/install.sh @@ -0,0 +1,32 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007-2024 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +ln -svf /etc/init.d/mpd /etc/rc.d/rc3.d/S65mpd +ln -svf /etc/init.d/mpd /etc/rc.d/rc0.d/K35mpd +ln -svf /etc/init.d/mpd /etc/rc.d/rc6.d/K35mpd +ln -svf /var/ipfire/mpd/mpd.conf /etc/mpd.conf +touch /var/log/mpd.log +restore_backup ${NAME} +/etc/init.d/mpd start diff --git a/src/paks/mpd/uninstall.sh b/src/paks/mpd/uninstall.sh new file mode 100644 index 0000000000..7b86ae393d --- /dev/null +++ b/src/paks/mpd/uninstall.sh @@ -0,0 +1,28 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007-2024 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/etc/init.d/mpd stop +make_backup ${NAME} +remove_files +rm -f /etc/rc.d/rc*.d/???mpd /var/log/mpd.error.log /var/log/mpd.log /etc/mpd.conf diff --git a/src/paks/mpd/update.sh b/src/paks/mpd/update.sh new file mode 100644 index 0000000000..31d1d77cc5 --- /dev/null +++ b/src/paks/mpd/update.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007-2024 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_backup_includes +./uninstall.sh +./install.sh diff --git a/src/paks/mpfire/install.sh b/src/paks/mpfire/install.sh index f8f833de96..541a25ca2e 100644 --- a/src/paks/mpfire/install.sh +++ b/src/paks/mpfire/install.sh @@ -17,20 +17,11 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007-2011 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2024 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh extract_files -ln -svf /etc/init.d/mpd /etc/rc.d/rc3.d/S65mpd -ln -svf /etc/init.d/mpd /etc/rc.d/rc0.d/K35mpd -ln -svf /etc/init.d/mpd /etc/rc.d/rc6.d/K35mpd -ln -svf /var/ipfire/mpfire/mpd.conf /etc/mpd.conf chmod 755 /srv/web/ipfire/html/images/mpfire -touch /var/log/mpd.log restore_backup ${NAME} -# comment removed option from config -sed -i -e "s|^error_file|#error_file|g" /var/ipfire/mpfire/mpd.conf -# -/etc/init.d/mpd start diff --git a/src/paks/mpfire/uninstall.sh b/src/paks/mpfire/uninstall.sh index 7dec707ee2..ed7e6a821c 100644 --- a/src/paks/mpfire/uninstall.sh +++ b/src/paks/mpfire/uninstall.sh @@ -17,12 +17,10 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2024 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh -/etc/init.d/mpd stop make_backup ${NAME} remove_files -rm -f /etc/rc.d/rc*.d/???mpd /var/log/mpd.error.log /var/log/mpd.log /etc/mpd.conf diff --git a/src/paks/mpfire/update.sh b/src/paks/mpfire/update.sh index 99776659c3..31d1d77cc5 100644 --- a/src/paks/mpfire/update.sh +++ b/src/paks/mpfire/update.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2024 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. db4977b30ab4a9424627a3cbe9415ed4f43b88fb
by Arne Fitzenreiter 19 Feb '24

19 Feb '24

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 db4977b30ab4a9424627a3cbe9415ed4f43b88fb (commit) from 4d7023105dc3c1ee04da6c2ffb441146c04428fa (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 db4977b30ab4a9424627a3cbe9415ed4f43b88fb Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Feb 19 19:58:51 2024 +0100 core185: fix rpi4 firmare names Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/185/filelists/files | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/core/185/filelists/files b/config/rootfiles/core/185/filelists/files index 1fc68ec00..c2af22632 100644 --- a/config/rootfiles/core/185/filelists/files +++ b/config/rootfiles/core/185/filelists/files @@ -10,8 +10,8 @@ lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-zero.txt lib/firmware/brcm/brcmfmac43430-sdio.sinovoip,bpi-m3.txt lib/firmware/brcm/brcmfmac43455-sdio.clm_blob lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt -lib/firmware/brcm/brcmfmac43455-sdio.Raspberry_Pi_Foundation-Raspberry_Pi_4_Model_B.txt -lib/firmware/brcm/brcmfmac43455-sdio.Raspberry_Pi_Foundation-Raspberry_Pi_Compute_Module_4.txt +lib/firmware/brcm/brcmfmac43455-sdio.Raspberry Pi Foundation-Raspberry Pi 4 Model B.txt +lib/firmware/brcm/brcmfmac43455-sdio.Raspberry Pi Foundation-Raspberry Pi Compute Module 4.txt lib/firmware/brcm/brcmfmac4354-sdio.clm_blob lib/firmware/brcm/brcmfmac4356-pcie.clm_blob lib/firmware/brcm/brcmfmac4356-sdio.clm_blob hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4d7023105dc3c1ee04da6c2ffb441146c04428fa
by Michael Tremer 19 Feb '24

19 Feb '24

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 4d7023105dc3c1ee04da6c2ffb441146c04428fa (commit) from 1dbea7df56018981f37761f86de76f02a1d7a018 (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 4d7023105dc3c1ee04da6c2ffb441146c04428fa Author: Stéphane Pautrel <stephane.pautrel(a)acb78.com> Date: Mon Feb 19 10:52:18 2024 +0000 lang: Update French translation - Added strings concerning extrahd, hostile network logs and ids, Reiserfs deletion notification - improvement of various existing strings Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: doc/language_issues.fr | 14 -------------- doc/language_missings | 13 ------------- langs/fr/cgi-bin/fr.pl | 25 +++++++++++++++++++------ 3 files changed, 19 insertions(+), 33 deletions(-) Difference in files: diff --git a/doc/language_issues.fr b/doc/language_issues.fr index a53358147c..1714a6edf8 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -908,15 +908,10 @@ 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: core notice 3 = available. -WARNING: untranslated string: downfall gather data sampling = Downfall/Gather Data Sampling WARNING: untranslated string: enable disable client = unknown string WARNING: untranslated string: enable disable dyndns = unknown string WARNING: untranslated string: error message = unknown string WARNING: untranslated string: extrahd because it is outside the allowed mount path = unknown string -WARNING: untranslated string: extrahd mounted = Mounted -WARNING: untranslated string: extrahd no mount point given = No mount point given -WARNING: untranslated string: extrahd not configured = Not configured -WARNING: untranslated string: extrahd not mounted = Not mounted WARNING: untranslated string: fwhost cust locationgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string WARNING: untranslated string: guardian block a host = unknown string @@ -948,19 +943,10 @@ 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: hostile networks in = From Hostile Networks -WARNING: untranslated string: hostile networks out = To Hostile Networks WARNING: untranslated string: hostile networks total = Total Hostile Networks -WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks -WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks WARNING: untranslated string: pakfire ago = ago. -WARNING: untranslated string: regenerate host certificate = Renew Host Certificate -WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. -WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. -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: spec rstack overflow = Speculative Return Stack Overflow WARNING: untranslated string: wio = unknown string WARNING: untranslated string: wio checked = unknown string WARNING: untranslated string: wio cron = unknown string diff --git a/doc/language_missings b/doc/language_missings index c92e1e6a36..7a7d757507 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -142,23 +142,10 @@ < ansi t1.483 < bewan adsl pci st < bewan adsl usb -< downfall gather data sampling < extrahd because it it outside the allowed mount path -< extrahd mounted -< extrahd no mount point given -< extrahd not configured -< extrahd not mounted < g.dtm < g.lite -< hostile networks in -< hostile networks out < hostile networks total -< log drop hostile in -< log drop hostile out -< regenerate host certificate -< reiserfs warning1 -< reiserfs warning2 -< spec rstack overflow < 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 87ec52e8b2..6034de409d 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -936,6 +936,7 @@ 'done' => 'Fait', 'dos charset' => 'Jeu de car. DOS', 'down and up speed' => 'Entrez votre débit descendant et montant <br /> et cliquez sur <i>Sauvegarder</i>.', +'downfall gather data sampling' => 'Chute / collecte échantillons de données - proc. Intel', 'downlink' => 'Liaison descendante', 'downlink speed' => 'Débit descendant - download (kbit/sec) ', 'downlink std class' => 'Classe standard de réception ', @@ -1077,11 +1078,15 @@ 'external access rule removed' => 'Règle d\'accès externe supprimée ; Redémarrage du contrôleur d\'accès', 'external aliases configuration' => 'Configuration des alias externes', 'extrahd' => 'Options stockage', -'extrahd because there is already a device mounted' => ' car vous avez déjà un support de monté', +'extrahd because there is already a device mounted' => ', car il y a déjà un périphérique monté', 'extrahd cant umount' => 'Impossible de démonter', 'extrahd detected drives' => 'Périphériques de stockage détectés', 'extrahd install or load driver' => 'Si votre stockage n\'est pas visible ici, vous devez installer ou charger son pilote.<br />Si vous voyez votre stockage mais pas de partitions, vous devez tout d\'abord les créer.', 'extrahd maybe the device is in use' => '. Votre support est peut-être en cours d\'utilisation', +'extrahd mounted' => 'Monté', +'extrahd no mount point given' => 'Aucun point de montage indiqué', +'extrahd not configured' => 'Non configuré', +'extrahd not mounted' => 'Non monté', 'extrahd to' => 'vers', 'extrahd to root' => 'vers root', 'extrahd unable to read' => 'Impossible de lire', @@ -1406,7 +1411,9 @@ 'host deny' => 'Liste des hôtes non autorisés', 'host ip' => 'Adresse IP de l\'hôte ', 'host to net vpn' => 'Réseau privé virtuel (VPN) de l\'hôte au réseau (client nomade) ', -'hostile networks' => 'Réseaux hostiles', +'hostile networks' => 'Total réseaux hostiles', +'hostile networks in' => 'Depuis réseaux hostiles', +'hostile networks out' => 'Vers réseaux hostiles', 'hostname' => 'Nom hôte ', 'hostname and domain already in use' => 'Le nom d\'hôte et de domaine sont déjà utilisés.', 'hostname cant be empty' => 'Le nom d\'hôte ne peut pas être vide.', @@ -1442,8 +1449,8 @@ 'ids hide' => 'Cacher', 'ids ignored hosts' => 'Hôtes de liste blanche', 'ids log hits' => 'Total du nombre de règles activées pour', -'ids log viewer' => 'Rapport IDs', -'ids logs' => 'Rapports IDs', +'ids log viewer' => 'Rapport IDS', +'ids logs' => 'Rapports IDS', 'ids merge classifications' => 'Fusion des classements...', 'ids merge sid files' => 'Fusion des sid aux fichiers de messages...', 'ids monitor traffic only' => 'Surveiller seulement le trafic', @@ -1686,6 +1693,8 @@ 'locationblock enable feature' => 'Activer le blocage par localisation :', 'locationblock flag' => 'Drap.', 'log' => 'Rapport :', +'log drop hostile in' => 'Journaliser les paquets abandonnés depuis des réseaux hostiles', +'log drop hostile out' => 'Journaliser les paquets abandonnés vers des réseaux hostiles', 'log dropped conntrack invalids' => 'Journaliser les paquets abandonnés classés comme INVALIDES par le suivi de connexion', 'log enabled' => 'Journal activé', 'log level' => 'Niveau de rapport', @@ -2211,7 +2220,10 @@ 'refresh' => 'Actualiser', 'refresh index page while connected' => 'Actualiser la page index.cgi pendant la connexion', 'refresh update list' => 'Actualiser la liste des mises à jour', +'regenerate host certificate' => 'Renouveler le certificat hôte', 'registered user rules' => 'Règles Sourcefire VRT pour les utilisateurs enregistrés', +'reiserfs warning1' => 'Reiserfs est obsolète et devrait être supprimé du noyau en 2025.', +'reiserfs warning2' => 'Assurez-vous qu\'une nouvelle installation est effectuée à l\'aide des systèmes de fichiers ext4 ou xfs avant cette date.', 'release' => 'Révision', 'released' => 'Disponible', 'reload' => 'Recharger', @@ -2255,7 +2267,7 @@ 'root certificate' => 'Certificat racine', 'root path' => 'Répertoire root', 'root user password' => 'Mot de passe root', -'route config changed' => '', +'route config changed' => 'La configuration de la route a été modifiée', 'route subnet is invalid' => 'L\'itinéraire additionnel push du sous-réseau est non valide', 'router ip' => 'Adresse IP du routeur :', 'routing table' => 'Table de routage', @@ -2379,6 +2391,7 @@ 'source port overlaps' => 'La plage de port source chevauche une plage de port existante.', 'speaker off' => 'Haut-parleur éteint :', 'speaker on' => 'Haut-parleur allumé :', +'spec rstack overflow' => 'Débordement de la pile de rendement spéculative - proc. AMD', 'spectre variant 1' => 'Spectre - variante 1', 'spectre variant 2' => 'Spectre - variante 2', 'spectre variant 4' => 'Spectre - variante 4', @@ -2460,7 +2473,7 @@ 'system logs' => 'Rapports système', 'system status information' => 'Informations sur le statut du système', 'ta key' => 'Clé d\'authentification TLS', -'taa zombieload2' => 'TSX Async Abort/ZombieLoad v2', +'taa zombieload2' => 'TSX Async Abort / ZombieLoad v2', 'tcp more reliable' => 'TCP (plus fiable)', 'telephone not set' => 'Numéro de téléphone non défini.', 'template' => 'Préétabli', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1dbea7df56018981f37761f86de76f02a1d7a018
by Michael Tremer 19 Feb '24

19 Feb '24

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 1dbea7df56018981f37761f86de76f02a1d7a018 (commit) via 7e79a6c92e563ac3b322ec35c8f50b7221091397 (commit) from 7275d72be39594283cbec4027ea2ab57068e760e (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 1dbea7df56018981f37761f86de76f02a1d7a018 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 19 10:16:33 2024 +0000 core185: Ship ca-certificates Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7e79a6c92e563ac3b322ec35c8f50b7221091397 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Feb 17 21:01:00 2024 +0000 ca-certificates: Update root CA certificates bundle 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/ca-certificates/certdata.txt | 1008 +++++++++++++++++--- .../121 => core/185}/filelists/ca-certificates | 0 lfs/ca-certificates | 4 +- 3 files changed, 877 insertions(+), 135 deletions(-) copy config/rootfiles/{oldcore/121 => core/185}/filelists/ca-certificates (100%) Difference in files: diff --git a/config/ca-certificates/certdata.txt b/config/ca-certificates/certdata.txt index 59cc15df6e..ed5e6cb17c 100644 --- a/config/ca-certificates/certdata.txt +++ b/config/ca-certificates/certdata.txt @@ -1294,138 +1294,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -# -# Certificate "Security Communication Root CA" -# -# Issuer: OU=Security Communication RootCA1,O=SECOM Trust.net,C=JP -# Serial Number: 0 (0x0) -# Subject: OU=Security Communication RootCA1,O=SECOM Trust.net,C=JP -# Not Valid Before: Tue Sep 30 04:20:49 2003 -# Not Valid After : Sat Sep 30 04:20:49 2023 -# Fingerprint (SHA-256): E7:5E:72:ED:9F:56:0E:EC:6E:B4:80:00:73:A4:3F:C3:AD:19:19:5A:39:22:82:01:78:95:97:4A:99:02:6B:6C -# Fingerprint (SHA1): 36:B1:2B:49:F9:81:9E:D7:4C:9E:BC:38:0F:C6:56:8F:5D:AC:B2:F7 -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Security Communication Root CA" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\120\061\013\060\011\006\003\125\004\006\023\002\112\120\061 -\030\060\026\006\003\125\004\012\023\017\123\105\103\117\115\040 -\124\162\165\163\164\056\156\145\164\061\047\060\045\006\003\125 -\004\013\023\036\123\145\143\165\162\151\164\171\040\103\157\155 -\155\165\156\151\143\141\164\151\157\156\040\122\157\157\164\103 -\101\061 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\120\061\013\060\011\006\003\125\004\006\023\002\112\120\061 -\030\060\026\006\003\125\004\012\023\017\123\105\103\117\115\040 -\124\162\165\163\164\056\156\145\164\061\047\060\045\006\003\125 -\004\013\023\036\123\145\143\165\162\151\164\171\040\103\157\155 -\155\165\156\151\143\141\164\151\157\156\040\122\157\157\164\103 -\101\061 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\000 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\003\132\060\202\002\102\240\003\002\001\002\002\001\000 -\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060 -\120\061\013\060\011\006\003\125\004\006\023\002\112\120\061\030 -\060\026\006\003\125\004\012\023\017\123\105\103\117\115\040\124 -\162\165\163\164\056\156\145\164\061\047\060\045\006\003\125\004 -\013\023\036\123\145\143\165\162\151\164\171\040\103\157\155\155 -\165\156\151\143\141\164\151\157\156\040\122\157\157\164\103\101 -\061\060\036\027\015\060\063\060\071\063\060\060\064\062\060\064 -\071\132\027\015\062\063\060\071\063\060\060\064\062\060\064\071 -\132\060\120\061\013\060\011\006\003\125\004\006\023\002\112\120 -\061\030\060\026\006\003\125\004\012\023\017\123\105\103\117\115 -\040\124\162\165\163\164\056\156\145\164\061\047\060\045\006\003 -\125\004\013\023\036\123\145\143\165\162\151\164\171\040\103\157 -\155\155\165\156\151\143\141\164\151\157\156\040\122\157\157\164 -\103\101\061\060\202\001\042\060\015\006\011\052\206\110\206\367 -\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002 -\202\001\001\000\263\263\376\177\323\155\261\357\026\174\127\245 -\014\155\166\212\057\113\277\144\373\114\356\212\360\363\051\174 -\365\377\356\052\340\351\351\272\133\144\042\232\232\157\054\072 -\046\151\121\005\231\046\334\325\034\152\161\306\232\175\036\235 -\335\174\154\306\214\147\147\112\076\370\161\260\031\047\251\011 -\014\246\225\277\113\214\014\372\125\230\073\330\350\042\241\113 -\161\070\171\254\227\222\151\263\211\176\352\041\150\006\230\024 -\226\207\322\141\066\274\155\047\126\236\127\356\300\300\126\375 -\062\317\244\331\216\302\043\327\215\250\363\330\045\254\227\344 -\160\070\364\266\072\264\235\073\227\046\103\243\241\274\111\131 -\162\114\043\060\207\001\130\366\116\276\034\150\126\146\257\315 -\101\135\310\263\115\052\125\106\253\037\332\036\342\100\075\333 -\315\175\271\222\200\234\067\335\014\226\144\235\334\042\367\144 -\213\337\141\336\025\224\122\025\240\175\122\311\113\250\041\311 -\306\261\355\313\303\225\140\321\017\360\253\160\370\337\313\115 -\176\354\326\372\253\331\275\177\124\362\245\351\171\372\331\326 -\166\044\050\163\002\003\001\000\001\243\077\060\075\060\035\006 -\003\125\035\016\004\026\004\024\240\163\111\231\150\334\205\133 -\145\343\233\050\057\127\237\275\063\274\007\110\060\013\006\003 -\125\035\017\004\004\003\002\001\006\060\017\006\003\125\035\023 -\001\001\377\004\005\060\003\001\001\377\060\015\006\011\052\206 -\110\206\367\015\001\001\005\005\000\003\202\001\001\000\150\100 -\251\250\273\344\117\135\171\263\005\265\027\263\140\023\353\306 -\222\135\340\321\323\152\376\373\276\233\155\277\307\005\155\131 -\040\304\034\360\267\332\204\130\002\143\372\110\026\357\117\245 -\013\367\112\230\362\077\236\033\255\107\153\143\316\010\107\353 -\122\077\170\234\257\115\256\370\325\117\317\232\230\052\020\101 -\071\122\304\335\331\233\016\357\223\001\256\262\056\312\150\102 -\044\102\154\260\263\072\076\315\351\332\110\304\025\313\351\371 -\007\017\222\120\111\212\335\061\227\137\311\351\067\252\073\131 -\145\227\224\062\311\263\237\076\072\142\130\305\111\255\142\016 -\161\245\062\252\057\306\211\166\103\100\023\023\147\075\242\124 -\045\020\313\361\072\362\331\372\333\111\126\273\246\376\247\101 -\065\303\340\210\141\311\210\307\337\066\020\042\230\131\352\260 -\112\373\126\026\163\156\254\115\367\042\241\117\255\035\172\055 -\105\047\345\060\301\136\362\332\023\313\045\102\121\225\107\003 -\214\154\041\314\164\102\355\123\377\063\213\217\017\127\001\026 -\057\317\246\356\311\160\042\024\275\375\276\154\013\003 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE - -# Trust for "Security Communication Root CA" -# Issuer: OU=Security Communication RootCA1,O=SECOM Trust.net,C=JP -# Serial Number: 0 (0x0) -# Subject: OU=Security Communication RootCA1,O=SECOM Trust.net,C=JP -# Not Valid Before: Tue Sep 30 04:20:49 2003 -# Not Valid After : Sat Sep 30 04:20:49 2023 -# Fingerprint (SHA-256): E7:5E:72:ED:9F:56:0E:EC:6E:B4:80:00:73:A4:3F:C3:AD:19:19:5A:39:22:82:01:78:95:97:4A:99:02:6B:6C -# Fingerprint (SHA1): 36:B1:2B:49:F9:81:9E:D7:4C:9E:BC:38:0F:C6:56:8F:5D:AC:B2:F7 -CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Security Communication Root CA" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\066\261\053\111\371\201\236\327\114\236\274\070\017\306\126\217 -\135\254\262\367 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\361\274\143\152\124\340\265\047\365\315\347\032\343\115\156\112 -END -CKA_ISSUER MULTILINE_OCTAL -\060\120\061\013\060\011\006\003\125\004\006\023\002\112\120\061 -\030\060\026\006\003\125\004\012\023\017\123\105\103\117\115\040 -\124\162\165\163\164\056\156\145\164\061\047\060\045\006\003\125 -\004\013\023\036\123\145\143\165\162\151\164\171\040\103\157\155 -\155\165\156\151\143\141\164\151\157\156\040\122\157\157\164\103 -\101\061 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\000 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - # # Certificate "XRamp Global CA Root" # @@ -13758,7 +13626,7 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL \072\352 END CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE @@ -24617,3 +24485,877 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "D-Trust SBR Root CA 1 2022" +# +# Issuer: CN=D-Trust SBR Root CA 1 2022,O=D-Trust GmbH,C=DE +# Serial Number:52:cf:e4:8c:6d:a0:4a:f7:3f:82:97:0c:80:09:8c:95 +# Subject: CN=D-Trust SBR Root CA 1 2022,O=D-Trust GmbH,C=DE +# Not Valid Before: Wed Jul 06 11:30:00 2022 +# Not Valid After : Mon Jul 06 11:29:59 2037 +# Fingerprint (SHA-256): D9:2C:17:1F:5C:F8:90:BA:42:80:19:29:29:27:FE:22:F3:20:7F:D2:B5:44:49:CB:6F:67:5A:F4:92:21:46:E2 +# Fingerprint (SHA1): 0F:52:3A:6B:4E:7D:1D:18:05:A5:48:F9:4D:CD:E4:C3:1E:1B:E9:E6 +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "D-Trust SBR Root CA 1 2022" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\111\061\013\060\011\006\003\125\004\006\023\002\104\105\061 +\025\060\023\006\003\125\004\012\023\014\104\055\124\162\165\163 +\164\040\107\155\142\110\061\043\060\041\006\003\125\004\003\023 +\032\104\055\124\162\165\163\164\040\123\102\122\040\122\157\157 +\164\040\103\101\040\061\040\062\060\062\062 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\111\061\013\060\011\006\003\125\004\006\023\002\104\105\061 +\025\060\023\006\003\125\004\012\023\014\104\055\124\162\165\163 +\164\040\107\155\142\110\061\043\060\041\006\003\125\004\003\023 +\032\104\055\124\162\165\163\164\040\123\102\122\040\122\157\157 +\164\040\103\101\040\061\040\062\060\062\062 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\122\317\344\214\155\240\112\367\077\202\227\014\200\011 +\214\225 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\002\136\060\202\001\343\240\003\002\001\002\002\020\122 +\317\344\214\155\240\112\367\077\202\227\014\200\011\214\225\060 +\012\006\010\052\206\110\316\075\004\003\003\060\111\061\013\060 +\011\006\003\125\004\006\023\002\104\105\061\025\060\023\006\003 +\125\004\012\023\014\104\055\124\162\165\163\164\040\107\155\142 +\110\061\043\060\041\006\003\125\004\003\023\032\104\055\124\162 +\165\163\164\040\123\102\122\040\122\157\157\164\040\103\101\040 +\061\040\062\060\062\062\060\036\027\015\062\062\060\067\060\066 +\061\061\063\060\060\060\132\027\015\063\067\060\067\060\066\061 +\061\062\071\065\071\132\060\111\061\013\060\011\006\003\125\004 +\006\023\002\104\105\061\025\060\023\006\003\125\004\012\023\014 +\104\055\124\162\165\163\164\040\107\155\142\110\061\043\060\041 +\006\003\125\004\003\023\032\104\055\124\162\165\163\164\040\123 +\102\122\040\122\157\157\164\040\103\101\040\061\040\062\060\062 +\062\060\166\060\020\006\007\052\206\110\316\075\002\001\006\005 +\053\201\004\000\042\003\142\000\004\131\223\071\366\214\111\146 +\050\327\141\014\310\253\177\014\243\055\337\242\244\174\222\053 +\150\325\056\176\036\100\313\264\150\111\177\022\241\253\177\127 +\237\031\056\143\056\133\376\146\161\014\063\017\271\336\153\304 +\210\303\261\357\354\071\100\343\226\253\333\345\173\256\037\334 +\371\257\106\232\152\106\006\057\307\067\144\213\027\142\376\226 +\303\242\356\204\340\260\227\071\274\243\201\217\060\201\214\060 +\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377 +\060\035\006\003\125\035\016\004\026\004\024\361\051\243\036\001 +\022\035\075\165\126\115\307\120\174\305\031\252\017\030\267\060 +\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060 +\112\006\003\125\035\037\004\103\060\101\060\077\240\075\240\073 +\206\071\150\164\164\160\072\057\057\143\162\154\056\144\055\164 +\162\165\163\164\056\156\145\164\057\143\162\154\057\144\055\164 +\162\165\163\164\137\163\142\162\137\162\157\157\164\137\143\141 +\137\061\137\062\060\062\062\056\143\162\154\060\012\006\010\052 +\206\110\316\075\004\003\003\003\151\000\060\146\002\061\000\227 +\371\336\256\113\217\230\265\036\100\177\062\175\115\124\103\332 +\211\315\302\252\222\074\321\202\036\163\317\372\114\222\040\373 +\143\047\305\365\163\075\011\075\367\247\141\206\214\363\152\002 +\061\000\347\057\174\270\365\045\214\073\071\037\066\253\215\365 +\206\242\056\341\172\144\332\147\071\002\376\376\063\077\331\163 +\266\130\133\072\374\262\244\331\140\170\167\314\171\247\246\256 +\125\275 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE + +# Trust for "D-Trust SBR Root CA 1 2022" +# Issuer: CN=D-Trust SBR Root CA 1 2022,O=D-Trust GmbH,C=DE +# Serial Number:52:cf:e4:8c:6d:a0:4a:f7:3f:82:97:0c:80:09:8c:95 +# Subject: CN=D-Trust SBR Root CA 1 2022,O=D-Trust GmbH,C=DE +# Not Valid Before: Wed Jul 06 11:30:00 2022 +# Not Valid After : Mon Jul 06 11:29:59 2037 +# Fingerprint (SHA-256): D9:2C:17:1F:5C:F8:90:BA:42:80:19:29:29:27:FE:22:F3:20:7F:D2:B5:44:49:CB:6F:67:5A:F4:92:21:46:E2 +# Fingerprint (SHA1): 0F:52:3A:6B:4E:7D:1D:18:05:A5:48:F9:4D:CD:E4:C3:1E:1B:E9:E6 +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "D-Trust SBR Root CA 1 2022" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\017\122\072\153\116\175\035\030\005\245\110\371\115\315\344\303 +\036\033\351\346 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\023\074\033\202\352\156\352\355\144\142\351\132\171\005\151\004 +END +CKA_ISSUER MULTILINE_OCTAL +\060\111\061\013\060\011\006\003\125\004\006\023\002\104\105\061 +\025\060\023\006\003\125\004\012\023\014\104\055\124\162\165\163 +\164\040\107\155\142\110\061\043\060\041\006\003\125\004\003\023 +\032\104\055\124\162\165\163\164\040\123\102\122\040\122\157\157 +\164\040\103\101\040\061\040\062\060\062\062 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\122\317\344\214\155\240\112\367\077\202\227\014\200\011 +\214\225 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "D-Trust SBR Root CA 2 2022" +# +# Issuer: CN=D-Trust SBR Root CA 2 2022,O=D-Trust GmbH,C=DE +# Serial Number:54:d5:a3:95:1e:3d:95:ba:72:1b:9a:d0:31:21:4a:ba +# Subject: CN=D-Trust SBR Root CA 2 2022,O=D-Trust GmbH,C=DE +# Not Valid Before: Thu Jul 07 07:30:00 2022 +# Not Valid After : Tue Jul 07 07:29:59 2037 +# Fingerprint (SHA-256): DB:A8:4D:D7:EF:62:2D:48:54:63:A9:01:37:EA:4D:57:4D:F8:55:09:28:F6:AF:A0:3B:4D:8B:11:41:E6:36:CC +# Fingerprint (SHA1): 27:FF:63:B9:EF:34:29:31:03:38:1A:D8:60:60:DA:CC:60:28:35:E1 +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "D-Trust SBR Root CA 2 2022" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\111\061\013\060\011\006\003\125\004\006\023\002\104\105\061 +\025\060\023\006\003\125\004\012\023\014\104\055\124\162\165\163 +\164\040\107\155\142\110\061\043\060\041\006\003\125\004\003\023 +\032\104\055\124\162\165\163\164\040\123\102\122\040\122\157\157 +\164\040\103\101\040\062\040\062\060\062\062 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\111\061\013\060\011\006\003\125\004\006\023\002\104\105\061 +\025\060\023\006\003\125\004\012\023\014\104\055\124\162\165\163 +\164\040\107\155\142\110\061\043\060\041\006\003\125\004\003\023 +\032\104\055\124\162\165\163\164\040\123\102\122\040\122\157\157 +\164\040\103\101\040\062\040\062\060\062\062 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\124\325\243\225\036\075\225\272\162\033\232\320\061\041 +\112\272 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\005\254\060\202\003\224\240\003\002\001\002\002\020\124 +\325\243\225\036\075\225\272\162\033\232\320\061\041\112\272\060 +\015\006\011\052\206\110\206\367\015\001\001\015\005\000\060\111 +\061\013\060\011\006\003\125\004\006\023\002\104\105\061\025\060 +\023\006\003\125\004\012\023\014\104\055\124\162\165\163\164\040 +\107\155\142\110\061\043\060\041\006\003\125\004\003\023\032\104 +\055\124\162\165\163\164\040\123\102\122\040\122\157\157\164\040 +\103\101\040\062\040\062\060\062\062\060\036\027\015\062\062\060 +\067\060\067\060\067\063\060\060\060\132\027\015\063\067\060\067 +\060\067\060\067\062\071\065\071\132\060\111\061\013\060\011\006 +\003\125\004\006\023\002\104\105\061\025\060\023\006\003\125\004 +\012\023\014\104\055\124\162\165\163\164\040\107\155\142\110\061 +\043\060\041\006\003\125\004\003\023\032\104\055\124\162\165\163 +\164\040\123\102\122\040\122\157\157\164\040\103\101\040\062\040 +\062\060\062\062\060\202\002\042\060\015\006\011\052\206\110\206 +\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002\012 +\002\202\002\001\000\257\054\274\216\066\214\353\144\257\121\152 +\326\156\074\136\221\072\352\232\303\312\154\373\252\047\236\144 +\042\251\100\337\271\050\105\132\354\123\141\026\050\230\302\212 +\244\165\170\120\204\335\372\040\110\222\007\145\101\065\146\121 +\022\164\141\235\007\006\205\071\061\127\173\050\077\325\234\245 +\354\132\351\034\113\047\237\316\047\006\363\067\365\122\330\021 +\063\026\101\072\037\365\143\170\145\143\206\311\277\310\001\004 +\037\156\356\342\354\254\014\356\202\222\342\366\032\015\077\071 +\371\235\145\223\255\370\271\005\301\075\370\067\201\126\303\240 +\376\005\354\340\224\026\072\043\026\004\332\246\012\223\205\162 +\155\141\073\241\215\105\326\343\177\276\025\275\066\204\010\366 +\013\203\153\046\252\242\275\340\260\347\252\340\256\147\304\323 +\202\245\014\251\244\360\063\171\015\120\077\360\357\220\075\044 +\271\177\322\040\154\352\227\363\277\234\334\107\336\011\141\275 +\224\171\225\132\002\166\065\140\304\107\042\015\367\166\143\003 +\323\306\373\203\306\135\253\255\355\151\045\053\003\133\115\045 +\000\101\343\214\207\027\122\250\340\005\053\103\115\024\023\312 +\347\077\103\042\274\067\244\165\361\366\277\072\357\062\036\256 +\356\130\206\220\162\272\004\254\100\110\357\134\304\170\247\251 +\217\047\132\313\172\354\130\362\302\010\130\220\155\115\003\205 +\171\161\025\005\016\116\076\371\337\017\005\367\137\024\110\126 +\041\015\063\222\261\254\214\345\030\376\277\017\356\340\004\252 +\275\041\362\130\266\134\211\012\213\030\011\042\032\263\065\306 +\146\302\365\063\025\231\200\340\010\371\226\057\023\214\356\332 +\267\210\304\351\067\265\327\152\327\072\204\115\253\160\214\323 +\116\024\125\240\242\020\374\144\332\147\350\361\313\063\335\311 +\232\212\217\226\057\130\201\331\370\232\000\103\314\220\373\125 +\166\373\206\343\067\001\050\014\157\364\351\131\115\025\167\121 +\102\112\314\064\270\200\103\120\201\357\127\245\023\333\247\224 +\171\017\113\312\176\027\175\257\243\041\144\350\161\125\126\217 +\006\260\107\354\131\017\135\160\133\054\026\102\360\206\236\165 +\336\153\115\110\230\204\342\127\030\266\234\202\231\145\072\213 +\200\170\127\014\111\002\003\001\000\001\243\201\217\060\201\214 +\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001 +\377\060\035\006\003\125\035\016\004\026\004\024\135\263\200\224 +\033\345\206\277\150\272\024\064\244\366\356\155\362\335\337\347 +\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006 +\060\112\006\003\125\035\037\004\103\060\101\060\077\240\075\240 +\073\206\071\150\164\164\160\072\057\057\143\162\154\056\144\055 +\164\162\165\163\164\056\156\145\164\057\143\162\154\057\144\055 +\164\162\165\163\164\137\163\142\162\137\162\157\157\164\137\143 +\141\137\062\137\062\060\062\062\056\143\162\154\060\015\006\011 +\052\206\110\206\367\015\001\001\015\005\000\003\202\002\001\000 +\064\124\056\130\030\126\315\112\275\227\323\365\175\053\334\257 +\017\121\341\115\274\041\113\223\364\000\104\023\007\020\013\045 +\030\076\110\131\226\367\241\341\223\220\170\146\032\075\043\353 +\042\253\001\246\216\014\121\063\346\155\214\061\356\254\244\001 +\160\071\110\336\307\146\054\153\015\313\163\237\207\222\351\076 +\107\037\270\357\057\356\267\126\214\110\211\360\070\247\025\071 +\262\356\300\077\027\244\163\002\010\234\274\006\212\244\302\267 +\141\141\371\303\333\304\320\172\174\141\336\261\130\221\365\335 +\145\114\057\013\370\353\075\265\355\212\276\167\034\272\131\002 +\022\146\161\345\230\047\316\016\075\257\121\242\105\371\202\373 +\132\245\224\160\367\213\204\303\114\145\045\233\173\342\037\060 +\160\263\100\216\072\356\275\364\347\150\305\235\311\051\107\161 +\016\223\310\265\110\116\365\146\273\007\210\161\151\153\173\110 +\216\157\360\021\304\264\311\160\024\230\040\275\355\247\352\001 +\332\156\245\233\022\376\076\104\060\263\360\353\165\122\300\364 +\303\372\167\046\244\167\202\055\157\363\050\036\116\225\360\060 +\367\211\370\054\242\120\133\362\276\062\176\154\124\333\162\311 +\052\132\340\034\266\013\330\122\232\131\241\343\260\001\047\305 +\240\026\120\146\334\353\256\155\364\233\133\075\204\155\133\207 +\347\251\211\273\156\270\340\233\123\211\300\377\056\100\032\211 +\104\056\030\103\147\070\344\174\162\137\331\243\051\045\101\101 +\075\034\167\033\144\250\303\125\356\143\161\146\142\203\364\177 +\046\231\240\124\073\241\022\155\160\142\316\323\371\270\275\042 +\374\324\232\324\273\342\070\026\057\267\175\071\302\260\251\003 +\351\234\317\176\030\215\166\334\137\021\273\353\102\354\120\011 +\076\134\354\220\061\330\032\162\272\077\151\007\356\230\064\302 +\064\244\326\332\023\326\251\204\362\000\206\300\124\272\036\021 +\260\342\271\304\007\264\221\347\252\346\061\126\157\261\104\304 +\052\142\274\311\260\145\234\064\374\014\032\123\337\041\027\273 +\302\155\241\012\346\361\260\252\104\011\120\111\070\172\135\161 +\342\061\056\031\260\337\225\102\004\175\204\210\316\012\043\147 +\153\070\235\026\336\006\376\050\160\070\245\132\256\374\203\355 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE + +# Trust for "D-Trust SBR Root CA 2 2022" +# Issuer: CN=D-Trust SBR Root CA 2 2022,O=D-Trust GmbH,C=DE +# Serial Number:54:d5:a3:95:1e:3d:95:ba:72:1b:9a:d0:31:21:4a:ba +# Subject: CN=D-Trust SBR Root CA 2 2022,O=D-Trust GmbH,C=DE +# Not Valid Before: Thu Jul 07 07:30:00 2022 +# Not Valid After : Tue Jul 07 07:29:59 2037 +# Fingerprint (SHA-256): DB:A8:4D:D7:EF:62:2D:48:54:63:A9:01:37:EA:4D:57:4D:F8:55:09:28:F6:AF:A0:3B:4D:8B:11:41:E6:36:CC +# Fingerprint (SHA1): 27:FF:63:B9:EF:34:29:31:03:38:1A:D8:60:60:DA:CC:60:28:35:E1 +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "D-Trust SBR Root CA 2 2022" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\047\377\143\271\357\064\051\061\003\070\032\330\140\140\332\314 +\140\050\065\341 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\220\361\364\053\074\247\312\112\210\073\005\053\010\124\205\336 +END +CKA_ISSUER MULTILINE_OCTAL +\060\111\061\013\060\011\006\003\125\004\006\023\002\104\105\061 +\025\060\023\006\003\125\004\012\023\014\104\055\124\162\165\163 +\164\040\107\155\142\110\061\043\060\041\006\003\125\004\003\023 +\032\104\055\124\162\165\163\164\040\123\102\122\040\122\157\157 +\164\040\103\101\040\062\040\062\060\062\062 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\124\325\243\225\036\075\225\272\162\033\232\320\061\041 +\112\272 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "Telekom Security SMIME ECC Root 2021" +# +# Issuer: CN=Telekom Security SMIME ECC Root 2021,O=Deutsche Telekom Security GmbH,C=DE +# Serial Number:15:2a:dd:14:c9:18:d1:a4:56:40:86:a6:25:af:07:5f +# Subject: CN=Telekom Security SMIME ECC Root 2021,O=Deutsche Telekom Security GmbH,C=DE +# Not Valid Before: Thu Mar 18 11:08:30 2021 +# Not Valid After : Sat Mar 17 23:59:59 2046 +# Fingerprint (SHA-256): 3A:E6:DF:7E:0D:63:7A:65:A8:C8:16:12:EC:6F:9A:14:2F:85:A1:68:34:C1:02:80:D8:8E:70:70:28:51:87:55 +# Fingerprint (SHA1): B7:F9:1D:98:EC:25:93:F3:50:14:84:9A:A8:7E:22:10:3C:C4:39:27 +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Telekom Security SMIME ECC Root 2021" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\145\061\013\060\011\006\003\125\004\006\023\002\104\105\061 +\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143 +\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\107\155\142\110\061\055\060\053\006\003\125\004 +\003\014\044\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\123\115\111\115\105\040\105\103\103\040\122\157 +\157\164\040\062\060\062\061 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\145\061\013\060\011\006\003\125\004\006\023\002\104\105\061 +\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143 +\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\107\155\142\110\061\055\060\053\006\003\125\004 +\003\014\044\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\123\115\111\115\105\040\105\103\103\040\122\157 +\157\164\040\062\060\062\061 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\025\052\335\024\311\030\321\244\126\100\206\246\045\257 +\007\137 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\002\107\060\202\001\315\240\003\002\001\002\002\020\025 +\052\335\024\311\030\321\244\126\100\206\246\045\257\007\137\060 +\012\006\010\052\206\110\316\075\004\003\003\060\145\061\013\060 +\011\006\003\125\004\006\023\002\104\105\061\047\060\045\006\003 +\125\004\012\014\036\104\145\165\164\163\143\150\145\040\124\145 +\154\145\153\157\155\040\123\145\143\165\162\151\164\171\040\107 +\155\142\110\061\055\060\053\006\003\125\004\003\014\044\124\145 +\154\145\153\157\155\040\123\145\143\165\162\151\164\171\040\123 +\115\111\115\105\040\105\103\103\040\122\157\157\164\040\062\060 +\062\061\060\036\027\015\062\061\060\063\061\070\061\061\060\070 +\063\060\132\027\015\064\066\060\063\061\067\062\063\065\071\065 +\071\132\060\145\061\013\060\011\006\003\125\004\006\023\002\104 +\105\061\047\060\045\006\003\125\004\012\014\036\104\145\165\164 +\163\143\150\145\040\124\145\154\145\153\157\155\040\123\145\143 +\165\162\151\164\171\040\107\155\142\110\061\055\060\053\006\003 +\125\004\003\014\044\124\145\154\145\153\157\155\040\123\145\143 +\165\162\151\164\171\040\123\115\111\115\105\040\105\103\103\040 +\122\157\157\164\040\062\060\062\061\060\166\060\020\006\007\052 +\206\110\316\075\002\001\006\005\053\201\004\000\042\003\142\000 +\004\260\031\217\242\153\265\307\315\017\060\231\067\014\303\140 +\133\361\361\047\040\125\075\300\222\213\253\127\241\157\163\203 +\041\302\103\023\014\136\211\252\307\005\065\171\223\142\220\326 +\135\023\037\321\172\240\274\236\020\247\146\174\106\012\260\127 +\154\277\346\124\071\070\041\154\022\134\161\314\323\132\137\155 +\267\247\206\337\263\337\356\302\347\211\101\226\065\366\057\112 +\265\243\102\060\100\060\035\006\003\125\035\016\004\026\004\024 +\053\313\001\014\143\303\123\022\245\250\127\257\320\234\203\373 +\275\220\072\113\060\017\006\003\125\035\023\001\001\377\004\005 +\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377\004 +\004\003\002\001\006\060\012\006\010\052\206\110\316\075\004\003 +\003\003\150\000\060\145\002\061\000\326\274\110\222\207\107\003 +\307\160\073\045\266\037\256\106\147\163\164\000\047\113\344\245 +\004\242\003\337\136\050\255\156\136\003\310\335\150\234\266\277 +\224\020\110\225\057\017\377\030\213\002\060\001\100\063\236\227 +\227\115\005\362\164\124\014\315\071\375\152\153\011\301\044\077 +\141\216\070\241\267\350\327\104\025\021\142\377\016\141\067\107 +\113\100\177\112\137\262\147\132\163\165\302 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE + +# Trust for "Telekom Security SMIME ECC Root 2021" +# Issuer: CN=Telekom Security SMIME ECC Root 2021,O=Deutsche Telekom Security GmbH,C=DE +# Serial Number:15:2a:dd:14:c9:18:d1:a4:56:40:86:a6:25:af:07:5f +# Subject: CN=Telekom Security SMIME ECC Root 2021,O=Deutsche Telekom Security GmbH,C=DE +# Not Valid Before: Thu Mar 18 11:08:30 2021 +# Not Valid After : Sat Mar 17 23:59:59 2046 +# Fingerprint (SHA-256): 3A:E6:DF:7E:0D:63:7A:65:A8:C8:16:12:EC:6F:9A:14:2F:85:A1:68:34:C1:02:80:D8:8E:70:70:28:51:87:55 +# Fingerprint (SHA1): B7:F9:1D:98:EC:25:93:F3:50:14:84:9A:A8:7E:22:10:3C:C4:39:27 +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Telekom Security SMIME ECC Root 2021" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\267\371\035\230\354\045\223\363\120\024\204\232\250\176\042\020 +\074\304\071\047 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\165\275\136\355\174\015\146\076\007\244\233\274\002\007\330\264 +END +CKA_ISSUER MULTILINE_OCTAL +\060\145\061\013\060\011\006\003\125\004\006\023\002\104\105\061 +\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143 +\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\107\155\142\110\061\055\060\053\006\003\125\004 +\003\014\044\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\123\115\111\115\105\040\105\103\103\040\122\157 +\157\164\040\062\060\062\061 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\025\052\335\024\311\030\321\244\126\100\206\246\045\257 +\007\137 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "Telekom Security TLS ECC Root 2020" +# +# Issuer: CN=Telekom Security TLS ECC Root 2020,O=Deutsche Telekom Security GmbH,C=DE +# Serial Number:36:3a:96:8c:c9:5c:b2:58:cd:d0:01:5d:c5:e5:57:00 +# Subject: CN=Telekom Security TLS ECC Root 2020,O=Deutsche Telekom Security GmbH,C=DE +# Not Valid Before: Tue Aug 25 07:48:20 2020 +# Not Valid After : Fri Aug 25 23:59:59 2045 +# Fingerprint (SHA-256): 57:8A:F4:DE:D0:85:3F:4E:59:98:DB:4A:EA:F9:CB:EA:8D:94:5F:60:B6:20:A3:8D:1A:3C:13:B2:BC:7B:A8:E1 +# Fingerprint (SHA1): C0:F8:96:C5:A9:3B:01:06:21:07:DA:18:42:48:BC:E9:9D:88:D5:EC +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Telekom Security TLS ECC Root 2020" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\143\061\013\060\011\006\003\125\004\006\023\002\104\105\061 +\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143 +\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\107\155\142\110\061\053\060\051\006\003\125\004 +\003\014\042\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\124\114\123\040\105\103\103\040\122\157\157\164 +\040\062\060\062\060 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\143\061\013\060\011\006\003\125\004\006\023\002\104\105\061 +\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143 +\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\107\155\142\110\061\053\060\051\006\003\125\004 +\003\014\042\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\124\114\123\040\105\103\103\040\122\157\157\164 +\040\062\060\062\060 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\066\072\226\214\311\134\262\130\315\320\001\135\305\345 +\127\000 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\002\102\060\202\001\311\240\003\002\001\002\002\020\066 +\072\226\214\311\134\262\130\315\320\001\135\305\345\127\000\060 +\012\006\010\052\206\110\316\075\004\003\003\060\143\061\013\060 +\011\006\003\125\004\006\023\002\104\105\061\047\060\045\006\003 +\125\004\012\014\036\104\145\165\164\163\143\150\145\040\124\145 +\154\145\153\157\155\040\123\145\143\165\162\151\164\171\040\107 +\155\142\110\061\053\060\051\006\003\125\004\003\014\042\124\145 +\154\145\153\157\155\040\123\145\143\165\162\151\164\171\040\124 +\114\123\040\105\103\103\040\122\157\157\164\040\062\060\062\060 +\060\036\027\015\062\060\060\070\062\065\060\067\064\070\062\060 +\132\027\015\064\065\060\070\062\065\062\063\065\071\065\071\132 +\060\143\061\013\060\011\006\003\125\004\006\023\002\104\105\061 +\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143 +\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\107\155\142\110\061\053\060\051\006\003\125\004 +\003\014\042\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\124\114\123\040\105\103\103\040\122\157\157\164 +\040\062\060\062\060\060\166\060\020\006\007\052\206\110\316\075 +\002\001\006\005\053\201\004\000\042\003\142\000\004\316\277\376 +\127\250\277\325\252\367\020\232\315\274\321\021\242\275\147\102 +\314\220\353\025\030\220\331\242\315\014\052\045\353\076\117\316 +\265\322\217\017\363\065\332\103\213\002\200\276\157\121\044\035 +\017\153\053\312\237\302\157\120\062\345\067\040\266\040\377\210 +\015\017\155\111\273\333\006\244\207\220\222\224\364\011\320\317 +\177\310\200\013\301\227\263\273\065\047\311\302\033\243\102\060 +\100\060\035\006\003\125\035\016\004\026\004\024\343\162\314\156 +\225\231\107\261\346\263\141\114\321\313\253\343\272\315\336\237 +\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001 +\377\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001 +\006\060\012\006\010\052\206\110\316\075\004\003\003\003\147\000 +\060\144\002\060\165\122\213\267\244\020\117\256\112\020\213\262 +\204\133\102\341\346\052\066\002\332\240\156\031\077\045\277\332 +\131\062\216\344\373\220\334\223\144\316\255\264\101\107\140\342 +\317\247\313\036\002\060\067\101\214\146\337\101\153\326\203\000 +\101\375\057\132\367\120\264\147\321\054\250\161\327\103\312\234 +\047\044\221\203\110\015\317\315\367\124\201\257\354\177\344\147 +\333\270\220\356\335\045 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE + +# Trust for "Telekom Security TLS ECC Root 2020" +# Issuer: CN=Telekom Security TLS ECC Root 2020,O=Deutsche Telekom Security GmbH,C=DE +# Serial Number:36:3a:96:8c:c9:5c:b2:58:cd:d0:01:5d:c5:e5:57:00 +# Subject: CN=Telekom Security TLS ECC Root 2020,O=Deutsche Telekom Security GmbH,C=DE +# Not Valid Before: Tue Aug 25 07:48:20 2020 +# Not Valid After : Fri Aug 25 23:59:59 2045 +# Fingerprint (SHA-256): 57:8A:F4:DE:D0:85:3F:4E:59:98:DB:4A:EA:F9:CB:EA:8D:94:5F:60:B6:20:A3:8D:1A:3C:13:B2:BC:7B:A8:E1 +# Fingerprint (SHA1): C0:F8:96:C5:A9:3B:01:06:21:07:DA:18:42:48:BC:E9:9D:88:D5:EC +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Telekom Security TLS ECC Root 2020" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\300\370\226\305\251\073\001\006\041\007\332\030\102\110\274\351 +\235\210\325\354 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\301\253\376\152\020\054\003\215\274\034\042\062\300\205\247\375 +END +CKA_ISSUER MULTILINE_OCTAL +\060\143\061\013\060\011\006\003\125\004\006\023\002\104\105\061 +\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143 +\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\107\155\142\110\061\053\060\051\006\003\125\004 +\003\014\042\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\124\114\123\040\105\103\103\040\122\157\157\164 +\040\062\060\062\060 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\066\072\226\214\311\134\262\130\315\320\001\135\305\345 +\127\000 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "Telekom Security SMIME RSA Root 2023" +# +# Issuer: CN=Telekom Security SMIME RSA Root 2023,O=Deutsche Telekom Security GmbH,C=DE +# Serial Number:0c:7e:62:f5:79:73:3b:9d:43:8e:8b:63:ed:91:95:b8 +# Subject: CN=Telekom Security SMIME RSA Root 2023,O=Deutsche Telekom Security GmbH,C=DE +# Not Valid Before: Tue Mar 28 12:09:22 2023 +# Not Valid After : Fri Mar 27 23:59:59 2048 +# Fingerprint (SHA-256): 78:A6:56:34:4F:94:7E:9C:C0:F7:34:D9:05:3D:32:F6:74:20:86:B6:B9:CD:2C:AE:4F:AE:1A:2E:4E:FD:E0:48 +# Fingerprint (SHA1): 89:3F:6F:1C:E2:4D:7F:FB:C3:D3:14:7A:05:80:A7:DE:E1:0A:5E:4D +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Telekom Security SMIME RSA Root 2023" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\145\061\013\060\011\006\003\125\004\006\023\002\104\105\061 +\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143 +\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\107\155\142\110\061\055\060\053\006\003\125\004 +\003\014\044\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\123\115\111\115\105\040\122\123\101\040\122\157 +\157\164\040\062\060\062\063 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\145\061\013\060\011\006\003\125\004\006\023\002\104\105\061 +\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143 +\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\107\155\142\110\061\055\060\053\006\003\125\004 +\003\014\044\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\123\115\111\115\105\040\122\123\101\040\122\157 +\157\164\040\062\060\062\063 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\014\176\142\365\171\163\073\235\103\216\213\143\355\221 +\225\270 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\005\267\060\202\003\237\240\003\002\001\002\002\020\014 +\176\142\365\171\163\073\235\103\216\213\143\355\221\225\270\060 +\015\006\011\052\206\110\206\367\015\001\001\014\005\000\060\145 +\061\013\060\011\006\003\125\004\006\023\002\104\105\061\047\060 +\045\006\003\125\004\012\014\036\104\145\165\164\163\143\150\145 +\040\124\145\154\145\153\157\155\040\123\145\143\165\162\151\164 +\171\040\107\155\142\110\061\055\060\053\006\003\125\004\003\014 +\044\124\145\154\145\153\157\155\040\123\145\143\165\162\151\164 +\171\040\123\115\111\115\105\040\122\123\101\040\122\157\157\164 +\040\062\060\062\063\060\036\027\015\062\063\060\063\062\070\061 +\062\060\071\062\062\132\027\015\064\070\060\063\062\067\062\063 +\065\071\065\071\132\060\145\061\013\060\011\006\003\125\004\006 +\023\002\104\105\061\047\060\045\006\003\125\004\012\014\036\104 +\145\165\164\163\143\150\145\040\124\145\154\145\153\157\155\040 +\123\145\143\165\162\151\164\171\040\107\155\142\110\061\055\060 +\053\006\003\125\004\003\014\044\124\145\154\145\153\157\155\040 +\123\145\143\165\162\151\164\171\040\123\115\111\115\105\040\122 +\123\101\040\122\157\157\164\040\062\060\062\063\060\202\002\042 +\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003 +\202\002\017\000\060\202\002\012\002\202\002\001\000\357\305\016 +\213\276\062\322\147\107\377\012\114\147\263\052\277\310\303\305 +\221\353\265\307\036\221\341\146\250\210\213\125\040\200\037\121 +\136\167\227\236\031\012\134\307\153\067\041\174\003\066\001\364 +\210\045\331\250\056\101\252\374\330\046\340\226\100\142\171\256 +\127\236\003\070\032\034\262\167\024\076\351\241\162\320\344\340 +\067\321\027\106\355\120\134\172\130\305\370\053\367\165\057\317 +\201\236\132\054\267\072\254\240\131\230\004\121\014\377\111\305 +\120\375\036\323\107\205\113\063\117\242\067\265\257\004\232\047 +\062\235\126\325\077\125\141\343\213\157\256\121\376\227\376\151 +\007\372\142\133\046\346\024\171\025\245\023\070\256\137\067\276 +\224\112\326\015\200\026\151\244\221\262\072\111\230\165\235\106 +\020\212\134\172\177\204\245\350\257\036\307\253\263\132\106\265 +\243\113\365\246\043\066\000\106\261\333\005\266\033\316\236\172 +\062\134\232\325\162\303\235\206\115\053\204\323\036\265\210\332 +\020\170\234\042\303\073\043\265\353\023\007\275\157\123\354\233 +\354\233\323\145\365\007\011\343\135\247\231\265\176\206\216\325 +\002\377\267\205\011\343\107\024\335\226\146\030\064\336\010\325 +\337\313\030\231\142\013\053\354\000\135\122\104\323\306\226\374 +\062\126\045\221\317\315\031\073\225\071\076\002\207\231\143\266 +\325\076\064\172\017\021\165\201\274\175\004\312\140\264\050\165 +\327\002\121\335\122\000\056\307\375\211\361\134\363\313\244\047 +\022\070\217\273\373\211\360\344\304\070\054\276\202\240\161\141 +\142\221\217\110\014\057\053\251\260\361\313\020\004\347\164\277 +\067\220\357\117\052\103\065\227\022\306\052\160\015\336\054\125 +\107\171\143\051\365\312\037\152\006\122\034\256\055\044\042\203 +\042\257\320\252\060\267\052\037\377\145\043\130\145\223\310\216 +\175\100\020\061\206\170\331\125\313\074\060\360\336\121\052\000 +\066\322\047\105\137\330\350\241\041\075\176\106\126\073\051\105 +\361\035\005\011\316\266\103\060\334\105\220\020\060\114\244\153 +\206\213\077\075\057\061\221\161\357\046\271\366\276\235\260\154 +\337\021\356\130\077\103\171\206\071\200\361\046\027\007\230\360 +\231\252\060\054\103\131\024\316\355\342\100\023\205\002\003\001 +\000\001\243\143\060\141\060\016\006\003\125\035\017\001\001\377 +\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026\004 +\024\232\316\254\052\354\001\372\145\160\336\227\235\361\322\000 +\214\245\243\144\273\060\017\006\003\125\035\023\001\001\377\004 +\005\060\003\001\001\377\060\037\006\003\125\035\043\004\030\060 +\026\200\024\232\316\254\052\354\001\372\145\160\336\227\235\361 +\322\000\214\245\243\144\273\060\015\006\011\052\206\110\206\367 +\015\001\001\014\005\000\003\202\002\001\000\343\120\375\365\100 +\026\042\011\226\072\015\251\357\201\347\056\062\360\241\361\111 +\136\173\210\015\004\162\327\276\147\250\272\035\356\120\273\162 +\156\172\321\273\014\162\060\106\310\325\327\002\022\026\231\116 +\036\337\132\226\356\217\221\276\256\206\370\020\167\245\304\156 +\107\141\300\362\046\331\117\141\150\005\110\165\010\025\245\241 +\173\325\270\263\211\171\346\355\361\363\141\000\206\173\056\061 +\376\243\134\370\171\075\264\133\210\173\340\043\273\015\241\027 +\372\313\150\015\230\167\161\010\342\155\103\164\153\304\066\305 +\224\101\244\000\326\127\055\231\212\213\040\022\025\002\062\016 +\322\111\354\201\110\305\152\047\122\327\262\163\125\123\226\074 +\236\117\114\265\240\320\117\127\320\147\050\110\144\276\306\270 +\272\354\144\317\310\173\305\152\347\052\346\131\127\266\326\324 +\326\300\147\134\331\236\050\011\100\277\363\251\065\061\145\140 +\003\313\031\154\202\225\003\036\137\077\341\275\352\111\161\345 +\133\267\013\107\026\033\040\211\155\224\231\014\176\210\154\035 +\015\364\267\041\032\131\227\254\313\350\276\027\037\225\174\123 +\233\257\120\122\252\215\013\056\257\132\327\140\362\052\151\052 +\271\356\124\160\030\252\275\365\241\077\322\335\241\143\031\000 +\370\247\014\353\243\171\362\160\131\243\370\242\022\003\354\023 +\377\344\002\206\066\327\301\303\244\265\324\244\302\067\105\266 +\224\160\075\305\275\353\243\025\035\343\066\172\025\151\052\126 +\064\071\317\245\232\066\252\310\355\171\274\317\366\316\004\123 +\013\332\262\120\043\174\274\076\046\255\360\016\103\273\046\313 +\256\302\100\336\067\037\012\240\121\315\143\235\266\117\330\306 +\107\174\274\330\264\355\236\213\363\021\342\250\265\076\354\256 +\160\076\176\042\273\065\110\027\140\142\024\221\060\243\166\075 +\246\121\066\213\037\015\335\152\061\034\245\355\335\226\243\156 +\162\017\023\115\252\247\251\134\170\371\003\022\030\223\067\105 +\022\211\075\370\276\312\275\331\276\014\331\030\144\247\310\101 +\076\165\202\041\070\175\145\364\240\324\023\113\007\170\051\371 +\235\176\314\207\077\304\332\056\210\335\343\013\334\132\121\132 +\351\331\022\117\236\002\333\367\005\045\121 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE + +# Trust for "Telekom Security SMIME RSA Root 2023" +# Issuer: CN=Telekom Security SMIME RSA Root 2023,O=Deutsche Telekom Security GmbH,C=DE +# Serial Number:0c:7e:62:f5:79:73:3b:9d:43:8e:8b:63:ed:91:95:b8 +# Subject: CN=Telekom Security SMIME RSA Root 2023,O=Deutsche Telekom Security GmbH,C=DE +# Not Valid Before: Tue Mar 28 12:09:22 2023 +# Not Valid After : Fri Mar 27 23:59:59 2048 +# Fingerprint (SHA-256): 78:A6:56:34:4F:94:7E:9C:C0:F7:34:D9:05:3D:32:F6:74:20:86:B6:B9:CD:2C:AE:4F:AE:1A:2E:4E:FD:E0:48 +# Fingerprint (SHA1): 89:3F:6F:1C:E2:4D:7F:FB:C3:D3:14:7A:05:80:A7:DE:E1:0A:5E:4D +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Telekom Security SMIME RSA Root 2023" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\211\077\157\034\342\115\177\373\303\323\024\172\005\200\247\336 +\341\012\136\115 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\353\335\044\371\050\017\243\302\303\156\012\077\320\303\015\033 +END +CKA_ISSUER MULTILINE_OCTAL +\060\145\061\013\060\011\006\003\125\004\006\023\002\104\105\061 +\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143 +\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\107\155\142\110\061\055\060\053\006\003\125\004 +\003\014\044\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\123\115\111\115\105\040\122\123\101\040\122\157 +\157\164\040\062\060\062\063 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\014\176\142\365\171\163\073\235\103\216\213\143\355\221 +\225\270 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "Telekom Security TLS RSA Root 2023" +# +# Issuer: CN=Telekom Security TLS RSA Root 2023,O=Deutsche Telekom Security GmbH,C=DE +# Serial Number:21:9c:54:2d:e8:f6:ec:71:77:fa:4e:e8:c3:70:57:97 +# Subject: CN=Telekom Security TLS RSA Root 2023,O=Deutsche Telekom Security GmbH,C=DE +# Not Valid Before: Tue Mar 28 12:16:45 2023 +# Not Valid After : Fri Mar 27 23:59:59 2048 +# Fingerprint (SHA-256): EF:C6:5C:AD:BB:59:AD:B6:EF:E8:4D:A2:23:11:B3:56:24:B7:1B:3B:1E:A0:DA:8B:66:55:17:4E:C8:97:86:46 +# Fingerprint (SHA1): 54:D3:AC:B3:BD:57:56:F6:85:9D:CE:E5:C3:21:E2:D4:AD:83:D0:93 +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Telekom Security TLS RSA Root 2023" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\143\061\013\060\011\006\003\125\004\006\023\002\104\105\061 +\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143 +\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\107\155\142\110\061\053\060\051\006\003\125\004 +\003\014\042\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\124\114\123\040\122\123\101\040\122\157\157\164 +\040\062\060\062\063 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\143\061\013\060\011\006\003\125\004\006\023\002\104\105\061 +\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143 +\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\107\155\142\110\061\053\060\051\006\003\125\004 +\003\014\042\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\124\114\123\040\122\123\101\040\122\157\157\164 +\040\062\060\062\063 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\041\234\124\055\350\366\354\161\167\372\116\350\303\160 +\127\227 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\005\263\060\202\003\233\240\003\002\001\002\002\020\041 +\234\124\055\350\366\354\161\167\372\116\350\303\160\127\227\060 +\015\006\011\052\206\110\206\367\015\001\001\014\005\000\060\143 +\061\013\060\011\006\003\125\004\006\023\002\104\105\061\047\060 +\045\006\003\125\004\012\014\036\104\145\165\164\163\143\150\145 +\040\124\145\154\145\153\157\155\040\123\145\143\165\162\151\164 +\171\040\107\155\142\110\061\053\060\051\006\003\125\004\003\014 +\042\124\145\154\145\153\157\155\040\123\145\143\165\162\151\164 +\171\040\124\114\123\040\122\123\101\040\122\157\157\164\040\062 +\060\062\063\060\036\027\015\062\063\060\063\062\070\061\062\061 +\066\064\065\132\027\015\064\070\060\063\062\067\062\063\065\071 +\065\071\132\060\143\061\013\060\011\006\003\125\004\006\023\002 +\104\105\061\047\060\045\006\003\125\004\012\014\036\104\145\165 +\164\163\143\150\145\040\124\145\154\145\153\157\155\040\123\145 +\143\165\162\151\164\171\040\107\155\142\110\061\053\060\051\006 +\003\125\004\003\014\042\124\145\154\145\153\157\155\040\123\145 +\143\165\162\151\164\171\040\124\114\123\040\122\123\101\040\122 +\157\157\164\040\062\060\062\063\060\202\002\042\060\015\006\011 +\052\206\110\206\367\015\001\001\001\005\000\003\202\002\017\000 +\060\202\002\012\002\202\002\001\000\355\065\241\201\200\363\313 +\112\151\133\302\373\121\203\256\046\375\341\156\363\201\022\175 +\161\100\377\207\165\102\051\041\355\201\122\054\337\022\301\031 +\204\211\301\275\305\050\325\325\113\154\104\326\114\333\007\226 +\112\125\172\312\066\202\004\066\250\245\374\047\366\111\361\325 +\162\236\221\371\043\326\160\173\273\365\233\301\354\223\317\031 +\352\145\176\210\160\240\163\374\366\377\265\126\142\341\163\152 +\064\230\076\202\270\254\225\123\364\001\240\047\007\162\243\000 +\123\240\344\262\253\203\070\127\063\045\224\237\276\110\035\230 +\341\243\272\236\134\315\004\161\121\175\165\170\253\363\131\252 +\304\340\140\276\217\203\122\270\165\032\101\065\355\274\363\072 +\143\351\251\024\105\327\346\122\321\156\322\336\274\343\365\013 +\073\346\340\304\275\103\144\023\246\316\364\230\067\154\212\225 +\250\227\310\107\017\360\136\020\213\347\035\034\376\261\073\240 +\005\063\150\005\101\202\301\003\053\001\310\347\217\115\253\350 +\265\366\315\153\104\265\347\335\213\354\352\045\264\000\042\127 +\115\260\261\262\061\301\026\316\377\375\024\204\267\107\372\262 +\361\160\336\333\213\154\066\130\244\174\263\021\321\303\167\177 +\137\266\045\340\015\305\322\263\371\270\270\167\333\067\161\161 +\107\343\140\030\117\044\266\165\067\170\271\243\142\257\275\311 +\162\216\057\314\273\256\333\344\025\122\031\007\063\373\152\267 +\055\113\220\050\202\163\376\030\213\065\215\333\247\004\152\276 +\352\301\115\066\073\026\066\221\062\357\266\100\211\221\103\340 +\362\242\253\004\056\346\362\114\016\026\064\040\254\207\301\055 +\176\311\146\107\027\024\021\244\363\367\241\044\211\253\330\032 +\310\241\134\261\243\367\214\155\310\001\311\117\311\354\304\374 +\254\121\063\321\310\203\321\311\237\035\324\107\064\051\076\313 +\260\016\372\203\013\050\130\345\051\334\077\174\250\237\311\266 +\012\273\246\350\106\026\017\226\345\173\344\152\172\110\155\166 +\230\005\245\334\155\036\102\036\102\332\032\340\122\367\265\203 +\300\032\173\170\065\054\070\365\037\375\111\243\056\322\131\143 +\277\200\260\214\223\163\313\065\246\231\225\042\141\145\003\140 +\373\057\223\113\372\232\234\200\073\002\003\001\000\001\243\143 +\060\141\060\016\006\003\125\035\017\001\001\377\004\004\003\002 +\001\006\060\035\006\003\125\035\016\004\026\004\024\266\247\227 +\202\075\164\205\233\367\074\237\223\232\225\171\165\122\214\155 +\107\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001 +\001\377\060\037\006\003\125\035\043\004\030\060\026\200\024\266 +\247\227\202\075\164\205\233\367\074\237\223\232\225\171\165\122 +\214\155\107\060\015\006\011\052\206\110\206\367\015\001\001\014 +\005\000\003\202\002\001\000\250\314\141\246\276\165\236\025\120 +\244\153\373\250\160\105\174\272\176\261\132\374\133\043\372\012 +\167\370\230\161\202\014\155\340\136\106\252\223\364\036\240\303 +\341\223\333\113\255\262\246\135\253\260\324\142\313\136\273\146 +\365\055\356\227\100\074\142\353\136\326\024\326\214\342\226\213 +\101\151\223\065\346\271\231\153\142\264\241\027\146\064\246\153 +\143\306\271\116\362\042\351\130\015\126\101\321\372\014\112\360 +\063\315\073\273\155\041\072\256\216\162\265\303\112\373\351\175 +\345\261\233\206\356\342\340\175\264\367\062\375\042\204\361\205 +\311\067\171\351\265\077\277\134\344\164\262\217\021\142\000\335 +\030\146\241\331\173\043\137\361\216\325\147\350\124\332\133\072 +\153\066\157\371\201\261\063\107\063\167\100\371\122\252\335\324 +\203\317\205\170\231\232\223\271\163\147\102\106\021\041\352\376 +\012\251\033\032\145\151\263\217\256\026\266\366\113\126\262\055 +\371\245\310\354\073\142\243\355\153\320\116\325\100\011\244\037 +\230\327\072\245\222\131\040\344\260\175\315\133\163\150\275\155 +\304\242\023\016\147\031\270\215\102\176\154\014\232\156\240\044 +\055\325\105\033\334\304\002\024\376\205\133\145\227\312\116\220 +\120\010\172\102\065\371\352\302\146\324\370\001\256\036\264\276 +\303\250\357\376\166\232\242\246\037\106\366\204\355\374\333\316 +\304\002\316\167\110\054\214\262\354\303\000\243\354\054\125\030 +\301\176\031\356\341\057\362\255\203\233\236\253\031\337\306\212 +\057\214\167\345\267\005\354\073\301\354\276\206\263\206\274\300 +\367\334\347\352\133\256\262\314\265\065\206\113\320\342\077\266 +\330\370\016\000\356\135\343\367\215\130\377\317\213\067\351\143 +\137\156\367\011\161\066\302\022\135\127\362\310\264\315\363\356 +\002\337\021\334\152\271\127\204\035\131\115\214\316\310\016\043 +\302\267\046\232\020\024\161\376\223\262\212\270\200\360\016\020 +\236\323\250\120\014\067\202\057\352\340\212\235\341\054\071\377 +\265\264\163\000\344\367\110\246\163\254\277\262\336\167\004\207 +\264\243\315\233\065\044\067\372\220\223\023\201\102\306\230\046 +\165\067\146\101\020\254\273\365\224\343\302\061\053\255\347\043 +\126\314\065\045\222\263\120 +END +CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE +CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE +CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE + +# Trust for "Telekom Security TLS RSA Root 2023" +# Issuer: CN=Telekom Security TLS RSA Root 2023,O=Deutsche Telekom Security GmbH,C=DE +# Serial Number:21:9c:54:2d:e8:f6:ec:71:77:fa:4e:e8:c3:70:57:97 +# Subject: CN=Telekom Security TLS RSA Root 2023,O=Deutsche Telekom Security GmbH,C=DE +# Not Valid Before: Tue Mar 28 12:16:45 2023 +# Not Valid After : Fri Mar 27 23:59:59 2048 +# Fingerprint (SHA-256): EF:C6:5C:AD:BB:59:AD:B6:EF:E8:4D:A2:23:11:B3:56:24:B7:1B:3B:1E:A0:DA:8B:66:55:17:4E:C8:97:86:46 +# Fingerprint (SHA1): 54:D3:AC:B3:BD:57:56:F6:85:9D:CE:E5:C3:21:E2:D4:AD:83:D0:93 +CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Telekom Security TLS RSA Root 2023" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\124\323\254\263\275\127\126\366\205\235\316\345\303\041\342\324 +\255\203\320\223 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\277\133\353\124\100\315\110\161\304\040\215\175\336\012\102\362 +END +CKA_ISSUER MULTILINE_OCTAL +\060\143\061\013\060\011\006\003\125\004\006\023\002\104\105\061 +\047\060\045\006\003\125\004\012\014\036\104\145\165\164\163\143 +\150\145\040\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\107\155\142\110\061\053\060\051\006\003\125\004 +\003\014\042\124\145\154\145\153\157\155\040\123\145\143\165\162 +\151\164\171\040\124\114\123\040\122\123\101\040\122\157\157\164 +\040\062\060\062\063 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\041\234\124\055\350\366\354\161\167\372\116\350\303\160 +\127\227 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/config/rootfiles/core/185/filelists/ca-certificates b/config/rootfiles/core/185/filelists/ca-certificates new file mode 120000 index 0000000000..320fea8f40 --- /dev/null +++ b/config/rootfiles/core/185/filelists/ca-certificates @@ -0,0 +1 @@ +../../../common/ca-certificates \ No newline at end of file diff --git a/lfs/ca-certificates b/lfs/ca-certificates index e828b55713..5fe5ca5501 100644 --- a/lfs/ca-certificates +++ b/lfs/ca-certificates @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 = 20231204 +VER = 20240217 # From https://hg.mozilla.org/mozilla-central/raw-file/tip/security/nss/lib/ckfw/b… 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 February 2024