From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 17 Mar 2015 21:23:13 +0000 (+0100)
Subject: fireinfo: Forbid string "Serial"
X-Git-Tag: v2.17-core89~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13ed354420129239911bd9ec3229957caf8a7fd5;p=ipfire-2.x.git

fireinfo: Forbid string "Serial"
---

diff --git a/config/rootfiles/core/88/filelists/fireinfo b/config/rootfiles/core/88/filelists/fireinfo
new file mode 120000
index 0000000000..c46115521f
--- /dev/null
+++ b/config/rootfiles/core/88/filelists/fireinfo
@@ -0,0 +1 @@
+../../../common/fireinfo
\ No newline at end of file
diff --git a/lfs/fireinfo b/lfs/fireinfo
index 32953881e8..e63bdc812c 100644
--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-Add-an-other-forbidden-string-Serial.patch
 
 	cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
 	cd $(DIR_APP) && ./configure --prefix=/usr
diff --git a/src/patches/fireinfo-Add-an-other-forbidden-string-Serial.patch b/src/patches/fireinfo-Add-an-other-forbidden-string-Serial.patch
new file mode 100644
index 0000000000..d7108520d4
--- /dev/null
+++ b/src/patches/fireinfo-Add-an-other-forbidden-string-Serial.patch
@@ -0,0 +1,25 @@
+From edacae4b2cdc41f1c0bfc93e041532ff6c49f60c Mon Sep 17 00:00:00 2001
+From: Michael Tremer <michael.tremer@ipfire.org>
+Date: Tue, 17 Mar 2015 22:19:17 +0100
+Subject: [PATCH] Add an other forbidden string: "Serial"
+
+---
+ src/fireinfo/system.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/fireinfo/system.py b/src/fireinfo/system.py
+index daf77b399d20..9d7872822b85 100644
+--- a/src/fireinfo/system.py
++++ b/src/fireinfo/system.py
+@@ -45,7 +45,7 @@ INVALID_ID_STRINGS = (
+ 	"EVAL",
+ 	"Not Applicable",
+ 	"None", "empty",
+-	"System Serial Number",
++	"Serial", "System Serial Number",
+ 	"XXXXX",
+ 	"01010101-0101-0101-0101-010101010101",
+ 	"00020003-0004-0005-0006-000700080009",
+-- 
+2.1.0
+