From patchwork Sat Aug 30 13:27:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 9022 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R13" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4cDbXX0Dznz3wkk for ; Sat, 30 Aug 2025 13:27:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [IPv6:2001:678:b28::201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail02.haj.ipfire.org", Issuer "E8" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4cDbXW63Nhz5R3 for ; Sat, 30 Aug 2025 13:27:23 +0000 (UTC) Authentication-Results: mail01.ipfire.org; dkim=pass header.d=ipfire.org header.s=202003ed25519 header.b=Z4OkjCqw; dkim=pass header.d=ipfire.org header.s=202003rsa header.b=iv1Ws0Ll; dmarc=pass (policy=reject) header.from=ipfire.org; spf=softfail (mail01.ipfire.org: 2001:678:b28::201 is neither permitted nor denied by domain of "development+bounces-891-patchwork=ipfire.org@lists.ipfire.org") smtp.mailfrom="development+bounces-891-patchwork=ipfire.org@lists.ipfire.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1756560443; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=lb/lJoSgUcghko+i+6tHWKPzYQjJI4Ia3H9ennWvVKU=; b=NKr+sQ4180AzOoU3CJ7CLThXbU+fAodhQxuWZgIAyj5b+6LG76kOUg2D55ORRhXKeqbHku DwEmijJM1AG/6uZNFBefBsb5EC4AN1odrWJYwNP3RU8SVjOwtrSNAk6E+UKIlzWJBiIzrw cPODntnvJd14i477NnvMD77X31wKZRbLm/qh9TKostfn88ShiEkPx+2BH0vQpH7K9ky4eH UW0wp3S+cVwza7fDwf5pPdkZvgk8H65KuoQ7baIfcghEHM8qJhLuNEJ//wkhZZ3xEhPH+W /5E3Bnb/6Meup1GlStSt6Qj+vRpkpYrLHddwRUJTb3l6hvnyfQLX56aM7OfO3g== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=ipfire.org header.s=202003ed25519 header.b=Z4OkjCqw; dkim=pass header.d=ipfire.org header.s=202003rsa header.b=iv1Ws0Ll; dmarc=pass (policy=reject) header.from=ipfire.org; spf=softfail (mail01.ipfire.org: 2001:678:b28::201 is neither permitted nor denied by domain of "development+bounces-891-patchwork=ipfire.org@lists.ipfire.org") smtp.mailfrom="development+bounces-891-patchwork=ipfire.org@lists.ipfire.org" ARC-Seal: i=1; s=202003rsa; d=ipfire.org; t=1756560443; a=rsa-sha256; cv=none; b=dE61bPi1BWw3KuJwj5yLB1x47uFCFR410EDzMGnge5V1zs6zVMGK5Cd8hBimhqXDHShxgb 3X/b/uEP9LyTYLMZJnfPZJoiU5O+ZAMD2jOqykag0EDC8+jAP1XfzMev5aRWvlpMQCylTE R+HI73w+6YWR5LgPSXwp3okAriUkgeUsZPAb8K8m5B6DMdScXBTZ/CV989g6CbUfcUpS+w V4EIjzf4lgCOf4cCW363JcmdJlbbv8nZ//29EnZR2lnDS5dIZ+uul3qtc3xMFZbD1ZgvQF NluO+qbQgVBNQkvsVJw4JL4uWrHNrTvTb5NpgKkgRPtolCdSxmepyowoZqd2Fw== Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4cDbXW5HdTz30Qc for ; Sat, 30 Aug 2025 13:27:23 +0000 (UTC) X-Original-To: development@lists.ipfire.org Received: from mail01.ipfire.org (mail01.haj.ipfire.org [IPv6:2001:678:b28::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1 raw public key) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R13" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4cDbXT0vDZz2xHm for ; Sat, 30 Aug 2025 13:27:21 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4cDbXQ0tZsz37D; Sat, 30 Aug 2025 13:27:18 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1756560438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=lb/lJoSgUcghko+i+6tHWKPzYQjJI4Ia3H9ennWvVKU=; b=Z4OkjCqwxchP0Dj4pt8MgvCXENtkz1fATPeeoTjwkzZR4NgWq88mEhGRqEsYjwYnGWAm7B JG2Z5o4pFizjayBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1756560438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=lb/lJoSgUcghko+i+6tHWKPzYQjJI4Ia3H9ennWvVKU=; b=iv1Ws0Ll7mOHa/+mw2fdpvCSdqwi6guXLCxaPcd/ijWyAYQ0hj3UJjs5qpUUW8J8sg9neO hdA6Knsm/Fo4oDPjmaqKsxbli/tmD41+ypU8Fi844lVO6APPbJwe1aRJFagrK60Gh7XcID yiIKIGg2fZG+P2oCjxyx0OlCReYXiJoL3HnBL7Ss/wxdcXelKiUtZl342FKXXR+jIa9kEk RB/ABocjSYutU5QGpgp0Gk7+v1UloVIYWrmKaHKvtc0IiKnQ34SHSHujRJf1hVK5JJ0H/s C5pezSGLxUGBiBKqLPyq8W4iB6RONK7V+dByW4R9Bod6Jx2l/p7u7o1KQHqWMA== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH] fireinfo: housekeeping to merge patches into version v2.2.1 Date: Sat, 30 Aug 2025 15:27:15 +0200 Message-ID: <20250830132715.3380364-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 X-Rspamd-Server: mail01.haj.ipfire.org X-Rspamd-Queue-Id: 4cDbXW63Nhz5R3 X-Rspamd-Action: no action X-Spamd-Result: default: False [-11.08 / 11.00]; BAYES_HAM(-3.00)[100.00%]; DWL_DNSWL_MED(-2.00)[ipfire.org:dkim]; FROM_INTERNAL_BULK_SENDERS(-2.00)[2001:678:b28::201]; R_DKIM_ALLOW(-1.66)[ipfire.org:s=202003ed25519,ipfire.org:s=202003rsa]; NEURAL_HAM(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; DKIM_REPUTATION(-0.93)[-0.92613943257955]; IP_REPUTATION_HAM(-0.51)[asn: 204867(-0.14), country: DE(-0.00), ip: 2001:678:b28::(-0.36)]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; DMARC_POLICY_ALLOW_WITH_FAILURES(-0.50)[]; R_MISSING_CHARSET(0.50)[]; RCVD_IN_DNSWL_MED(-0.20)[2001:678:b28::25:received]; MAILLIST(-0.18)[generic]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; MX_GOOD(-0.01)[]; RECEIVED_HELO_LOCALHOST(0.00)[]; ARC_SIGNED(0.00)[ipfire.org:s=202003rsa:i=1]; TO_DN_SOME(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; TAGGED_FROM(0.00)[bounces-891-patchwork=ipfire.org]; RCVD_COUNT_THREE(0.00)[3]; ASN(0.00)[asn:204867, ipnet:2001:678:b28::/48, country:DE]; RCVD_VIA_SMTP_AUTH(0.00)[]; FORGED_SENDER_MAILLIST(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MISSING_XM_UA(0.00)[]; DMARC_POLICY_ALLOW(0.00)[ipfire.org,reject]; DKIM_TRACE(0.00)[ipfire.org:+]; RCVD_TLS_LAST(0.00)[]; FROM_NEQ_ENVFROM(0.00)[adolf.belka@ipfire.org,development@lists.ipfire.org]; R_SPF_SOFTFAIL(0.00)[~all:c] - As the last update was 5 years ago, I thought it good housekeeping to merge the four patches into the fireinfo tarball - Update of rootfile not required - Changelog v2.2.1 Inclusion of previous four patches into tarball Signed-off-by: Adolf Belka --- lfs/fireinfo | 16 +++----- ...-one-error-when-detecting-hypervisor.patch | 38 ------------------- .../fireinfo/fireinfo-2.2.0-python-3.8.patch | 26 ------------- ...ystem-blacklist-jetways-product-uuid.patch | 28 -------------- ...ignore-when-the-serial-number-is-ssn.patch | 37 ------------------ 5 files changed, 5 insertions(+), 140 deletions(-) delete mode 100644 src/patches/fireinfo-virt-fix-off-by-one-error-when-detecting-hypervisor.patch delete mode 100644 src/patches/fireinfo/fireinfo-2.2.0-python-3.8.patch delete mode 100644 src/patches/fireinfo/fireinfo-system-blacklist-jetways-product-uuid.patch delete mode 100644 src/patches/fireinfo/fireinfo-system-ignore-when-the-serial-number-is-ssn.patch diff --git a/lfs/fireinfo b/lfs/fireinfo index 629626d1e..b8727c778 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team # +# Copyright (C) 2007-2025 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 2.2.0 +VER = 2.2.1 THISAPP = fireinfo-v$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 765a483359a9061df8e8a60c90b851900e14ca4229ff8554f54ada661ef59b97e1c7bb1b6a4767ec5ce9fa813fa3d45576e69e3efe1793a9b9d341de1c3818f6 +$(DL_FILE)_BLAKE2 = f811c8acf078c6fcb27305f0a6b81429862ad9631699e50ee0e4b2e713c8e1a745ba453783422598b818da59fd4d9e96be395884a7fccd7bcda0e64c7cd8d692 install : $(TARGET) @@ -70,15 +70,9 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - - # Apply upstream patches - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo/fireinfo-2.2.0-python-3.8.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo/fireinfo-system-blacklist-jetways-product-uuid.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo/fireinfo-system-ignore-when-the-serial-number-is-ssn.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-virt-fix-off-by-one-error-when-detecting-hypervisor.patch - cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh - cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && ./configure \ + --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/src/patches/fireinfo-virt-fix-off-by-one-error-when-detecting-hypervisor.patch b/src/patches/fireinfo-virt-fix-off-by-one-error-when-detecting-hypervisor.patch deleted file mode 100644 index 0799ecce5..000000000 --- a/src/patches/fireinfo-virt-fix-off-by-one-error-when-detecting-hypervisor.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e3e68b9baa9723916b1999394432e9ad260cfaa2 Mon Sep 17 00:00:00 2001 -From: Michael Tremer -Date: Sat, 1 Jul 2023 09:08:48 +0000 -Subject: [PATCH] virt: Fix off-by-one error when detecting hypervisor - -Reported-by: Mauro Condarelli -Fixes: #13155 - _fireinfo.detect_hypervisor() rises Segmentation fault -Signed-off-by: Michael Tremer ---- - src/_fireinfo/fireinfo.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/_fireinfo/fireinfo.c b/src/_fireinfo/fireinfo.c -index 1d3f424..18edf34 100644 ---- a/src/_fireinfo/fireinfo.c -+++ b/src/_fireinfo/fireinfo.c -@@ -32,8 +32,8 @@ enum hypervisors { - HYPER_KVM, - HYPER_MSHV, - HYPER_VMWARE, -+ // Must always be last - HYPER_OTHER, -- HYPER_LAST /* for loop - must be last*/ - }; - - const char *hypervisor_ids[] = { -@@ -157,7 +157,7 @@ int detect_hypervisor(int *hypervisor) { - *hypervisor = HYPER_OTHER; - - if (*sig.text) { -- for (int id = HYPER_NONE + 1; id < HYPER_LAST; id++) { -+ for (int id = HYPER_NONE + 1; id < HYPER_OTHER; id++) { - if (strcmp(hypervisor_ids[id], sig.text) == 0) { - *hypervisor = id; - break; --- -2.39.2 - diff --git a/src/patches/fireinfo/fireinfo-2.2.0-python-3.8.patch b/src/patches/fireinfo/fireinfo-2.2.0-python-3.8.patch deleted file mode 100644 index ca0e6843b..000000000 --- a/src/patches/fireinfo/fireinfo-2.2.0-python-3.8.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1d70d3cbf7e1fe1e1f0760e9a79e520e416519fe Mon Sep 17 00:00:00 2001 -From: Michael Tremer -Date: Tue, 18 May 2021 13:40:51 +0000 -Subject: [PATCH] python: Fix linking against Python 3.8 - -Signed-off-by: Michael Tremer ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index ede2cb6..6efe73c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -91,7 +91,7 @@ AC_SUBST([OUR_LDFLAGS], $with_ldflags) - - # Python - AM_PATH_PYTHON([3.7]) --PKG_CHECK_MODULES([PYTHON_DEVEL], [python-${PYTHON_VERSION}]) -+PKG_CHECK_MODULES([PYTHON_DEVEL], [python-${PYTHON_VERSION}-embed python-${PYTHON_VERSION}]) - - AC_CONFIG_FILES([ - Makefile --- -2.20.1 - diff --git a/src/patches/fireinfo/fireinfo-system-blacklist-jetways-product-uuid.patch b/src/patches/fireinfo/fireinfo-system-blacklist-jetways-product-uuid.patch deleted file mode 100644 index f604d8433..000000000 --- a/src/patches/fireinfo/fireinfo-system-blacklist-jetways-product-uuid.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 33be9aa38d65dace9a61247f41ac3627a6750cce Mon Sep 17 00:00:00 2001 -From: Michael Tremer -Date: Fri, 8 Jul 2022 08:30:55 +0000 -Subject: [PATCH] system: Blacklist Jetway's product UUID - -Fixes: #12896 -Signed-off-by: Michael Tremer ---- - src/fireinfo/system.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/fireinfo/system.py b/src/fireinfo/system.py -index 4c0b0a3..c9c81b1 100644 ---- a/src/fireinfo/system.py -+++ b/src/fireinfo/system.py -@@ -51,6 +51,9 @@ INVALID_ID_STRINGS = ( - "03000200-0400-0500-0006-000700080009", - "11111111-1111-1111-1111-111111111111", - "0000000", "00000000", -+ -+ # Jetway gives all systems the same product UUID -+ "3b903780-4f79-1018-816e-aeb2724778a7", - ) - - INVALID_ID_STRINGS_EXACT_MATCH = ( --- -2.30.2 - diff --git a/src/patches/fireinfo/fireinfo-system-ignore-when-the-serial-number-is-ssn.patch b/src/patches/fireinfo/fireinfo-system-ignore-when-the-serial-number-is-ssn.patch deleted file mode 100644 index 611bc98ce..000000000 --- a/src/patches/fireinfo/fireinfo-system-ignore-when-the-serial-number-is-ssn.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 4d74466456c0824663e10881f9deabcd1f4d32c3 Mon Sep 17 00:00:00 2001 -From: Michael Tremer -Date: Fri, 8 Jul 2022 08:31:25 +0000 -Subject: [PATCH] system: Ignore when the serial number is "SSN" - -Signed-off-by: Michael Tremer ---- - src/fireinfo/system.py | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/fireinfo/system.py b/src/fireinfo/system.py -index c9c81b1..9edc345 100644 ---- a/src/fireinfo/system.py -+++ b/src/fireinfo/system.py -@@ -44,7 +44,7 @@ INVALID_ID_STRINGS = ( - "EVAL", - "Not Applicable", - "None", "empty", -- "Serial", "System Serial Number", -+ "Serial", "System Serial Number", "SSN", - "XXXXX", - "01010101-0101-0101-0101-010101010101", - "00020003-0004-0005-0006-000700080009", -@@ -272,7 +272,9 @@ class System(object, metaclass=Singleton): - if not ids: - root_disk_serial = self.root_disk_serial - if root_disk_serial and not root_disk_serial.startswith("QM000"): -- ids.append(root_disk_serial) -+ # Skip any invalid IDs -+ if not root_disk_serial in INVALID_ID_STRINGS: -+ ids.append(root_disk_serial) - - # As last resort, we use the UUID from pakfire. - if not ids: --- -2.30.2 -