From nobody Mon Dec 19 02:50:13 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 4Nb41x6tsqz1H17D; Mon, 19 Dec 2022 02:50:13 +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 4Nb41x20jNz4MY5; Mon, 19 Dec 2022 02:50:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671418213; 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=1I2jZQP+Z2vB4N3StdddYztOl79qA173vSE3FBFilaI=; b=OtB28NsmUFJiVcYn1K0PkI/0RewZ5An+cJx0L/eZGDCHL2Xy0XPBfPVJ8IFfWNu7rfW4qs J6cML8y0vF7BbK/BR5+cA4cNba6a9EpITg52yYFTwnrASTk2HED7MQw4Zza651O2Dr66OS BHjvR20z5yjX78pvymBI8fb7lsEEFHcjij2xUJY0RxAnpb0Qy+Wj7gnBU7g0JqDm5j199k 97d+VEp+V5fihx9BZ2Ob8ZmrS67POUwC3k+YxP0Jb4U9WgkXgROW4p1t0mANTPqG4TVJdG LE7JCn4ljszUvVu3RXuZNPbsc+7w8ilzyEGmTXtp+0EyDMqAy0vimPNp/YA11g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671418213; 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=1I2jZQP+Z2vB4N3StdddYztOl79qA173vSE3FBFilaI=; b=jvsKRL9AQywRM1263AwGMCozxOwIDWcWY5X/ALkn1JPqtbDAgYoOPyZ9N/faW0zGbZ3y8z +ZYD6DPW4CD9Zk5fgNVKjO1yE+PoRihQBvZaO0yBnSCXUQXnk9faOMWU7AhIOfCA8je2pq 695X3mQbta9w+Bm+8rNU9xwDzCD7RDToC5NaZp7NQZOVH2F8Z6og+QamXeh39ONBZwStU6 tLOMcx0SGE8Lpcdp5Tb98hTCd2L+W7g+Um/TTtdybxzHngStAPYAU9aGdikYoHr6InwpNp RA5peh1KzIHJvNYCJKgICXASKuGN7wYpFGb3Z87QblhHbAAB66aRitKPMHMJLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671418213; a=rsa-sha256; cv=none; b=F2wC6YfR1YTaEiADM4t1SHay2FkPpsE6pA9MgYek8Vb/mkZc72bmhh32wCX9jgK8oNbsAE v6sK/tOdOi8AA4kGdJEpF41Yq1yYoKxQtXrRQUcY0RdF1y7qN/W8JCH+pOYq3r4khOaTsi nRGLsLHY54lBXyG9xfgbZwAOR8FcFUesQS0Q2pO83g+y/2A3zMaco27CjMexBfJRiVPt5S X/ftfMgS+p/Rdok2aCE7pkivM55+BDwfbL+qUe0AdOtQytENFkgvjnNnl179nZZ56qgukf M/nX//jngMLAjAjpS1Sr9ScYfjoic4uItj7pcnq5oGs1rqOATlryN/Yru5H8ZQ== 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 4Nb41x0skbzfyj; Mon, 19 Dec 2022 02:50:13 +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 2BJ2oDhD086078; Mon, 19 Dec 2022 02:50:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BJ2oD7S086072; Mon, 19 Dec 2022 02:50:13 GMT (envelope-from git) Date: Mon, 19 Dec 2022 02:50:13 GMT Message-Id: <202212190250.2BJ2oD7S086072@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 9bf432b7476d - main - net/brynet: Update 1.12.1-4 -> 1.12.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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9bf432b7476dfb46682e876f0f11e484193e0e52 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=9bf432b7476dfb46682e876f0f11e484193e0e52 commit 9bf432b7476dfb46682e876f0f11e484193e0e52 Author: Yuri Victorovich AuthorDate: 2022-12-19 02:49:37 +0000 Commit: Yuri Victorovich CommitDate: 2022-12-19 02:49:37 +0000 net/brynet: Update 1.12.1-4 -> 1.12.2 Reported by: portscout --- net/brynet/Makefile | 3 +-- net/brynet/distinfo | 6 ++--- .../files/patch-include_brynet_base_Platform.hpp | 11 -------- .../patch-include_brynet_net_CurrentThread.hpp | 31 ---------------------- .../files/patch-include_brynet_net_EventLoop.hpp | 14 ---------- 5 files changed, 4 insertions(+), 61 deletions(-) diff --git a/net/brynet/Makefile b/net/brynet/Makefile index 582577373686..87b322f6c0d3 100644 --- a/net/brynet/Makefile +++ b/net/brynet/Makefile @@ -1,7 +1,6 @@ PORTNAME= brynet DISTVERSIONPREFIX= v -DISTVERSION= 1.12.1-4 -DISTVERSIONSUFFIX= -g2e7d54d +DISTVERSION= 1.12.2 CATEGORIES= net devel MAINTAINER= yuri@FreeBSD.org diff --git a/net/brynet/distinfo b/net/brynet/distinfo index f6e96e136ec6..f8523f8fc4a7 100644 --- a/net/brynet/distinfo +++ b/net/brynet/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1667801389 -SHA256 (IronsDu-brynet-v1.12.1-4-g2e7d54d_GH0.tar.gz) = cde787bf10b9496b2af04d89d10d79a466d9bd14cde5cf495e6f70c1d4cf9210 -SIZE (IronsDu-brynet-v1.12.1-4-g2e7d54d_GH0.tar.gz) = 232439 +TIMESTAMP = 1671417565 +SHA256 (IronsDu-brynet-v1.12.2_GH0.tar.gz) = b8b740cae39804d1e7037866046321065856c0ea9f565d26f67aeccc7ccd3d51 +SIZE (IronsDu-brynet-v1.12.2_GH0.tar.gz) = 232522 diff --git a/net/brynet/files/patch-include_brynet_base_Platform.hpp b/net/brynet/files/patch-include_brynet_base_Platform.hpp deleted file mode 100644 index 4c178deab84e..000000000000 --- a/net/brynet/files/patch-include_brynet_base_Platform.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- include/brynet/base/Platform.hpp.orig 2022-11-07 05:36:34 UTC -+++ include/brynet/base/Platform.hpp -@@ -5,6 +5,8 @@ - #pragma comment(lib, "ws2_32") - #elif defined __APPLE_CC__ || defined __APPLE__ - #define BRYNET_PLATFORM_DARWIN -+#elif defined __FreeBSD__ -+#define BRYNET_PLATFORM_FREEBSD - #else - #define BRYNET_PLATFORM_LINUX - #endif diff --git a/net/brynet/files/patch-include_brynet_net_CurrentThread.hpp b/net/brynet/files/patch-include_brynet_net_CurrentThread.hpp deleted file mode 100644 index 9b31c50db90a..000000000000 --- a/net/brynet/files/patch-include_brynet_net_CurrentThread.hpp +++ /dev/null @@ -1,31 +0,0 @@ ---- include/brynet/net/CurrentThread.hpp.orig 2022-11-07 05:56:13 UTC -+++ include/brynet/net/CurrentThread.hpp -@@ -23,7 +23,11 @@ namespace brynet { namespace net { namespace current_t - #ifdef BRYNET_PLATFORM_WINDOWS - using THREAD_ID_TYPE = DWORD; - #elif defined BRYNET_PLATFORM_LINUX || defined BRYNET_PLATFORM_DARWIN || defined BRYNET_PLATFORM_FREEBSD -+# if defined BRYNET_PLATFORM_FREEBSD -+using THREAD_ID_TYPE = pthread_t; -+# else - using THREAD_ID_TYPE = int; -+# endif - #endif - - static THREAD_ID_TYPE& tid() -@@ -41,12 +45,16 @@ static THREAD_ID_TYPE& tid() - #elif defined BRYNET_PLATFORM_LINUX - cachedTid = static_cast(::syscall(SYS_gettid)); - #elif defined BRYNET_PLATFORM_DARWIN || defined BRYNET_PLATFORM_FREEBSD -+# if defined BRYNET_PLATFORM_FREEBSD -+ cachedTid = pthread_self(); -+# else - // warning: 'syscall' is deprecated: - // first deprecated in macOS 10.12 - syscall(2) is unsupported; - // please switch to a supported interface. - uint64_t tid64; - pthread_threadid_np(NULL, &tid64); - cachedTid = (pid_t) tid64; -+# endif - #endif - } - diff --git a/net/brynet/files/patch-include_brynet_net_EventLoop.hpp b/net/brynet/files/patch-include_brynet_net_EventLoop.hpp deleted file mode 100644 index 26ead00fbb2b..000000000000 --- a/net/brynet/files/patch-include_brynet_net_EventLoop.hpp +++ /dev/null @@ -1,14 +0,0 @@ ---- include/brynet/net/EventLoop.hpp.orig 2022-11-07 05:58:53 UTC -+++ include/brynet/net/EventLoop.hpp -@@ -72,7 +72,11 @@ class EventLoop : public brynet::base::NonCopyable (pu - mIsInBlock = true; - - reAllocEventSize(1024); -+#if defined BRYNET_PLATFORM_FREEBSD -+ mSelfThreadID = nullptr; -+#else - mSelfThreadID = -1; -+#endif - mTimer = std::make_shared(); - mSelfThreadIDIsInitialized.store(false); - }