Accepting request 1153205 from Application:ERP:GNUHealth:4.4

- version 2.6.1
  * Release updates: Automate builds with CI, make just 64-bit Windows release, make a single universal2 release for both Intel and Apple Silicon macOS
  * Upgrade dependencies, including Tor, meek, and snowflake
  * Bug fix: Restore the primary_action mode settings in a tab after OnionShare reconnects to Tor
  * Bug fix: Fix issue with auto-connecting to Tor with persistent tabs open
  * Bug fix: Fix packaging issue where Windows version of OnionShare conflicts with Windows version of Dangerzone
  * Bug fix: Fix 'Use a bridge' checkbox state change
  * Bug fix: Raise error from waitress if not shutdown
  * Patches removed:
    fix-test-cli-web.patch
    onionshare-pr1677-fix-werkzeug3.patch
    onionshare-poetry-core.patch

OBS-URL: https://build.opensuse.org/request/show/1153205
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-onionshare?expand=0&rev=50

fix-test-cli-web.patch

@@ -1,12 +0,0 @@
-diff -Nur onionshare-2.5/cli/tests/test_cli_web.py new/cli/tests/test_cli_web.py
---- onionshare-2.5/cli/tests/test_cli_web.py	2022-01-17 21:56:39.000000000 +0100
-+++ new/cli/tests/test_cli_web.py	2022-02-24 23:43:29.209447238 +0100
-@@ -624,7 +624,7 @@
-                 ]
-             )
- 
--    @pytest.mark.skipif(sys.platform != "Linux", reason="requires Linux")
-+    @pytest.mark.skipif(sys.platform != "linux", reason="requires Linux")
-     @check_unsupported("http", ["--version"])
-     def test_httpie(self, temp_dir, common_obj):
-         web = web_obj(temp_dir, common_obj, "share", 3)

onionshare-2.6.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fdc86207b6aeaf7fe9f68cc8fc63dc487f6b1bf0f80c7f96b7f0d5749906a5d0
+size 8285945

onionshare-2.6.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40006a612a90bf31df697936c26e8dca16384bc8c7ef084ef7b1a21651c84304
-size 8106401

onionshare-poetry-core.patch

@@ -1,21 +0,0 @@
-From a05d7af729585bdaa4f71437167339ac67bf3327 Mon Sep 17 00:00:00 2001
-From: Saptak S <saptak013@gmail.com>
-Date: Sun, 9 Apr 2023 20:24:48 +0530
-Subject: [PATCH] Updates poetry build system to poetry-core
-
----
- cli/pyproject.toml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cli/pyproject.toml b/cli/pyproject.toml
-index d0f311b39..a3675a7a1 100644
---- a/cli/pyproject.toml
-+++ b/cli/pyproject.toml
-@@ -40,5 +40,5 @@ pytest = ">=7.2.0"
- onionshare-cli = 'onionshare_cli:main'
- 
- [build-system]
--requires = ["poetry>=0.12"]
--build-backend = "poetry.masonry.api"
-+requires = ["poetry-core"]
-+build-backend = "poetry.core.masonry.api"

python-onionshare.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Feb 28 18:28:24 UTC 2024 - Axel Braun <axel.braun@gmx.de>
+
+- version 2.6.1
+  * Release updates: Automate builds with CI, make just 64-bit Windows release, make a single universal2 release for both Intel and Apple Silicon macOS
+  * Upgrade dependencies, including Tor, meek, and snowflake
+  * Bug fix: Restore the primary_action mode settings in a tab after OnionShare reconnects to Tor
+  * Bug fix: Fix issue with auto-connecting to Tor with persistent tabs open
+  * Bug fix: Fix packaging issue where Windows version of OnionShare conflicts with Windows version of Dangerzone
+  * Bug fix: Fix 'Use a bridge' checkbox state change
+  * Bug fix: Raise error from waitress if not shutdown
+  * Patches removed:
+    fix-test-cli-web.patch
+    onionshare-pr1677-fix-werkzeug3.patch
+    onionshare-poetry-core.patch
+
 -------------------------------------------------------------------
 Sun Jan 28 17:35:56 UTC 2024 - Ben Greiner <code@bnavigator.de>
 

python-onionshare.spec

@@ -28,7 +28,7 @@
 %define plainpython python
 
 Name:           python-onionshare
-Version:        2.6
+Version:        2.6.1
 Release:        0
 Summary:        Self-hosting Tor Onion Service based file sharing
 License:        GPL-3.0-or-later
@@ -38,14 +38,8 @@ Source0:        https://github.com/onionshare/onionshare/archive/v%{version}.tar
 Source99:       python-onionshare.rpmlintrc
 # PATCH-FIX-OPENSUSE skip test_large_download in gui tests
 Patch0:         0001-adjust_tests.diff
