Compare commits
53 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8ba6ef58d2 | ||
|
|
c82ae71264 | ||
|
|
de7ea94edf |
||
|
|
5bb0cafe50 |
||
|
|
a2500a4c99 | ||
|
|
2afd4b2674 | ||
|
|
4ccc324af3 | ||
|
|
720f2742d0 | ||
|
|
61c2655717 |
||
|
|
dedd353fe7 | ||
|
|
4e4c19a028 |
||
|
|
13a1b07f32 | ||
|
|
682a4e8001 | ||
|
|
f950e7eac2 |
||
|
|
fab98c1246 |
||
|
|
fc98c68b40 |
||
|
|
f879056646 |
||
|
|
8fd3b0dce3 |
||
|
|
243086924c |
||
|
|
2405ab343a |
||
|
|
4ca3855bcf | ||
|
|
4884749aca | ||
|
|
0296333d57 | ||
|
|
01e9c71207 | ||
|
|
712d69fdd3 | ||
|
|
593bf58c62 | ||
|
|
f134e3c17b | ||
|
|
892b44222a | ||
|
|
b72de101a6 | ||
|
|
5b33382a1e |
||
|
|
45ad1b7f49 |
||
|
|
3567b90b25 |
||
|
|
f9a69f22bc |
||
|
|
c2f2d74820 | ||
|
|
2cf62665fb |
||
|
|
8d6c81d86e |
||
|
|
1b7ac92bf3 |
||
|
|
a0bc985168 |
||
|
|
ce00940224 |
||
|
|
4ce1cf0f3f |
||
|
|
1915cbb3ee | ||
|
|
4f0432daaf | ||
|
|
aef2688045 | ||
|
|
b8d3a22583 | ||
|
|
eacda9a5dd | ||
|
|
6308364583 | ||
|
|
473142dd7d | ||
|
|
4b45f4c7c9 | ||
|
|
d77c484ebe | ||
|
|
b43afeaccb | ||
|
|
5d846b7f84 | ||
|
|
0b309bc750 | ||
|
|
1fa052bd17 |
8 changed files with 351 additions and 315 deletions
32
.gitignore
vendored
32
.gitignore
vendored
|
|
@ -42,3 +42,35 @@
|
|||
/yt-dlp-2024.08.01.tar.gz
|
||||
/yt-dlp-2024.08.06.tar.gz
|
||||
/yt-dlp-2024.09.27.tar.gz
|
||||
/yt-dlp-2024.10.07.tar.gz
|
||||
/yt-dlp-2024.10.22.tar.gz
|
||||
/yt-dlp-2024.11.04.tar.gz
|
||||
/yt-dlp-2024.11.18.tar.gz
|
||||
/yt-dlp-2024.12.23.tar.gz
|
||||
/yt-dlp-2025.01.12.tar.gz
|
||||
/yt-dlp-2025.01.15.tar.gz
|
||||
/yt-dlp-2025.01.26.tar.gz
|
||||
/yt-dlp-2025.02.19.tar.gz
|
||||
/yt-dlp-2025.03.26.tar.gz
|
||||
/yt-dlp-2025.03.31.tar.gz
|
||||
/yt-dlp-2025.04.30.tar.gz
|
||||
/yt-dlp-2025.05.22.tar.gz
|
||||
/yt-dlp-2025.06.09.tar.gz
|
||||
/yt-dlp-2025.06.25.tar.gz
|
||||
/yt-dlp-2025.06.30.tar.gz
|
||||
/yt-dlp-2025.07.21.tar.gz
|
||||
/yt-dlp-2025.08.11.tar.gz
|
||||
/yt-dlp-2025.08.22.tar.gz
|
||||
/yt-dlp-2025.08.27.tar.gz
|
||||
/yt-dlp-2025.09.05.tar.gz
|
||||
/yt-dlp-2025.09.26.tar.gz
|
||||
/yt-dlp-2025.10.22.tar.gz
|
||||
/yt-dlp-2025.12.08.tar.gz
|
||||
/yt-dlp-2026.01.29.tar.gz
|
||||
/yt-dlp-2026.02.04.tar.gz
|
||||
/yt-dlp-2026.02.21.tar.gz
|
||||
/yt-dlp-2026.03.03.tar.gz
|
||||
/yt-dlp-2026.03.13.tar.gz
|
||||
/yt-dlp-2026.03.17.tar.gz
|
||||
/yt-dlp-2026.06.09.tar.gz
|
||||
/yt-dlp-2026.08.19.tar.gz
|
||||
|
|
|
|||
46
0002-Restore-compatibility-with-pytest-9.patch
Normal file
46
0002-Restore-compatibility-with-pytest-9.patch
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
From b958f102848b73edeec7bb92fff8d4d002ae4b23 Mon Sep 17 00:00:00 2001
|
||||
From: Maxwell G <maxwell@gtmx.me>
|
||||
Date: Thu, 18 Jun 2026 21:19:45 -0500
|
||||
Subject: [PATCH 2/2] Restore compatibility with pytest < 9
|
||||
|
||||
---
|
||||
pyproject.toml | 4 +---
|
||||
test/test_downloader_external.py | 2 +-
|
||||
2 files changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index 8128fb3..8bb3631 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -467,14 +467,12 @@ select = [
|
||||
]
|
||||
exclude = "*/extractor/lazy_extractors.py,*venv*,*/test/testdata/sigs/player-*.js,.idea,.vscode"
|
||||
|
||||
-[tool.pytest]
|
||||
+[tool.pytest.ini_options]
|
||||
addopts = [
|
||||
"-ra", # summary: all except passed
|
||||
"--tb=short",
|
||||
]
|
||||
verbosity_test_cases = "1"
|
||||
-strict_config = true
|
||||
-strict_markers = true
|
||||
markers = [
|
||||
"download",
|
||||
]
|
||||
diff --git a/test/test_downloader_external.py b/test/test_downloader_external.py
|
||||
index 0b51c96..d318d3c 100644
|
||||
--- a/test/test_downloader_external.py
|
||||
+++ b/test/test_downloader_external.py
|
||||
@@ -132,7 +132,7 @@ class TestDownloaderCookieBehavior:
|
||||
pytest.param(WgetFD, marks=pytest.mark.skipif(not WgetFD.available(), reason='wget unavailable')),
|
||||
pytest.param(Aria2cFD, marks=pytest.mark.skipif(not Aria2cFD.available(), reason='aria2c unavailable')),
|
||||
])
|
||||
- def test_cookie_behavior(self, /, downloader_cls):
|
||||
+ def test_cookie_behavior(self, downloader_cls):
|
||||
with FakeYDL() as ydl:
|
||||
downloader = downloader_cls(ydl, {})
|
||||
|
||||
--
|
||||
2.54.0
|
||||
|
||||
45
17491.patch
Normal file
45
17491.patch
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
From b6ef4e25fe882a82c02c12ca716f19fb3c1b89f3 Mon Sep 17 00:00:00 2001
|
||||
From: Mikel Olasagasti Uranga <mikel@olasagasti.info>
|
||||
Date: Thu, 20 Aug 2026 16:23:27 +0200
|
||||
Subject: [PATCH] tests: accept newer OpenSSL handshake error wording
|
||||
|
||||
Newer Python/OpenSSL combinations may report TLS handshake failures as
|
||||
"TLS_ALERT_HANDSHAKE_FAILURE" / "tls alert handshake failure" instead
|
||||
of the older "sslv3 alert handshake failure" wording expected by the
|
||||
test suite.
|
||||
|
||||
Relax the test regexes to accept both forms without changing the
|
||||
behavior being tested.
|
||||
|
||||
Signed-off-by: Mikel Olasagasti Uranga <mikel@olasagasti.info>
|
||||
---
|
||||
test/test_networking.py | 2 +-
|
||||
test/test_websockets.py | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/test/test_networking.py b/test/test_networking.py
|
||||
index 9dbe263b6fcd..57a7a21bd14b 100644
|
||||
--- a/test/test_networking.py
|
||||
+++ b/test/test_networking.py
|
||||
@@ -338,7 +338,7 @@ def test_ssl_error(self, handler):
|
||||
https_server_thread.start()
|
||||
|
||||
with handler(verify=False) as rh:
|
||||
- with pytest.raises(SSLError, match=r'(?i)ssl(?:v3|/tls).alert.handshake.failure') as exc_info:
|
||||
+ with pytest.raises(SSLError, match=r'(?i)(?:TLS_ALERT_HANDSHAKE_FAILURE|(?:sslv3|ssl/tls|tls).alert.handshake.failure)') as exc_info:
|
||||
validate_and_send(rh, Request(f'https://127.0.0.1:{https_port}/headers'))
|
||||
assert not issubclass(exc_info.type, CertificateVerifyError)
|
||||
|
||||
diff --git a/test/test_websockets.py b/test/test_websockets.py
|
||||
index caa026f44f3a..3b3814018eeb 100644
|
||||
--- a/test/test_websockets.py
|
||||
+++ b/test/test_websockets.py
|
||||
@@ -186,7 +186,7 @@ def test_verify_cert(self, handler):
|
||||
|
||||
def test_ssl_error(self, handler):
|
||||
with handler(verify=False) as rh:
|
||||
- with pytest.raises(SSLError, match=r'ssl(?:v3|/tls) alert handshake failure') as exc_info:
|
||||
+ with pytest.raises(SSLError, match=r'(?:TLS_ALERT_HANDSHAKE_FAILURE|(?:sslv3|ssl/tls|tls) alert handshake failure)') as exc_info:
|
||||
ws_validate_and_send(rh, Request(self.bad_wss_host))
|
||||
assert not issubclass(exc_info.type, CertificateVerifyError)
|
||||
|
||||
180
changelog
Normal file
180
changelog
Normal file
|
|
@ -0,0 +1,180 @@
|
|||
* Mon Nov 18 2024 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 2024.11.18-1
|
||||
- Update to 2024.11.18. Fixes rhbz#2326919
|
||||
|
||||
* Tue Nov 05 2024 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 2024.11.04-1
|
||||
- Update to 2024.11.04. Fixes rhbz#2323783
|
||||
|
||||
* Wed Oct 23 2024 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 2024.10.22-1
|
||||
- Update to 2024.10.22. Fixes rhbz#2321221
|
||||
|
||||
* Tue Oct 08 2024 Maxwell G <maxwell@gtmx.me> - 2024.10.07-1
|
||||
- Update to 2024.10.07.
|
||||
|
||||
* Sat Sep 28 2024 Maxwell G <maxwell@gtmx.me> - 2024.09.27-1
|
||||
- Update to 2024.09.27.
|
||||
|
||||
* Mon Aug 12 2024 Maxwell G <maxwell@gtmx.me> - 2024.08.06-1
|
||||
- Update to 2024.08.06. Fixes rhbz#2303069.
|
||||
|
||||
* Sat Aug 03 2024 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 2024.08.01-1
|
||||
- Update to 2024.08.01. Fixes rhbz#2302522
|
||||
|
||||
* Fri Jul 26 2024 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 2024.07.25-1
|
||||
- Update to 2024.07.25. Fixes rhbz#2300087
|
||||
|
||||
* Wed Jul 24 2024 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 2024.07.16-1
|
||||
- Update to 2024.07.16. Fixes rhbz#2298550
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2024.07.09-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Thu Jul 11 2024 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 2024.07.09-1
|
||||
- Update to 2024.07.09. Fixes rhbz#2297344
|
||||
|
||||
* Mon Jul 08 2024 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 2024.07.07-1
|
||||
- Update to 2024.07.07. Fixes rhbz#2296356
|
||||
|
||||
* Thu Jul 04 2024 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 2024.07.02-1
|
||||
- Update to 2024.07.02. Fixes rhbz#2295769
|
||||
|
||||
* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 2024.05.27-2
|
||||
- Rebuilt for Python 3.13
|
||||
|
||||
* Wed May 29 2024 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 2024.05.27-1
|
||||
- Update to 2024.05.27. Fixes rhbz#2283578.
|
||||
|
||||
* Mon May 27 2024 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 2024.05.26-1
|
||||
- Update to 2024.05.26. Fixes rhbz#2274266.
|
||||
|
||||
* Wed Apr 10 2024 Maxwell G <maxwell@gtmx.me> - 2024.04.09-1
|
||||
- Update to 2024.04.09.
|
||||
|
||||
* Wed Mar 13 2024 Maxwell G <maxwell@gtmx.me> - 2024.03.10-1
|
||||
- Update to 2024.03.10. Fixes rhbz#2268944.
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2023.12.30-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Wed Jan 3 2024 Maxwell G <maxwell@gtmx.me> - 2023.12.30-1
|
||||
- Update to 2023.12.30. Fixes rhbz#2244200.
|
||||
|
||||
* Wed Oct 11 2023 Marcus Müller <marcus_fedora@baseband.digital> - 2023.10.07-1
|
||||
- Update to 2023.10.07.
|
||||
- Fixes rhbz#2243274
|
||||
- Fixes rhbz#2240465
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2023.07.06-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Fri Jul 07 2023 Maxwell G <maxwell@gtmx.me> - 2023.07.06-1
|
||||
- Update to 2023.07.06.
|
||||
- Mitigates CVE-2023-35934 / GHSA-v8mc-9377-rwjj
|
||||
|
||||
* Wed Jul 05 2023 Maxwell G <maxwell@gtmx.me> - 2023.06.22-1
|
||||
- Update to 2023.06.22. Fixes rhbz#2216612.
|
||||
|
||||
* Thu Jun 22 2023 Maxwell G <maxwell@gtmx.me> - 2023.06.21-1
|
||||
- Update to 2023.06.21. Fixes rhbz#2216612.
|
||||
|
||||
* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 2023.03.04-2
|
||||
- Rebuilt for Python 3.12
|
||||
|
||||
* Mon Mar 06 2023 Maxwell G <maxwell@gtmx.me> - 2023.03.04-1
|
||||
- Update to 2023.03.04. Fixes rhbz#2175395.
|
||||
|
||||
* Fri Feb 17 2023 Maxwell G <maxwell@gtmx.me> - 2023.02.17-1
|
||||
- Update to 2023.02.17.
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2023.01.06-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Tue Jan 10 2023 Maxwell G <gotmax@e.email> - 2023.01.06-1
|
||||
- Update to 2023.01.06. Fixes rhbz#2157879.
|
||||
|
||||
* Mon Nov 14 2022 Maxwell G <gotmax@e.email> - 2022.11.11-1
|
||||
- Update to 2022.11.11. Fixes rhbz#2142417.
|
||||
|
||||
* Sat Oct 08 2022 Maxwell G <gotmax@e.email> - 2022.10.04-1
|
||||
- Update to 2022.10.04. Fixes rhbz#2132726.
|
||||
|
||||
* Fri Sep 02 2022 Maxwell G <gotmax@e.email> - 2022.09.01-1
|
||||
- Update to 2022.09.01. Fixes rhbz#2123442.
|
||||
|
||||
* Fri Aug 19 2022 Maxwell G <gotmax@e.email> - 2022.08.19-1
|
||||
- Update to 2022.08.19. Fixes rhbz#2118224.
|
||||
|
||||
* Tue Aug 09 2022 Maxwell G <gotmax@e.email> - 2022.08.08-1
|
||||
- Update to 2022.08.08.
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2022.06.29-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Mon Jul 04 2022 Maxwell G <gotmax@e.email> - 2022.06.29-2
|
||||
- Fix shell completions subpackages
|
||||
|
||||
* Mon Jul 04 2022 Maxwell G <gotmax@e.email> - 2022.06.29-1
|
||||
- Update to 2022.06.29. Fixes rhbz#2102238.
|
||||
|
||||
* Thu Jun 23 2022 Maxwell G <gotmax@e.email> - 2022.06.22.1-1
|
||||
- Update to 2022.06.22.1. Fixes rhbz#2100019.
|
||||
|
||||
* Fri Jun 17 2022 Maxwell G <gotmax@e.email> - 2022.05.18-3
|
||||
- Fix gating configuration
|
||||
|
||||
* Thu Jun 16 2022 Python Maint <python-maint@redhat.com> - 2022.05.18-2
|
||||
- Rebuilt for Python 3.11
|
||||
|
||||
* Tue May 24 2022 Maxwell G <gotmax@e.email> - 2022.05.18-1
|
||||
- Update to 2022.05.18. Fixes rhbz#2088564.
|
||||
|
||||
* Fri Apr 08 2022 Maxwell G <gotmax@e.email> - 2022.04.08-1
|
||||
- Update to 2022.04.08. Fixes rhbz#2073359.
|
||||
|
||||
* Sat Mar 12 2022 Artem Polishchuk <ego.cordatus@gmail.com> - 2022.03.08.1-2
|
||||
- build: Make ffmpeg and ffprobe conditional deps for >= f36 only
|
||||
|
||||
* Thu Mar 10 2022 Maxwell G <gotmax@e.email> - 2022.03.08.1-1
|
||||
- Update to 2022.03.08.1. Fixes rhbz#2061973.
|
||||
|
||||
* Mon Mar 07 2022 Maxwell G <gotmax@e.email> - 2022.02.04-2
|
||||
- Add weak dependency on ffmpeg and ffprobe.
|
||||
- Make shell-completion subpackages optional again.
|
||||
|
||||
* Fri Feb 04 2022 Maxwell G <gotmax@e.email> - 2022.2.4-1
|
||||
- Update to 2022.2.4. Fixes rhbz#2050497.
|
||||
|
||||
* Mon Jan 24 2022 Maxwell G <gotmax@e.email> - 2022.01.21-1
|
||||
- Update to 2022.01.21.
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2021.12.27-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Mon Dec 27 2021 Maxwell G <gotmax@e.email> - 2021.12.27-1
|
||||
- Update to 2021.12.27.
|
||||
|
||||
* Sun Dec 26 2021 Maxwell G <gotmax@e.email> - 2021.12.25-1
|
||||
- Update to 2021.12.25.
|
||||
|
||||
* Wed Dec 01 2021 Maxwell G <gotmax@e.email> - 2021.12.01-1
|
||||
- Update to 2021.12.01.
|
||||
|
||||
* Tue Nov 9 2021 Maxwell G <gotmax@e.email> - 2021.11.10.1-1
|
||||
- Update to 2021.11.10.1.
|
||||
|
||||
* Tue Nov 9 2021 Maxwell G <gotmax@e.email> - 2021.10.22-2
|
||||
- Skip installing unnecessary tox dependencies
|
||||
- Fix shell-completion subpackages
|
||||
- Only package README.md; don't generate extra README.txt
|
||||
|
||||
* Sat Oct 23 2021 Maxwell G <gotmax@e.email> - 2021.10.22-1
|
||||
- Update to 2021.10.22
|
||||
|
||||
* Sun Oct 10 2021 Maxwell G <gotmax@e.email> - 2021.10.10-1
|
||||
- Mark LICENSE with %%license instead of %%doc
|
||||
- Update to 2021.10.10
|
||||
- Fix non-executable-script rpmlint error
|
||||
- Use `python3dist(NAME)` for dependencies
|
||||
- Fix rpm-buildroot-usage rpmlint error
|
||||
|
||||
* Sat Oct 9 2021 Maxwell G <gotmax@e.email> - 2021.10.09-1
|
||||
- Initial package
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (yt-dlp-2024.09.27.tar.gz) = 8c518aae18d049495def31dad1e81374ff7a2f1b136356c574d97643c6bbde37f757f74d77c519a8782c4d69668db80f367a21424923f249e82491c14f4880e8
|
||||
SHA512 (yt-dlp-2026.08.19.tar.gz) = 04f2dae28fe2b087fed3df38fc6787eac8f85a351bd72f3b010a84fb48bccf9bfde3a50ca4c005afb384f1219ee66a4cab24e5740eb1e5b8eb1a0d8ab773bafd
|
||||
|
|
|
|||
|
|
@ -1,77 +0,0 @@
|
|||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index d5480e1c6d73..fe6894a42838 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -49,7 +49,7 @@ dependencies = [
|
||||
"pycryptodomex",
|
||||
"requests>=2.32.2,<3",
|
||||
"urllib3>=1.26.17,<3",
|
||||
- "websockets>=12.0",
|
||||
+ "websockets>=13.0",
|
||||
]
|
||||
|
||||
[project.optional-dependencies]
|
||||
diff --git a/test/test_websockets.py b/test/test_websockets.py
|
||||
index 43f20ac655ad..06112cc0b8fb 100644
|
||||
--- a/test/test_websockets.py
|
||||
+++ b/test/test_websockets.py
|
||||
@@ -88,7 +88,7 @@ def create_wss_websocket_server():
|
||||
certfn = os.path.join(TEST_DIR, 'testcert.pem')
|
||||
sslctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
|
||||
sslctx.load_cert_chain(certfn, None)
|
||||
- return create_websocket_server(ssl_context=sslctx)
|
||||
+ return create_websocket_server(ssl=sslctx)
|
||||
|
||||
|
||||
MTLS_CERT_DIR = os.path.join(TEST_DIR, 'testdata', 'certificate')
|
||||
@@ -103,7 +103,7 @@ def create_mtls_wss_websocket_server():
|
||||
sslctx.load_verify_locations(cafile=cacertfn)
|
||||
sslctx.load_cert_chain(certfn, None)
|
||||
|
||||
- return create_websocket_server(ssl_context=sslctx)
|
||||
+ return create_websocket_server(ssl=sslctx)
|
||||
|
||||
|
||||
def create_legacy_wss_websocket_server():
|
||||
@@ -112,7 +112,7 @@ def create_legacy_wss_websocket_server():
|
||||
sslctx.maximum_version = ssl.TLSVersion.TLSv1_2
|
||||
sslctx.set_ciphers('SHA1:AESCCM:aDSS:eNULL:aNULL')
|
||||
sslctx.load_cert_chain(certfn, None)
|
||||
- return create_websocket_server(ssl_context=sslctx)
|
||||
+ return create_websocket_server(ssl=sslctx)
|
||||
|
||||
|
||||
def ws_validate_and_send(rh, req):
|
||||
@@ -139,7 +139,7 @@ def setup_class(cls):
|
||||
cls.wss_thread, cls.wss_port = create_wss_websocket_server()
|
||||
cls.wss_base_url = f'wss://127.0.0.1:{cls.wss_port}'
|
||||
|
||||
- cls.bad_wss_thread, cls.bad_wss_port = create_websocket_server(ssl_context=ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER))
|
||||
+ cls.bad_wss_thread, cls.bad_wss_port = create_websocket_server(ssl=ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER))
|
||||
cls.bad_wss_host = f'wss://127.0.0.1:{cls.bad_wss_port}'
|
||||
|
||||
cls.mtls_wss_thread, cls.mtls_wss_port = create_mtls_wss_websocket_server()
|
||||
diff --git a/yt_dlp/networking/_websockets.py b/yt_dlp/networking/_websockets.py
|
||||
index 492af1154de7..21b765b91dc8 100644
|
||||
--- a/yt_dlp/networking/_websockets.py
|
||||
+++ b/yt_dlp/networking/_websockets.py
|
||||
@@ -47,10 +47,7 @@
|
||||
# 2: "AttributeError: 'ClientConnection' object has no attribute 'recv_events_exc'. Did you mean: 'recv_events'?"
|
||||
import websockets.sync.connection # isort: split
|
||||
with contextlib.suppress(Exception):
|
||||
- # > 12.0
|
||||
websockets.sync.connection.Connection.recv_exc = None
|
||||
- # 12.0
|
||||
- websockets.sync.connection.Connection.recv_events_exc = None
|
||||
|
||||
|
||||
class WebsocketsResponseAdapter(WebSocketResponse):
|
||||
@@ -162,7 +159,7 @@ def _send(self, request):
|
||||
additional_headers=headers,
|
||||
open_timeout=timeout,
|
||||
user_agent_header=None,
|
||||
- ssl_context=ssl_ctx if wsuri.secure else None,
|
||||
+ ssl=ssl_ctx if wsuri.secure else None,
|
||||
close_timeout=0, # not ideal, but prevents yt-dlp hanging
|
||||
)
|
||||
return WebsocketsResponseAdapter(conn, url=request.url)
|
||||
279
yt-dlp.spec
279
yt-dlp.spec
|
|
@ -2,31 +2,29 @@
|
|||
# SPDX-License-Identifier: MIT
|
||||
# SPDX-FileCopyrightText: Fedora Project Authors
|
||||
# SPDX-FileCopyrightText: 2022 Maxwell G <gotmax@e.email>
|
||||
# See %%{name}.spec.license for the full license text.
|
||||
# License text: https://spdx.org/licenses/MIT.html
|
||||
|
||||
%bcond_without tests
|
||||
|
||||
Name: yt-dlp
|
||||
Version: 2024.09.27
|
||||
Release: 1%{?dist}
|
||||
Version: 2026.08.19
|
||||
Release: %autorelease
|
||||
Summary: A command-line program to download videos from online video platforms
|
||||
|
||||
License: Unlicense
|
||||
URL: https://github.com/%{name}/%{name}
|
||||
Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
# License of the specfile
|
||||
Source: yt-dlp.spec.license
|
||||
URL: https://github.com/yt-dlp/yt-dlp
|
||||
Source: %{url}/archive/%{version}/yt-dlp-%{version}.tar.gz
|
||||
|
||||
# https://github.com/yt-dlp/yt-dlp/commit/6f9e6537434562d513d0c9b68ced8a61ade94a64
|
||||
# [rh:websockets] Upgrade websockets to 13.0 (#10815)
|
||||
# Revert this patch for compatibility with older Fedora versions
|
||||
Patch1000: websockets-13.patch
|
||||
# https://github.com/yt-dlp/yt-dlp/pull/17491
|
||||
# Relax handshake error regexp
|
||||
Patch: 17491.patch
|
||||
|
||||
# Needed for compatibility with Fedora <= 44
|
||||
Patch: 0002-Restore-compatibility-with-pytest-9.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: python3-devel
|
||||
|
||||
# Needed for %%prep
|
||||
BuildRequires: tomcli
|
||||
|
||||
%if %{with tests}
|
||||
|
|
@ -38,61 +36,49 @@ BuildRequires: %{py3_dist pytest}
|
|||
BuildRequires: pandoc
|
||||
BuildRequires: make
|
||||
|
||||
Requires: yt-dlp+default = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
|
||||
# ffmpeg-free is now available in Fedora.
|
||||
Recommends: /usr/bin/ffmpeg
|
||||
Recommends: /usr/bin/ffprobe
|
||||
|
||||
Suggests: python3dist(keyring)
|
||||
|
||||
%global _description %{expand:
|
||||
# START: Remove in Fedora 46
|
||||
Provides: yt-dlp-bash-completion = %{version}-%{release}
|
||||
Obsoletes: yt-dlp-bash-completion < 2025.09.26-2
|
||||
|
||||
Provides: yt-dlp-fish-completion = %{version}-%{release}
|
||||
Obsoletes: yt-dlp-fish-completion < 2025.09.26-2
|
||||
|
||||
Provides: yt-dlp-zsh-completion = %{version}-%{release}
|
||||
Obsoletes: yt-dlp-zsh-completion < 2025.09.26-2
|
||||
# END: Remove in Fedora 46
|
||||
|
||||
%description
|
||||
yt-dlp is a command-line program to download videos from many different online
|
||||
video platforms, such as youtube.com. The project is a fork of youtube-dl with
|
||||
additional features and fixes.}
|
||||
additional features and fixes.
|
||||
|
||||
%description %{_description}
|
||||
|
||||
%package bash-completion
|
||||
Summary: Bash completion for %{name}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: bash-completion
|
||||
Supplements: (%{name} and bash-completion)
|
||||
|
||||
%description bash-completion
|
||||
Bash command line completion support for %{name}.
|
||||
|
||||
%package zsh-completion
|
||||
Summary: Zsh completion for %{name}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: zsh
|
||||
Supplements: (%{name} and zsh)
|
||||
|
||||
%description zsh-completion
|
||||
Zsh command line completion support for %{name}.
|
||||
|
||||
%package fish-completion
|
||||
Summary: Fish completion for %{name}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: fish
|
||||
Supplements: (%{name} and fish)
|
||||
|
||||
%description fish-completion
|
||||
Fish command line completion support for %{name}.
|
||||
|
||||
%prep
|
||||
%autosetup -N
|
||||
%if %{defined fedora} && %{fedora} <= 41
|
||||
# Revert patch for compatibility with older websockets
|
||||
%patch -P1000 -p1 -R
|
||||
%endif
|
||||
%autosetup -p1
|
||||
|
||||
# TODO: Figure out https://bugzilla.redhat.com/show_bug.cgi?id=2405578
|
||||
# Users can configure JS challenges manually for now.
|
||||
tomcli set pyproject.toml arrays delitem \
|
||||
project.optional-dependencies.default 'yt-dlp-ejs.*'
|
||||
|
||||
# Remove -s from shebang so users can install extra deps or plugins (or yt-dlp-ejs) using pip.
|
||||
%undefine _py3_shebang_s
|
||||
|
||||
# Remove unnecessary shebangs
|
||||
find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{}' +
|
||||
# Relax version constraints
|
||||
tomcli-set pyproject.toml lists replace project.dependencies \
|
||||
'(requests|urllib3|websockets)>=.*' '\1'
|
||||
|
||||
|
||||
%generate_buildrequires
|
||||
%pyproject_buildrequires -r
|
||||
%pyproject_buildrequires -x default,secretstorage
|
||||
|
||||
|
||||
%build
|
||||
# Docs and shell completions
|
||||
|
|
@ -101,197 +87,30 @@ make yt-dlp.1 completion-bash completion-zsh completion-fish
|
|||
# Docs and shell completions are also included in the wheel.
|
||||
%pyproject_wheel
|
||||
|
||||
|
||||
%install
|
||||
%pyproject_install
|
||||
%pyproject_save_files yt_dlp
|
||||
|
||||
|
||||
%check
|
||||
%if %{with tests}
|
||||
# See https://github.com/yt-dlp/yt-dlp/blob/master/devscripts/run_tests.sh
|
||||
%pytest -k "not download"
|
||||
%pytest -k "not download and not test_verify_cert[Websockets]"
|
||||
%endif
|
||||
|
||||
|
||||
%files -f %{pyproject_files}
|
||||
%{_bindir}/%{name}
|
||||
%{_mandir}/man1/%{name}.1*
|
||||
%doc README.md
|
||||
%license LICENSE
|
||||
%{_bindir}/yt-dlp
|
||||
%{_mandir}/man1/yt-dlp.1*
|
||||
%{bash_completions_dir}/yt-dlp
|
||||
%{fish_completions_dir}/yt-dlp.fish
|
||||
%{zsh_completions_dir}/_yt-dlp
|
||||
|
||||
%files bash-completion
|
||||
%{bash_completions_dir}/%{name}
|
||||
|
||||
%files zsh-completion
|
||||
%{zsh_completions_dir}/_%{name}
|
||||
%pyproject_extras_subpkg -n yt-dlp default secretstorage
|
||||
|
||||
%files fish-completion
|
||||
%{fish_completions_dir}/%{name}.fish
|
||||
|
||||
%changelog
|
||||
* Sat Sep 28 2024 Maxwell G <maxwell@gtmx.me> - 2024.09.27-1
|
||||
- Update to 2024.09.27.
|
||||
|
||||
* Mon Aug 12 2024 Maxwell G <maxwell@gtmx.me> - 2024.08.06-1
|
||||
- Update to 2024.08.06. Fixes rhbz#2303069.
|
||||
|
||||
* Sat Aug 03 2024 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 2024.08.01-1
|
||||
- Update to 2024.08.01. Fixes rhbz#2302522
|
||||
|
||||
* Fri Jul 26 2024 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 2024.07.25-1
|
||||
- Update to 2024.07.25. Fixes rhbz#2300087
|
||||
|
||||
* Wed Jul 24 2024 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 2024.07.16-1
|
||||
- Update to 2024.07.16. Fixes rhbz#2298550
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2024.07.09-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Thu Jul 11 2024 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 2024.07.09-1
|
||||
- Update to 2024.07.09. Fixes rhbz#2297344
|
||||
|
||||
* Mon Jul 08 2024 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 2024.07.07-1
|
||||
- Update to 2024.07.07. Fixes rhbz#2296356
|
||||
|
||||
* Thu Jul 04 2024 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 2024.07.02-1
|
||||
- Update to 2024.07.02. Fixes rhbz#2295769
|
||||
|
||||
* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 2024.05.27-2
|
||||
- Rebuilt for Python 3.13
|
||||
|
||||
* Wed May 29 2024 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 2024.05.27-1
|
||||
- Update to 2024.05.27. Fixes rhbz#2283578.
|
||||
|
||||
* Mon May 27 2024 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 2024.05.26-1
|
||||
- Update to 2024.05.26. Fixes rhbz#2274266.
|
||||
|
||||
* Wed Apr 10 2024 Maxwell G <maxwell@gtmx.me> - 2024.04.09-1
|
||||
- Update to 2024.04.09.
|
||||
|
||||
* Wed Mar 13 2024 Maxwell G <maxwell@gtmx.me> - 2024.03.10-1
|
||||
- Update to 2024.03.10. Fixes rhbz#2268944.
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2023.12.30-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Wed Jan 3 2024 Maxwell G <maxwell@gtmx.me> - 2023.12.30-1
|
||||
- Update to 2023.12.30. Fixes rhbz#2244200.
|
||||
|
||||
* Wed Oct 11 2023 Marcus Müller <marcus_fedora@baseband.digital> - 2023.10.07-1
|
||||
- Update to 2023.10.07.
|
||||
- Fixes rhbz#2243274
|
||||
- Fixes rhbz#2240465
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2023.07.06-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Fri Jul 07 2023 Maxwell G <maxwell@gtmx.me> - 2023.07.06-1
|
||||
- Update to 2023.07.06.
|
||||
- Mitigates CVE-2023-35934 / GHSA-v8mc-9377-rwjj
|
||||
|
||||
* Wed Jul 05 2023 Maxwell G <maxwell@gtmx.me> - 2023.06.22-1
|
||||
- Update to 2023.06.22. Fixes rhbz#2216612.
|
||||
|
||||
* Thu Jun 22 2023 Maxwell G <maxwell@gtmx.me> - 2023.06.21-1
|
||||
- Update to 2023.06.21. Fixes rhbz#2216612.
|
||||
|
||||
* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 2023.03.04-2
|
||||
- Rebuilt for Python 3.12
|
||||
|
||||
* Mon Mar 06 2023 Maxwell G <maxwell@gtmx.me> - 2023.03.04-1
|
||||
- Update to 2023.03.04. Fixes rhbz#2175395.
|
||||
|
||||
* Fri Feb 17 2023 Maxwell G <maxwell@gtmx.me> - 2023.02.17-1
|
||||
- Update to 2023.02.17.
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2023.01.06-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Tue Jan 10 2023 Maxwell G <gotmax@e.email> - 2023.01.06-1
|
||||
- Update to 2023.01.06. Fixes rhbz#2157879.
|
||||
|
||||
* Mon Nov 14 2022 Maxwell G <gotmax@e.email> - 2022.11.11-1
|
||||
- Update to 2022.11.11. Fixes rhbz#2142417.
|
||||
|
||||
* Sat Oct 08 2022 Maxwell G <gotmax@e.email> - 2022.10.04-1
|
||||
- Update to 2022.10.04. Fixes rhbz#2132726.
|
||||
|
||||
* Fri Sep 02 2022 Maxwell G <gotmax@e.email> - 2022.09.01-1
|
||||
- Update to 2022.09.01. Fixes rhbz#2123442.
|
||||
|
||||
* Fri Aug 19 2022 Maxwell G <gotmax@e.email> - 2022.08.19-1
|
||||
- Update to 2022.08.19. Fixes rhbz#2118224.
|
||||
|
||||
* Tue Aug 09 2022 Maxwell G <gotmax@e.email> - 2022.08.08-1
|
||||
- Update to 2022.08.08.
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2022.06.29-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Mon Jul 04 2022 Maxwell G <gotmax@e.email> - 2022.06.29-2
|
||||
- Fix shell completions subpackages
|
||||
|
||||
* Mon Jul 04 2022 Maxwell G <gotmax@e.email> - 2022.06.29-1
|
||||
- Update to 2022.06.29. Fixes rhbz#2102238.
|
||||
|
||||
* Thu Jun 23 2022 Maxwell G <gotmax@e.email> - 2022.06.22.1-1
|
||||
- Update to 2022.06.22.1. Fixes rhbz#2100019.
|
||||
|
||||
* Fri Jun 17 2022 Maxwell G <gotmax@e.email> - 2022.05.18-3
|
||||
- Fix gating configuration
|
||||
|
||||
* Thu Jun 16 2022 Python Maint <python-maint@redhat.com> - 2022.05.18-2
|
||||
- Rebuilt for Python 3.11
|
||||
|
||||
* Tue May 24 2022 Maxwell G <gotmax@e.email> - 2022.05.18-1
|
||||
- Update to 2022.05.18. Fixes rhbz#2088564.
|
||||
|
||||
* Fri Apr 08 2022 Maxwell G <gotmax@e.email> - 2022.04.08-1
|
||||
- Update to 2022.04.08. Fixes rhbz#2073359.
|
||||
|
||||
* Sat Mar 12 2022 Artem Polishchuk <ego.cordatus@gmail.com> - 2022.03.08.1-2
|
||||
- build: Make ffmpeg and ffprobe conditional deps for >= f36 only
|
||||
|
||||
* Thu Mar 10 2022 Maxwell G <gotmax@e.email> - 2022.03.08.1-1
|
||||
- Update to 2022.03.08.1. Fixes rhbz#2061973.
|
||||
|
||||
* Mon Mar 07 2022 Maxwell G <gotmax@e.email> - 2022.02.04-2
|
||||
- Add weak dependency on ffmpeg and ffprobe.
|
||||
- Make shell-completion subpackages optional again.
|
||||
|
||||
* Fri Feb 04 2022 Maxwell G <gotmax@e.email> - 2022.2.4-1
|
||||
- Update to 2022.2.4. Fixes rhbz#2050497.
|
||||
|
||||
* Mon Jan 24 2022 Maxwell G <gotmax@e.email> - 2022.01.21-1
|
||||
- Update to 2022.01.21.
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2021.12.27-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Mon Dec 27 2021 Maxwell G <gotmax@e.email> - 2021.12.27-1
|
||||
- Update to 2021.12.27.
|
||||
|
||||
* Sun Dec 26 2021 Maxwell G <gotmax@e.email> - 2021.12.25-1
|
||||
- Update to 2021.12.25.
|
||||
|
||||
* Wed Dec 01 2021 Maxwell G <gotmax@e.email> - 2021.12.01-1
|
||||
- Update to 2021.12.01.
|
||||
|
||||
* Tue Nov 9 2021 Maxwell G <gotmax@e.email> - 2021.11.10.1-1
|
||||
- Update to 2021.11.10.1.
|
||||
|
||||
* Tue Nov 9 2021 Maxwell G <gotmax@e.email> - 2021.10.22-2
|
||||
- Skip installing unnecessary tox dependencies
|
||||
- Fix shell-completion subpackages
|
||||
- Only package README.md; don't generate extra README.txt
|
||||
|
||||
* Sat Oct 23 2021 Maxwell G <gotmax@e.email> - 2021.10.22-1
|
||||
- Update to 2021.10.22
|
||||
|
||||
* Sun Oct 10 2021 Maxwell G <gotmax@e.email> - 2021.10.10-1
|
||||
- Mark LICENSE with %%license instead of %%doc
|
||||
- Update to 2021.10.10
|
||||
- Fix non-executable-script rpmlint error
|
||||
- Use `python3dist(NAME)` for dependencies
|
||||
- Fix rpm-buildroot-usage rpmlint error
|
||||
|
||||
* Sat Oct 9 2021 Maxwell G <gotmax@e.email> - 2021.10.09-1
|
||||
- Initial package
|
||||
%autochangelog
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
MIT License
|
||||
|
||||
Copyright (c) <year> <copyright holders>
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
Loading…
Add table
Add a link
Reference in a new issue