mediasoup 3.9.9 → 3.9.12

package/node/lib/Worker.js

@@ -81,7 +81,7 @@ class Worker extends EnhancedEventEmitter_1.EnhancedEventEmitter {
         // options
         {
             env: {
-                MEDIASOUP_VERSION: '3.9.9',
+                MEDIASOUP_VERSION: '3.9.12',
                 // Let the worker process inherit all environment variables, useful
                 // if a custom and not in the path GCC is used so the user can set
                 // LD_LIBRARY_PATH environment variable for runtime.

package/node/lib/index.d.ts

@@ -9,7 +9,7 @@ export { types };
 /**
  * Expose mediasoup version.
  */
-export declare const version = "3.9.9";
+export declare const version = "3.9.12";
 /**
  * Expose parseScalabilityMode() function.
  */

package/node/lib/index.js

@@ -11,7 +11,7 @@ exports.types = types;
 /**
  * Expose mediasoup version.
  */
-exports.version = '3.9.9';
+exports.version = '3.9.12';
 /**
  * Expose parseScalabilityMode() function.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mediasoup",
-  "version": "3.9.9",
+  "version": "3.9.12",
   "description": "Cutting Edge WebRTC Video Conferencing",
   "contributors": [
     "Iñaki Baz Castillo <ibc@aliax.net> (https://inakibaz.me)",
@@ -30,7 +30,6 @@
     "worker/scripts/*.js",
     "worker/scripts/*.json",
     "worker/src",
-    "worker/subprojects/packagefiles",
     "worker/subprojects/*.wrap",
     "worker/test/include",
     "worker/test/src",
@@ -70,24 +69,24 @@
   },
   "dependencies": {
     "@types/node": "^16.11.10",
-    "debug": "^4.3.3",
+    "debug": "^4.3.4",
     "h264-profile-level-id": "^1.0.1",
-    "supports-color": "^9.2.1",
+    "supports-color": "^9.2.2",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
     "@types/uuid": "^8.3.4",
-    "@typescript-eslint/eslint-plugin": "^5.13.0",
-    "@typescript-eslint/parser": "^5.13.0",
-    "eslint": "^8.10.0",
-    "eslint-plugin-jest": "^26.1.1",
+    "@typescript-eslint/eslint-plugin": "^5.22.0",
+    "@typescript-eslint/parser": "^5.22.0",
+    "eslint": "^8.14.0",
+    "eslint-plugin-jest": "^26.1.5",
     "jest": "^27.5.1",
     "jest-tobetype": "^1.2.3",
     "open-cli": "^7.0.1",
     "pick-port": "^1.0.0",
     "sctp": "^1.0.0",
-    "tsc-watch": "^4.6.0",
-    "typescript": "^4.6.2"
+    "tsc-watch": "^5.0.3",
+    "typescript": "^4.6.4"
   }
 }

package/worker/Makefile

@@ -7,6 +7,11 @@ PYTHON ?= $(shell command -v python3 2> /dev/null || echo python)
 ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 CORES ?= $(shell ${ROOT_DIR}/scripts/cpu_cores.sh || echo 4)
 MEDIASOUP_OUT_DIR ?= $(shell pwd)/out
+# Controls build types, `Release` and `Debug` are presets optimized for those use cases.
+# Other build types are possible too, but they are not presets and will require `MESON_ARGS` use to customize build
+# configuration.
+# Check the meaning of useful macros in the `worker/include/Logger.hpp` header file if you want to enable tracing or
+# other debug information.
 MEDIASOUP_BUILDTYPE ?= Release
 GULP = ./scripts/node_modules/.bin/gulp
 LCOV = ./deps/lcov/bin/lcov
@@ -15,6 +20,11 @@ PIP_DIR = $(MEDIASOUP_OUT_DIR)/pip
 INSTALL_DIR ?= $(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)
 BUILD_DIR ?= $(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)/build
 MESON ?= $(PIP_DIR)/bin/meson
+# `MESON_ARGS` can be used to provide extra configuration parameters to Meson, such as adding defines or changing
+# optimization options. For instance, use `MESON_ARGS="-DMS_LOG_TRACE -DMS_LOG_FILE_LINE" npm i` to compile worker with
+# tracing and enabled.
+#
+# NOTE: On Windows make sure to add `--vsenv` or have MSVS environment already active if you override this parameter.
 MESON_ARGS ?= ""
 # Workaround for NixOS and Guix that don't work with pre-built binaries, see:
 # https://github.com/NixOS/nixpkgs/issues/142383.

package/worker/include/RTC/RtpPacket.hpp

@@ -602,7 +602,7 @@ namespace RTC
 			this->payloadDescriptorHandler.reset(payloadDescriptorHandler);
 		}
 
-		bool ProcessPayload(RTC::Codecs::EncodingContext* context);
+		bool ProcessPayload(RTC::Codecs::EncodingContext* context, bool& marker);
 
 		void RestorePayload();
 

package/worker/include/Utils.hpp

@@ -2,7 +2,7 @@
 #define MS_UTILS_HPP
 
 #include "common.hpp"
-#include <openssl/hmac.h>
+#include <openssl/evp.h>
 #include <cmath>
 #include <cstring> // std::memcmp(), std::memcpy()
 #include <nlohmann/json.hpp>
@@ -255,7 +255,8 @@ namespace Utils
 
 	private:
 		thread_local static uint32_t seed;
-		thread_local static HMAC_CTX* hmacSha1Ctx;
+		thread_local static EVP_MAC* mac;
+		thread_local static EVP_MAC_CTX* hmacSha1Ctx;
 		thread_local static uint8_t hmacSha1Buffer[];
 		static const uint32_t crc32Table[256];
 	};

package/worker/meson.build

@@ -315,7 +315,7 @@ mediasoup_worker_test = executable(
 test(
   'mediasoup-worker-test',
   mediasoup_worker_test,
-  workdir: meson.source_root(),
+  workdir: meson.project_source_root(),
 )
 
 if host_machine.system() == 'linux'

package/worker/scripts/package-lock.json

@@ -3015,9 +3015,9 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "node_modules/mixin-deep": {
@@ -7917,9 +7917,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "mixin-deep": {

package/worker/src/RTC/DtlsTransport.cpp

@@ -6,11 +6,8 @@
 #include "MediaSoupErrors.hpp"
 #include "Settings.hpp"
 #include "Utils.hpp"
-#include <openssl/asn1.h>
-#include <openssl/bn.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
-#include <openssl/rsa.h>
 #include <uv.h>
 #include <cstdio>  // std::sprintf(), std::fopen()
 #include <cstring> // std::memcpy(), std::strcmp()
@@ -157,56 +154,20 @@ namespace RTC
 		MS_TRACE();
 
 		int ret{ 0 };
-		EC_KEY* ecKey{ nullptr };
 		X509_NAME* certName{ nullptr };
 		std::string subject =
 		  std::string("mediasoup") + std::to_string(Utils::Crypto::GetRandomUInt(100000, 999999));
 
 		// Create key with curve.
-		ecKey = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
-
-		if (!ecKey)
-		{
-			LOG_OPENSSL_ERROR("EC_KEY_new_by_curve_name() failed");
-
-			goto error;
-		}
-
-		EC_KEY_set_asn1_flag(ecKey, OPENSSL_EC_NAMED_CURVE);
-
-		// NOTE: This can take some time.
-		ret = EC_KEY_generate_key(ecKey);
-
-		if (ret == 0)
-		{
-			LOG_OPENSSL_ERROR("EC_KEY_generate_key() failed");
-
-			goto error;
-		}
-
-		// Create a private key object.
-		DtlsTransport::privateKey = EVP_PKEY_new();
+		DtlsTransport::privateKey = EVP_EC_gen(SN_X9_62_prime256v1);
 
 		if (!DtlsTransport::privateKey)
 		{
-			LOG_OPENSSL_ERROR("EVP_PKEY_new() failed");
-
-			goto error;
-		}
-
-		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-cstyle-cast)
-		ret = EVP_PKEY_assign_EC_KEY(DtlsTransport::privateKey, ecKey);
-
-		if (ret == 0)
-		{
-			LOG_OPENSSL_ERROR("EVP_PKEY_assign_EC_KEY() failed");
+			LOG_OPENSSL_ERROR("EVP_EC_gen() failed");
 
 			goto error;
 		}
 
-		// The EC key now belongs to the private key, so don't clean it up separately.
-		ecKey = nullptr;
-
 		// Create the X509 certificate.
 		DtlsTransport::certificate = X509_new();
 
@@ -278,11 +239,8 @@ namespace RTC
 
 	error:
 
-		if (ecKey)
-			EC_KEY_free(ecKey);
-
 		if (DtlsTransport::privateKey)
-			EVP_PKEY_free(DtlsTransport::privateKey); // NOTE: This also frees the EC key.
+			EVP_PKEY_free(DtlsTransport::privateKey);
 
 		if (DtlsTransport::certificate)
 			X509_free(DtlsTransport::certificate);
@@ -1030,17 +988,22 @@ namespace RTC
 		uv_timeval_t dtlsTimeout{ 0, 0 };
 		uint64_t timeoutMs;
 
-		// NOTE: If ret == 0 then ignore the value in dtlsTimeout.
 		// NOTE: No DTLSv_1_2_get_timeout() or DTLS_get_timeout() in OpenSSL 1.1.0-dev.
 		ret = DTLSv1_get_timeout(this->ssl, static_cast<void*>(&dtlsTimeout)); // NOLINT
 
 		if (ret == 0)
+		{
+			OnTimer(this->timer);
+
 			return true;
+		}
 
 		timeoutMs = (dtlsTimeout.tv_sec * static_cast<uint64_t>(1000)) + (dtlsTimeout.tv_usec / 1000);
 
 		if (timeoutMs == 0)
 		{
+			OnTimer(this->timer);
+
 			return true;
 		}
 		else if (timeoutMs < 30000)
@@ -1461,12 +1424,27 @@ namespace RTC
 			return;
 		}
 
-		DTLSv1_handle_timeout(this->ssl);
+		auto ret = DTLSv1_handle_timeout(this->ssl);
 
-		// If required, send DTLS data.
-		SendPendingOutgoingDtlsData();
+		// -1 means that too many timeouts had expired without progress or an
+		// error occurs.
+		if (ret == -1)
+		{
+			MS_WARN_TAG(dtls, "DTLSv1_handle_timeout() failed");
+
+			Reset();
+
+			// Set state and notify the listener.
+			this->state = DtlsState::FAILED;
+			this->listener->OnDtlsTransportFailed(this);
+		}
+		else
+		{
+			// If required, send DTLS data.
+			SendPendingOutgoingDtlsData();
 
-		// Set the DTLS timer again.
-		SetTimeout();
+			// Set the DTLS timer again.
+			SetTimeout();
+		}
 	}
 } // namespace RTC

package/worker/src/RTC/RtpPacket.cpp

@@ -782,20 +782,15 @@ namespace RTC
 		return true;
 	}
 
-	bool RtpPacket::ProcessPayload(RTC::Codecs::EncodingContext* context)
+	bool RtpPacket::ProcessPayload(RTC::Codecs::EncodingContext* context, bool& marker)
 	{
 		MS_TRACE();
 
 		if (!this->payloadDescriptorHandler)
 			return true;
 
-		bool marker{ false };
-
 		if (this->payloadDescriptorHandler->Process(context, this->payload, marker))
 		{
-			if (marker)
-				SetMarker(true);
-
 			return true;
 		}
 		else

package/worker/src/RTC/SimulcastConsumer.cpp

@@ -13,7 +13,6 @@ namespace RTC
 {
 	/* Static. */
 
-	static constexpr uint8_t StreamGoodScore{ 5u };
 	static constexpr uint64_t StreamMinActiveMs{ 2000u };           // In ms.
 	static constexpr uint64_t BweDowngradeConservativeMs{ 10000u }; // In ms.
 	static constexpr uint64_t BweDowngradeMinActiveMs{ 8000u };     // In ms.
@@ -444,7 +443,7 @@ namespace RTC
 			auto* producerRtpStream = this->producerRtpStreams.at(spatialLayer);
 
 			// Producer stream does not exist or it's not good. Ignore.
-			if (!producerRtpStream || producerRtpStream->GetScore() < StreamGoodScore)
+			if (!producerRtpStream)
 				continue;
 
 			// If the stream has not been active time enough and we have an active one
@@ -822,6 +821,8 @@ namespace RTC
 			this->keyFrameForTsOffsetRequested = false;
 		}
 
+		bool marker{ false };
+
 		if (shouldSwitchCurrentSpatialLayer)
 		{
 			// Update current spatial layer.
@@ -841,14 +842,14 @@ namespace RTC
 			EmitScore();
 
 			// Rewrite payload if needed.
-			packet->ProcessPayload(this->encodingContext.get());
+			packet->ProcessPayload(this->encodingContext.get(), marker);
 		}
 		else
 		{
 			auto previousTemporalLayer = this->encodingContext->GetCurrentTemporalLayer();
 
 			// Rewrite payload if needed. Drop packet if necessary.
-			if (!packet->ProcessPayload(this->encodingContext.get()))
+			if (!packet->ProcessPayload(this->encodingContext.get(), marker))
 			{
 				this->rtpSeqManager.Drop(packet->GetSequenceNumber());
 
@@ -1295,17 +1296,11 @@ namespace RTC
 			if (!CanSwitchToSpatialLayer(spatialLayer))
 				continue;
 
-			// If the stream score is worse than the best seen and not good enough, ignore
-			// this stream.
-			if (producerScore < maxProducerScore && producerScore < StreamGoodScore)
-				continue;
-
 			newTargetSpatialLayer = spatialLayer;
 			maxProducerScore      = producerScore;
 
-			// If this is the preferred or higher spatial layer and has good score,
-			// take it and exit.
-			if (spatialLayer >= this->preferredSpatialLayer && producerScore >= StreamGoodScore)
+			// If this is the preferred or higher spatial layer take it and exit.
+			if (spatialLayer >= this->preferredSpatialLayer)
 				break;
 		}
 

package/worker/src/RTC/SvcConsumer.cpp

@@ -581,7 +581,10 @@ namespace RTC
 		auto previousSpatialLayer  = this->encodingContext->GetCurrentSpatialLayer();
 		auto previousTemporalLayer = this->encodingContext->GetCurrentTemporalLayer();
 
-		if (!packet->ProcessPayload(this->encodingContext.get()))
+		bool marker{ false };
+		bool origMarker = packet->HasMarker();
+
+		if (!packet->ProcessPayload(this->encodingContext.get(), marker))
 		{
 			this->rtpSeqManager.Drop(packet->GetSequenceNumber());
 
@@ -612,6 +615,11 @@ namespace RTC
 		packet->SetSsrc(this->rtpParameters.encodings[0].ssrc);
 		packet->SetSequenceNumber(seq);
 
+		if (marker)
+		{
+			packet->SetMarker(true);
+		}
+
 		if (isSyncPacket)
 		{
 			MS_DEBUG_TAG(
@@ -649,6 +657,7 @@ namespace RTC
 		// Restore packet fields.
 		packet->SetSsrc(origSsrc);
 		packet->SetSequenceNumber(origSeq);
+		packet->SetMarker(origMarker);
 
 		// Restore the original payload if needed.
 		packet->RestorePayload();

package/worker/src/Utils/Crypto.cpp

@@ -10,7 +10,8 @@ namespace Utils
 	/* Static variables. */
 
 	thread_local uint32_t Crypto::seed;
-	thread_local HMAC_CTX* Crypto::hmacSha1Ctx{ nullptr };
+	thread_local EVP_MAC* Crypto::mac{ nullptr };
+	thread_local EVP_MAC_CTX* Crypto::hmacSha1Ctx{ nullptr };
 	thread_local uint8_t Crypto::hmacSha1Buffer[SHA_DIGEST_LENGTH];
 	// clang-format off
 	const uint32_t Crypto::crc32Table[] =
@@ -61,7 +62,8 @@ namespace Utils
 		Crypto::seed = static_cast<uint32_t>(reinterpret_cast<uintptr_t>(std::addressof(Crypto::seed)));
 
 		// Create an OpenSSL HMAC_CTX context for HMAC SHA1 calculation.
-		Crypto::hmacSha1Ctx = HMAC_CTX_new();
+		Crypto::mac         = EVP_MAC_fetch(nullptr, "HMAC", nullptr);
+		Crypto::hmacSha1Ctx = EVP_MAC_CTX_new(mac);
 	}
 
 	void Crypto::ClassDestroy()
@@ -69,7 +71,10 @@ namespace Utils
 		MS_TRACE();
 
 		if (Crypto::hmacSha1Ctx != nullptr)
-			HMAC_CTX_free(Crypto::hmacSha1Ctx);
+			EVP_MAC_CTX_free(Crypto::hmacSha1Ctx);
+
+		if (Crypto::mac != nullptr)
+			EVP_MAC_free(Crypto::mac);
 	}
 
 	const uint8_t* Crypto::GetHmacSha1(const std::string& key, const uint8_t* data, size_t len)
@@ -78,26 +83,29 @@ namespace Utils
 
 		int ret;
 
-		ret = HMAC_Init_ex(Crypto::hmacSha1Ctx, key.c_str(), key.length(), EVP_sha1(), nullptr);
+		OSSL_PARAM sha1[] = { { "digest", OSSL_PARAM_UTF8_STRING, (void*)"sha1", 4, 0 }, OSSL_PARAM_END };
+
+		ret = EVP_MAC_init(
+		  Crypto::hmacSha1Ctx, reinterpret_cast<const unsigned char*>(key.c_str()), key.length(), sha1);
 
-		MS_ASSERT(ret == 1, "OpenSSL HMAC_Init_ex() failed with key '%s'", key.c_str());
+		MS_ASSERT(ret == 1, "OpenSSL EVP_MAC_init() failed with key '%s'", key.c_str());
 
-		ret = HMAC_Update(Crypto::hmacSha1Ctx, data, static_cast<int>(len));
+		ret = EVP_MAC_update(Crypto::hmacSha1Ctx, data, len);
 
 		MS_ASSERT(
 		  ret == 1,
-		  "OpenSSL HMAC_Update() failed with key '%s' and data length %zu bytes",
+		  "OpenSSL EVP_MAC_update() failed with key '%s' and data length %zu bytes",
 		  key.c_str(),
 		  len);
 
-		uint32_t resultLen;
+		size_t resultLen;
 
-		ret = HMAC_Final(Crypto::hmacSha1Ctx, (uint8_t*)Crypto::hmacSha1Buffer, &resultLen);
+		ret = EVP_MAC_final(Crypto::hmacSha1Ctx, Crypto::hmacSha1Buffer, &resultLen, SHA_DIGEST_LENGTH);
 
 		MS_ASSERT(
 		  ret == 1, "OpenSSL HMAC_Final() failed with key '%s' and data length %zu bytes", key.c_str(), len);
 		MS_ASSERT(
-		  resultLen == SHA_DIGEST_LENGTH, "OpenSSL HMAC_Final() resultLen is %u instead of 20", resultLen);
+		  resultLen == SHA_DIGEST_LENGTH, "OpenSSL HMAC_Final() resultLen is %zu instead of 20", resultLen);
 
 		return Crypto::hmacSha1Buffer;
 	}

package/worker/subprojects/abseil-cpp.wrap

@@ -1,11 +1,11 @@
 [wrap-file]
-directory = abseil-cpp-20210324.2
-source_url = https://github.com/abseil/abseil-cpp/archive/20210324.2.tar.gz
-source_filename = abseil-cpp-20210324.2.tar.gz
-source_hash = 59b862f50e710277f8ede96f083a5bb8d7c9595376146838b9580be90374ee1f
-patch_filename = abseil-cpp_20210324.2-2_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/abseil-cpp_20210324.2-2/get_patch
-patch_hash = 49440e58e4969bf0ec77d1d38ead7e56ea8163d1ba19012a0f838238d0f6950c
+directory = abseil-cpp-20211102.0
+source_url = https://github.com/abseil/abseil-cpp/archive/20211102.0.tar.gz
+source_filename = abseil-cpp-20211102.0.tar.gz
+source_hash = dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4
+patch_filename = abseil-cpp_20211102.0-2_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/abseil-cpp_20211102.0-2/get_patch
+patch_hash = 9463930367b0db984435350c7d7614e400faa8811a7e9a2def5a63ff39fdb325
 
 [provide]
 absl_base = absl_base_dep

package/worker/subprojects/nlohmann_json.wrap

@@ -1,12 +1,9 @@
 [wrap-file]
-directory = nlohmann_json-3.9.1
+directory = nlohmann_json-3.10.5
 lead_directory_missing = true
-source_url = https://github.com/nlohmann/json/releases/download/v3.9.1/include.zip
-source_filename = nlohmann_json-3.9.1.zip
-source_hash = 6bea5877b1541d353bd77bdfbdb2696333ae5ed8f9e8cc22df657192218cad91
-patch_url = https://wrapdb.mesonbuild.com/v2/nlohmann_json_3.9.1-1/get_patch
-patch_filename = nlohmann_json-3.9.1-1-wrap.zip
-patch_hash = 1774e5506fbe3897d652f67e41973194b948d2ab851cf464a742f35f160a1435
+source_url = https://github.com/nlohmann/json/releases/download/v3.10.5/include.zip
+source_filename = nlohmann_json-3.10.5.zip
+source_hash = b94997df68856753b72f0d7a3703b7d484d4745c567f3584ef97c96c25a5798e
 
 [provide]
 nlohmann_json = nlohmann_json_dep

package/worker/subprojects/openssl.wrap

@@ -1,11 +1,11 @@
 [wrap-file]
-directory = openssl-1.1.1l
-source_url = https://www.openssl.org/source/openssl-1.1.1l.tar.gz
-source_filename = openssl-1.1.1l.tar.gz
-source_hash = 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1
-patch_filename = openssl_1.1.1l-2_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/openssl_1.1.1l-2/get_patch
-patch_hash = 852521fb016fa2deee8ebf9ffeeee0292c6de86a03c775cf72ac04e86f9f177e
+directory = openssl-3.0.2
+source_url = https://www.openssl.org/source/openssl-3.0.2.tar.gz
+source_filename = openssl-3.0.2.tar.gz
+source_hash = 98e91ccead4d4756ae3c9cde5e09191a8e586d9f4d50838e7ec09d6411dfdb63
+patch_filename = openssl_3.0.2-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/openssl_3.0.2-1/get_patch
+patch_hash = 762ab4ea94d02178d6a1d3eb63409c2c4d61315d358391cdac62df15211174d4
 
 [provide]
 libcrypto = libcrypto_dep

package/worker/subprojects/usrsctp.wrap

@@ -1,8 +1,8 @@
 [wrap-file]
-directory = usrsctp-9d6b99b10a70f7a63d21cd80d03c353da9ac19d3
-source_url = https://github.com/sctplab/usrsctp/archive/9d6b99b10a70f7a63d21cd80d03c353da9ac19d3.zip
-source_filename = 9d6b99b10a70f7a63d21cd80d03c353da9ac19d3.zip
-source_hash = d9b7b3350ea0be2a3d1437e404d4852df741c4984b734729c5edc337ff4b7611
+directory = usrsctp-4e06feb01cadcd127d119486b98a4bd3d64aa1e7
+source_url = https://github.com/sctplab/usrsctp/archive/4e06feb01cadcd127d119486b98a4bd3d64aa1e7.zip
+source_filename = 4e06feb01cadcd127d119486b98a4bd3d64aa1e7.zip
+source_hash = 15f7844c4c4ca93228ae0fe844182c72edd1d809b461cb97b1bb687a804dd4fc
 
 [provide]
 usrsctp = usrsctp_dep

package/worker/subprojects/wingetopt.wrap

@@ -1,6 +1,5 @@
 [wrap-file]
-directory = wingetopt-0.95
-source_url = https://github.com/alex85k/wingetopt/archive/v0.95.zip
-source_filename = wingetopt-0.95.zip
-source_hash = 7b535dd753b93446539504a76cd561282e9a8a9969fe06e0d8691fc3048987c5
-patch_directory = wingetopt
+directory = wingetopt-1.00
+source_url = https://github.com/alex85k/wingetopt/archive/v1.00.zip
+source_filename = wingetopt-1.00.zip
+source_hash = 4454ca03a59702a4ca4d1488ca8fa6168b0c8d77dc739a6fe2825c3dd8609d87

package/worker/subprojects/packagefiles/wingetopt/meson.build

@@ -1,43 +0,0 @@
-project(
-  'wingetopt',
-  'c',
-  version: '0.95',
-  license : ['ISC', 'BSD-3-Clause'],
-  meson_version: '>= 0.55',
-  default_options: [
-    'warning_level=1',
-  ],
-)
-
-compiler = meson.get_compiler('c')
-
-c_args = []
-
-if compiler.get_id() == 'msvc'
-  c_args += [
-    '-D_CRT_SECURE_NO_WARNINGS',
-  ]
-
-  if get_option('default_library') == 'shared'
-    c_args += [
-      '-DBUILDING_WINGETOPT_DLL',
-      '-DWINGETOPT_SHARED_LIB',
-    ]
-  endif
-endif
-
-wingetopt_lib = library(
-  'wingetopt',
-  'src/getopt.c',
-  include_directories: include_directories(
-    'src',
-  ),
-  c_args: c_args,
-)
-
-wingetopt_dep = declare_dependency(
-  link_with: wingetopt_lib,
-  include_directories: include_directories(
-    'src',
-  ),
-)