From 4d81ab2da9e1bbacd0e536363f179936146b6e4f Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 12 Jun 2013 16:04:44 +0300
Subject: [PATCH 1/5] oscam: update to oscam-8695 & improve suspend/resume

---
 packages/addons/service/softcam/oscam/changelog.txt       | 4 ++++
 packages/addons/service/softcam/oscam/meta                | 4 ++--
 .../service/softcam/oscam/source/sleep.d/oscam.power      | 8 ++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/addons/service/softcam/oscam/changelog.txt b/packages/addons/service/softcam/oscam/changelog.txt
index bf831d8ce7..5cfabd511a 100644
--- a/packages/addons/service/softcam/oscam/changelog.txt
+++ b/packages/addons/service/softcam/oscam/changelog.txt
@@ -1,3 +1,7 @@
+3.0.12
+- update to oscam-8695
+- improve suspend/resume
+
 3.0.11
 - update to oscam-8678
 
diff --git a/packages/addons/service/softcam/oscam/meta b/packages/addons/service/softcam/oscam/meta
index 546432afe1..0d1509a15d 100644
--- a/packages/addons/service/softcam/oscam/meta
+++ b/packages/addons/service/softcam/oscam/meta
@@ -20,8 +20,8 @@
 ################################################################################
 
 PKG_NAME="oscam"
-PKG_VERSION="8678"
-PKG_REV="11"
+PKG_VERSION="8695"
+PKG_REV="12"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.streamboard.tv/oscam/wiki"
diff --git a/packages/addons/service/softcam/oscam/source/sleep.d/oscam.power b/packages/addons/service/softcam/oscam/source/sleep.d/oscam.power
index c2db86d947..1989f1fbe0 100644
--- a/packages/addons/service/softcam/oscam/source/sleep.d/oscam.power
+++ b/packages/addons/service/softcam/oscam/source/sleep.d/oscam.power
@@ -41,6 +41,14 @@ if [ "$RESTART_ON_RESUME" == "true" ] ; then
     thaw|resume)
       progress "Restarting oscam for wakeup..."
       if [ -f "$LOCKFILE" ] ; then
+        oscam.stop
+        for seq in `seq 1 10` ; do
+          if [ ! "$(pidof oscam)" ];then
+            break
+          fi
+          usleep 500000
+        done
+        killall -9 oscam &>/dev/null
         rm -rf "$LOCKFILE"
         oscam.start
       fi

From ef15c901fe0dc90e426cba28192d49ccdeca49c2 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 12 Jun 2013 16:05:21 +0300
Subject: [PATCH 2/5] tvheadend: improve suspend/resume

---
 .../addons/service/multimedia/tvheadend/changelog.txt     | 3 +++
 packages/addons/service/multimedia/tvheadend/meta         | 2 +-
 .../multimedia/tvheadend/source/sleep.d/tvheadend.power   | 8 ++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/addons/service/multimedia/tvheadend/changelog.txt b/packages/addons/service/multimedia/tvheadend/changelog.txt
index 10033e2556..67acaa1f2b 100644
--- a/packages/addons/service/multimedia/tvheadend/changelog.txt
+++ b/packages/addons/service/multimedia/tvheadend/changelog.txt
@@ -1,3 +1,6 @@
+3.0.11
+- improve suspend/resume
+
 3.0.10
 - fix preloading capmt.so with sundtek
 - added the ability to use a script's stdout as the xmltv source instead of a fixed file or URL
diff --git a/packages/addons/service/multimedia/tvheadend/meta b/packages/addons/service/multimedia/tvheadend/meta
index 45975736c7..6db2ca25f5 100644
--- a/packages/addons/service/multimedia/tvheadend/meta
+++ b/packages/addons/service/multimedia/tvheadend/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="tvheadend"
 PKG_VERSION="3.4"
-PKG_REV="10"
+PKG_REV="11"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
diff --git a/packages/addons/service/multimedia/tvheadend/source/sleep.d/tvheadend.power b/packages/addons/service/multimedia/tvheadend/source/sleep.d/tvheadend.power
index 80554f4ed3..7fd90f9d3a 100755
--- a/packages/addons/service/multimedia/tvheadend/source/sleep.d/tvheadend.power
+++ b/packages/addons/service/multimedia/tvheadend/source/sleep.d/tvheadend.power
@@ -50,6 +50,14 @@ case "$1" in
       for module in $REMOVE_MODULES ; do
         modprobe $module
       done
