multimedia/ringrtc: Update to 2.25.1

Changes:
  https://github.com/signalapp/ringrtc/releases/tag/v2.25.1

3 files changed, 18 insertions, 19 deletions

diff --git a/multimedia/ringrtc/Makefile b/multimedia/ringrtc/Makefile
index 2ea84ad51b7d..53ec2f208519 100644
--- a/multimedia/ringrtc/Makefile
+++ b/multimedia/ringrtc/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	ringrtc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.25.0
-PORTREVISION=	1
+DISTVERSION=	2.25.1
 CATEGORIES=	multimedia
 MASTER_SITES=	LOCAL/mikael/ringrtc/:base \
 		LOCAL/mikael/ringrtc/:boringssl \
@@ -58,7 +57,7 @@ EXTRA_PATCHES+=	${"${:!${GREP} mempcpy ${CROSS_SYSROOT}/usr/include/string.h \
 	|| ${TRUE}!}" == "":?${PATCHDIR}/extra-patch-no-mempcpy-nasm:}
 
 # sh net-im/signal-desktop/get_deps.sh
-WEBRTC_REV=	5359d
+WEBRTC_REV=	5481
 
 # modify webrtc_fetch.sh, then sh webrtc_fetch.sh
 BASE_REV=		b054aaefd4d4ec5aad7189c4e97000a06b594163
@@ -75,7 +74,7 @@ NASM_REV=		9215e8e1d0fe474ffd3e16c1a07a0f97089e6224
 TESTING_REV=		6f2362298838e8789b09282cf198c8582f9c4555
 THIRD_PARTY_REV=	28a4580f804c4fc4279ecf10100a409811030235
 
-BINARY_ALIAS=	python3=${PYTHON_CMD}
+BINARY_ALIAS=	vpython3=${PYTHON_CMD}
 
 # Keep in sync with https://github.com/signalapp/ringrtc/blob/${DISTVERSION}/bin/build-electron#L96
 # Run "gn args out/Release --list" for all variables.
@@ -102,7 +101,7 @@ MAKE_ARGS=	-C out/${BUILDTYPE}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}/src/rust
 WEBRTCDIR=	${WRKDIR}/${PORTNAME}-${DISTVERSION}/src/webrtc/src
 
-# fetch -qo - https://raw.githubusercontent.com/signalapp/ringrtc/v2.25.0/src/rust/Cargo.lock | awk -f /usr/ports/Mk/Scripts/cargo-crates.awk | portedit merge -i Makefile
+# fetch -qo - https://raw.githubusercontent.com/signalapp/ringrtc/v2.25.1/src/rust/Cargo.lock | awk -f /usr/ports/Mk/Scripts/cargo-crates.awk | portedit merge -i Makefile
 CARGO_CRATES=	adler-1.0.2 \
 		aes-0.8.2 \
 		aho-corasick-0.7.20 \
@@ -220,7 +219,7 @@ CARGO_CRATES=	adler-1.0.2 \
 		syn-1.0.107 \
 		syn-mid-0.5.3 \
 		synstructure-0.12.6 \
-		sysinfo-0.27.7 \
+		sysinfo-0.28.0 \
 		tempfile-3.3.0 \
 		termcolor-1.2.0 \
 		thiserror-1.0.38 \
diff --git a/multimedia/ringrtc/distinfo b/multimedia/ringrtc/distinfo
index 4bdf64626901..daf3dde83d12 100644
--- a/multimedia/ringrtc/distinfo
+++ b/multimedia/ringrtc/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1678029843
+TIMESTAMP = 1678965674
 SHA256 (base-b054aaefd4d4ec5aad7189c4e97000a06b594163.tar.gz) = f488e9590186eff2ec7d3ea144a0bcc8d62cb1edd2445084985aac0825ca7eed
 SIZE (base-b054aaefd4d4ec5aad7189c4e97000a06b594163.tar.gz) = 5455794
 SHA256 (boringssl-1ee71185a2322dc354bee5e5a0abfb1810a27dc6.tar.gz) = ad65537bbc8b34e383a32b73c25cf2051c3f437fe63c66ec7188016e649f67b0
@@ -259,8 +259,8 @@ SHA256 (rust/crates/syn-mid-0.5.3.crate) = baa8e7560a164edb1621a55d18a0c59abf49d
 SIZE (rust/crates/syn-mid-0.5.3.crate) = 12758
 SHA256 (rust/crates/synstructure-0.12.6.crate) = f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f
 SIZE (rust/crates/synstructure-0.12.6.crate) = 18429
