From 451c4600cd731364b6c77f21656651084e53e973510ee1eafabe97773afa0821 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 19 Oct 2024 11:52:37 +0000 Subject: [PATCH 1/4] - update to 0.12.0: * The simplejson module is no longer needed for redis token support * redis tokens can now be either JSON or plain text * websockify can now listen to a Unix socket for incoming connections * Command line now supports disabling directory listings * Basic Dockerfile included - update to 0.5.1: OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-websockify?expand=0&rev=51 --- optional-websockify.patch | 19 +++++++++++-------- python-websockify.changes | 14 +++++++++++++- python-websockify.spec | 10 ++++------ v0.10.0.tar.gz | 3 --- v0.12.0.tar.gz | 3 +++ 5 files changed, 31 insertions(+), 18 deletions(-) delete mode 100644 v0.10.0.tar.gz create mode 100644 v0.12.0.tar.gz diff --git a/optional-websockify.patch b/optional-websockify.patch index ed732fe..bb0da5f 100644 --- a/optional-websockify.patch +++ b/optional-websockify.patch @@ -1,10 +1,13 @@ ---- websockify-0.10.0/setup.py -+++ websockify-0.10.0/setup.py -@@ -29,7 +29,6 @@ - +Index: websockify-0.12.0/setup.py +=================================================================== +--- websockify-0.12.0.orig/setup.py ++++ websockify-0.12.0/setup.py +@@ -30,7 +30,7 @@ setup(name=name, packages=['websockify'], include_package_data=True, -- install_requires=['numpy'], - zip_safe=False, - entry_points={ - 'console_scripts': [ + install_requires=[ +- 'numpy', 'requests', ++ 'requests', + 'jwcrypto', + 'redis', + ], diff --git a/python-websockify.changes b/python-websockify.changes index 6057bd2..9d354b9 100644 --- a/python-websockify.changes +++ b/python-websockify.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sat Oct 19 11:51:49 UTC 2024 - Dirk Müller + +- update to 0.12.0: + * The simplejson module is no longer needed for redis token + support + * redis tokens can now be either JSON or plain text + * websockify can now listen to a Unix socket for incoming + connections + * Command line now supports disabling directory listings + * Basic Dockerfile included + ------------------------------------------------------------------- Tue Jun 7 11:54:41 UTC 2022 - Dirk Müller @@ -182,7 +194,7 @@ Thu Oct 24 11:17:04 UTC 2013 - speilicke@suse.com ------------------------------------------------------------------- Wed Jul 3 11:53:13 UTC 2013 - dmueller@suse.com -- update to 0.5.1: +- update to 0.5.1: * use upstream einaros/ws (>=0.4.27) with websockify.js * file_only and no_parent security options for WSRequestHandler * Update build of web-socket-js (c0855c6cae) diff --git a/python-websockify.spec b/python-websockify.spec index a275a12..b0a4775 100644 --- a/python-websockify.spec +++ b/python-websockify.spec @@ -1,7 +1,7 @@ # # spec file for package python-websockify # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,9 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%{?sle15_python_module_pythons} Name: python-websockify -Version: 0.10.0 +Version: 0.12.0 Release: 0 Summary: WebSocket to TCP proxy/bridge License: BSD-2-Clause AND LGPL-3.0-only AND MPL-2.0 AND BSD-3-Clause @@ -30,19 +30,17 @@ BuildRequires: %{python_module jwcrypto} BuildRequires: %{python_module pytest} BuildRequires: %{python_module redis} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module simplejson} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: %{python_module numpy if (%python-base without python36-base)} Requires: python-setuptools Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives BuildArch: noarch %if 0%{?suse_version} Recommends: python-jwcrypto Recommends: python-numpy Recommends: python-redis -Recommends: python-simplejson %endif %python_subpackages diff --git a/v0.10.0.tar.gz b/v0.10.0.tar.gz deleted file mode 100644 index aee0b0d..0000000 --- a/v0.10.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7bd99b727e0be230f6f47f65fbe4bd2ae8b2aa3568350148bdf5cf440c4c6b4a -size 53402 diff --git a/v0.12.0.tar.gz b/v0.12.0.tar.gz new file mode 100644 index 0000000..249b59c --- /dev/null +++ b/v0.12.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37448ec992ef626f29558404cf6535592d02894ec1d5f0990a8c62621b39a967 +size 56839 From 7eecb9521c581249510816234a406563fe443202a77d46851b048ee5bc970345 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 19 Oct 2024 11:58:19 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-websockify?expand=0&rev=52 --- python-websockify.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/python-websockify.spec b/python-websockify.spec index b0a4775..53e8a27 100644 --- a/python-websockify.spec +++ b/python-websockify.spec @@ -27,9 +27,10 @@ Source: https://github.com/novnc/websockify/archive/v%{version}.tar.gz Patch1: optional-websockify.patch BuildRequires: %{python_module cryptography} BuildRequires: %{python_module jwcrypto} +BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} BuildRequires: %{python_module redis} -BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: %{python_module numpy if (%python-base without python36-base)} @@ -74,10 +75,10 @@ This package contains common files. sed -i '1 { /^#!/ d }' websockify/websock*.py %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %python_clone -a %{buildroot}%{_bindir}/websockify @@ -94,6 +95,7 @@ sed -i '1 { /^#!/ d }' websockify/websock*.py %license COPYING %doc CHANGES.txt README.md %python_alternative %{_bindir}/websockify -%{python_sitelib}/* +%{python_sitelib}/websockify +%{python_sitelib}/websockify-%{version}.dist-info %changelog From 010bb01ebabe488c8c1cdf95f7db6920ab2cd8b2f64fad16bc9c2b798d2fbfca Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 19 Oct 2024 12:00:40 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-websockify?expand=0&rev=53 --- python-websockify.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/python-websockify.spec b/python-websockify.spec index 53e8a27..c726596 100644 --- a/python-websockify.spec +++ b/python-websockify.spec @@ -34,13 +34,12 @@ BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: %{python_module numpy if (%python-base without python36-base)} -Requires: python-setuptools Requires(post): update-alternatives Requires(postun): update-alternatives BuildArch: noarch +Requires: python-jwcrypto +Requires: python-requests %if 0%{?suse_version} -Recommends: python-jwcrypto -Recommends: python-numpy Recommends: python-redis %endif %python_subpackages From 27b92ffeb9095f02bbf3f5240ae6c56cc2dfddbe99d64df3ac1aa6da16b7d72f Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 22 Oct 2024 07:50:12 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-websockify?expand=0&rev=54 --- python-websockify.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-websockify.spec b/python-websockify.spec index c726596..7572117 100644 --- a/python-websockify.spec +++ b/python-websockify.spec @@ -38,9 +38,9 @@ Requires(post): update-alternatives Requires(postun): update-alternatives BuildArch: noarch Requires: python-jwcrypto -Requires: python-requests %if 0%{?suse_version} Recommends: python-redis +Recommends: python-requests %endif %python_subpackages