From nobody Tue May 17 19:16:36 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0353F1B33567; Tue, 17 May 2022 19:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L2m7m6bXlz4Qnj; Tue, 17 May 2022 19:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652814996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+nHtNb/Yok1KJfIvyhXvCUwj7H27vnSbyxRB3yf+EZ0=; b=Uyv+gtkPw6Zt+peDP4zr+kqCP8nq6vP8SEVd97fHzK+TMpQkVxAWRtOkV/LiME49Kr4KiU PO7DBIUVjVFbj2CJOTLDenm1ksKW6X5KxPhEkNnfnjkHuqt7KHJbZLCCyzQnETWipy0MM4 Aliti7B4nhGMzBDaCG+AJWP/Hf2C3oRP9QllhxBcQruAxxDv3s96AmekPY4cb58z4cly1k uWnEbXACjdwj+7uYb3uA7DAV2eN6jBfgI/mM1jiAt5TcjPmCjAyZTnRtgyAGkf1qpqS8t0 QouszuAnhiFfHGO3ujsQB6b9ahF3jHPlkJsCbKMZoKQ04hWK0H4+FcQUduD4cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BE19A1A7DD; Tue, 17 May 2022 19:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24HJGat3060606; Tue, 17 May 2022 19:16:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24HJGawc060605; Tue, 17 May 2022 19:16:36 GMT (envelope-from git) Date: Tue, 17 May 2022 19:16:36 GMT Message-Id: <202205171916.24HJGawc060605@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernhard Froehlich Subject: git: f42b8c78b141 - main - multimedia/minisatip: Update to 1.2.2 which includes all our upstreamed patches List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: decke X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f42b8c78b141c2fd8ab1730b598c8163b830f7fa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652814996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+nHtNb/Yok1KJfIvyhXvCUwj7H27vnSbyxRB3yf+EZ0=; b=YcwA0q1Yh8l2UWHHXmccXt1CzBvWa5GweD2jup+Aj4foBTMS07kAMqUekuahkoUE43us4J aPJvolR1TMcVxJqAvQ5nYl8Q89ByOfC4Ca/E+Elkc5l7gImPvcOq9NllYIKI7b4zqpXKgP QNXP7iOP0uf05++22nDpKTi0HaIlQ4d3Dgn5kGtsROZmd3M+vKgpshj+TktctJ+uarStOD pMgGY/9oqfnN9gGdjshPaU2asRHBnqTzZOcbkK0UvdsTab/400trbyir7H0stc+kzTHltH WRNLHyedBA6SMLjNZZoJpKDjyEvHkMzxUYou2W3ReA8H2g4z+JxuhOwhu1ah4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652814996; a=rsa-sha256; cv=none; b=vSmlADVCv9hUsSJaYBoWzbf62G6T0IiHWd31KtmzX0ES0OylIlGSUljz3UtjLFUP0lY7h3 QDCOK4ScJ4Sp/I0Mj91sv6Jj8GIwtgwlhmppD7k2pYpDrVbJqBxtxvm+OArCH1mP0mbNxf CN4ndscP70pVmTlwR/f2M6QamT1yoyWhp83g92ixWlmiFuWrJdIY1V/I3QegTEuIZdzzkq lKED1OD7SlEMwzMdfgQmwpdyH3c9rWmrQNUNKkrtvU773I531nSYAqdYGmEGUrSG7xpo2E jRYbXYVAPnFLis/Eno5boocybXapKNL60HZRswoGXt8UqhB2bKfUqVJvTJJjMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by decke: URL: https://cgit.FreeBSD.org/ports/commit/?id=f42b8c78b141c2fd8ab1730b598c8163b830f7fa commit f42b8c78b141c2fd8ab1730b598c8163b830f7fa Author: Bernhard Froehlich AuthorDate: 2022-05-17 19:16:11 +0000 Commit: Bernhard Froehlich 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 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 -+#include - - typedef int (*socket_action)(void *s); - typedef int (*read_action)(int, void *, size_t, void *, int *);