+      tvheadend.stop
+      for seq in `seq 1 10` ; do
+        if [ ! "$(pidof tvheadend)" ];then
+          break
+        fi
+        usleep 500000
+      done
+      killall -9 tvheadend &>/dev/null
       rm -rf "$LOCKFILE"
       tvheadend.start
     fi

From a01212ec64bbcb4e89de200119cc7d6cbd15585e Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 12 Jun 2013 16:05:35 +0300
Subject: [PATCH 3/5] vdr-addon: improve suspend/resume

---
 .../addons/service/multimedia/vdr-addon/changelog.txt     | 3 +++
 packages/addons/service/multimedia/vdr-addon/meta         | 2 +-
 .../service/multimedia/vdr-addon/source/sleep.d/vdr.power | 8 ++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/addons/service/multimedia/vdr-addon/changelog.txt b/packages/addons/service/multimedia/vdr-addon/changelog.txt
index f90ad45f28..b4231be586 100644
--- a/packages/addons/service/multimedia/vdr-addon/changelog.txt
+++ b/packages/addons/service/multimedia/vdr-addon/changelog.txt
@@ -1,3 +1,6 @@
+3.0.10
+- improve suspend/resume
+
 3.0.9
 - rebuild
 
diff --git a/packages/addons/service/multimedia/vdr-addon/meta b/packages/addons/service/multimedia/vdr-addon/meta
index 15d6e9ec69..ed5a862813 100644
--- a/packages/addons/service/multimedia/vdr-addon/meta
+++ b/packages/addons/service/multimedia/vdr-addon/meta
@@ -21,7 +21,7 @@
 
 PKG_NAME="vdr-addon"
 PKG_VERSION="3.0"
-PKG_REV="9"
+PKG_REV="10"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
diff --git a/packages/addons/service/multimedia/vdr-addon/source/sleep.d/vdr.power b/packages/addons/service/multimedia/vdr-addon/source/sleep.d/vdr.power
index 13fa7beeef..59b037f014 100644
--- a/packages/addons/service/multimedia/vdr-addon/source/sleep.d/vdr.power
+++ b/packages/addons/service/multimedia/vdr-addon/source/sleep.d/vdr.power
@@ -50,6 +50,14 @@ case "$1" in
       for module in $REMOVE_MODULES ; do
         modprobe $module
       done
+      vdr.stop
+      for seq in `seq 1 10` ; do
+        if [ ! "$(pidof vdr.bin)" ];then
+          break
+        fi
+        usleep 500000
+      done
+      killall -9 vdr.bin &>/dev/null
       rm -rf "$LOCKFILE"
       vdr.start
     fi

From d32fcd1617e59c58c9e25cf1a9edb95f41b8fb14 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 12 Jun 2013 19:29:16 +0300
Subject: [PATCH 4/5] connman: update to connman-475a695

---
 packages/network/connman/meta | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/network/connman/meta b/packages/network/connman/meta
index d0841589c2..425fa7bb54 100644
--- a/packages/network/connman/meta
+++ b/packages/network/connman/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="connman"
-PKG_VERSION="0515b22"
+PKG_VERSION="475a695"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

From 7c773ff398fa91c0e012cc9bbc125d705933e94f Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 12 Jun 2013 22:16:31 +0300
Subject: [PATCH 5/5] busybox: increase ash history size

---
 packages/sysutils/busybox/config/busybox.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf
index ca64ec0dfd..2a03a2794c 100644
--- a/packages/sysutils/busybox/config/busybox.conf
+++ b/packages/sysutils/busybox/config/busybox.conf
@@ -104,7 +104,7 @@ CONFIG_FEATURE_USE_TERMIOS=y
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
 # CONFIG_FEATURE_EDITING_VI is not set
-CONFIG_FEATURE_EDITING_HISTORY=15
+CONFIG_FEATURE_EDITING_HISTORY=200
 CONFIG_FEATURE_EDITING_SAVEHISTORY=y
 CONFIG_FEATURE_EDITING_SAVE_ON_EXIT=y
 CONFIG_FEATURE_REVERSE_SEARCH=y