[arch-commits] Commit in pgadmin4/trunk (PKGBUILD jinja-3.1.patch)

[Evangelos Foutras]

    Date: Tuesday, May 24, 2022 @ 13:31:01
  Author: foutrelis
Revision: 1210207

upgpkg: pgadmin4 4.30-4: fix for jinja 3.1

Added:
  pgadmin4/trunk/jinja-3.1.patch
Modified:
  pgadmin4/trunk/PKGBUILD

-----------------+
 PKGBUILD        |    5 ++++-
 jinja-3.1.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-24 13:19:13 UTC (rev 1210206)
+++ PKGBUILD	2022-05-24 13:31:01 UTC (rev 1210207)
@@ -3,7 +3,7 @@
 
 pkgname=pgadmin4
 pkgver=4.30
-pkgrel=3
+pkgrel=4
 pkgdesc='Comprehensive design and management interface for PostgreSQL'
 url='https://www.pgadmin.org/'
 arch=('x86_64')
@@ -29,6 +29,7 @@
         config_distro.py
         config_local.py
         pgadmin4-python-de-vendor-venv-paths.patch
+        jinja-3.1.patch
         flask-security-compat.patch
         flask2-compat.patch)
 validpgpkeys=('E8697E2EEF76C02D3A6332778881B2A8210976F2') # Package Manager (Package Signing Key) <packages at pgadmin.org>
@@ -38,6 +39,7 @@
             '16d00dc2095904a6b12da7039458f632873829ad98d4d7653eac5804032ba92097ccae4488d56467d0ea9bd64e2654a3dead73eb7924c947ff1737ff6e3b4745'
             'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'
             'a8c1a3762469b02b745da4e3b30f7534ad6bb94e91d43f7e63604fef24f638e09575e2c9336e753e5b6dbe167c55bb49fb6247a16431415318479eb3a3712adc'
+            'ec7b9ef6d944ac5b8e2c0e7ff7626af8950b369e34bb643322d9208908baea70ad6753ae9eff2799c04fe5182edbb5c270ee69647f224349f0df890a735a7767'
             '8b23686674c12f1bbba9ded22425874adb5f6802f2e1f7e381c07208251301f0bb56622a0440e5609c5dcc5461f50fe08c7dcab4405878e9662de6faf782a39b'
             '5eb39b2926adc7fe715a2b1b3f2165bd84a9fab3f8afda1ddaaba557ad1d41a4aa8d279387699b7148a86c7af4782d5b6b7f50f89972ef3507d14795c006a65c')
 
@@ -45,6 +47,7 @@
   cd ${pkgname}-${pkgver}
 
   patch -Np1 < ../pgadmin4-python-de-vendor-venv-paths.patch
+  patch -Np1 --no-backup-if-mismatch < ../jinja-3.1.patch
   patch -NRp1 < ../flask-security-compat.patch
   patch -NRp1 < ../flask2-compat.patch
 

Added: jinja-3.1.patch
===================================================================
--- jinja-3.1.patch	                        (rev 0)
+++ jinja-3.1.patch	2022-05-24 13:31:01 UTC (rev 1210207)
@@ -0,0 +1,32 @@
+From 04d0ab4adfe6c8d1eabdcfbdbbc47c5c73ee59fe Mon Sep 17 00:00:00 2001
+From: Nikhil Mohite <nikhil.mohite at enterprisedb.com>
+Date: Fri, 25 Mar 2022 11:52:11 +0530
+Subject: [PATCH] Ensure that pgAdmin4 should work with latest jinja2 version.
+ Fixes #7269
+
+---
+ docs/en_US/release_notes_6_8.rst | 1 +
+ web/pgadmin/__init__.py          | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/web/pgadmin/__init__.py b/web/pgadmin/__init__.py
+index 19befe9f5d..d5188dd5d6 100644
+--- a/web/pgadmin/__init__.py
++++ b/web/pgadmin/__init__.py
+@@ -33,6 +33,7 @@
+ from werkzeug.datastructures import ImmutableDict
+ from werkzeug.local import LocalProxy
+ from werkzeug.utils import find_modules
++from jinja2 import select_autoescape
+ 
+ from pgadmin.model import db, Role, Server, SharedServer, ServerGroup, \
+     User, Keys, Version, SCHEMA_VERSION as CURRENT_SCHEMA_VERSION
+@@ -70,7 +71,7 @@ class PgAdmin(Flask):
+     def __init__(self, *args, **kwargs):
+         # Set the template loader to a postgres-version-aware loader
+         self.jinja_options = ImmutableDict(
+-            extensions=['jinja2.ext.autoescape', 'jinja2.ext.with_'],
++            autoescape=select_autoescape(enabled_extensions=('html', 'xml')),
+             loader=VersionedTemplateLoader(self)
+         )
+         self.logout_hooks = []