Merge branch 'obi/master'

diff --combined lib/dvb/dvb.cpp
index 6c353c3,cd6c232..c2ddb40
--- 1/lib/dvb/dvb.cpp
--- 2/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@@ -98,8 -98,6 +98,8 @@@ eDVBResourceManager::eDVBResourceManage
                m_boxtype = DM500HD;
        else if (!strncmp(tmp, "dm800se\n", rd))
                m_boxtype = DM800SE;
 +      else if (!strncmp(tmp, "dm7020hd\n", rd))
 +              m_boxtype = DM7020HD;
        else {
                eDebug("boxtype detection via /proc/stb/info not possible... use fallback via demux count!\n");
                if (m_demux.size() == 3)
@@@ -110,7 -108,7 +110,7 @@@
                        m_boxtype = DM8000;
        }
  
-       eDebug("found %d adapter, %d frontends(%d sim) and %d demux, boxtype %d",
+       eDebug("found %zd adapter, %zd frontends(%zd sim) and %zd demux, boxtype %d",
                m_adapter.size(), m_frontend.size(), m_simulate_frontend.size(), m_demux.size(), m_boxtype);
  
        eDVBCAService::registerChannelCallback(this);
@@@ -336,7 -334,7 +336,7 @@@ PyObject *eDVBResourceManager::setFront
        }
        if (assigned != m_frontend.size()) {
                char blasel[256];
-               sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations .. assigned %d socket informations, but %d registered frontends!",
+               sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations .. assigned %zd socket informations, but %d registered frontends!",
                        m_frontend.size(), assigned);
                PyErr_SetString(PyExc_StandardError, blasel);
                return NULL;
@@@ -522,7 -520,7 +522,7 @@@ RESULT eDVBResourceManager::allocateDem
                        }
                }
        }
 -      else if (m_boxtype == DM8000)
 +      else if (m_boxtype == DM8000 || m_boxtype == DM7020HD)
        {
                cap |= capHoldDecodeReference; // this is checked in eDVBChannel::getDemux
                for (; i != m_demux.end(); ++i, ++n)
@@@ -1490,7 -1488,7 +1490,7 @@@ void eDVBChannel::getNextSourceSpan(off
                                size = max;
                        else
                                size = aligned_end - current_offset;
-                       eDebug("HIT, %lld < %lld < %lld, size: %d", i->first, current_offset, i->second, size);
+                       eDebug("HIT, %lld < %lld < %lld, size: %zd", i->first, current_offset, i->second, size);
                        return;
                }
                if (current_offset < aligned_start)
@@@ -1531,10 -1529,10 +1531,10 @@@
                                        len = aligned_end - aligned_start;
  
                                start = aligned_end - len;
-                               eDebug("skipping to %llx, %d", start, len);
+                               eDebug("skipping to %llx, %zd", start, len);
                        }
  
-                       eDebug("result: %llx, %x (%llx %llx)", start, size, aligned_start, aligned_end);
+                       eDebug("result: %llx, %zx (%llx %llx)", start, size, aligned_start, aligned_end);
                        return;
                }
        }
@@@ -1550,7 -1548,7 +1550,7 @@@
        {
                start = current_offset;
                size = max;
-               eDebug("NO CUESHEET. (%08llx, %d)", start, size);
+               eDebug("NO CUESHEET. (%08llx, %zd)", start, size);
        } else
        {
                start = current_offset;

diff --combined lib/service/servicedvb.cpp
index 3e58091,2f07ce4..914d6bf
--- 1/lib/service/servicedvb.cpp
--- 2/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@@ -905,7 -905,7 +905,7 @@@ RESULT eServiceFactoryDVB::lookupServic
                /* we are sure to have a ..DVB reference as the info() call was forwarded here according to it's ID. */
                if ((err = db->getService((eServiceReferenceDVB&)ref, service)) != 0)
                {
 -                      eDebug("getService failed!");
 +//                    eDebug("getService failed!");
                        return err;
                }
        }
@@@ -2403,7 -2403,7 +2403,7 @@@ void eDVBServicePlay::updateDecoder(boo
                eDebug("getting program info failed.");
        else
        {
-               eDebugNoNewLine("have %d video stream(s)", program.videoStreams.size());
+               eDebugNoNewLine("have %zd video stream(s)", program.videoStreams.size());
                if (!program.videoStreams.empty())
                {
                        eDebugNoNewLine(" (");
@@@ -2422,7 -2422,7 +2422,7 @@@
                        }
                        eDebugNoNewLine(")");
                }
-               eDebugNoNewLine(", and %d audio stream(s)", program.audioStreams.size());
+               eDebugNoNewLine(", and %zd audio stream(s)", program.audioStreams.size());
                if (!program.audioStreams.empty())
                {
                        eDebugNoNewLine(" (");
@@@ -2599,7 -2599,7 +2599,7 @@@ void eDVBServicePlay::loadCuesheet(
                        m_cue_entries.insert(cueEntry(where, what));
                }
                fclose(f);
-               eDebug("%d entries", m_cue_entries.size());
+               eDebug("%zd entries", m_cue_entries.size());
        } else
                eDebug("cutfile not found!");
        

diff --combined main/bsod.cpp
index 5b01c7c,12d8dc2..a119432
--- 1/main/bsod.cpp
--- 2/main/bsod.cpp
+++ b/main/bsod.cpp
@@@ -183,7 -183,6 +183,7 @@@ void bsodFatal(const char *component
                xml.open("image");
                xml.stringFromFile("dreamboxmodel", "/proc/stb/info/model");
                xml.stringFromFile("kernelcmdline", "/proc/cmdline");
 +              xml.stringFromFile("nimsockets", "/proc/bus/nim_sockets");
                if (!getConfigBool("config.plugins.crashlogautosubmit.sendAnonCrashlog", true)) {
                        xml.cDataFromFile("dreamboxca", "/proc/stb/info/ca");
                        xml.cDataFromFile("enigma2settings", eEnv::resolve("${sysconfdir}/enigma2/settings"), ".password=");
@@@ -200,9 -199,9 +200,9 @@@
                xml.close();
  
                xml.open("software");
-               xml.cDataFromCmd("enigma2software", "ipkg list_installed | grep enigma2");
-               xml.cDataFromCmd("dreamboxsoftware", "ipkg list_installed | grep dream");
-               xml.cDataFromCmd("gstreamersoftware", "ipkg list_installed | grep gst");
+               xml.cDataFromCmd("enigma2software", "opkg list_installed | grep enigma2");
+               xml.cDataFromCmd("dreamboxsoftware", "opkg list_installed | grep dream");
+               xml.cDataFromCmd("gstreamersoftware", "opkg list_installed | grep gst");
                xml.close();
  
                xml.open("crashlogs");