FreeBSD Bugzilla – Attachment 164589 Details for
Bug 205569
multimedia/oscam: port updated to contain rc.d script and new feature of dvbapi
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
diff -Nru from the o to the r to the i and g
oscam.patch (text/plain), 3.50 KB, created by
Franz Bettag
on 2015-12-24 11:51:42 UTC
(
hide
)
Description:
diff -Nru from the o to the r to the i and g
Filename:
MIME Type:
Creator:
Franz Bettag
Created:
2015-12-24 11:51:42 UTC
Size:
3.50 KB
patch
obsolete
>diff -Nru oscam.orig/Makefile oscam/Makefile >--- oscam.orig/Makefile 2015-12-02 18:11:37.000000000 +0100 >+++ oscam/Makefile 2015-12-24 12:18:30.472210000 +0100 >@@ -3,6 +3,7 @@ > > PORTNAME= oscam > PORTVERSION= 1.20 >+PORTREVISION= 2 > CATEGORIES= multimedia > MASTER_SITES= http://el8.nl/~fbettag/oscam/ > >@@ -12,6 +13,7 @@ > LICENSE= GPLv3 > > USES= gmake tar:bzip2 >+USE_RC_SUBR= oscam > MAKE_ARGS+= HOSTCC=clang CC=clang > > .if target(gen-dist) >diff -Nru oscam.orig/files/oscam.in oscam/files/oscam.in >--- oscam.orig/files/oscam.in 1970-01-01 01:00:00.000000000 +0100 >+++ oscam/files/oscam.in 2015-12-24 12:12:56.717629000 +0100 >@@ -0,0 +1,46 @@ >+#!/bin/sh >+ >+# $FreeBSD: head/multimedia/oscam/files/oscam.in 365334 2014-08-18 17:54:21Z decke $ >+# >+# PROVIDE: oscam >+# REQUIRE: DAEMON >+# KEYWORD: shutdown >+# >+# Add the following line to /etc/rc.conf[.local] to enable oscam >+# >+# oscam_enable (bool): Set to "NO" by default. >+# Set it to "YES" to enable oscam. >+# oscam_flags (str): Custom flags for oscam. >+ >+. /etc/rc.subr >+ >+name=oscam >+rcvar=oscam_enable >+load_rc_config $name >+ >+: ${oscam_enable:=NO} >+ >+pidfile="/var/run/${name}.pid" >+confdir="/usr/local/etc/oscam" >+logdir="/var/log/oscam" >+command="/usr/local/bin/oscam" >+ >+command_args="-b -B ${pidfile} -c ${confdir}" >+start_precmd="${name}_prestart" >+ >+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin >+ >+oscam_prestart() >+{ >+ if [ ! -f "${pidfile}" ]; then >+ /usr/bin/install -m 644 /dev/null ${pidfile} >+ fi >+ if [ ! -d "${confdir}" ]; then >+ /usr/bin/install -m 755 -d ${confdir} >+ fi >+ if [ ! -d "${logdir}" ]; then >+ /usr/bin/install -m 755 -d ${logdir} >+ fi >+} >+ >+run_rc_command "$1" >diff -Nru oscam.orig/files/patch-config.h oscam/files/patch-config.h >--- oscam.orig/files/patch-config.h 2015-12-02 18:11:37.000000000 +0100 >+++ oscam/files/patch-config.h 2015-12-24 10:06:44.498949000 +0100 >@@ -1,15 +1,18 @@ >---- config.h.orig 2015-09-30 21:11:35 UTC >-+++ config.h >-@@ -7,7 +7,7 @@ >+--- config.h.orig 2015-12-24 10:03:49.005137000 +0100 >++++ config.h 2015-12-24 10:06:16.058704000 +0100 >+@@ -5,10 +5,8 @@ >+ #define WEBIF_LIVELOG 1 >+ #define WEBIF_JQUERY 1 > #define TOUCH 1 >- //#define WITH_SSL 1 >- #if defined(__linux__) || defined(__CYGWIN__) >--#define HAVE_DVBAPI 1 >-+//#define HAVE_DVBAPI 1 >- #endif >+-//#define WITH_SSL 1 >+-#if defined(__linux__) || defined(__CYGWIN__) >++#define WITH_SSL 1 >+ #define HAVE_DVBAPI 1 >+-#endif > #define READ_SDT_CHARSETS 1 > #define CLOCKFIX 1 >-@@ -23,18 +23,18 @@ >+ #define IRDETO_GUESSING 1 >+@@ -23,18 +21,18 @@ > #define MODULE_MONITOR 1 > > //#define MODULE_CAMD33 1 >diff -Nru oscam.orig/files/patch-module-dvbapi.c oscam/files/patch-module-dvbapi.c >--- oscam.orig/files/patch-module-dvbapi.c 1970-01-01 01:00:00.000000000 +0100 >+++ oscam/files/patch-module-dvbapi.c 2015-12-24 10:33:21.177975000 +0100 >@@ -0,0 +1,27 @@ >+--- module-dvbapi.c.orig 2015-12-24 10:32:46.709194000 +0100 >++++ module-dvbapi.c 2015-12-24 10:32:50.324786000 +0100 >+@@ -3,7 +3,6 @@ >+ #include "globals.h" >+ >+ #ifdef HAVE_DVBAPI >+- >+ #include "module-dvbapi.h" >+ #include "module-cacheex.h" >+ #include "module-dvbapi-azbox.h" >+@@ -4366,13 +4365,15 @@ >+ signal_action.sa_flags = SA_RESTART; >+ sigaction(SIGRTMIN + 1, &signal_action, NULL); >+ >++ /* >+ dir_fd = open(TMPDIR, O_RDONLY); >+ if(dir_fd >= 0) >+ { >+ fcntl(dir_fd, F_SETSIG, SIGRTMIN + 1); >+ fcntl(dir_fd, F_NOTIFY, DN_MODIFY | DN_CREATE | DN_DELETE | DN_MULTISHOT); >+ event_handler(SIGRTMIN + 1); >+- } >++ }*/ >++ cs_log("Only PMT 4-6 supported on FreeBSD, sorry..."); >+ } >+ else >+ {
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 205569
:
164589
|
164822