[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 13ed354420129239911bd9ec3229957caf8a7fd5

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 3211 bytes --]

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, master has been updated
       via  13ed354420129239911bd9ec3229957caf8a7fd5 (commit)
      from  0fbf41404c75702d73b5234c6dde210c346ae0e6 (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 13ed354420129239911bd9ec3229957caf8a7fd5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Mar 17 22:23:13 2015 +0100

    fireinfo: Forbid string "Serial"

-----------------------------------------------------------------------

Summary of changes:
 .../{oldcore/87 => core/88}/filelists/fireinfo     |  0
 lfs/fireinfo                                       |  1 +
 ...info-Add-an-other-forbidden-string-Serial.patch | 25 ++++++++++++++++++++++
 3 files changed, 26 insertions(+)
 copy config/rootfiles/{oldcore/87 => core/88}/filelists/fireinfo (100%)
 create mode 100644 src/patches/fireinfo-Add-an-other-forbidden-string-Serial.patch

Difference in files:
diff --git a/config/rootfiles/core/88/filelists/fireinfo b/config/rootfiles/core/88/filelists/fireinfo
new file mode 120000
index 0000000..c461155
--- /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 3295388..e63bdc8 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 0000000..d710852
--- /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(a)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
+


hooks/post-receive
--
IPFire 2.x development tree