From 575e94367b80dfd38942a1f8fab0ce7d3e08a56b Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 27 Oct 2022 15:07:39 +0100 Subject: [PATCH] Update to 1.2.3 (#1996163) Additionally, this fixes CVE-2022-40023. --- .gitignore | 1 + ...a4b1e2bdc025b643f2061aa32bf7ae0c78a8.patch | 38 ------------------- python-mako.spec | 18 ++++----- sources | 2 +- 4 files changed, 11 insertions(+), 48 deletions(-) delete mode 100644 9b8da4b1e2bdc025b643f2061aa32bf7ae0c78a8.patch diff --git a/.gitignore b/.gitignore index 18b0ab4..a6ee045 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ Mako-0.4.0.tar.gz /rel_1_1_1.tar.gz /rel_1_1_3.tar.gz /rel_1_1_4.tar.gz +/rel_1_2_3.tar.gz diff --git a/9b8da4b1e2bdc025b643f2061aa32bf7ae0c78a8.patch b/9b8da4b1e2bdc025b643f2061aa32bf7ae0c78a8.patch deleted file mode 100644 index a757da3..0000000 --- a/9b8da4b1e2bdc025b643f2061aa32bf7ae0c78a8.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9b8da4b1e2bdc025b643f2061aa32bf7ae0c78a8 Mon Sep 17 00:00:00 2001 -From: Mike Bayer -Date: Sat, 9 Apr 2022 11:43:32 -0400 -Subject: [PATCH] reduce exception message tested for py311 compat - -Change-Id: I519d4a840fd456ea042a5b0735da183a1e340aa4 ---- - test/test_exceptions.py | 10 ++-------- - 1 file changed, 2 insertions(+), 8 deletions(-) - -diff --git a/test/test_exceptions.py b/test/test_exceptions.py -index b1930c5..7a2e6b0 100644 ---- a/test/test_exceptions.py -+++ b/test/test_exceptions.py -@@ -274,10 +274,7 @@ def test_tback_no_trace_from_py_file(self): - html_error = exceptions.html_error_template().render_unicode( - error=v, traceback=None - ) -- assert ( -- "local variable 'y' referenced before assignment" -- in html_error -- ) -+ assert "local variable 'y'" in html_error - - def test_tback_trace_from_py_file(self): - t = self._file_template("runtimeerr.html") -@@ -287,10 +284,7 @@ def test_tback_trace_from_py_file(self): - except: - html_error = exceptions.html_error_template().render_unicode() - -- assert ( -- "local variable 'y' referenced before assignment" -- in html_error -- ) -+ assert "local variable 'y'" in html_error - - def test_code_block_line_number(self): - l = TemplateLookup() diff --git a/python-mako.spec b/python-mako.spec index 6d9a250..9e94e07 100644 --- a/python-mako.spec +++ b/python-mako.spec @@ -1,17 +1,14 @@ -Name: python-mako -Version: 1.1.4 -Release: 9%{?dist} -BuildArch: noarch +Name: python-mako +Version: 1.2.3 +Release: 1%{?dist} +Summary: Mako template library for Python # Mostly MIT, but _ast_util.py is Python licensed License: MIT and Python -Summary: Mako template library for Python -URL: http://www.makotemplates.org/ +URL: https://www.makotemplates.org/ Source0: https://github.com/sqlalchemy/mako/archive/rel_%(echo %{version} | sed "s/\./_/g").tar.gz -# patch for Python 3.11 compatibility to reduce exception message -Patch: https://github.com/sqlalchemy/mako/commit/9b8da4b1e2bdc025b643f2061aa32bf7ae0c78a8.patch - +BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-pytest BuildRequires: python3-setuptools @@ -81,6 +78,9 @@ pytest-3 %changelog +* Thu Oct 27 2022 David King - 1.2.3-1 +- Update to 1.2.3 (#1996163) + * Fri Jul 22 2022 Fedora Release Engineering - 1.1.4-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 98b9f07..9cbaf37 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rel_1_1_4.tar.gz) = 70c5c9a4850a982550730739eb74cfae13c6ea729e5b768c1a54c6a391ddc30e51e17c1f6b9b7fa56e751527bdac66ec7ae0a0885e2f45289b7401df13f0c01e +SHA512 (rel_1_2_3.tar.gz) = 400bf78afcc72c93a956805fbfb062caa1645f37034b0c261a5e0c203b324a3b553fabdd0e889dbefa6ca0955bb6f16aeaee88851fdc830303473019621342f0