gentoo auto-resync : 25:09:2023 - 23:26:33

4 files changed, 2 insertions, 167 deletions

diff --git a/dev-python/websockify/Manifest b/dev-python/websockify/Manifest
index 9443d536177c..63c82780d37f 100644
--- a/dev-python/websockify/Manifest
+++ b/dev-python/websockify/Manifest
@@ -1,6 +1,3 @@
-AUX websockify-0.10.0-fix-jwcrypto-1.3.patch 4944 BLAKE2B ec1c42458d09082b0f2c98abee8bc922e532571d2550dd0c28ca95331e9c3f5097aaef2394d72d4c89213e7c386b193897cc204fa304ad8de098eb3d8bbac1ce SHA512 f9df762236b961549bd8ee127d7363e1942a280a892676d82bd8e32d43434cb30efbcc15ef345a5a15ad9f08759861caf6f009a8afc98a15021126c8051b8da0
-DIST websockify-0.10.0.gh.tar.gz 53402 BLAKE2B e909dc316d6dd0ee03ee23b07ca2d78cc60994a8f361b3968759c382c704637357848e903fb12af002b5d5b2bec957f9a4c2b0ddb0e6d008ff9b4a462f3e8871 SHA512 262071f4858e5e3b6471c6f3731d8715c5c13fcc5f43738a330323958a8f0cbe7797847bdc676f1c6c34055c6f8afb949d005a5607d6b220b893910ff973ddc5
 DIST websockify-0.11.0.gh.tar.gz 55126 BLAKE2B df49e8025ea0341b7f8d329a3b3dcddc08df3d0b42bbcb33d25726df8fee1f0a8791d552c9019a3ae514549619a0f3cc9c7861ff4f30017f27498f7465fd5d11 SHA512 cbae6abdee3c9ba6e78c2245fa7ebc4bd6aa96a534b8577da1ae9acd316dd146cece6ceb6f6cdca9c1ddcb3cbaff69e0fc3c3d6048b9374b0937abb91843bf72
-EBUILD websockify-0.10.0-r2.ebuild 950 BLAKE2B d618297d5642824ae86bd2d8845caf7f1af4ce1cca70fbe53a39dc8ef58c7a59c30d2fc6af6881c1c612f29d7a4419d1fdac4916b1a098461de294ed56d01d74 SHA512 7ea33ccf3968497f8f81b4243764c8b769ad38417c9aa97c49a9d8a19392fb803362642833630773962573f02ba705f677800438745407522042d9af9d346ec4
-EBUILD websockify-0.11.0.ebuild 988 BLAKE2B fa949e84e9f82aaea38bd33818ee874514452508533e3569da89ed4600f7f04c6d5a244c392db86a8ad065bca360abe20f756bc057c743fc2fee9c9e1137cd66 SHA512 d994de69d938d358da34f37e6893c2af89b3ca661523ad0d10315e6d36878d4579fd0bf76c06f80ed1e34ffac4c387198fa1fb3225a173dcb26d9f2d70c806dd
+EBUILD websockify-0.11.0.ebuild 986 BLAKE2B cedcb9b319e10403ec14e196706740796e72ccbc333972db4e2c7fd9f3deba7d7004ad9c59ccc903a8f7e306eba352fa7a238c406bc35f178000c7d2231bab8d SHA512 a15ef769582a27130d289197c33be39d072513eae4ff45a778c01536c7c55c55ea4d954be300efbd81bfca270c4dbdb3a8ce40267ae2fb9f9c404fcf2c8a0e9b
 MISC metadata.xml 509 BLAKE2B 225c838d2cc6350daa72ef825bac2332db172d6790623b154a49d48fc71de06b2d4b0c732b297e93514b8b088f3b7a17fb5ade431afc28fd8893f2617a67e5e1 SHA512 c70bc93e2869fd4a85a8358ca3489d0d0e6f6d8355e616e8f5d62e2922af2d2cb415e354f91cb97a1e38633ab7bd955378f7a40fd71d5f3bb51411526d2a6c29
