Merge remote-tracking branch 'stevee/next-flag-icons' into next

diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid
index 76abbe8516bf6fdce0e1fe1bcc702e0be92ad719..1b78c8e0cf2909257f9b95f394b7879a47333c5d 100644 (file)
--- a/config/rootfiles/common/squid
+++ b/config/rootfiles/common/squid
@@ -34,7 +34,6 @@ usr/lib/squid/basic_smb_auth
 usr/lib/squid/basic_smb_auth.sh
 #usr/lib/squid/cachemgr.cgi
 usr/lib/squid/cert_tool
-usr/lib/squid/cert_valid.pl
 usr/lib/squid/digest_file_auth
 usr/lib/squid/digest_ldap_auth
 usr/lib/squid/diskd

diff --git a/config/rootfiles/core/90/filelists/fireinfo b/config/rootfiles/core/90/filelists/fireinfo
new file mode 120000 (symlink)
index 0000000..c461155
--- /dev/null
+++ b/config/rootfiles/core/90/filelists/fireinfo
@@ -0,0 +1 @@
+../../../common/fireinfo
\ No newline at end of file

diff --git a/lfs/fireinfo b/lfs/fireinfo
index e63bdc812cff1b4e5f509ef5c60756591a40c500..9d657653ec1ac27f5d1853682f84729b0ceafc0c 100644 (file)
--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -71,6 +71,7 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-Skip-search-for-hypervisor-name-when-the-CPU-string-.patch
 
        cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
        cd $(DIR_APP) && ./configure --prefix=/usr

diff --git a/src/patches/fireinfo-Skip-search-for-hypervisor-name-when-the-CPU-string-.patch b/src/patches/fireinfo-Skip-search-for-hypervisor-name-when-the-CPU-string-.patch
new file mode 100644 (file)
index 0000000..24a8ca1
--- /dev/null
+++ b/src/patches/fireinfo-Skip-search-for-hypervisor-name-when-the-CPU-string-.patch
@@ -0,0 +1,34 @@
+From c667589410912ca980a78f417e86dd6585d58f9a Mon Sep 17 00:00:00 2001
+From: Michael Tremer <michael.tremer@ipfire.org>
+Date: Mon, 4 May 2015 16:00:31 +0200
+Subject: [PATCH] Skip search for hypervisor name when the CPU string is empty
+
+---
+ src/_fireinfo/fireinfo.c | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/_fireinfo/fireinfo.c b/src/_fireinfo/fireinfo.c
+index fc639d9d4cd9..6601c21a733f 100644
+--- a/src/_fireinfo/fireinfo.c
++++ b/src/_fireinfo/fireinfo.c
+@@ -156,11 +156,12 @@ int detect_hypervisor(int *hypervisor) {
+ 
+               *hypervisor = HYPER_OTHER;
+ 
+-              int id;
+-              for (id = HYPER_NONE + 1; id < HYPER_LAST; id++) {
+-                      if (strcmp(hypervisor_ids[id], sig.text) == 0) {
+-                              *hypervisor = id;
+-                              break;
++              if (*sig.text) {
++                      for (int id = HYPER_NONE + 1; id < HYPER_LAST; id++) {
++                              if (strcmp(hypervisor_ids[id], sig.text) == 0) {
++                                      *hypervisor = id;
++                                      break;
++                              }
+                       }
+               }
+ 
+-- 
+2.1.0
+