bump version oscam-11768

diff --git a/make/oscam.mk b/make/oscam.mk
index 03d327ab78bfdc38e41454abf05b8f55804ea1d0..a01bccd7627afc1854c7616fe6d801502e874194 100644 (file)
--- a/make/oscam.mk
+++ b/make/oscam.mk
@@ -5,8 +5,8 @@
 ################################################################################
 
 # 11760
-OSCAM_GIT = e07195cb
-OSCAM_EMU_PATCH = 68a345a
+OSCAM_TAG = 11768
+OSCAM_EMU_PATCH = c3f239e
 
 # https://github.com/oscam-emu/oscam-emu/commits/master
 OSCAM_EMU_GIT = "https://github.com/oscam-emu/oscam-emu.git"
@@ -50,8 +50,8 @@ OSCAM_CONF_OPTS = \
        CARDREADER_SMARGO
        
 # enable ssl
-OSCAM_CONF_OPTS += \
-       --enable WITH_SSL
+#OSCAM_CONF_OPTS += \
+#      --enable WITH_SSL
 
 # enable streamrelay
 OSCAM_CONF_OPTS += \
@@ -107,14 +107,16 @@ oscam: oscam_emu_patch $(D)/libusb $(D)/openssl $(D)/libdvbcsa | $(TARGETPREFIX)
        echo $(OSCAM_MAKE_OPTS)
        $(REMOVE)/oscam-svn
        if [ -e $(ARCHIVE)/oscam-svn ]; then \
-               set -e; cd $(ARCHIVE)/oscam-svn; \
-               git checkout master; git pull; git checkout $(OSCAM_GIT); \
+               cd $(ARCHIVE)/oscam-svn; \
+               git checkout master; git pull; git checkout $(OSCAM_TAG); \
        else \
                git clone $(OSCAM_URL) $(ARCHIVE)/oscam-svn; \
+               cd $(ARCHIVE)/oscam-svn; \
+               git checkout $(OSCAM_TAG); \
        fi; \
        cp -r $(ARCHIVE)/oscam-svn $(BUILD_TMP)/oscam-svn
        set -e; cd $(BUILD_TMP)/oscam-svn; \
-               patch -p0 < $(BUILD_TMP)/oscam-emu-patch-$(OSCAM_EMU_PATCH)/oscam-emu.patch; \
+               patch -p1 < $(BUILD_TMP)/oscam-emu-patch-$(OSCAM_EMU_PATCH)/oscam-emu.patch; \
                if [ "$(BOXMODEL)" = "kronos" -o "$(BOXMODEL)" = "kronos_v2" ]; then \
                        sed -i -e "s|^#define MAX_COOL_DMX.*|#define MAX_COOL_DMX 3|" $(BUILD_TMP)/oscam-svn/module-dvbapi-coolapi.c; \
                        sed -i -e "s|^#define MAX_COOL_DMX.*|#define MAX_COOL_DMX 3|" $(BUILD_TMP)/oscam-svn/module-dvbapi-coolapi-legacy.c; \