Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.0

packages/mediacenter/xbmc/patches/xbmc-990.18.01-PR2475.patch

@@ -0,0 +1,76 @@
+From e1374217a66d1324f3482f6567448f0bc7ef2946 Mon Sep 17 00:00:00 2001
+From: spiff <spiff@xbmc.org>
+Date: Thu, 21 Mar 2013 14:40:52 +0100
+Subject: [PATCH] fixed: prevent infinite loop in add-on dependency checks
+
+---
+ xbmc/addons/AddonInstaller.cpp | 21 ++++++++++++++-------
+ xbmc/addons/AddonInstaller.h   | 10 ++++++++++
+ 2 files changed, 24 insertions(+), 7 deletions(-)
+
+diff --git a/xbmc/addons/AddonInstaller.cpp b/xbmc/addons/AddonInstaller.cpp
+index b5ba7a0..3e655bb 100644
+--- a/xbmc/addons/AddonInstaller.cpp
++++ b/xbmc/addons/AddonInstaller.cpp
+@@ -313,6 +313,14 @@ void CAddonInstaller::InstallFromXBMCRepo(const set<CStdString> &addonIDs)
+ 
+ bool CAddonInstaller::CheckDependencies(const AddonPtr &addon)
+ {
++  std::vector<std::string> preDeps;
++  preDeps.push_back(addon->ID());
++  return CheckDependencies(addon, preDeps);
++}
++
++bool CAddonInstaller::CheckDependencies(const AddonPtr &addon,
++                                        std::vector<std::string>& preDeps)
++{
+   if (!addon.get())
+     return true; // a NULL addon has no dependencies
+   ADDONDEPS deps = addon->GetDeps();
+@@ -333,16 +341,15 @@ bool CAddonInstaller::CheckDependencies(const AddonPtr &addon)
+         return false;
+       }
+     }
+-    // prevent infinite loops
+-    if (dep && dep->ID() == addon->ID())
+-    {
+-      CLog::Log(LOGERROR, "Addon %s depends on itself, ignoring", addon->ID().c_str());
+-      return false;
+-    }
+     // at this point we have our dep, or the dep is optional (and we don't have it) so check that it's OK as well
+     // TODO: should we assume that installed deps are OK?
+-    if (dep && !CheckDependencies(dep))
++    if (dep && 
++       std::find(preDeps.begin(), preDeps.end(), dep->ID()) == preDeps.end() &&
++       !CheckDependencies(dep, preDeps))
++    {
+       return false;
++    }
++    preDeps.push_back(dep->ID());
+   }
+   return true;
+ }
+diff --git a/xbmc/addons/AddonInstaller.h b/xbmc/addons/AddonInstaller.h
+index b0ff2bd..5df69fb 100644
+--- a/xbmc/addons/AddonInstaller.h
++++ b/xbmc/addons/AddonInstaller.h
+@@ -122,6 +122,16 @@ class CAddonInstaller : public IJobCallback
+    */
+   bool DoInstall(const ADDON::AddonPtr &addon, const CStdString &hash = "", bool update = false, const CStdString &referer = "", bool background = true);
+ 
++  /*! \brief Check whether dependencies of an addon exist or are installable.
++   Iterates through the addon's dependencies, checking they're installed or installable.
++   Each dependency must also satisfies CheckDependencies in turn.
++   \param addon the addon to check
++   \param preDeps previous dependencies encountered during recursion. aids in avoiding infinite recursion
++   \return true if dependencies are available, false otherwise.
++   */
++  bool CheckDependencies(const ADDON::AddonPtr &addon,
++                         std::vector<std::string>& preDeps);
++
+   void PrunePackageCache();
+   int64_t EnumeratePackageFolder(std::map<CStdString,CFileItemList*>& result);
+ 
+-- 
+1.8.1.5
+

packages/mediacenter/xbmc/patches/xbmc-990.18.02-PR2475.patch

@@ -0,0 +1,37 @@
+From b5458130ba00c15ef468d6180a21994bff3daf42 Mon Sep 17 00:00:00 2001
+From: Voyager1 <voyager@xbmc.org>
+Date: Sat, 23 Mar 2013 07:32:09 +0100
+Subject: [PATCH] fixed: addoninstaller unguarded null pointer after
+ b0825b1a212849e52fca27409ea87e81591f7cf4
+
+---
+ xbmc/addons/AddonInstaller.cpp | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/xbmc/addons/AddonInstaller.cpp b/xbmc/addons/AddonInstaller.cpp
+index 3e655bb..276467a 100644
+--- a/xbmc/addons/AddonInstaller.cpp
++++ b/xbmc/addons/AddonInstaller.cpp
+@@ -343,13 +343,14 @@ bool CAddonInstaller::CheckDependencies(const AddonPtr &addon,
+     }
+     // at this point we have our dep, or the dep is optional (and we don't have it) so check that it's OK as well
+     // TODO: should we assume that installed deps are OK?
+-    if (dep && 
+-       std::find(preDeps.begin(), preDeps.end(), dep->ID()) == preDeps.end() &&
+-       !CheckDependencies(dep, preDeps))
++    if (dep)
+     {
+-      return false;
++      if (std::find(preDeps.begin(), preDeps.end(), dep->ID()) == preDeps.end() &&
++       !CheckDependencies(dep, preDeps))
++        return false;
++      else
++        preDeps.push_back(dep->ID());
+     }
+-    preDeps.push_back(dep->ID());
+   }
+   return true;
+ }
+-- 
+1.8.1.5
+

packages/mediacenter/xbmc/patches/xbmc-990.18.03-PR2475.patch

@@ -0,0 +1,33 @@
+From cc39b66b38657787e99bf6369a77c993cd601c23 Mon Sep 17 00:00:00 2001
+From: ulion <ulion2002@gmail.com>
+Date: Sun, 24 Mar 2013 08:05:04 +0800
+Subject: [PATCH] Only add to preDeps when it's not in there.
+
+---
+ xbmc/addons/AddonInstaller.cpp | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/xbmc/addons/AddonInstaller.cpp b/xbmc/addons/AddonInstaller.cpp
+index 276467a..631a01c 100644
+--- a/xbmc/addons/AddonInstaller.cpp
++++ b/xbmc/addons/AddonInstaller.cpp
+@@ -343,13 +343,11 @@ bool CAddonInstaller::CheckDependencies(const AddonPtr &addon,
+     }
+     // at this point we have our dep, or the dep is optional (and we don't have it) so check that it's OK as well
+     // TODO: should we assume that installed deps are OK?
+-    if (dep)
++    if (dep && std::find(preDeps.begin(), preDeps.end(), dep->ID()) == preDeps.end())
+     {
+-      if (std::find(preDeps.begin(), preDeps.end(), dep->ID()) == preDeps.end() &&
+-       !CheckDependencies(dep, preDeps))
++      if (!CheckDependencies(dep, preDeps))
+         return false;
+-      else
+-        preDeps.push_back(dep->ID());
++      preDeps.push_back(dep->ID());
+     }
+   }
+   return true;
+-- 
+1.8.1.5
+