gentoo auto-resync : 15:04:2024 - 12:04:02

5 files changed, 169 insertions, 3 deletions

diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index 455f0ac13c1e..2c090bb148e2 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,8 +1,11 @@
+AUX streamlink-6.7.2-validator.patch 2637 BLAKE2B 91b6c0f12b584c0908f0d4092d87cb50feefbdc3ff563d7585c5713547ffbb54614b7970435664d3a0cae7c1b7ae69edaa7bd15ff19a4169c9bc5ff02f0edfe5 SHA512 fe9d12e5d7bbdee7f778ac344494ec0fca6489509a92627b6305b425d1f594337a8b495c61c87f90356a9aaf97996b6b9b2b804f1b08f1ca3358ad2dec1cdea8
 DIST streamlink-6.5.1.tar.gz 717297 BLAKE2B 7f24a9ac2e62ff08d2126e4aceda75cbd46d78de08784336dd3b4d7608cd7885a5dca28bd9dda9f8c217b9cc428f8f50f09d0c45e470e0d3534ecd3effb2a95f SHA512 b31b34a2ef510d47d396b12b770c042bed24ff61835db6a654722803ae94e8371aa547f30bf20d7cf34d737ed9bd59bcea1bb1810e926cfc7ae3fa72f38881d8
 DIST streamlink-6.6.2.tar.gz 737076 BLAKE2B f1603c292cbb1135534d34b89bad3d859194a9d9b602aafc05e38d901071b77a92fc054387081a4579a4504642d33454427ee239def80a8ec0b50f901dab05ab SHA512 727fbd6bbf03a55a468b625984abe3d7f1792aaab11b2a55d5b0526454cc1959d7bfb3579526eb9e7493a44277302e6f40556f3ad99509751f950d49605b60db
 DIST streamlink-6.7.2.tar.gz 741037 BLAKE2B b6ecea883a8b09e524a28ebdee083bb5f1e563605ef16fb3adebba03194ad3f1d8f9dc902cfe80372dc53c5778f1ddc9695680b5cd4a87277b646fc15fffd7e2 SHA512 251e0b03c39dae980367e8a5b6ffcb1c279b0874eeaeff31d9d4486917b759ef27ba2bd5bba0bc74691237e429981f3748002e0ef49befe8c7be69160856ecfe
+DIST streamlink-6.7.3.tar.gz 742832 BLAKE2B 5f03a036c3f2170d25e43618f36d7b937e8063f15a965f45d8cc6033b49899b15c19af23aa2a845f8aec74341932721b792dad6bff70400f0dea24a19f1415ed SHA512 0955faab177bcdd0f66500f837124bf0f426829cb5c847fa18bb85aa3fcd7c27a750bab13f3e247b5187e9561713330b582b10729d82984d98081856e976ae65
 EBUILD streamlink-6.5.1.ebuild 2195 BLAKE2B 402b5052819b75766701fca53fcef174031ecabf1546cef2ae582183601321af449089df87fceac39f799cf1ec1005ceb5d8681268b33d3b9d4bf5e36a5868c9 SHA512 0a3c651ec9ea507e721fd819a7cb4fede850cc7a6fe001002cf5087e554515deb6816d0c7da8f673ab95795d22a5d0f6a3a11c615ea29fa5bef8fce0a1c5026d
 EBUILD streamlink-6.6.2.ebuild 2196 BLAKE2B 8ef3951cba5995da90a9964a29f231a62939d9a154375757d48eb2227fedcc0b5f07ebcc3215ba281d9485a4c902ef0d9a7e648cfccd7b929b2ab667d758de97 SHA512 8a6282c96ed33721631aa2fcaee5caf424881090b5c2406a44bd4ec355d92e41ec93fb3f9daf4124e3f67e024e435fa48f03a65a534485fa5bc406dfb3c3bc39
