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

Conflicts:
	packages/network/avahi/init.d/53_avahi
	packages/network/bluez/init.d/55_obexd
	packages/network/openssh/init.d/51_sshd
	packages/network/openssh/scripts/sshd-keygen
	packages/network/samba/scripts/52_samba
	packages/x11/xserver/xorg-server/profile.d/xorg-server.conf

packages/mediacenter/service.openelec.settings/patches.upstream/service.openelec.settings-folders.patch

@@ -0,0 +1,122 @@
+From b0f33807f0dadf11d1b007204607d98d9f17d8f7 Mon Sep 17 00:00:00 2001
+From: lufi <lutz@fiebach.de>
+Date: Sun, 18 Aug 2013 22:16:45 +0200
+Subject: [PATCH 1/3] Update defaults.py
+
+---
+ defaults.py | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/defaults.py b/defaults.py
+index 7a582de..16e78e8 100755
+--- a/defaults.py
++++ b/defaults.py
+@@ -144,11 +144,11 @@
+ 
+ _services = \
+     {
+-        "sshd"      : ["sshd.service"],
+-        "avahi"     : ["avahi-daemon.service"],
+-        "samba"     : ["nmbd.service", "smbd.service"],
+-        "bluetooth" : ["bluetooth.service"],
+-        "obexd"     : ["obex.service"],
+-        "syslog"    : ["syslog.service"],
+-        "cron"      : ["cron.service"],
+-    }
+\ No newline at end of file
++        "sshd"   : ["sshd.service"],
++        "avahi"  : ["avahi-daemon.service"],
++        "samba"  : ["nmbd.service", "smbd.service"],
++        "bluez"  : ["bluetooth.service"],
++        "obexd"  : ["obex.service"],
++        "syslog" : ["syslog.service"],
++        "cron"   : ["cron.service"],
++    }
+-- 
+1.8.1.6
+
+
+From 26d02eb4b2ca01e975a4c0b4c8a91a8010147cbf Mon Sep 17 00:00:00 2001
+From: lufi <lutz@fiebach.de>
+Date: Sun, 18 Aug 2013 22:21:28 +0200
+Subject: [PATCH 2/3] change old service config files to .cache/services/ dir
+
+---
+ oe.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/oe.py b/oe.py
+index 7df2ba2..d3db4b4 100755
+--- a/oe.py
++++ b/oe.py
+@@ -213,7 +213,7 @@ def set_service_option(service, option, value):
+         lines = []        
+         changed = False
+ 
+-        conf_file_name = '%s/service_%s.conf' % (CONFIG_CACHE, service)
++        conf_file_name = '%s/services/%s.conf' % (CONFIG_CACHE, service)
+                         
+         if os.path.isfile(conf_file_name):
+             with open(conf_file_name, "r") as conf_file:
+@@ -239,7 +239,7 @@ def get_service_option(service, option, default=None):
+         conf_file_name = ''
+         
+         if not SYSTEMD:
+-            conf_file_name = '%s/service_%s.conf' % (CONFIG_CACHE, service)
++            conf_file_name = '%s/services/%s.conf' % (CONFIG_CACHE, service)
+         else:
+             if os.path.exists('%s/services/%s.conf' % (CONFIG_CACHE, service)):
+                 conf_file_name = '%s/services/%s.conf' % (CONFIG_CACHE, service)
+-- 
+1.8.1.6
+
+
+From adfcc15ae01cecc78a63613d2b46f08b8e7f6713 Mon Sep 17 00:00:00 2001
+From: lufi <lutz@fiebach.de>
+Date: Mon, 19 Aug 2013 13:34:13 +0200
+Subject: [PATCH 3/3] Update services.py
+
+---
+ resources/lib/modules/services.py | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/resources/lib/modules/services.py b/resources/lib/modules/services.py
+index 9ec987b..d4d96a6 100755
+--- a/resources/lib/modules/services.py
++++ b/resources/lib/modules/services.py
+@@ -399,12 +399,12 @@ def load_values(self):
+                             self.struct['bluez']['settings']['enabled']['value'] = '0'
+                             
+                         if os.path.isfile(self.oe.dictModules['bluetooth'].OBEX_DAEMON):  
+-                            if self.oe.get_service_option('bluez', 'OBEXD_ENABLED', 'true') == 'true':
++                            if self.oe.get_service_option('obexd', 'OBEXD_ENABLED', 'true') == 'true':
+                                 self.struct['bluez']['settings']['obex_enabled']['value'] = '1'
+                             else:
+                                 self.struct['bluez']['settings']['obex_enabled']['value'] = '0'                        
+ 
+-                            tmpVal = self.oe.get_service_option('bluez', 'OBEXD_ROOT', 
++                            tmpVal = self.oe.get_service_option('obexd', 'OBEXD_ROOT', 
+                                                                 self.oe.dictModules['bluetooth'].D_OBEXD_ROOT)
+                             if not tmpVal is None:
+                                 self.struct['bluez']['settings']['obex_root']['value'] = tmpVal 
+@@ -946,14 +946,14 @@ def init_bluetooth(self, **kwargs):
+             if not self.oe.SYSTEMD: 
+                 if self.struct['bluez']['settings']['obex_enabled']['value'] == '0':
+                     
+-                    self.oe.set_service_option('bluez',
++                    self.oe.set_service_option('obexd',
+                                                 'OBEXD_ENABLED',
+                                                 'false') 
+                 else:
+-                    self.oe.set_service_option('bluez',
++                    self.oe.set_service_option('obexd',
+                                                 'OBEXD_ENABLED',
+                                                 'true')
+-                    self.oe.set_service_option('bluez',
++                    self.oe.set_service_option('obexd',
+                                                 'OBEXD_ROOT',
+                                                 self.struct['bluez']['settings'
+                                                         ]['obex_root']['value'])
+-- 
+1.8.1.6
+

packages/mediacenter/xbmc-theme-Confluence/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="12.2-7da5ea4"
+PKG_VERSION="12.2-8e195d7"
 if [ "$XBMC" = "master" ]; then
   PKG_VERSION="13.alpha-df91888"
 elif [ "$XBMC" = "xbmc-aml" ]; then

packages/mediacenter/xbmc/config/advancedsettings.xml

@@ -19,6 +19,6 @@
   </samba>
   <network>
     <curlclienttimeout>30</curlclienttimeout>
-    <readBufferFactor>4.0</readBufferFactor>
+    <readbufferfactor>4.0</readbufferfactor>
   </network>
 </advancedsettings>

packages/mediacenter/xbmc/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="12.2-7da5ea4"
+PKG_VERSION="12.2-8e195d7"
 if [ "$XBMC" = "master" ]; then
   PKG_VERSION="13.alpha-df91888"
 elif [ "$XBMC" = "xbmc-aml" ]; then

packages/network/connman/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="connman"
-PKG_VERSION="38c1662"
+PKG_VERSION="8378438"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/sysutils/busybox/init.d/05_syslogd

@@ -29,8 +29,8 @@
   . /etc/profile
 
   SYSLOG_REMOTE=false
-  if [ -e $CONFIG_CACHE/service_syslog.conf ] ; then
+  if [ -e $CONFIG_CACHE/services/syslog.conf ] ; then
-    . $CONFIG_CACHE/service_syslog.conf
+    . $CONFIG_CACHE/services/syslog.conf
   fi
 
   SYSLOGD_OPTIONS="-L"

packages/sysutils/busybox/scripts/09_crond

@@ -29,8 +29,8 @@
   . /etc/profile
 
   CRON_ENABLED=true
-  if [ -f $CONFIG_CACHE/service_cron.conf ]; then
+  if [ -f $CONFIG_CACHE/services/cron.conf ]; then
-    . $CONFIG_CACHE/service_cron.conf
+    . $CONFIG_CACHE/services/cron.conf
   fi
 
   if [ "$CRON_ENABLED" == "true" ]; then

projects/ARCTIC_MC/xbmc/advancedsettings.xml

@@ -19,7 +19,7 @@
   </samba>
   <network>
     <curlclienttimeout>30</curlclienttimeout>
-    <readBufferFactor>4.0</readBufferFactor>
+    <readbufferfactor>4.0</readbufferfactor>
   </network>
 <!-- audio workaround for fusion -->
   <audiooutput>

projects/ATV/xbmc/advancedsettings.xml

@@ -21,7 +21,7 @@
   </samba>
   <network>
     <curlclienttimeout>30</curlclienttimeout>
-    <readBufferFactor>4.0</readBufferFactor>
+    <readbufferfactor>4.0</readbufferfactor>
   </network>
   <!-- audio workaround for ATV -->
   <audiooutput>

projects/Fusion/xbmc/advancedsettings.xml

@@ -19,7 +19,7 @@
   </samba>
   <network>
     <curlclienttimeout>30</curlclienttimeout>
-    <readBufferFactor>4.0</readBufferFactor>
+    <readbufferfactor>4.0</readbufferfactor>
   </network>
 <!-- audio workaround for fusion -->
   <audiooutput>

projects/RPi/xbmc/advancedsettings.xml

@@ -29,7 +29,7 @@
 
   <network>
     <curlclienttimeout>30</curlclienttimeout>
-    <readBufferFactor>4.0</readBufferFactor>
+    <readbufferfactor>4.0</readbufferfactor>
   </network>
 
 </advancedsettings>