From b4bd2ec8207dfdc0c17ef0e27ba5eb3f0421b6f4 Mon Sep 17 00:00:00 2001
From: FlatTV <FlatTV@gmx.de>
Date: Sun, 8 Oct 2017 15:01:24 +0200
Subject: [PATCH 1/2] FIM: rework versions query with Firmware > 06.9

---
 .../FritzInfoMonitor/connect.cpp              | 22 ++++++++++++++++---
 .../FritzInfoMonitor/globals.h                |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/archive-sources/FritzCallMonitor/FritzInfoMonitor/connect.cpp b/archive-sources/FritzCallMonitor/FritzInfoMonitor/connect.cpp
index 21a5e4b4..e4128e21 100644
--- a/archive-sources/FritzCallMonitor/FritzInfoMonitor/connect.cpp
+++ b/archive-sources/FritzCallMonitor/FritzInfoMonitor/connect.cpp
@@ -581,7 +581,7 @@ int CConnect::get_query_logic(const char *sid, int logic)
 	log(1,"%s()\n", __FUNCTION__);
 
 	url	<< cpars->getFritzAdr() << "/query.lua?sid=" << sid
-		<< "&ver=logic:status/nspver";
+		<< "&ver=uimodlogic:status/nspver"; //Firmware > 06.9
 
 	string s = post2fritz(url.str().c_str(), "");
 	string res = cpars->parseString("ver", s);
@@ -593,9 +593,25 @@ int CConnect::get_query_logic(const char *sid, int logic)
 		query_logic = 3;
 		return (query_logic);
 	}
-	else {
-		return (get_OLDquery_logic(sid, logic));
+	else
+	{
+		url.str("");
+		url	<< cpars->getFritzAdr() << "/query.lua?sid=" << sid
+		<< "&ver=logic:status/nspver"; //Firmware < 06.9
+
+		s = post2fritz(url.str().c_str(), "");
+		res = cpars->parseString("ver", s);
+
+		if(!res.empty() && (pos = res.find('.')) != string::npos)
+		{
+			log(0,"Firmwareversion (%s)\n", res.c_str());
+			cpars->setNspver(res);
+			query_logic = 3;
+			return (query_logic);
+		}
 	}
+
+	return (get_OLDquery_logic(sid, logic));
 }
 
 int CConnect::get_OLDquery_logic(const char *sid, int logic)
diff --git a/archive-sources/FritzCallMonitor/FritzInfoMonitor/globals.h b/archive-sources/FritzCallMonitor/FritzInfoMonitor/globals.h
index 38a4a5a2..354bfb59 100644
--- a/archive-sources/FritzCallMonitor/FritzInfoMonitor/globals.h
+++ b/archive-sources/FritzCallMonitor/FritzInfoMonitor/globals.h
@@ -12,7 +12,7 @@
 #define CONFIGFILE "/var/tuxbox/config/FritzCallMonitor.cfg"
 
 #define BASENAME "FIM"
-#define VERSION "V4.3"
+#define VERSION "V4.4"
 #define COPYR "2011 (c) FlatTV"
 
 /* rc codes */

From c7d93079a3d53654cdde81e95cb7d9819d775af1 Mon Sep 17 00:00:00 2001
From: FlatTV <FlatTV@gmx.de>
Date: Sun, 8 Oct 2017 15:21:44 +0200
Subject: [PATCH 2/2] - ax: change libstb-hal boxtype to hd51

---
 make/neutrino.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/neutrino.mk b/make/neutrino.mk
index 1b409854..acc34c3d 100644
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -146,7 +146,7 @@ $(LH_OBJDIR)/config.status: $(NEUTRINO_DEPS)
 			--enable-shared=no \
 			\
 			--with-target=cdk \
-			--with-boxtype=armbox
+			--with-boxtype=hd51
 
 NEUTRINO_INST_DIR ?= $(TARGETPREFIX)
 $(D)/neutrino: $(N_OBJDIR)/config.status