diff --git a/multimedia/minisatip/Makefile b/multimedia/minisatip/Makefile index e3e7099eaf5a..350889d10d1f 100644 --- a/multimedia/minisatip/Makefile +++ b/multimedia/minisatip/Makefile @@ -1,36 +1,37 @@ # Created by: Bernhard Froehlich PORTNAME= minisatip -PORTVERSION= 1.0.4 +PORTVERSION= 1.0.6 +DISTVERSIONPREFIX= v CATEGORIES= multimedia MAINTAINER= decke@FreeBSD.org COMMENT= Multi-threaded SATIP server that supports DVB cards LICENSE= GPLv2+ BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat LIB_DEPENDS= libdvbcsa.so:multimedia/libdvbcsa USES= gmake USE_GITHUB= yes GH_ACCOUNT= catalinii CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes ALL_TARGET= minisatip .include post-patch: @${REINPLACE_CMD} 's|/usr/share/minisatip|${DATADIR}|' \ ${WRKSRC}/src/minisatip.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/minisatip ${STAGEDIR}${PREFIX}/sbin @${MKDIR} ${STAGEDIR}${DATADIR} @(cd ${WRKSRC} && ${COPYTREE_SHARE} html ${STAGEDIR}${DATADIR}) .include diff --git a/multimedia/minisatip/distinfo b/multimedia/minisatip/distinfo index 36f0bf057404..dedfb158539c 100644 --- a/multimedia/minisatip/distinfo +++ b/multimedia/minisatip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1606393176 -SHA256 (catalinii-minisatip-1.0.4_GH0.tar.gz) = aa6ef68228a19faf04cf1283e994cae80134a01d9ee6bc45b9969d145b1281e5 -SIZE (catalinii-minisatip-1.0.4_GH0.tar.gz) = 360042 +TIMESTAMP = 1620235470 +SHA256 (catalinii-minisatip-v1.0.6_GH0.tar.gz) = da9a5035d5257a4d5dd47c15065a4081e132e430a2fb7110eccb184fa80eba2c +SIZE (catalinii-minisatip-v1.0.6_GH0.tar.gz) = 379689 diff --git a/multimedia/minisatip/files/patch-src_socketworks.c b/multimedia/minisatip/files/patch-src_socketworks.c index 3f4a81f1db24..2f59c73f6644 100644 --- a/multimedia/minisatip/files/patch-src_socketworks.c +++ b/multimedia/minisatip/files/patch-src_socketworks.c @@ -1,21 +1,24 @@ ---- src/socketworks.c.orig 2020-08-16 05:56:14 UTC +--- src/socketworks.c.orig 2021-05-05 05:43:10 UTC +++ src/socketworks.c -@@ -1023,7 +1023,7 @@ void set_sockets_rtime(int i, int r) - if (ss) - ss->rtime = r; +@@ -968,7 +968,7 @@ void set_sockets_rtime(int i, int r) { + if (ss) + ss->rtime = r; } -#ifndef __APPLE__ +#ifdef __linux__ - int get_mac_address(char *mac) - { -@@ -1658,7 +1658,9 @@ void set_socket_dscp(int id, int dscp, int prio) - setsockopt(id, IPPROTO_IP, IP_TOS, &d, sizeof(d)); + int get_mac_address(char *mac) { + struct ifreq ifr; +@@ -1562,8 +1562,12 @@ void set_socket_dscp(int id, int dscp, int prio) { + LOG("%s: setsockopt IP_TOS failed", __FUNCTION__); - d = prio; + d = prio; +#if defined(SO_PRIORITY) - setsockopt(id, SOL_SOCKET, SO_PRIORITY, &d, sizeof(d)); + if (setsockopt(id, SOL_SOCKET, SO_PRIORITY, &d, sizeof(d))) + LOG("%s: setsockopt SO_PRIORITY failed", __FUNCTION__); ++#else ++ LOG("%s: setsockopt SO_PRIORITY not implemented", __FUNCTION__); +#endif } - void sockets_set_opaque(int id, void *opaque, void *opaque2, void *opaque3) + void sockets_set_opaque(int id, void *opaque, void *opaque2, void *opaque3) { diff --git a/multimedia/minisatip/files/patch-src_socketworks.h b/multimedia/minisatip/files/patch-src_socketworks.h index 4d1cd1a67139..128c8b289a70 100644 --- a/multimedia/minisatip/files/patch-src_socketworks.h +++ b/multimedia/minisatip/files/patch-src_socketworks.h @@ -1,10 +1,10 @@ ---- src/socketworks.h.orig 2020-08-16 05:56:14 UTC +--- src/socketworks.h.orig 2021-05-05 05:43:10 UTC +++ src/socketworks.h -@@ -2,6 +2,7 @@ - #define SOCKETWORKS_H +@@ -3,6 +3,7 @@ #define MAX_SOCKS 300 + #include "utils.h" #include +#include - #include "utils.h" typedef int (*socket_action)(void *s); + typedef int (*read_action)(int, void *, size_t, void *, int *);