[Pkg-privacy-commits] [Git][pkg-privacy-team/onionshare][debian/sid] 6 commits: Add patch for compatibility with werkzeug 3.0.1

[Hefee (@hefee)]

Hefee pushed to branch debian/sid at Privacy Maintainers / onionshare


Commits:
60e38d21 by Pushkar Kulkarni at 2024-01-23T11:59:48+05:30
Add patch for compatibility with werkzeug 3.0.1

- - - - -
3d26b7b2 by Sandro Knauß at 2024-01-24T22:27:10+01:00
mark changelog as UNRELEASED.

- - - - -
b6087c59 by Sandro Knauß at 2024-01-24T22:27:52+01:00
Bump Standards-Version to 4.6.2 (no changes needed).

- - - - -
6f2ee59d by Sandro Knauß at 2024-01-24T22:29:19+01:00
rename patch.

- - - - -
56d19a99 by Sandro Knauß at 2024-01-24T22:32:29+01:00
Update patch to depend on Flask 3.x

- - - - -
c0ebf2b2 by Sandro Knauß at 2024-01-24T22:35:07+01:00
Release to experimental.

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/patches/0001-Make-it-compatible-with-Flask-version-inside-Debian.patch
- + debian/patches/0002-werkzeug-3.0.1-compat.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+onionshare (2.6-6) experimental; urgency=medium
+
+  [ Pushkar Kulkarni ]
+  * Adapt to the python3-werkzeug 3.0.1 urls API (Closes: #1061360)
+
+  [ Sandro Knauß ]
+  * Bump Standards-Version to 4.6.2 (no changes needed).
+  * Update patch to depend on Flask 3.x
+
+ -- Sandro Knauß <hefee at debian.org>  Wed, 24 Jan 2024 22:33:15 +0100
+
 onionshare (2.6-5) unstable; urgency=medium
 
   * Install desktp/appmetadata at expected places. (Closes: #1036691)


=====================================
debian/control
=====================================
@@ -33,7 +33,7 @@ Build-Depends:
  tor <!nocheck>,
  xauth <!nocheck>,
  xvfb <!nocheck>
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Homepage: https://onionshare.org
 Vcs-Git: https://salsa.debian.org/pkg-privacy-team/onionshare.git
 Vcs-Browser: https://salsa.debian.org/pkg-privacy-team/onionshare


=====================================
debian/patches/0001-Make-it-compatible-with-Flask-version-inside-Debian.patch
=====================================
@@ -14,7 +14,7 @@ Forwarded: not-needed
  python = "^3.7"
  click = "*"
 -flask = "2.0.3"
-+flask = "2.*"
++flask = "3.*"
  flask-socketio = "5.3.1"
  psutil = "*"
  pysocks = "*"


=====================================
debian/patches/0002-werkzeug-3.0.1-compat.patch
=====================================
@@ -0,0 +1,46 @@
+From: Pushkar Kulkarni <pushkar.kulkarni at canonical.com>
+Description: Adapt onionshare to the python-werkzeug 3.0.1 API
+  This patch cherry-picks a small part of an upstream pull-request,
+  something relevant to the werkzeug API compatibility only.
+Origin: upstream, https://github.com/onionshare/onionshare/pull/1677
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061360
+--- a/cli/onionshare_cli/web/send_base_mode.py
++++ b/cli/onionshare_cli/web/send_base_mode.py
+@@ -25,7 +25,7 @@
+ import gzip
+ from flask import Response, request
+ from unidecode import unidecode
+-from werkzeug.urls import url_quote
++from urllib.parse import quote
+ 
+ 
+ class SendBaseModeWeb:
+@@ -284,7 +284,7 @@
+         r.headers.set("Content-Length", filesize)
+         filename_dict = {
+             "filename": unidecode(basename),
+-            "filename*": "UTF-8''%s" % url_quote(basename),
++            "filename*": "UTF-8''%s" % quote(basename),
+         }
+         r.headers.set("Content-Disposition", "inline", **filename_dict)
+         (content_type, _) = mimetypes.guess_type(basename, strict=False)
+--- a/cli/onionshare_cli/web/share_mode.py
++++ b/cli/onionshare_cli/web/share_mode.py
+@@ -29,7 +29,7 @@
+ from flask import Response, request, render_template, make_response, abort
+ from unidecode import unidecode
+ from werkzeug.http import parse_date, http_date
+-from werkzeug.urls import url_quote
++from urllib.parse import quote
+ 
+ from .send_base_mode import SendBaseModeWeb
+ 
+@@ -233,7 +233,7 @@
+             r.headers.set("Content-Length", range_[1] - range_[0] + 1)
+             filename_dict = {
+                 "filename": unidecode(basename),
+-                "filename*": "UTF-8''%s" % url_quote(basename),
++                "filename*": "UTF-8''%s" % quote(basename),
+             }
+             r.headers.set("Content-Disposition", "attachment", **filename_dict)
+             # guess content type


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 0001-Make-it-compatible-with-Flask-version-inside-Debian.patch
+0002-werkzeug-3.0.1-compat.patch



View it on GitLab: https://salsa.debian.org/pkg-privacy-team/onionshare/-/compare/afd1156f6b7b2d99915b81f2fa9a042d0abff8d8...c0ebf2b22e83cee22856f517c4744d23ff8260e9

-- 
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/onionshare/-/compare/afd1156f6b7b2d99915b81f2fa9a042d0abff8d8...c0ebf2b22e83cee22856f517c4744d23ff8260e9
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-privacy-commits/attachments/20240124/dcf23b38/attachment-0001.htm>