-# PATCH-FIX-UPSTREAM fix-test-cli-web.patch -- https://github.com/onionshare/onionshare/issues/1534
-Patch1:         fix-test-cli-web.patch
 # PATCH-FIX-OPENSUSE relax-async-mode.patch -- Do not rely on gevent
-Patch2:         relax-async-mode.patch
-# PATCH-FIX-UPSTREAM onionshare-poetry-core.patch -- poetry-core is enough to build and has a much smaller footprint
-Patch3:         https://github.com/onionshare/onionshare/commit/a05d7af729585bdaa4f71437167339ac67bf3327.patch#/onionshare-poetry-core.patch
-# PATCH-FIX-UPSTREAM onionshare-pr1677-fix-werkzeug3.patch gh#onionshare/onionshare#1677
-Patch4:         onionshare-pr1677-fix-werkzeug3.patch
+Patch1:         relax-async-mode.patch
 BuildRequires:  %{mypython}-devel
 BuildRequires:  %{mypython}-pip
 BuildRequires:  %{mypython}-setuptools
@@ -64,7 +58,7 @@ BuildRequires:  %{mypython}-pytest-xvfb
 # SECTION runtime test
 BuildRequires:  %{mypython}-Flask >= 2.3.2
 BuildRequires:  %{mypython}-Flask-Compress >= 1.13
-BuildRequires:  %{mypython}-Flask-SocketIO >= 5.3.1
+BuildRequires:  %{mypython}-Flask-SocketIO >= 5.3.4
 BuildRequires:  %{mypython}-PyNaCl
 BuildRequires:  %{mypython}-PySocks
 BuildRequires:  %{mypython}-Unidecode
@@ -75,7 +69,7 @@ BuildRequires:  %{mypython}-colorama
 BuildRequires:  %{mypython}-eventlet
 BuildRequires:  %{mypython}-gevent-websocket
 BuildRequires:  %{mypython}-psutil
-BuildRequires:  %{mypython}-pyside2 >= 5.15.2.1
+BuildRequires:  %{mypython}-pyside6 >= 6.5.2
 BuildRequires:  %{mypython}-python-gnupg
 BuildRequires:  %{mypython}-qrcode
 BuildRequires:  %{mypython}-requests
@@ -85,7 +79,7 @@ BuildRequires:  tor
 # /SECTION
 Requires:       python-Flask >= 2.3.2
 Requires:       python-Flask-Compress >= 1.13
-Requires:       python-Flask-SocketIO >= 5.3.1
+Requires:       python-Flask-SocketIO >= 5.3.4
 Requires:       python-PyNaCl
 Requires:       python-PySocks
 Requires:       python-Unidecode
@@ -96,7 +90,7 @@ Requires:       python-colorama
 Requires:       python-eventlet
 Requires:       python-gevent-websocket
 Requires:       python-psutil
-Requires:       python-pyside2 >= 5.15.2.1
+Requires:       python-pyside6 >= 6.5.2
 Requires:       python-python-gnupg
 Requires:       python-qrcode
 Requires:       python-requests
@@ -179,7 +173,7 @@ popd
 %files %python_files
 %{_bindir}/onionshare
 %{_bindir}/onionshare-cli
-%license LICENSE
+%license LICENSE.txt
 %doc README.md
 %{_datadir}/applications/org.onionshare.OnionShare.desktop
 %{_datadir}/metainfo/org.onionshare.OnionShare.metainfo.xml

relax-async-mode.patch

@@ -2,7 +2,7 @@ Index: onionshare-2.6/cli/onionshare_cli/web/web.py
 ===================================================================
 --- onionshare-2.6.orig/cli/onionshare_cli/web/web.py
 +++ onionshare-2.6/cli/onionshare_cli/web/web.py
-@@ -164,10 +164,10 @@ class Web:
+@@ -177,10 +177,10 @@ class Web:
          elif self.mode == "chat":
              if self.common.verbose:
                  self.socketio = SocketIO(
@@ -15,16 +15,3 @@ Index: onionshare-2.6/cli/onionshare_cli/web/web.py
              self.socketio.init_app(self.app)
              self.chat_mode = ChatModeWeb(self.common, self)
  
-Index: onionshare-2.6/desktop/pyproject.toml
-===================================================================
---- onionshare-2.6.orig/desktop/pyproject.toml
-+++ onionshare-2.6/desktop/pyproject.toml
-@@ -6,7 +6,7 @@ authors = ["Micah Lee <micah@micahflee.c
- license = "GPLv3+"
- 
- [tool.poetry.dependencies]
--python = ">=3.7,<3.11"
-+python = ">=3.7"
- onionshare_cli = {path = "../cli", develop = true}
- PySide2 = "5.15.2.1"
- qrcode = "*"