From nobody Thu May 26 12:36:23 2022 X-Original-To: dev-commits-ports-main@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 BD7761B5A13E; Thu, 26 May 2022 12:36:23 +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 4L86qq4ynmz3CNk; Thu, 26 May 2022 12:36:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653568583; 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=d7x0TrlJxArpSvxvG7RmDUajtrD8hdUwriSJa/IbCJ0=; b=krwAdbEJmlV8uSmjVYGM65OvdKJhOKySAHk72uzmiCcke/OMZy/x5aJTloAlZ8mnXZK/h0 4dt+r30uCq9NZViuJJEdAfkV2zDxwuQhc/hZQqH0ZHOTQRDdXXNbTHue9YLpeh1FhQ8fi8 VYgy2xmElN+nD+bXFaXDtN9oXtb6fMoNNXDsowuzNVWqsqQVNK1gsXH3LU5EowZkbvaspw LO3dyW9dQw9yjAnH3/r7MnGKVnKrpIdCXEswPSXo9HC9PilPRq3tbxHAZCL2rLEQIRFhYP zkd7INF69VCbt3V9X1galLiu42lbdOLFIxPgJwYEBHYUExh4m4gNX/T2vsCZqw== 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 86BCD6302; Thu, 26 May 2022 12:36:23 +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 24QCaNKr043826; Thu, 26 May 2022 12:36:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24QCaNXC043825; Thu, 26 May 2022 12:36:23 GMT (envelope-from git) Date: Thu, 26 May 2022 12:36:23 GMT Message-Id: <202205261236.24QCaNXC043825@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Vanilla I. Shu" Subject: git: 79ca5f26fcb2 - main - www/janus: update to 1.0.2. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vanilla X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79ca5f26fcb2a5406d2b71db7483aad7f9fe7be6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653568583; 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=d7x0TrlJxArpSvxvG7RmDUajtrD8hdUwriSJa/IbCJ0=; b=q/t9+MlsGu3e9AhxTm4pAjhTZEo0yyLmgw7mtDRfG4zz8mm2zl2Ahy9sur4tqo4ig2oCat jxQaZKMk8ufqfv8r+dfD1CIEVejWjv16fuL/7u1WMO8xjq5fr7fROmnceMn097TgH9uPTJ PwHE7Eu97FkozKIFCnFv01DoWT4VHXOOzZCuHjxsiZJVxjHh+byKIQClrtDL1csWCAsggs rdiWMmV9/6rhT1+eP2ia2uhetLGcqEEIWpCznvjkB9GJK7sSVRGpHnQQsYYVQ5VYsz3Vey q6dcUEpbjH1VbYdv0nSKDb+GpWZYgrBkw6PWr4Tg9EsHB2Jq9L3wDra3Yg2KOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653568583; a=rsa-sha256; cv=none; b=NtITFBohY+zjbThnrcbte1E9fNjGgvceFIGxc5cDXSUcj5oL/MrEKyWKMOhMG+aIrkAWvN kvgPNEHcTm7VioZP0F6uF/HaH4pSi6SWxBFLI5mTnWAN06mHTJWtTmQZ4l3T2q33NCtgvC Nr1Ransfi8hlQbZ2A1Yu3JgJbIUYDyBpZMfKh334oc3l6oTH0mlyMgRl4F4D2msjItexwY Y0OLn/pO1O5L9+vRI7MV58ebXp4DxfQsBsI/xLYA/XQqB3xAd5aV/Ppblj0+opeUsoghsP frGsd63/pdxqeIL5FZmfEhfo7wBzwO0+ZFoi8OAC1zrM2R2J/dQQATSKATfAbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vanilla: URL: https://cgit.FreeBSD.org/ports/commit/?id=79ca5f26fcb2a5406d2b71db7483aad7f9fe7be6 commit 79ca5f26fcb2a5406d2b71db7483aad7f9fe7be6 Author: Vanilla I. Shu AuthorDate: 2022-05-26 12:35:50 +0000 Commit: Vanilla I. Shu CommitDate: 2022-05-26 12:36:11 +0000 www/janus: update to 1.0.2. --- www/janus/Makefile | 2 +- www/janus/distinfo | 6 +++--- www/janus/files/patch-configure.ac | 22 ++++++++++++++++++++-- www/janus/files/patch-src__janus.c | 10 +++++----- .../files/patch-src_transports_janus__websockets.c | 22 ---------------------- 5 files changed, 29 insertions(+), 33 deletions(-) diff --git a/www/janus/Makefile b/www/janus/Makefile index 5aa35423e3b1..085c8ed5d0d9 100644 --- a/www/janus/Makefile +++ b/www/janus/Makefile @@ -1,6 +1,6 @@ PORTNAME= janus DISTVERSIONPREFIX= v -DISTVERSION= 1.0.1 +DISTVERSION= 1.0.2 PORTREVISION= 0 CATEGORIES= www diff --git a/www/janus/distinfo b/www/janus/distinfo index 03c946d29e82..7e03eab73eae 100644 --- a/www/janus/distinfo +++ b/www/janus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651128158 -SHA256 (meetecho-janus-gateway-v1.0.1_GH0.tar.gz) = c1ca94a149d8c00f980cd3c4b714720784db8c6cff6c0c11a5dcd61dc1fcb0df -SIZE (meetecho-janus-gateway-v1.0.1_GH0.tar.gz) = 6322789 +TIMESTAMP = 1653521948 +SHA256 (meetecho-janus-gateway-v1.0.2_GH0.tar.gz) = a1ca0ae787fa162a36b4e391c29ae81f9388c3077699fb7b7c054149a5503355 +SIZE (meetecho-janus-gateway-v1.0.2_GH0.tar.gz) = 6329634 diff --git a/www/janus/files/patch-configure.ac b/www/janus/files/patch-configure.ac index 3aeb90ee511f..a46cd7d82c09 100644 --- a/www/janus/files/patch-configure.ac +++ b/www/janus/files/patch-configure.ac @@ -1,4 +1,4 @@ ---- configure.ac.orig 2022-03-03 10:44:38 UTC +--- configure.ac.orig 2022-05-23 09:14:54 UTC +++ configure.ac @@ -359,8 +359,6 @@ freebsd*) libconfig @@ -9,7 +9,25 @@ zlib" esac PKG_CHECK_MODULES([JANUS],"$PKGCHECKMODULES") -@@ -963,8 +961,6 @@ AS_IF([test "x$enable_post_processing" = "xyes"], +@@ -559,7 +557,7 @@ AC_CHECK_LIB([websockets], + AS_IF([test "x$enable_websockets" != "xno"], + [ + AC_DEFINE(HAVE_WEBSOCKETS) +- WS_MANUAL_LIBS="-lwebsockets -lresolv" ++ WS_MANUAL_LIBS="-lwebsockets" + enable_websockets=yes + AC_CHECK_LIB([websockets], + [lws_get_peer_simple], +@@ -569,7 +567,7 @@ AC_CHECK_LIB([websockets], + AS_IF([test "x$enable_websockets_event_handler" != "xno"], + [ + AC_DEFINE(HAVE_WSEVH) +- WS_MANUAL_LIBS="-lwebsockets -lresolv" ++ WS_MANUAL_LIBS="-lwebsockets" + enable_websockets_event_handler=yes + ]) + ], +@@ -956,8 +954,6 @@ AS_IF([test "x$enable_post_processing" = "xyes"], [ glib-2.0 >= $glib_version jansson >= $jansson_version diff --git a/www/janus/files/patch-src__janus.c b/www/janus/files/patch-src__janus.c index 5fef7b777a47..160951012a30 100644 --- a/www/janus/files/patch-src__janus.c +++ b/www/janus/files/patch-src__janus.c @@ -1,6 +1,6 @@ ---- src/janus.c.orig 2022-03-03 10:44:38 UTC +--- src/janus.c.orig 2022-05-23 09:14:54 UTC +++ src/janus.c -@@ -4435,6 +4435,7 @@ gint main(int argc, char *argv[]) +@@ -4449,6 +4449,7 @@ gint main(int argc, char *argv[]) { if (exit_on_dl_error) exit(1); } else { @@ -8,11 +8,11 @@ create_l *create = (create_l*) dlsym(event, "create"); const char *dlsym_error = dlerror(); if (dlsym_error) { -@@ -5459,6 +5460,7 @@ gint main(int argc, char *argv[]) - if (exit_on_dl_error) +@@ -5474,6 +5475,7 @@ gint main(int argc, char *argv[]) { exit(1); + } } else { + dlerror(); create_p *create = (create_p*) dlsym(plugin, "create"); const char *dlsym_error = dlerror(); - if (dlsym_error) { + if(dlsym_error) { diff --git a/www/janus/files/patch-src_transports_janus__websockets.c b/www/janus/files/patch-src_transports_janus__websockets.c deleted file mode 100644 index 0e16c6eecc17..000000000000 --- a/www/janus/files/patch-src_transports_janus__websockets.c +++ /dev/null @@ -1,22 +0,0 @@ ---- src/transports/janus_websockets.c.orig 2022-03-03 10:44:38 UTC -+++ src/transports/janus_websockets.c -@@ -384,6 +384,9 @@ static struct lws_vhost* janus_websockets_create_ws_se - { - janus_config_item *item; - char item_name[255]; -+#ifdef __FreeBSD__ -+ int ipv4_only = 0; -+#endif - - item = janus_config_get(config, config_container, janus_config_type_item, prefix); - if(!item || !item->value || !janus_is_true(item->value)) { -@@ -530,9 +533,6 @@ int janus_websockets_init(janus_transport_callbacks *c - JANUS_LOG(LOG_WARN, "libwebsockets has been built without IPv6 support, will bind to IPv4 only\n"); - #endif - --#ifdef __FreeBSD__ -- int ipv4_only = 0; --#endif - /* This is the callback we'll need to invoke to contact the Janus core */ - gateway = callback; -