diff --git a/packages/addons/service/softcam/oscam/addon b/packages/addons/service/softcam/oscam/addon deleted file mode 100755 index 135872f2f0..0000000000 --- a/packages/addons/service/softcam/oscam/addon +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011-2011 Gregor Fuis (gujs@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID - cp -PR $PKG_DIR/config/settings.xml $ADDON_BUILD/$PKG_ADDON_ID/settings-default.xml - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $PKG_BUILD/build/oscam $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $PKG_BUILD/build/utils/list_smargo $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -PR $PKG_DIR/config/oscam.conf $ADDON_BUILD/$PKG_ADDON_ID/oscam-default.conf diff --git a/packages/addons/service/softcam/oscam/build b/packages/addons/service/softcam/oscam/build deleted file mode 100755 index 092142fefb..0000000000 --- a/packages/addons/service/softcam/oscam/build +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011-2011 Gregor Fuis (gujs@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -cd $PKG_BUILD -mkdir -p build && cd build - -cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIBUSBDIR=$SYSROOT_PREFIX/usr \ - -DWITH_SSL=0 \ - -DHAVE_LIBCRYPTO=0 \ - -DHAVE_DVBAPI=1 -DWITH_STAPI=0 \ - -DMODULE_CAMD33=1 \ - -DWEBIF=1 \ - -DWITH_DEBUG=0 \ - -DOPTIONAL_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include \ - -DSTATIC_LIBUSB=1 \ - .. - -make diff --git a/packages/addons/service/softcam/oscam/changelog.txt b/packages/addons/service/softcam/oscam/changelog.txt deleted file mode 100644 index f3270c8096..0000000000 --- a/packages/addons/service/softcam/oscam/changelog.txt +++ /dev/null @@ -1,85 +0,0 @@ -3.1.1 -- rebuild for OpenELEC-3.2 - -3.0.12 -- update to oscam-8695 -- improve suspend/resume - -3.0.11 -- update to oscam-8678 - -3.0.10 -- update to oscam-8636 - -3.0.9 -- update to oscam-8568 - -3.0.8 -- update to oscam-8469 -- update to pcsc-lite-1.8.8 - -3.0.7 -- update to oscam-8357 - -3.0.6 -- update to oscam-8334 - -3.0.5 -- update to oscam-8119 -- use internal crypto functions -- disable ssl support -- disable debug support - -3.0.4 -- update to oscam-8030 -- update to pcsc-lite-1.8.7 - -3.0.3 -- update to oscam-7968 - -3.0.2 -- update to pcsc-lite-1.8.6 - -3.0.1 -- bump addon version - -2.1.7 -- add option to restart on suspend / resume - -2.1.6 -- update to oscam-7168 - -2.1.5 -- update to oscam-7038 -- start userspace DVB drivers before oscam - -2.1.4 -- update to oscam-6626 - * added bulcrypt cas support - -2.1.3 -- update to oscam-6596 - -2.1.2 -- update to oscam-6576 - -2.1.1 -- update to addon version 2.1 - -2.0.3 -- add pcsc reader support - -2.0.2 -- add possibilty to start / stop addon from addon manager with enable / disable - -2.0.1 -- enable libusb support for smartcard support - -2.0.0 -- update to oscam-6136 - -0.99.2 -- update to oscam-5386 - -0.99.1 -- initial version oscam-5377 diff --git a/packages/addons/service/softcam/oscam/config/oscam.conf b/packages/addons/service/softcam/oscam/config/oscam.conf deleted file mode 100644 index f5a0ebc151..0000000000 --- a/packages/addons/service/softcam/oscam/config/oscam.conf +++ /dev/null @@ -1,31 +0,0 @@ -# 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 - -[global] -usrfile = /storage/.xbmc/userdata/addon_data/service.softcam.oscam/log/oscamuser.log -logfile = /storage/.xbmc/userdata/addon_data/service.softcam.oscam/log/oscam.log -cwlogdir = /storage/.xbmc/userdata/addon_data/service.softcam.oscam/log/cw -nice = -1 -saveinithistory = 1 - -[monitor] -port = 988 -aulow = 120 -hideclient_to = 15 -monlevel = 1 -appendchaninfo = 0 - -[webif] -httpport = 8888 -httpuser = oscam -httppwd = oscam -httpallowed = 0.0.0.0-255.255.255.255 - -[anticasc] -enabled = 1 -numusers = 1 -samples = 5 -penalty = 1 -aclogfile = /storage/.xbmc/userdata/addon_data/service.softcam.oscam/log/aclog.log -denysamples = 4 - diff --git a/packages/addons/service/softcam/oscam/config/settings.xml b/packages/addons/service/softcam/oscam/config/settings.xml deleted file mode 100644 index 464b4519ec..0000000000 --- a/packages/addons/service/softcam/oscam/config/settings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/addons/service/softcam/oscam/icon/icon.png b/packages/addons/service/softcam/oscam/icon/icon.png deleted file mode 100644 index b936a07d69..0000000000 Binary files a/packages/addons/service/softcam/oscam/icon/icon.png and /dev/null differ diff --git a/packages/addons/service/softcam/oscam/meta b/packages/addons/service/softcam/oscam/meta deleted file mode 100644 index f367cb0839..0000000000 --- a/packages/addons/service/softcam/oscam/meta +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011-2011 Gregor Fuis (gujs@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="oscam" -PKG_VERSION="8695" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.streamboard.tv/oscam/wiki" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain pcsc-lite" -PKG_PRIORITY="optional" -PKG_SECTION="service/softcam" -PKG_SHORTDESC="oscam: OSCam is Open Source Conditional Access Modul." -PKG_LONGDESC="OSCam is Open Source Conditional Access Modul." -PKG_DISCLAIMER="using oscam may be illegal in your country. if in doubt, do not install" - -PKG_IS_ADDON="yes" -PKG_ADDON_TYPE="xbmc.service" - -PKG_AUTORECONF="no" diff --git a/packages/addons/service/softcam/oscam/patches/oscam-pcsc-pthread.patch b/packages/addons/service/softcam/oscam/patches/oscam-pcsc-pthread.patch deleted file mode 100644 index 4eeee55111..0000000000 --- a/packages/addons/service/softcam/oscam/patches/oscam-pcsc-pthread.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cd52430..b01b9fc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -530,6 +530,7 @@ if (HAVE_PCSC) - if (NOT OSCamOperatingSystem MATCHES "Mac OS X") - if (NOT OSCamOperatingSystem MATCHES "Windows/Cygwin") - target_link_libraries (${exe_name} pcsclite) -+ target_link_libraries (${exe_name} pthread) - endif (NOT OSCamOperatingSystem MATCHES "Windows/Cygwin") - endif (NOT OSCamOperatingSystem MATCHES "Mac OS X") - endif (HAVE_PCSC) diff --git a/packages/addons/service/softcam/oscam/source/bin/oscam.start b/packages/addons/service/softcam/oscam/source/bin/oscam.start deleted file mode 100755 index 34ad21a1ee..0000000000 --- a/packages/addons/service/softcam/oscam/source/bin/oscam.start +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011-2012 Gregor Fuis (gujs@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to the -# Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. /etc/profile - -LOCKDIR="/var/lock/" -LOCKFILE="oscam.disabled" - -# Check if process is already running -# use "$(pidof)" instead of $(pidof). otherwise 'if' statement will fail -# because oscam spawns at least one 'extra' process -if [ ! "$(pidof oscam)" ]; then - - ADDON_DIR="$HOME/.xbmc/addons/service.softcam.oscam" - ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.softcam.oscam" - ADDON_LOG_DIR="$ADDON_HOME/log" - - ADDON_SETTINGS="$ADDON_HOME/settings.xml" - ADDON_CONF_DIR="$ADDON_HOME/config" - ADDON_CONF="$ADDON_CONF_DIR/oscam.conf" - ADDON_CONF_AC="$ADDON_CONF_DIR/oscam.ac" - ADDON_CONF_CERT="$ADDON_CONF_DIR/oscam.cert" - ADDON_CONF_DVBAPI="$ADDON_CONF_DIR/oscam.dvbapi" - ADDON_CONF_GUESS="$ADDON_CONF_DIR/oscam.guess" - ADDON_CONF_IRD="$ADDON_CONF_DIR/oscam.ird" - ADDON_CONF_PROVID="$ADDON_CONF_DIR/oscam.provid" - ADDON_CONF_SERVER="$ADDON_CONF_DIR/oscam.server" - ADDON_CONF_SERVICES="$ADDON_CONF_DIR/oscam.services" - ADDON_CONF_SRVID="$ADDON_CONF_DIR/oscam.srvid" - ADDON_CONF_TIERS="$ADDON_CONF_DIR/oscam.tiers" - ADDON_CONF_USER="$ADDON_CONF_DIR/oscam.user" - - OSCAM_ARG="-c $ADDON_CONF_DIR" - - mkdir -p $ADDON_HOME - mkdir -p $ADDON_CONF_DIR - mkdir -p $ADDON_LOG_DIR - - if [ ! -f "$ADDON_CONF" ]; then - cp $ADDON_DIR/oscam-default.conf $ADDON_CONF - fi - - touch $ADDON_CONF_AC - touch $ADDON_CONF_CERT - touch $ADDON_CONF_DVBAPI - touch $ADDON_CONF_GUESS - touch $ADDON_CONF_IRD - touch $ADDON_CONF_PROVID - touch $ADDON_CONF_SERVER - touch $ADDON_CONF_SERVICES - touch $ADDON_CONF_SRVID - touch $ADDON_CONF_TIERS - touch $ADDON_CONF_USER - - if [ ! -f "$ADDON_SETTINGS" ]; then - cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS - fi - -# Restart process if it terminates. - if [ -f "$LOCKDIR/$LOCKFILE" ] ; then - rm -rf "$LOCKDIR/$LOCKFILE" - fi - while [ true ] ; do - if [ -f "$LOCKDIR/$LOCKFILE" ] ; then - break - fi - # start userspace DVB driver/addon - for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do - driver_dvb_name=$(echo $driver_dvb | awk 'BEGIN {FS="/"} {printf("%s", $5)}') - logger -t OSCAM "### Loading userspace DVB driver: $driver_dvb_name ###" - # use ". " because of variable export - . $driver_dvb - done - oscam $OSCAM_ARG > /dev/null 2>&1 - sleep 1 - done & -fi diff --git a/packages/addons/service/softcam/oscam/source/bin/oscam.stop b/packages/addons/service/softcam/oscam/source/bin/oscam.stop deleted file mode 100755 index b0168693b0..0000000000 --- a/packages/addons/service/softcam/oscam/source/bin/oscam.stop +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011-2012 Gregor Fuis (gujs@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to the -# Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. /etc/profile - -LOCKDIR="/var/lock/" -LOCKFILE="oscam.disabled" - -mkdir -p "$LOCKDIR" -touch "$LOCKDIR/$LOCKFILE" - -if [ "$(pidof oscam)" ];then - killall oscam -fi - diff --git a/packages/addons/service/softcam/oscam/source/default.py b/packages/addons/service/softcam/oscam/source/default.py deleted file mode 100644 index 301f33903e..0000000000 --- a/packages/addons/service/softcam/oscam/source/default.py +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011-2011 Gregor Fuis (gujs@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -import xbmc, time, os, subprocess, xbmcaddon - -__scriptname__ = "OSCAM Service" -__author__ = "OpenELEC" -__url__ = "http://www.openelec.tv" -__settings__ = xbmcaddon.Addon(id='service.softcam.oscam') -__cwd__ = __settings__.getAddonInfo('path') -__start__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "oscam.start") ) -__stop__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "oscam.stop") ) - -#make binary files executable in adson bin folder -subprocess.Popen("chmod -R +x " + __cwd__ + "/bin/*" , shell=True, close_fds=True) - -subprocess.Popen(__start__, shell=True, close_fds=True) - -while (not xbmc.abortRequested): - time.sleep(0.250) - -subprocess.Popen(__stop__, shell=True, close_fds=True) diff --git a/packages/addons/service/softcam/oscam/source/resources/language/English/strings.xml b/packages/addons/service/softcam/oscam/source/resources/language/English/strings.xml deleted file mode 100644 index d388c262c1..0000000000 --- a/packages/addons/service/softcam/oscam/source/resources/language/English/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - General - Restart on suspend / resume - diff --git a/packages/addons/service/softcam/oscam/source/resources/settings.xml b/packages/addons/service/softcam/oscam/source/resources/settings.xml deleted file mode 100644 index 41355ffc6b..0000000000 --- a/packages/addons/service/softcam/oscam/source/resources/settings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/packages/addons/service/softcam/oscam/source/sleep.d/oscam.power b/packages/addons/service/softcam/oscam/source/sleep.d/oscam.power deleted file mode 100644 index 1989f1fbe0..0000000000 --- a/packages/addons/service/softcam/oscam/source/sleep.d/oscam.power +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. /etc/profile - -ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.softcam.oscam" -ADDON_SETTINGS="$ADDON_HOME/settings.xml" -RESTART_ON_RESUME=`grep RESTART_ON_RESUME $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"` - -LOCKFILE="/var/lock/oscam.sleep" - -if [ "$RESTART_ON_RESUME" == "true" ] ; then - case "$1" in - hibernate|suspend) - if [ "$(pidof oscam)" ];then - progress "Shutting down oscam for suspending..." - oscam.stop - touch $LOCKFILE - fi - ;; - - 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 - ;; - *) exit $NA - ;; - esac -fi diff --git a/tools/mkpkg/mkpkg_oscam b/tools/mkpkg/mkpkg_oscam deleted file mode 100755 index 6611e428e1..0000000000 --- a/tools/mkpkg/mkpkg_oscam +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - - -echo "getting sources..." - svn checkout http://streamboard.de.vu/svn/oscam/trunk oscam-latest - -echo "getting version..." - cd oscam-latest - SVN_REV=`LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //'` - echo $SVN_REV - cd .. - -echo "copying sources..." - rm -rf oscam-$SVN_REV - cp -R oscam-latest oscam-$SVN_REV - -# webif needs versioning info -#echo "cleaning sources..." -# find oscam-$SVN_REV -name .svn -exec rm -rf {} ";" - -echo "packing sources..." - tar cvjf oscam-$SVN_REV.tar.bz2 oscam-$SVN_REV - -echo "remove temporary sourcedir..." - rm -rf oscam-$SVN_REV