-EBUILD streamlink-6.7.2.ebuild 3538 BLAKE2B 25640c8c168c175ed71a88ccb76edf58d60901ad265ac483e2600a0d7c69ee5bdb2b5f791a6d4545be5717a43db7e18bbdb9d24ff1bad75ff9687d099a125460 SHA512 c2a52cd668d9dbdb4aef0230f244044e135e852095b9ead7bda578b3f9ddb905506733daa4035c30c0b8585e7c22dadb7609486e537f7ec29feecfdfb2163226
-EBUILD streamlink-9999.ebuild 3538 BLAKE2B 25640c8c168c175ed71a88ccb76edf58d60901ad265ac483e2600a0d7c69ee5bdb2b5f791a6d4545be5717a43db7e18bbdb9d24ff1bad75ff9687d099a125460 SHA512 c2a52cd668d9dbdb4aef0230f244044e135e852095b9ead7bda578b3f9ddb905506733daa4035c30c0b8585e7c22dadb7609486e537f7ec29feecfdfb2163226
+EBUILD streamlink-6.7.2-r1.ebuild 3587 BLAKE2B c15e6c3b815d8fe77a3c98a80e814cbb15dd23cb0aefd0b65022a373b8228ce9675c7caf2edf02e1b584ad417ca0939524f9b0d8f9d8dd08edcbfbe139e87feb SHA512 6a1860f4f05afafaed455cf89784071de9920ea0fb80e8316599b303cb69c820a454ff1a2857fa8126ded5735b646985029533be3d3ad9264039ab3925be758c
+EBUILD streamlink-6.7.3.ebuild 3512 BLAKE2B 5b466bef6616009eeb15735d85b32d32d967a1b8ff17e6e04e2ee8d96f072fb72bdae3f5c554619ff2de438826c87b2af46bbdb7eb55ab74142b75f6b480d6e1 SHA512 8ad3b8d227b37aec93ca0f76b305a0e43afefae55ff3c2c1a963ced7d4e532c5199769005ef5361d2ec8e72946dc98e17e14fae6313be78423e15f4f7e18a55e
+EBUILD streamlink-9999.ebuild 3512 BLAKE2B 5b466bef6616009eeb15735d85b32d32d967a1b8ff17e6e04e2ee8d96f072fb72bdae3f5c554619ff2de438826c87b2af46bbdb7eb55ab74142b75f6b480d6e1 SHA512 8ad3b8d227b37aec93ca0f76b305a0e43afefae55ff3c2c1a963ced7d4e532c5199769005ef5361d2ec8e72946dc98e17e14fae6313be78423e15f4f7e18a55e
 MISC metadata.xml 398 BLAKE2B 43aa67d43256cecb95b788e4bab999f73b7b624fa1af0432aa87ffa94071f09e29eab6733468d6607eeb7aa9f81030610dfbcd849f9cb9196d80181ea5712f74 SHA512 2db05f8a1196e44e632b4ee1d85f804d295eb53141cf176e85cbe90cc30e0fee382a5e798e4cc7fd63557d60687d05a671533c2188a2fcf497f6e95292190149
