webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-10 17:28:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fireinfo: Amend upstream patches for fixing #12896

Browse Source 
https://bugzilla.ipfire.org/show_bug.cgi?id=12896#c16

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
This commit is contained in:
Peter Müller
2022-07-09 09:17:29 +00:00
parent 390a55dcfa
commit ac7f3c75aa
4 changed files with 72 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/patches/fireinfo/fireinfo-2.2.0-python-3.8.patch Normal file
View File

@@ -0,0 +1,26 @@
From 1d70d3cbf7e1fe1e1f0760e9a79e520e416519fe Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 18 May 2021 13:40:51 +0000
Subject: [PATCH] python: Fix linking against Python 3.8
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
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

28
src/patches/fireinfo/fireinfo-system-blacklist-jetways-product-uuid.patch Normal file
View File

@@ -0,0 +1,28 @@
From 33be9aa38d65dace9a61247f41ac3627a6750cce Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 8 Jul 2022 08:30:55 +0000
Subject: [PATCH] system: Blacklist Jetway's product UUID
Fixes: #12896
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
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

37
src/patches/fireinfo/fireinfo-system-ignore-when-the-serial-number-is-ssn.patch Normal file
View File

@@ -0,0 +1,37 @@
From 4d74466456c0824663e10881f9deabcd1f4d32c3 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 8 Jul 2022 08:31:25 +0000
Subject: [PATCH] system: Ignore when the serial number is "SSN"
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
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