From b7ae3da30ad20b514b14111efc6c60e9202254f0 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 7 Mar 2013 19:04:24 +0200 Subject: [PATCH 1/3] SABnzbd-Suite: oops. forgot to update default.py (configobj moved) --- .../service/downloadmanager/SABnzbd-Suite/source/default.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py index b24f34feb4..50317c5684 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py @@ -28,7 +28,6 @@ import urllib2 import socket import time import datetime -from configobj import ConfigObj __scriptname__ = "SABnzbd Suite" __author__ = "OpenELEC" @@ -51,6 +50,9 @@ subprocess.call(['python',__start__]) # check for launching sabnzbd sabNzbdLaunch = (__settings__.getSetting('SABNZBD_LAUNCH').lower() == 'true') +sys.path.append(os.path.join(__cwd__, 'pylib')) +from configobj import ConfigObj + if sabNzbdLaunch: # SABnzbd addresses and api key sabNzbdAddress = '127.0.0.1:8081' From b66a9560c43e9b57e03a96bd73b95eed9232c82b Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 7 Mar 2013 19:06:04 +0200 Subject: [PATCH 2/3] SABnzbd-Suite: bump. again --- .../addons/service/downloadmanager/SABnzbd-Suite/changelog.txt | 3 +++ packages/addons/service/downloadmanager/SABnzbd-Suite/meta | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt b/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt index add2dbfaec..749e0bffac 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt @@ -1,3 +1,6 @@ +3.0.6 +- fix configobj error n startup + 3.0.5 - rebuild. configobj included diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/meta b/packages/addons/service/downloadmanager/SABnzbd-Suite/meta index ac17103e84..08d2a5ee4e 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/meta +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/meta @@ -20,7 +20,7 @@ PKG_NAME="SABnzbd-Suite" PKG_VERSION="3.0" -PKG_REV="5" +PKG_REV="6" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.openelec.tv" From 1c7310c27e18a0f99145f88d3c435fb5855b5fcd Mon Sep 17 00:00:00 2001 From: Daniel Forsberg Date: Thu, 7 Mar 2013 21:32:53 +0100 Subject: [PATCH 3/3] connman: disable unstable dnsproxy in connman, using default dns insteed. --- packages/network/connman/init.d/21_network | 4 ++-- packages/network/connman/install | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/network/connman/init.d/21_network b/packages/network/connman/init.d/21_network index f246e474ef..5f59f96a19 100644 --- a/packages/network/connman/init.d/21_network +++ b/packages/network/connman/init.d/21_network @@ -271,9 +271,9 @@ set_interface() { set_hwclock if [ -f $HOME/.config/debug.connman ]; then - /usr/sbin/connmand -nd > /dev/null 2>&1 + /usr/sbin/connmand -nrd > /dev/null 2>&1 else - /usr/sbin/connmand -n > /dev/null 2>&1 + /usr/sbin/connmand -nr > /dev/null 2>&1 fi usleep 250000 done diff --git a/packages/network/connman/install b/packages/network/connman/install index c7added2b3..3fa8b20eec 100755 --- a/packages/network/connman/install +++ b/packages/network/connman/install @@ -26,7 +26,7 @@ add_user system x 430 430 "service" "/var/run/connman" "/bin/sh" add_group system 430 mkdir -p $INSTALL/etc - cp $PKG_DIR/config/resolv.conf $INSTALL/etc + ln -sf /var/cache/resolv.conf $INSTALL/etc/resolv.conf mkdir -p $INSTALL/etc/connman cp $PKG_DIR/config/main.conf $INSTALL/etc/connman