git: f42b8c78b141 - main - multimedia/minisatip: Update to 1.2.2 which includes all our upstreamed patches

The branch main has been updated by decke:

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

commit f42b8c78b141c2fd8ab1730b598c8163b830f7fa
Author:     Bernhard Froehlich <decke@FreeBSD.org>
AuthorDate: 2022-05-17 19:16:11 +0000
Commit:     Bernhard Froehlich <decke@FreeBSD.org>
CommitDate: 2022-05-17 19:16:11 +0000

    multimedia/minisatip: Update to 1.2.2 which includes all our upstreamed patches
---
 multimedia/minisatip/Makefile                      |  2 +-
 multimedia/minisatip/distinfo                      |  6 +++---
 multimedia/minisatip/files/patch-src_minisatip.c   | 20 ------------------
 multimedia/minisatip/files/patch-src_socketworks.c | 24 ----------------------
 multimedia/minisatip/files/patch-src_socketworks.h | 10 ---------
 5 files changed, 4 insertions(+), 58 deletions(-)

diff --git a/multimedia/minisatip/Makefile b/multimedia/minisatip/Makefile
index e57df7484580..277129575976 100644
--- a/multimedia/minisatip/Makefile
+++ b/multimedia/minisatip/Makefile
@@ -1,7 +1,7 @@
 # Created by: Bernhard Froehlich <decke@FreeBSD.org>
 
 PORTNAME=	minisatip
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	multimedia
 
diff --git a/multimedia/minisatip/distinfo b/multimedia/minisatip/distinfo
index b3391727acce..4501016e61ae 100644
--- a/multimedia/minisatip/distinfo
+++ b/multimedia/minisatip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1651662496
-SHA256 (catalinii-minisatip-v1.2.1_GH0.tar.gz) = c7ce74fa78c22b5ddafa69b7d6071b8125fdccad6c656624c97c599545adab98
-SIZE (catalinii-minisatip-v1.2.1_GH0.tar.gz) = 393924
+TIMESTAMP = 1652814718
+SHA256 (catalinii-minisatip-v1.2.2_GH0.tar.gz) = 91239dc616a95f9a6020bd7065143bccac52b780457691efaa5d3f5ad06cea41
+SIZE (catalinii-minisatip-v1.2.2_GH0.tar.gz) = 393991
diff --git a/multimedia/minisatip/files/patch-src_minisatip.c b/multimedia/minisatip/files/patch-src_minisatip.c
deleted file mode 100644
index 04eaf3f9b19e..000000000000
--- a/multimedia/minisatip/files/patch-src_minisatip.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/minisatip.c.orig	2022-02-04 06:56:09 UTC
-+++ src/minisatip.c
-@@ -1871,6 +1871,7 @@ int main(int argc, char *argv[]) {
-             struct ifreq ifr;
-             memset(&ifr, 0, sizeof(ifr));
-             snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s", opts.bind_dev);
-+#if defined(SO_BINDTODEVICE)
-             if (setsockopt(ssdp, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr,
-                            sizeof(ifr)) < 0)
-                 LOG("SSDP: Failed to set SO_BINDTODEVICE to %s", opts.bind_dev);
-@@ -1878,6 +1879,9 @@ int main(int argc, char *argv[]) {
-                            sizeof(ifr)) < 0)
-                 LOG("SSDP: Failed to set SO_BINDTODEVICE to %s", opts.bind_dev);
-             LOG("SSDP: Bound to device %s", opts.bind_dev);
-+#else
-+            LOG("SSDP: Binding to device with SO_BINDTODEVICE not supported!");
-+#endif
-         }
- 
-         si = sockets_add(ssdp, NULL, -1, TYPE_UDP, (socket_action)ssdp_reply,
diff --git a/multimedia/minisatip/files/patch-src_socketworks.c b/multimedia/minisatip/files/patch-src_socketworks.c
deleted file mode 100644
index 2f59c73f6644..000000000000
--- a/multimedia/minisatip/files/patch-src_socketworks.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/socketworks.c.orig	2021-05-05 05:43:10 UTC
-+++ src/socketworks.c
-@@ -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) {
-     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;
-+#if defined(SO_PRIORITY)
-     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) {
diff --git a/multimedia/minisatip/files/patch-src_socketworks.h b/multimedia/minisatip/files/patch-src_socketworks.h
deleted file mode 100644
index 128c8b289a70..000000000000
--- a/multimedia/minisatip/files/patch-src_socketworks.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/socketworks.h.orig	2021-05-05 05:43:10 UTC
-+++ src/socketworks.h
-@@ -3,6 +3,7 @@
- #define MAX_SOCKS 300
- #include "utils.h"
- #include <netinet/in.h>
-+#include <sys/socket.h>
- 
- typedef int (*socket_action)(void *s);
- typedef int (*read_action)(int, void *, size_t, void *, int *);