-SHA256 (rust/crates/sysinfo-0.27.7.crate) = 975fe381e0ecba475d4acff52466906d95b153a40324956552e027b2a9eaa89e
-SIZE (rust/crates/sysinfo-0.27.7.crate) = 145375
+SHA256 (rust/crates/sysinfo-0.28.0.crate) = 727220a596b4ca0af040a07091e49f5c105ec8f2592674339a5bf35be592f76e
+SIZE (rust/crates/sysinfo-0.28.0.crate) = 150250
 SHA256 (rust/crates/tempfile-3.3.0.crate) = 5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4
 SIZE (rust/crates/tempfile-3.3.0.crate) = 27578
 SHA256 (rust/crates/termcolor-1.2.0.crate) = be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6
@@ -349,7 +349,7 @@ SHA256 (rust/crates/zeroize-1.3.0.crate) = 4756f7db3f7b5574938c3eb1c117038b8e07f
 SIZE (rust/crates/zeroize-1.3.0.crate) = 15913
 SHA256 (rust/crates/zeroize_derive-1.3.3.crate) = 44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c
 SIZE (rust/crates/zeroize_derive-1.3.3.crate) = 10380
-SHA256 (signalapp-ringrtc-v2.25.0_GH0.tar.gz) = c4602777870d555aba557deb7352bc499d6127383882b2589057415b9fe5a63d
-SIZE (signalapp-ringrtc-v2.25.0_GH0.tar.gz) = 550952
-SHA256 (signalapp-webrtc-5359d_GH0.tar.gz) = fb1d1ae34a832ef59f297d0634b92f9c66f33b8387d21c4078b2027c242b4e6b
-SIZE (signalapp-webrtc-5359d_GH0.tar.gz) = 39819487
+SHA256 (signalapp-ringrtc-v2.25.1_GH0.tar.gz) = 72106e0532a05df95f28280066dda23edc62b4fc9e1d3bac96d927679a103bc0
+SIZE (signalapp-ringrtc-v2.25.1_GH0.tar.gz) = 546782
+SHA256 (signalapp-webrtc-5481_GH0.tar.gz) = 2ad5cb8aadbee8555b801274868d65ea361654778bb0816f4d667610f57c6a99
+SIZE (signalapp-webrtc-5481_GH0.tar.gz) = 39613568
diff --git a/multimedia/ringrtc/files/patch-src_webrtc_src_rtc__base_platform__thread__types.cc b/multimedia/ringrtc/files/patch-src_webrtc_src_rtc__base_platform__thread__types.cc
index 20380da326db..dbaf53ab29f0 100644
--- a/multimedia/ringrtc/files/patch-src_webrtc_src_rtc__base_platform__thread__types.cc
+++ b/multimedia/ringrtc/files/patch-src_webrtc_src_rtc__base_platform__thread__types.cc
@@ -12,7 +12,7 @@
  #include <sys/syscall.h>
  #endif
  
-@@ -37,6 +41,8 @@ PlatformThreadId CurrentThreadId() {
+@@ -44,6 +48,8 @@ PlatformThreadId CurrentThreadId() {
    return gettid();
  #elif defined(WEBRTC_FUCHSIA)
    return zx_thread_self();
@@ -21,7 +21,7 @@
  #elif defined(WEBRTC_LINUX)
    return syscall(__NR_gettid);
  #elif defined(__EMSCRIPTEN__)
-@@ -67,6 +73,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons
+@@ -74,6 +80,7 @@ void SetCurrentThreadName(const char* name) {
  }
  
  void SetCurrentThreadName(const char* name) {
@@ -29,10 +29,10 @@
  #if defined(WEBRTC_WIN)
    // The SetThreadDescription API works even if no debugger is attached.
    // The names set with this API also show up in ETW traces. Very handy.
-@@ -109,6 +116,7 @@ void SetCurrentThreadName(const char* name) {
-   prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name));  // NOLINT
- #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
-   pthread_setname_np(name);
+@@ -120,6 +127,7 @@ void SetCurrentThreadName(const char* name) {
+   zx_status_t status = zx_object_set_property(zx_thread_self(), ZX_PROP_NAME,
+                                               name, strlen(name));
+   RTC_DCHECK_EQ(status, ZX_OK);
 +#endif
  #endif
  }