Import from AlmaLinux stable repository

.python-reportlab.metadata

@@ -1 +0,0 @@
-bd7be4e532b00bc2535d08eef84d5de39814d23c SOURCES/reportlab-3.4.0.tar.gz

SOURCES/python-reportlab-3.4.0-invalid-char.patch

@@ -0,0 +1,11 @@
+--- python3-python-reportlab-3.4.0-6.el8_1.3/tools/pythonpoint/demos/htu.xml
++++ python3-python-reportlab-3.4.0-6.el8_1.3/tools/pythonpoint/demos/htu.xml
+@@ -34,7 +34,7 @@
+             þ ø İ ı ľ ĸ
+             >>> 
+             -->
+-          <font name="Serif" size="32"> 0 ^  1 _</font>
++          <font name="Serif" size="32">Ğ ğ İ ı Ş ş</font>
+         </para>
+       </frame>
+     </slide>

SOURCES/python-reportlab-3.4.0-unichar-element.patch

@@ -1,7 +1,6 @@
-diff -aruN reportlab-3.4.0/src/reportlab/platypus/paraparser.py reportlab-3.4.0.alma/src/reportlab/platypus/paraparser.py
+--- python3-python-reportlab-3.4.0-9.el8/src/reportlab/platypus/paraparser.py
---- reportlab-3.4.0/src/reportlab/platypus/paraparser.py	2017-03-07 13:17:00
++++ python3-python-reportlab-3.4.0-9.el8/src/reportlab/platypus/paraparser.py
-+++ reportlab-3.4.0.alma/src/reportlab/platypus/paraparser.py	2023-10-18 15:29:30
+@@ -841,7 +841,11 @@ class ParaParser(HTMLParser):
-@@ -841,7 +841,11 @@
                  v = '\0'
          elif 'code' in attr:
              try:
@@ -14,10 +13,9 @@ diff -aruN reportlab-3.4.0/src/reportlab/platypus/paraparser.py reportlab-3.4.0.
                  v = chr(v) if isPy3 else unichr(v)
              except:
                  self._syntax_error('<unichar/> invalid code attribute %s' % ascii(attr['code']))
-diff -aruN reportlab-3.4.0/tests/test_platypus_paragraphs.py reportlab-3.4.0.alma/tests/test_platypus_paragraphs.py
+--- python3-python-reportlab-3.4.0-9.el8/tests/test_platypus_paragraphs.py
---- reportlab-3.4.0/tests/test_platypus_paragraphs.py	2017-03-07 13:17:00
++++ python3-python-reportlab-3.4.0-9.el8/tests/test_platypus_paragraphs.py
-+++ reportlab-3.4.0.alma/tests/test_platypus_paragraphs.py	2023-10-18 15:29:30
+@@ -306,6 +306,13 @@ component delimits the traditional pract
-@@ -306,6 +306,13 @@
          doc = MyDocTemplate(outputfile('test_platypus_imageandflowables.pdf'),showBoundary=1)
          doc.multiBuild(story)
  

SPECS/python-reportlab.spec

@@ -3,7 +3,7 @@
 
 Name:           python-%{pypi}
 Version:        3.4.0
-Release:        8%{?dist}.2.alma.1
+Release:        9%{?dist}
 Summary:        Library for generating PDFs and graphics
 License:        BSD
 URL:            http://www.reportlab.org/
@@ -12,9 +12,9 @@ Source0:        https://pypi.python.org/packages/source/r/%{pypi}/%{pypi}-%{vers
 # https://bugzilla.redhat.com/show_bug.cgi?id=1769661
 Patch0:         python-reportlab-3.4.0-color-eval.patch
 
-# Patches were taken from upstream and modified to apply cleanly
+# https://issues.redhat.com/browse/RHEL-7010
-# https://github.com/MrBitBucket/reportlab-mirror/commit/4752c323bfd4358e57ed5039bdcc8425ccce544c
+Patch1:         python-reportlab-3.4.0-invalid-char.patch
-Patch1:         CVE-2019-19450.patch
+Patch2:         python-reportlab-3.4.0-unichar-element.patch
 
 %package -n     python3-%{pypi}
 Summary:        Library for generating PDFs and graphics
@@ -47,7 +47,8 @@ Contains the documentation for ReportLab.
 %prep
 %setup -qn reportlab-%{version}
 %patch0 -p1 -b .color-eval
-%patch1 -p1 -b .cve-2019-19450
+%patch1 -p1
+%patch2 -p1 -b .unichar-element
 # clean up hashbangs from libraries
 find src -name '*.py' | xargs sed -i -e '/^#!\//d'
 # patch the CMap path by adding Fedora ghostscript path before the match
@@ -83,11 +84,10 @@ rm -rf %{buildroot}%{python3_sitearch}/reportlab/fonts
 #%doc docs/*.pdf
 
 %changelog
-* Wed Nov 15 2023 Eduard Abdullin <eabdullin@almalinux.org> - 3.4.0-8.2.alma.1
+* Thu Oct 19 2023 Marek Kasik <mkasik@redhat.com> - 3.4.0-9
-- Rebuild for AlmaLinux 8.9
+- Do not evaluate unichar element
-
+- Replace an invalid char with a correct one (rpminspect)
-* Wed Oct 18 2023 Eduard Abdullin <eabdullin@almalinux.org> - 3.4.0-8.1.alma.1
+- Resolves: RHEL-7010
-- Fix CVE-2019-19450
 
 * Wed Jan 15 2020 Marek Kasik <mkasik@redhat.com> - 3.4.0-8
 - Fix Requires for doc subpackage