From 31bf42a95bb4417c971e68de360fc32a13238114 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm@fedoraproject.org>
Date: Sun, 9 Mar 2025 17:46:42 +0100
Subject: [PATCH] Update to 3.1.6, security fix for CVE-2025-27516

Resolves: RHEL-85058
---
 .gitignore         |  3 +--
 python-jinja2.spec | 11 +++++++++--
 sources            |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 38359a3..e0fc652 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 /Jinja2-*.tar.gz
-/jinja2-3.1.4.tar.gz
-/jinja2-3.1.5.tar.gz
+/jinja2-*.tar.gz
diff --git a/python-jinja2.spec b/python-jinja2.spec
index 116598a..e92c45a 100644
--- a/python-jinja2.spec
+++ b/python-jinja2.spec
@@ -1,7 +1,7 @@
 %global srcname jinja2
 
 Name:           python-jinja2
-Version:        3.1.5
+Version:        3.1.6
 Release:        1%{?dist}
 Summary:        General purpose template engine
 License:        BSD-3-Clause
@@ -76,7 +76,9 @@ rm -rvf docs/_build/html/.buildinfo
 
 
 %check
-%pytest tests %{!?with_asyncio_tests:--ignore tests/test_async.py --ignore tests/test_async_filters.py}
+# test_elif_deep is flaky for an unknown reason
+# https://github.com/pallets/jinja/issues/2079
+%pytest tests -k "not test_elif_deep" %{!?with_asyncio_tests:--ignore tests/test_async.py --ignore tests/test_async_filters.py}
 
 
 %files -n python3-jinja2 -f %{pyproject_files}
@@ -89,6 +91,11 @@ rm -rvf docs/_build/html/.buildinfo
 
 
 %changelog
+* Wed Mar 26 2025 Lumír Balhar <lbalhar@redhat.com> - 3.1.6-1
+- Update to 3.1.6
+- Security fix for CVE-2025-27516
+Resolves: RHEL-85058
+
 * Wed Jan 08 2025 Miro Hrončok <mhroncok@redhat.com> - 3.1.5-1
 - Update to 3.1.5
 - Security fix for CVE-2024-56201
diff --git a/sources b/sources
index bcd8583..17e3310 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jinja2-3.1.5.tar.gz) = 75ad0094482c69d45fcd3aa8ee32e249931e53fee3f804f6ddfd5b6da0ed16962d8f1fced811e7dcb4d8401fadd828e77528d6d1280547a7d4f5f77cccf9bbd4
+SHA512 (jinja2-3.1.6.tar.gz) = bddd5e142f1462426c57b2efafdfafdfc6b66de257668707940896feae71eabdf19e0b6e34ef49b965153baf9b1eb59bb5a97349bb287ea0921dd2a751e967ab