diff --git a/.gitignore b/.gitignore index e6c0205..6418b05 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /streamlink-1.3.1-without-win32-binaries.tar.gz /streamlink-1.4.1.tar.gz /streamlink-1.5.0.tar.gz +/streamlink-1.6.0.tar.gz diff --git a/python-streamlink-1.4.1-pycryptodomex.patch b/python-streamlink-1.4.1-pycryptodomex.patch deleted file mode 100644 index 7811a79..0000000 --- a/python-streamlink-1.4.1-pycryptodomex.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff -up ./setup.py.orig ./setup.py ---- ./setup.py.orig 2020-04-24 20:54:44.000000000 +0200 -+++ ./setup.py 2020-05-11 09:16:31.094252715 +0200 -@@ -31,7 +31,7 @@ if environ.get("STREAMLINK_USE_PYCRYPTO" - deps.append("pycrypto") - else: - # this version of pycryptodome is known to work and has a Windows wheel for py2.7, py3.3-3.6 -- deps.append("pycryptodome>=3.4.3,<4") -+ deps.append("pycryptodomex>=3.4.3,<4") - - # for localization - if environ.get("STREAMLINK_USE_PYCOUNTRY"): -diff -up ./src/streamlink/plugins/abematv.py.orig ./src/streamlink/plugins/abematv.py ---- ./src/streamlink/plugins/abematv.py.orig 2020-04-24 20:54:44.000000000 +0200 -+++ ./src/streamlink/plugins/abematv.py 2020-05-11 09:18:18.564434746 +0200 -@@ -9,7 +9,7 @@ import uuid - from base64 import urlsafe_b64encode - from binascii import unhexlify - --from Crypto.Cipher import AES -+from Cryptodome.Cipher import AES - - from requests import Response - from requests.adapters import BaseAdapter -diff -up ./src/streamlink/plugins/rtve.py.orig ./src/streamlink/plugins/rtve.py ---- ./src/streamlink/plugins/rtve.py.orig 2020-04-24 20:54:44.000000000 +0200 -+++ ./src/streamlink/plugins/rtve.py 2020-05-11 09:18:18.559434878 +0200 -@@ -3,7 +3,7 @@ import logging - import re - from functools import partial - --from Crypto.Cipher import Blowfish -+from Cryptodome.Cipher import Blowfish - - from streamlink.compat import bytes, is_py3 - from streamlink.plugin import Plugin, PluginArguments, PluginArgument -diff -up ./src/streamlink/plugins/steam.py.orig ./src/streamlink/plugins/steam.py ---- ./src/streamlink/plugins/steam.py.orig 2020-04-24 20:54:44.000000000 +0200 -+++ ./src/streamlink/plugins/steam.py 2020-05-11 09:18:18.556434956 +0200 -@@ -3,8 +3,8 @@ import logging - import re - import time - --from Crypto.Cipher import PKCS1_v1_5 --from Crypto.PublicKey import RSA -+from Cryptodome.Cipher import PKCS1_v1_5 -+from Cryptodome.PublicKey import RSA - - import streamlink - from streamlink.exceptions import FatalPluginError -diff -up ./src/streamlink/plugins/ustvnow.py.orig ./src/streamlink/plugins/ustvnow.py ---- ./src/streamlink/plugins/ustvnow.py.orig 2020-04-24 20:54:44.000000000 +0200 -+++ ./src/streamlink/plugins/ustvnow.py 2020-05-11 09:18:18.567434668 +0200 -@@ -7,9 +7,9 @@ import logging - import re - from uuid import uuid4 - --from Crypto.Cipher import AES --from Crypto.Hash import SHA256 --from Crypto.Util.Padding import pad, unpad -+from Cryptodome.Cipher import AES -+from Cryptodome.Hash import SHA256 -+from Cryptodome.Util.Padding import pad, unpad - - from streamlink import PluginError - from streamlink.compat import urljoin, urlparse -diff -up ./src/streamlink/plugins/webtv.py.orig ./src/streamlink/plugins/webtv.py ---- ./src/streamlink/plugins/webtv.py.orig 2020-04-24 20:54:44.000000000 +0200 -+++ ./src/streamlink/plugins/webtv.py 2020-05-11 09:18:18.553435035 +0200 -@@ -3,7 +3,7 @@ import base64 - - import binascii - --from Crypto.Cipher import AES -+from Cryptodome.Cipher import AES - - from streamlink.plugin import Plugin - from streamlink.plugin.api import validate -diff -up ./src/streamlink/stream/hls.py.orig ./src/streamlink/stream/hls.py ---- ./src/streamlink/stream/hls.py.orig 2020-04-24 20:54:44.000000000 +0200 -+++ ./src/streamlink/stream/hls.py 2020-05-11 09:18:18.571434563 +0200 -@@ -3,7 +3,7 @@ import re - import struct - - from collections import defaultdict, namedtuple --from Crypto.Cipher import AES -+from Cryptodome.Cipher import AES - from requests.exceptions import ChunkedEncodingError - - from streamlink.compat import urlparse -diff -up ./src/streamlink/utils/crypto.py.orig ./src/streamlink/utils/crypto.py ---- ./src/streamlink/utils/crypto.py.orig 2020-04-24 20:54:44.000000000 +0200 -+++ ./src/streamlink/utils/crypto.py 2020-05-11 09:18:18.549435140 +0200 -@@ -1,7 +1,7 @@ - from __future__ import absolute_import - import hashlib - --from Crypto.Cipher import AES -+from Cryptodome.Cipher import AES - - from streamlink.compat import is_py3 - -diff -up ./tests/streams/test_hls.py.orig ./tests/streams/test_hls.py ---- ./tests/streams/test_hls.py.orig 2020-04-24 20:54:44.000000000 +0200 -+++ ./tests/streams/test_hls.py 2020-05-11 09:18:18.545435245 +0200 -@@ -6,7 +6,7 @@ from functools import partial - - import pytest - import requests_mock --from Crypto.Cipher import AES -+from Cryptodome.Cipher import AES - from mock import patch, Mock - - from streamlink.session import Streamlink diff --git a/python-streamlink-1.6.0-pycryptodomex.patch b/python-streamlink-1.6.0-pycryptodomex.patch new file mode 100644 index 0000000..b3e1e23 --- /dev/null +++ b/python-streamlink-1.6.0-pycryptodomex.patch @@ -0,0 +1,103 @@ +diff -up ./src/streamlink/plugins/abematv.py.orig ./src/streamlink/plugins/abematv.py +--- ./src/streamlink/plugins/abematv.py.orig 2020-09-23 01:31:24.000000000 +0200 ++++ ./src/streamlink/plugins/abematv.py 2020-09-24 20:01:40.760143637 +0200 +@@ -9,7 +9,7 @@ import uuid + from base64 import urlsafe_b64encode + from binascii import unhexlify + +-from Crypto.Cipher import AES ++from Cryptodome.Cipher import AES + + from requests import Response + from requests.adapters import BaseAdapter +diff -up ./src/streamlink/plugins/rtve.py.orig ./src/streamlink/plugins/rtve.py +--- ./src/streamlink/plugins/rtve.py.orig 2020-09-23 01:31:24.000000000 +0200 ++++ ./src/streamlink/plugins/rtve.py 2020-09-24 20:01:40.756143734 +0200 +@@ -3,7 +3,7 @@ import logging + import re + from functools import partial + +-from Crypto.Cipher import Blowfish ++from Cryptodome.Cipher import Blowfish + + from streamlink.compat import bytes, is_py3 + from streamlink.plugin import Plugin, PluginArguments, PluginArgument +diff -up ./src/streamlink/plugins/steam.py.orig ./src/streamlink/plugins/steam.py +--- ./src/streamlink/plugins/steam.py.orig 2020-09-23 01:31:24.000000000 +0200 ++++ ./src/streamlink/plugins/steam.py 2020-09-24 20:01:40.755143759 +0200 +@@ -3,8 +3,8 @@ import logging + import re + import time + +-from Crypto.Cipher import PKCS1_v1_5 +-from Crypto.PublicKey import RSA ++from Cryptodome.Cipher import PKCS1_v1_5 ++from Cryptodome.PublicKey import RSA + + import streamlink + from streamlink.exceptions import FatalPluginError +diff -up ./src/streamlink/plugins/streann.py.orig ./src/streamlink/plugins/streann.py +diff -up ./src/streamlink/plugins/ustvnow.py.orig ./src/streamlink/plugins/ustvnow.py +--- ./src/streamlink/plugins/ustvnow.py.orig 2020-09-23 01:31:24.000000000 +0200 ++++ ./src/streamlink/plugins/ustvnow.py 2020-09-24 20:06:15.006441450 +0200 +@@ -7,9 +7,9 @@ import logging + import re + from uuid import uuid4 + +-from Crypto.Cipher import AES +-from Crypto.Hash import SHA256 +-from Crypto.Util.Padding import pad, unpad ++from Cryptodome.Cipher import AES ++from Cryptodome.Hash import SHA256 ++from Cryptodome.Util.Padding import pad, unpad + + from streamlink import PluginError + from streamlink.compat import urljoin, urlparse +diff -up ./src/streamlink/plugins/webtv.py.orig ./src/streamlink/plugins/webtv.py +--- ./src/streamlink/plugins/webtv.py.orig 2020-09-23 01:31:24.000000000 +0200 ++++ ./src/streamlink/plugins/webtv.py 2020-09-24 20:01:40.753143808 +0200 +@@ -3,7 +3,7 @@ import base64 + + import binascii + +-from Crypto.Cipher import AES ++from Cryptodome.Cipher import AES + + from streamlink.plugin import Plugin + from streamlink.plugin.api import validate +diff -up ./src/streamlink/stream/hls.py.orig ./src/streamlink/stream/hls.py +--- ./src/streamlink/stream/hls.py.orig 2020-09-23 01:31:24.000000000 +0200 ++++ ./src/streamlink/stream/hls.py 2020-09-24 20:01:40.762143588 +0200 +@@ -3,7 +3,7 @@ import re + import struct + + from collections import defaultdict, namedtuple +-from Crypto.Cipher import AES ++from Cryptodome.Cipher import AES + from requests.exceptions import ChunkedEncodingError + + from streamlink.compat import urlparse, str +diff -up ./src/streamlink/utils/crypto.py.orig ./src/streamlink/utils/crypto.py +--- ./src/streamlink/utils/crypto.py.orig 2020-09-23 01:31:24.000000000 +0200 ++++ ./src/streamlink/utils/crypto.py 2020-09-24 20:01:40.751143857 +0200 +@@ -1,7 +1,7 @@ + from __future__ import absolute_import + import hashlib + +-from Crypto.Cipher import AES ++from Cryptodome.Cipher import AES + + from streamlink.compat import is_py3 + +diff -up ./tests/streams/test_hls.py.orig ./tests/streams/test_hls.py +--- ./tests/streams/test_hls.py.orig 2020-09-23 01:31:24.000000000 +0200 ++++ ./tests/streams/test_hls.py 2020-09-24 20:01:40.749143906 +0200 +@@ -7,7 +7,7 @@ from functools import partial + + import pytest + import requests_mock +-from Crypto.Cipher import AES ++from Cryptodome.Cipher import AES + from mock import patch, Mock + + from streamlink.session import Streamlink diff --git a/python-streamlink.spec b/python-streamlink.spec index a6b964d..5f32ad4 100644 --- a/python-streamlink.spec +++ b/python-streamlink.spec @@ -7,8 +7,8 @@ who want access to the video stream data. This project was forked from Livestreamer, which is no longer maintained.} Name: python-%{srcname} -Version: 1.5.0 -Release: 2%{?dist} +Version: 1.6.0 +Release: 1%{?dist} Summary: Python library for extracting streams from various websites # src/streamlink/packages/requests_file.py is ASL 2.0 @@ -16,7 +16,7 @@ License: BSD and ASL 2.0 URL: https://streamlink.github.io/ Source0: https://github.com/%{srcname}/%{srcname}/archive/%{version}/%{srcname}-%{version}.tar.gz # Use pycryptodomex library instead of crypto/pycryptodome -Patch0: %{name}-1.4.1-pycryptodomex.patch +Patch0: %{name}-1.6.0-pycryptodomex.patch BuildRequires: python3-devel BuildRequires: %{py3_dist setuptools} @@ -29,6 +29,7 @@ BuildRequires: %{py3_dist pycryptodomex} BuildRequires: %{py3_dist pysocks} BuildRequires: %{py3_dist recommonmark} BuildRequires: %{py3_dist requests} +BuildRequires: %{py3_dist setuptools} BuildRequires: %{py3_dist sphinx} BuildRequires: %{py3_dist websocket-client} # Needed for tests @@ -96,7 +97,7 @@ install -Dpm 0644 build/sphinx/man/%{srcname}.1 $RPM_BUILD_ROOT%{_mandir}/man1/% %check -%{__python3} setup.py test +%pytest %files -n python3-%{srcname} @@ -115,6 +116,9 @@ install -Dpm 0644 build/sphinx/man/%{srcname}.1 $RPM_BUILD_ROOT%{_mandir}/man1/% %changelog +* Thu Sep 24 2020 Mohamed El Morabity - 1.6.0-1 +- Update to 1.6.0 + * Wed Jul 29 2020 Fedora Release Engineering - 1.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 095424e..e7bcdf9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (streamlink-1.5.0.tar.gz) = 5a849b4e2d95b2a94aad8e7a93eea404693102be46f7ccaf2a3cde5826a07b9dcf9591cb5e6fabe694d5d8981cdc869fd8c92cd0fd6d06da39f6d8bb61601355 +SHA512 (streamlink-1.6.0.tar.gz) = 4ee99cbfcbc4aaa963ed95cf7d0a37902fa97b4ecbdf3e1824458d7f63448b1df2e603580b91f7daf211d18d02eb1363138667cdafe60659f1e2cc412086c15e