diff --git a/dev-python/websockify/files/websockify-0.10.0-fix-jwcrypto-1.3.patch b/dev-python/websockify/files/websockify-0.10.0-fix-jwcrypto-1.3.patch
deleted file mode 100644
index 9da2cfe093dc..000000000000
--- a/dev-python/websockify/files/websockify-0.10.0-fix-jwcrypto-1.3.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 0f175003480b666fba78a5eda8dbc1dee07917dd Mon Sep 17 00:00:00 2001
-From: Javier Cacheiro <javier.cacheiro.lopez@cesga.es>
-Date: Wed, 25 May 2022 12:40:29 +0200
-Subject: [PATCH] Support for jwcrypto>=1.3
-
----
- tests/test_token_plugins.py | 20 ++++++++++----------
- websockify/token_plugins.py |  4 ++--
- 2 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/tests/test_token_plugins.py b/tests/test_token_plugins.py
-index 00078c7..3e1fd19 100644
---- a/tests/test_token_plugins.py
-+++ b/tests/test_token_plugins.py
-@@ -4,7 +4,7 @@
- 
- import unittest
- from unittest.mock import patch, mock_open, MagicMock
--from jwcrypto import jwt
-+from jwcrypto import jwt, jwk
- 
- from websockify.token_plugins import ReadOnlyTokenFile, JWTTokenApi, TokenRedis
- 
-@@ -56,7 +56,7 @@ class JWSTokenTestCase(unittest.TestCase):
-     def test_asymmetric_jws_token_plugin(self):
-         plugin = JWTTokenApi("./tests/fixtures/public.pem")
- 
--        key = jwt.JWK()
-+        key = jwk.JWK()
-         private_key = open("./tests/fixtures/private.pem", "rb").read()
-         key.import_from_pem(private_key)
-         jwt_token = jwt.JWT({"alg": "RS256"}, {'host': "remote_host", 'port': "remote_port"})
-@@ -71,7 +71,7 @@ def test_asymmetric_jws_token_plugin(self):
-     def test_asymmetric_jws_token_plugin_with_illigal_key_exception(self):
-         plugin = JWTTokenApi("wrong.pub")
- 
--        key = jwt.JWK()
-+        key = jwk.JWK()
-         private_key = open("./tests/fixtures/private.pem", "rb").read()
-         key.import_from_pem(private_key)
-         jwt_token = jwt.JWT({"alg": "RS256"}, {'host': "remote_host", 'port': "remote_port"})
-@@ -85,7 +85,7 @@ def test_asymmetric_jws_token_plugin_with_illigal_key_exception(self):
-     def test_jwt_valid_time(self, mock_time):
-         plugin = JWTTokenApi("./tests/fixtures/public.pem")
- 
--        key = jwt.JWK()
-+        key = jwk.JWK()
-         private_key = open("./tests/fixtures/private.pem", "rb").read()
-         key.import_from_pem(private_key)
-         jwt_token = jwt.JWT({"alg": "RS256"}, {'host': "remote_host", 'port': "remote_port", 'nbf': 100, 'exp': 200 })
-@@ -102,7 +102,7 @@ def test_jwt_valid_time(self, mock_time):
-     def test_jwt_early_time(self, mock_time):
-         plugin = JWTTokenApi("./tests/fixtures/public.pem")
- 
--        key = jwt.JWK()
-+        key = jwk.JWK()
-         private_key = open("./tests/fixtures/private.pem", "rb").read()
-         key.import_from_pem(private_key)
-         jwt_token = jwt.JWT({"alg": "RS256"}, {'host': "remote_host", 'port': "remote_port", 'nbf': 100, 'exp': 200 })
-@@ -117,7 +117,7 @@ def test_jwt_early_time(self, mock_time):
-     def test_jwt_late_time(self, mock_time):
-         plugin = JWTTokenApi("./tests/fixtures/public.pem")
- 
--        key = jwt.JWK()
-+        key = jwk.JWK()
-         private_key = open("./tests/fixtures/private.pem", "rb").read()
-         key.import_from_pem(private_key)
-         jwt_token = jwt.JWT({"alg": "RS256"}, {'host': "remote_host", 'port': "remote_port", 'nbf': 100, 'exp': 200 })
-@@ -132,7 +132,7 @@ def test_symmetric_jws_token_plugin(self):
-         plugin = JWTTokenApi("./tests/fixtures/symmetric.key")
- 
-         secret = open("./tests/fixtures/symmetric.key").read()
--        key = jwt.JWK()
-+        key = jwk.JWK()
-         key.import_key(kty="oct",k=secret)
-         jwt_token = jwt.JWT({"alg": "HS256"}, {'host': "remote_host", 'port': "remote_port"})
-         jwt_token.make_signed_token(key)
-@@ -147,7 +147,7 @@ def test_symmetric_jws_token_plugin_with_illigal_key_exception(self):
-         plugin = JWTTokenApi("wrong_sauce")
- 
-         secret = open("./tests/fixtures/symmetric.key").read()
--        key = jwt.JWK()
-+        key = jwk.JWK()
-         key.import_key(kty="oct",k=secret)
-         jwt_token = jwt.JWT({"alg": "HS256"}, {'host': "remote_host", 'port': "remote_port"})
-         jwt_token.make_signed_token(key)
-@@ -159,8 +159,8 @@ def test_symmetric_jws_token_plugin_with_illigal_key_exception(self):
-     def test_asymmetric_jwe_token_plugin(self):
-         plugin = JWTTokenApi("./tests/fixtures/private.pem")
- 
--        private_key = jwt.JWK()
--        public_key = jwt.JWK()
-+        private_key = jwk.JWK()
-+        public_key = jwk.JWK()
-         private_key_data = open("./tests/fixtures/private.pem", "rb").read()
-         public_key_data = open("./tests/fixtures/public.pem", "rb").read()
-         private_key.import_from_pem(private_key_data)
-diff --git a/websockify/token_plugins.py b/websockify/token_plugins.py
-index 4dc29de..19005d3 100644
---- a/websockify/token_plugins.py
-+++ b/websockify/token_plugins.py
-@@ -103,10 +103,10 @@ class JWTTokenApi(BasePlugin):
- 
-     def lookup(self, token):
-         try:
--            from jwcrypto import jwt
-+            from jwcrypto import jwt, jwk
-             import json
- 
--            key = jwt.JWK()
-+            key = jwk.JWK()
- 
-             try:
-                 with open(self.source, 'rb') as key_file:
diff --git a/dev-python/websockify/websockify-0.10.0-r2.ebuild b/dev-python/websockify/websockify-0.10.0-r2.ebuild
deleted file mode 100644
index bb90baa958b8..000000000000
--- a/dev-python/websockify/websockify-0.10.0-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="WebSockets support for any application/server"
-HOMEPAGE="
-	https://github.com/novnc/websockify/
-	https://pypi.org/project/websockify/
-"
-SRC_URI="
-	https://github.com/novnc/websockify/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jwcrypto[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-jwcrypto-1.3.patch"
-)
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO: incompatible with current jwcrypto? (not a regression)
-	tests/test_token_plugins.py::JWSTokenTestCase::test_asymmetric_jwe_token_plugin
-)
-
-python_install_all() {
-	doman docs/${PN}.1
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websockify/websockify-0.11.0.ebuild b/dev-python/websockify/websockify-0.11.0.ebuild
index 4e4a5d7ab23e..dad2f1bf3d20 100644
--- a/dev-python/websockify/websockify-0.11.0.ebuild
+++ b/dev-python/websockify/websockify-0.11.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/jwcrypto[${PYTHON_USEDEP}]