git: 4f84f5901de0 - 2021Q2 - multimedia/minisatip: Update to 1.0.6

[Bernhard Froehlich]

The branch 2021Q2 has been updated by decke:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4f84f5901de0e189e1bdc01f4be86bd022e40b96

commit 4f84f5901de0e189e1bdc01f4be86bd022e40b96
Author:     Bernhard Froehlich <decke at FreeBSD.org>
AuthorDate: 2021-05-05 17:37:40 +0000
Commit:     Bernhard Froehlich <decke at FreeBSD.org>
CommitDate: 2021-05-05 17:45:38 +0000

    multimedia/minisatip: Update to 1.0.6
    
    (cherry picked from commit 348acda125ee227962a6c71c4d69193ade1e59cd)
---
 multimedia/minisatip/Makefile                      |  3 ++-
 multimedia/minisatip/distinfo                      |  6 +++---
 multimedia/minisatip/files/patch-src_socketworks.c | 25 ++++++++++++----------
 multimedia/minisatip/files/patch-src_socketworks.h |  8 +++----
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/multimedia/minisatip/Makefile b/multimedia/minisatip/Makefile
index e3e7099eaf5a..350889d10d1f 100644
--- a/multimedia/minisatip/Makefile
+++ b/multimedia/minisatip/Makefile
@@ -1,7 +1,8 @@
 # Created by: Bernhard Froehlich <decke at FreeBSD.org>
 
 PORTNAME=	minisatip
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.6
+DISTVERSIONPREFIX=	v
 CATEGORIES=	multimedia
 
 MAINTAINER=	decke at FreeBSD.org
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 <netinet/in.h>
 +#include <sys/socket.h>
- #include "utils.h"
  
  typedef int (*socket_action)(void *s);
+ typedef int (*read_action)(int, void *, size_t, void *, int *);