Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 python-pypi/lektor/DETAILS                                            |    1 
 python-pypi/lektor/HISTORY                                            |    4 
+
 python-pypi/lektor/PRE_BUILD                                          |    4 
-
 python-pypi/lektor/patches/0001-Use-werkzeug.security.safe_join.patch |   29 
++++++++++
 4 files changed, 35 insertions(+), 3 deletions(-)

New commits:
commit d996c47119aa5ceaa0ce0250810ac6767f6536d0
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    lektor: Add backported API fix

diff --git a/python-pypi/lektor/DETAILS b/python-pypi/lektor/DETAILS
index 9b2a9e9..2f0d193 100755
--- a/python-pypi/lektor/DETAILS
+++ b/python-pypi/lektor/DETAILS
@@ -1,5 +1,6 @@
            SPELL=lektor
          VERSION=3.2.2
+      PATCHLEVEL=1
           SOURCE="$SPELL-$VERSION.tar.gz"
    
SOURCE_URL[0]=https://github.com/$SPELL/$SPELL/archive/refs/tags/v$VERSION.tar.gz
      
SOURCE_HASH=sha512:0e705cf83fac9ad2afcb9ecb0b2c4c1af3e2e495641fa09b5c9b3f3b2abc24f75a6cbe7cd7881d777f2e6f8aeece66600aafe7cf91c37c380cb944a24f21ed2d
diff --git a/python-pypi/lektor/HISTORY b/python-pypi/lektor/HISTORY
index e78bb71..7b0dab3 100644
--- a/python-pypi/lektor/HISTORY
+++ b/python-pypi/lektor/HISTORY
@@ -3,6 +3,10 @@
        * 
patches/0001-Replace-werkzeuz-s-rename-with-os.replace-enable-Wer.patch:
          removed, no longer needed
        * DEPENDS: added python-charset-normalizer
+       * PRE_BUILD: dropped edit of setup.py, no longer needed
+       * 
python-pypi/lektor/patches/0001-Use-werkzeug.security.safe_join.patch:
+         added API fix backport
+       * DETAILS: PATCHLEVEL++
 
 2021-05-30 Ismael Luceno <ismael AT sourcemage.org>
        * 
patches/0001-Replace-werkzeuz-s-rename-with-os.replace-enable-Wer.patch,
diff --git a/python-pypi/lektor/PRE_BUILD b/python-pypi/lektor/PRE_BUILD
index c8ef839..c230ad1 100755
--- a/python-pypi/lektor/PRE_BUILD
+++ b/python-pypi/lektor/PRE_BUILD
@@ -1,5 +1,3 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
-apply_patch_dir patches &&
-# Fix up dependencies
-sedit "/^ *'Werkzeug<1'/{s/<1//}" setup.py
+apply_patch_dir patches
diff --git 
a/python-pypi/lektor/patches/0001-Use-werkzeug.security.safe_join.patch 
b/python-pypi/lektor/patches/0001-Use-werkzeug.security.safe_join.patch
new file mode 100644
index 0000000..3731140
--- /dev/null
+++ b/python-pypi/lektor/patches/0001-Use-werkzeug.security.safe_join.patch
@@ -0,0 +1,29 @@
+From 3b7646692710ab27ef07a032f28d5d96542893a8 Mon Sep 17 00:00:00 2001
+From: Jeff Dairiki <dairiki AT dairiki.org>
+Date: Fri, 13 Aug 2021 16:09:40 -0700
+Subject: [PATCH] Use werkzeug.security.safe_join
+
+`Flask.helpers.safe_join` is deprecated in Flask>=2.
+
+Upstream-Status: Backport
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ lektor/admin/webui.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lektor/admin/webui.py b/lektor/admin/webui.py
+index 45434a59da22..246ad97a0b38 100644
+--- a/lektor/admin/webui.py
++++ b/lektor/admin/webui.py
+@@ -4,7 +4,7 @@ import sys
+ from flask import abort
+ from flask import Flask
+ from flask import request
+-from flask.helpers import safe_join
++from werkzeug.security import safe_join
+ from werkzeug.utils import append_slash_redirect
+ 
+ from lektor.admin.modules import register_modules
+-- 
+2.33.0
+