diff --git a/net-misc/streamlink/files/streamlink-6.7.2-validator.patch b/net-misc/streamlink/files/streamlink-6.7.2-validator.patch
new file mode 100644
index 000000000000..8dc69d62616a
--- /dev/null
+++ b/net-misc/streamlink/files/streamlink-6.7.2-validator.patch
@@ -0,0 +1,61 @@
+https://github.com/streamlink/streamlink/pull/5932
+https://github.com/streamlink/streamlink/commit/0466622dc0bd13db972f6a00d2e2bda31ad50229
+
+Quoting the PR:
+"""
+Since Python 3.11.9 / 3.12.3 / 3.13.0a6, urllib.parse.parse_qsl() now raises a TypeError
+if the input is not a str, is truthy and can't be passed to memoryview(), like integers for example,
+hence the test failure which previously just checked an invalid input to that validation schema.
+"""
+
+From 51c13ddd45f83384cf7800a881127ad74dec3bb8 Mon Sep 17 00:00:00 2001
+From: bastimeyer <mail@bastimeyer.de>
+Date: Tue, 9 Apr 2024 21:36:03 +0200
+Subject: [PATCH] plugin.api.validate: check parse_qsd() input type
+
+---
+ src/streamlink/plugin/api/validate/_validators.py |  6 +++++-
+ tests/test_api_validate.py                        | 11 +++++++++--
+ 2 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/src/streamlink/plugin/api/validate/_validators.py b/src/streamlink/plugin/api/validate/_validators.py
+index 69135b74919..e99d305733f 100644
+--- a/src/streamlink/plugin/api/validate/_validators.py
++++ b/src/streamlink/plugin/api/validate/_validators.py
+@@ -651,4 +651,8 @@ def validator_parse_qsd(*args, **kwargs) -> TransformSchema:
+     :raise ValidationError: On parsing error
+     """
+ 
+-    return TransformSchema(_parse_qsd, *args, **kwargs, exception=ValidationError, schema=None)
++    def parser(*_args, **_kwargs):
++        validate(AnySchema(str, bytes), _args[0])
++        return _parse_qsd(*_args, **_kwargs, exception=ValidationError, schema=None)
++
++    return TransformSchema(parser, *args, **kwargs)
+diff --git a/tests/test_api_validate.py b/tests/test_api_validate.py
+index ceff9bc1dde..c328116d27b 100644
+--- a/tests/test_api_validate.py
++++ b/tests/test_api_validate.py
+@@ -1343,13 +1343,20 @@ def test_success(self):
+             validate.parse_qsd(),
+             "foo=bar&foo=baz&qux=quux",
+         ) == {"foo": "baz", "qux": "quux"}
++        assert validate.validate(
++            validate.parse_qsd(),
++            b"foo=bar&foo=baz&qux=quux",
++        ) == {b"foo": b"baz", b"qux": b"quux"}
+ 
+     def test_failure(self):
+         with pytest.raises(ValidationError) as cm:
+             validate.validate(validate.parse_qsd(), 123)
+         assert_validationerror(cm.value, """
+-            ValidationError:
+-              Unable to parse query string: 'int' object has no attribute 'decode' (123)
++            ValidationError(AnySchema):
++              ValidationError(type):
++                Type of 123 should be str, but is int
++              ValidationError(type):
++                Type of 123 should be bytes, but is int
+         """)
+ 
+ 
diff --git a/net-misc/streamlink/streamlink-6.7.2.ebuild b/net-misc/streamlink/streamlink-6.7.2-r1.ebuild
index 77cb4490795c..2f0f40037611 100644
--- a/net-misc/streamlink/streamlink-6.7.2.ebuild
+++ b/net-misc/streamlink/streamlink-6.7.2-r1.ebuild
@@ -73,6 +73,10 @@ if [[ ${PV} == 9999* ]]; then
 	"
 fi
 
+PATCHES=(
+	"${FILESDIR}"/${P}-validator.patch
+)
+
 distutils_enable_tests pytest
 
 python_test() {
diff --git a/net-misc/streamlink/streamlink-6.7.3.ebuild b/net-misc/streamlink/streamlink-6.7.3.ebuild
new file mode 100644
index 000000000000..b224e1c5387a
--- /dev/null
+++ b/net-misc/streamlink/streamlink-6.7.3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
+	inherit git-r3
+fi
+
+DISTUTILS_SINGLE_IMPL=1
+# >= 6.2.1 uses a bunch of setuptools hooks instead of vanilla setuptools
+# https://github.com/streamlink/streamlink/commit/194d9bc193f5285bc1ba33af5fd89209a96ad3a7
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE='xml(+),threads(+)'
+inherit distutils-r1
+
+DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
+HOMEPAGE="https://streamlink.github.io/"
+
+if [[ ${PV} != 9999* ]]; then
+	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
+fi
+
+LICENSE="BSD-2 Apache-2.0"
+SLOT="0"
+if [[ ${PV} != 9999* ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+# See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep
+# See https://github.com/streamlink/streamlink/pull/5895 re exceptiongroup dep
+RDEPEND="
+	media-video/ffmpeg
+	$(python_gen_cond_dep '
+		dev-python/certifi[${PYTHON_USEDEP}]
+		|| (
+			dev-python/chardet[${PYTHON_USEDEP}]
+			dev-python/charset-normalizer[${PYTHON_USEDEP}]
+		)
+		dev-python/exceptiongroup[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
+		dev-python/isodate[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.6.4[${PYTHON_USEDEP}]
+		>=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}]
+		dev-python/pycountry[${PYTHON_USEDEP}]
+		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
+		>dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+		>=dev-python/trio-0.22.0[${PYTHON_USEDEP}]
+		>=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}]
+		>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/setuptools-64[${PYTHON_USEDEP}]
+		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
+		test? (
+			>=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
+			dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+			dev-python/pytest-trio[${PYTHON_USEDEP}]
+			dev-python/requests-mock[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+if [[ ${PV} == 9999* ]]; then
+	RDEPEND+="
+		$(python_gen_cond_dep '
+			>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
+		')
+	"
+fi
+
+distutils_enable_tests pytest
+
+python_test() {
+	# Skip tests requiring <dev-python/pytest-8.0.0
+	# https://github.com/streamlink/streamlink/pull/5901
+	EPYTEST_DESELECT+=(
+		tests/webbrowser/cdp/test_client.py::TestEvaluate::test_exception
+		tests/webbrowser/cdp/test_client.py::TestEvaluate::test_error
+		tests/webbrowser/cdp/test_client.py::TestNavigate::test_detach
+		tests/webbrowser/cdp/test_client.py::TestNavigate::test_error
+		tests/webbrowser/cdp/test_connection.py::TestCreateConnection::test_failure
+		tests/webbrowser/cdp/test_connection.py::TestReaderError::test_invalid_json
+		tests/webbrowser/cdp/test_connection.py::TestReaderError::test_unknown_session_id
+		'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Default timeout, response not in time]'
+		'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Custom timeout, response not in time]'
+		tests/webbrowser/cdp/test_connection.py::TestSend::test_bad_command
+		tests/webbrowser/cdp/test_connection.py::TestSend::test_result_exception
+		tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_error
+		tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_no_result
+	)
+
+	epytest
+}
diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild
index 77cb4490795c..b224e1c5387a 100644
--- a/net-misc/streamlink/streamlink-9999.ebuild
+++ b/net-misc/streamlink/streamlink-9999.ebuild
@@ -76,7 +76,7 @@ fi
 distutils_enable_tests pytest
 
 python_test() {
-	# Skip tests requiring <dev-python/pytest-8.0.0 which is currently masked
+	# Skip tests requiring <dev-python/pytest-8.0.0
 	# https://github.com/streamlink/streamlink/pull/5901
 	EPYTEST_DESELECT+=(
 		tests/webbrowser/cdp/test_client.py::TestEvaluate::test_exception