diff --git a/packages/addons/service/oscam/changelog.txt b/packages/addons/service/oscam/changelog.txt
index 2542ab4073..adb6790acd 100644
--- a/packages/addons/service/oscam/changelog.txt
+++ b/packages/addons/service/oscam/changelog.txt
@@ -1,3 +1,7 @@
+105
+- update OScam to 11420
+- add SSL support
+
104
- update OSCam to 11391
diff --git a/packages/addons/service/oscam/package.mk b/packages/addons/service/oscam/package.mk
index 19416a59d5..2dea1b55a7 100644
--- a/packages/addons/service/oscam/package.mk
+++ b/packages/addons/service/oscam/package.mk
@@ -1,6 +1,6 @@
################################################################################
# This file is part of LibreELEC - https://libreelec.tv
-# Copyright (C) 2016-2017 Team LibreELEC
+# Copyright (C) 2016-present Team LibreELEC
#
# LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -17,10 +17,10 @@
################################################################################
PKG_NAME="oscam"
-PKG_VERSION="2563c02"
-PKG_SHA256="2a025a1697dec8a4432bf40be7ba14f71e09879da2826e5789b4cb153e834f87"
-PKG_VERSION_NUMBER="11391"
-PKG_REV="104"
+PKG_VERSION="d785952"
+PKG_SHA256="3f698e522b8d47667a2c2841f75d5d790613664a8eea460f98b396ed7ca22c90"
+PKG_VERSION_NUMBER="11420"
+PKG_REV="105"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.streamboard.tv/oscam/wiki"
@@ -35,9 +35,10 @@ PKG_ADDON_NAME="OSCam"
PKG_ADDON_TYPE="xbmc.service"
PKG_CMAKE_OPTS_TARGET="-DLIBUSBDIR=$SYSROOT_PREFIX/usr \
- -DWITH_SSL=0 \
- -DHAVE_LIBCRYPTO=0 \
- -DHAVE_DVBAPI=1 -DWITH_STAPI=0 \
+ -DWITH_SSL=1 \
+ -DHAVE_LIBCRYPTO=1 \
+ -DHAVE_DVBAPI=1 \
+ -DWITH_STAPI=0 \
-DWEBIF=1 \
-DWITH_DEBUG=0 \
-DOPTIONAL_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include \
@@ -49,7 +50,7 @@ pre_configure_target() {
}
makeinstall_target() {
- : # nop
+ :
}
addon() {
diff --git a/packages/addons/service/oscam/patches/oscam-01-revision.patch b/packages/addons/service/oscam/patches/oscam-01-revision.patch
index 201666456e..73f8aca6f4 100644
--- a/packages/addons/service/oscam/patches/oscam-01-revision.patch
+++ b/packages/addons/service/oscam/patches/oscam-01-revision.patch
@@ -1,13 +1,11 @@
-diff --git a/config.sh b/config.sh
-index 7653731..a6b2ea8 100755
--- a/config.sh
+++ b/config.sh
-@@ -687,7 +687,7 @@ do
+@@ -689,7 +689,7 @@ do
break
;;
'-r'|'--oscam-revision')
-- (svnversion -n . 2>/dev/null || printf 0) | sed 's/.*://; s/[^0-9]*$//; s/^$/0/'
+- revision=`(svnversion -n . 2>/dev/null || printf 0) | sed 's/.*://; s/[^0-9]*$//; s/^$/0/'`
+ echo "$OSCAM_ADDON_VERSION"
- break
- ;;
- '-O'|'--detect-osx-sdk-version')
+ if [ "$revision" = "0" ]
+ then
+ which git > /dev/null 2>&1 && revision=`git log -1 --pretty=%B | grep git-svn-id | sed -n -e 's/^.*trunk@\([0-9]*\) .*$/\1/p'`
diff --git a/packages/addons/service/oscam/source/bin/oscam.start b/packages/addons/service/oscam/source/bin/oscam.start
index 23ae9d2bee..1d263ce61e 100755
--- a/packages/addons/service/oscam/source/bin/oscam.start
+++ b/packages/addons/service/oscam/source/bin/oscam.start
@@ -1,8 +1,8 @@
#!/bin/sh
################################################################################
-# This file is part of LibreELEC - https://LibreELEC.tv
-# Copyright (C) 2016 Team LibreELEC
+# This file is part of LibreELEC - https://libreelec.tv
+# Copyright (C) 2016-present Team LibreELEC
#
# LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/packages/addons/service/oscam/source/default.py b/packages/addons/service/oscam/source/default.py
index c6dfcce9f2..9cba488d77 100644
--- a/packages/addons/service/oscam/source/default.py
+++ b/packages/addons/service/oscam/source/default.py
@@ -1,6 +1,6 @@
################################################################################
-# This file is part of LibreELEC - https://LibreELEC.tv
-# Copyright (C) 2016 Team LibreELEC
+# This file is part of LibreELEC - https://libreelec.tv
+# Copyright (C) 2016-present Team LibreELEC
#
# LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/packages/addons/service/oscam/source/oscam-default.conf b/packages/addons/service/oscam/source/oscam-default.conf
index ac5da7844c..4357311a28 100644
--- a/packages/addons/service/oscam/source/oscam-default.conf
+++ b/packages/addons/service/oscam/source/oscam-default.conf
@@ -1,11 +1,14 @@
-# oscam.conf generated automatically by Streamboard OSCAM 1.00-unstable_svn build #0
-# Read more: http://streamboard.gmc.to/svn/oscam/trunk/Distribution/doc/txt/oscam.conf.txt
+#
+# main configuration
+#
[global]
+nice = -1
+WaitForCards = 1
+
usrfile = /storage/.kodi/userdata/addon_data/service.softcam.oscam/log/oscamuser.log
logfile = /storage/.kodi/userdata/addon_data/service.softcam.oscam/log/oscam.log
cwlogdir = /storage/.kodi/userdata/addon_data/service.softcam.oscam/log/cw
-nice = -1
saveinithistory = 1
[monitor]
diff --git a/packages/addons/service/oscam/source/resources/language/English/strings.po b/packages/addons/service/oscam/source/resources/language/English/strings.po
new file mode 100644
index 0000000000..61414741dd
--- /dev/null
+++ b/packages/addons/service/oscam/source/resources/language/English/strings.po
@@ -0,0 +1,34 @@
+# Kodi Media Center language file
+# Addon Name: oscam
+# Addon id: service.oscam
+# Addon Provider: Team LibreELEC
+msgid ""
+msgstr ""
+
+msgctxt "#30000"
+msgid "General"
+msgstr ""
+
+msgctxt "#30001"
+msgid "Restart on suspend / resume"
+msgstr ""
+
+msgctxt "#30002"
+msgid "DVBAPI"
+msgstr ""
+
+msgctxt "#30003"
+msgid "Delay the start of OSCam"
+msgstr ""
+
+msgctxt "#30004"
+msgid "time (s)"
+msgstr ""
+
+msgctxt "#30005"
+msgid "Wait for frontend initialization"
+msgstr ""
+
+msgctxt "#30006"
+msgid "Number of adapters to wait for"
+msgstr ""
diff --git a/packages/addons/service/oscam/source/resources/language/English/strings.xml b/packages/addons/service/oscam/source/resources/language/English/strings.xml
deleted file mode 100644
index adb080f372..0000000000
--- a/packages/addons/service/oscam/source/resources/language/English/strings.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- General
- Restart on suspend / resume
- DVBAPI
- Delay the start of OSCam
- time (s)
- Wait for frontend initialization
- Number of adapters to wait for
-
diff --git a/packages/addons/service/oscam/source/resources/settings.xml b/packages/addons/service/oscam/source/resources/settings.xml
index 669656f8c9..524fdff758 100644
--- a/packages/addons/service/oscam/source/resources/settings.xml
+++ b/packages/addons/service/oscam/source/resources/settings.xml
@@ -1,14 +1,14 @@
-
+
-
-
-
+
+
+
-
+
-
-
+
+
diff --git a/packages/addons/service/oscam/source/settings-default.xml b/packages/addons/service/oscam/source/settings-default.xml
index 2c9c856108..c1244edcce 100644
--- a/packages/addons/service/oscam/source/settings-default.xml
+++ b/packages/addons/service/oscam/source/settings-default.xml
@@ -1,7 +1,7 @@
-
-
-
-
-
-
+
+ 1
+ false
+ false
+ false
+ 1