import texlive-20180414-29.el8

.gitignore

@@ -603,6 +603,7 @@ SOURCES/tex.doc.tar.xz
 SOURCES/tex.tar.xz
 SOURCES/tex4ht.doc.tar.xz
 SOURCES/tex4ht.tar.xz
+SOURCES/texlive-20180414-poppler-20.11.0-luatex.patch
 SOURCES/texlive-20180414-source.tar.xz
 SOURCES/texlive-common.doc.tar.xz
 SOURCES/texlive-docindex.doc.tar.xz

.texlive.metadata

@@ -603,6 +603,7 @@ de2f54d2a459bae570d9f9fb0c0638bb531b0d9c SOURCES/tex-ini-files.tar.xz
 5df5b9595fcc9948fca717aa5dd1757c5aad0ee6 SOURCES/tex.tar.xz
 6161195cb1d8638a1d08773e66a607a2b2057dc4 SOURCES/tex4ht.doc.tar.xz
 afebcd84632de9c43c9461ba2ff593882a426a88 SOURCES/tex4ht.tar.xz
+a03553f4e0d70a86d861628edc5969b92c533477 SOURCES/texlive-20180414-poppler-20.11.0-luatex.patch
 81bdd9999b6ab860d1d3c388cf27062aba960255 SOURCES/texlive-20180414-source.tar.xz
 626b3dc7527c30a380406d888a890a56cd59aa2a SOURCES/texlive-common.doc.tar.xz
 91424e8fec75b4af84884f7dc0bafb32cd9a7170 SOURCES/texlive-docindex.doc.tar.xz

SPECS/texlive.spec

@@ -15,7 +15,7 @@
 
 Name: texlive
 Version: %{source_date}
-Release: 28%{?dist}
+Release: 29%{?dist}
 Epoch: %{tl_epoch}
 Summary: TeX formatting system
 Group: Applications/Publishing
@@ -54,6 +54,7 @@ BuildRequires: libtool
 BuildRequires: gmp-devel
 BuildRequires: mpfr-devel
 BuildRequires: chrpath
+BuildRequires: dos2unix
 
 Requires: texlive-scheme-basic
 Requires: texlive-collection-latexrecommended
@@ -882,6 +883,10 @@ Patch15: texlive-20180414-poppler-20.11.0-luatex.patch
 Patch16: texlive-xdvi-ghostcripts.patch
 Patch17: texlive-20180414-beamer-doc.patch
 
+# upstream patch
+# LuaTeX Security Vulnerabilities CVE-2023-32700
+Patch100: texlive-2018-luatex-CVE-2023-32700.patch
+
 %description
 The TeX Live software distribution offers a complete TeX system for a
 variety of Unix, Macintosh, Windows and other platforms. It
@@ -23821,25 +23826,27 @@ words.
 %setup -q -c -T
 xz -dc %{SOURCE0} | tar x
 [ -e %{source_name} ] && mv %{source_name} source
-%patch1 -p0
-%patch2 -p1
-%patch3 -p1
-%patch5 -p0
+%patch -P1 -p0
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P5 -p0
 %if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
-%patch7 -p1 -b .newpoppler
+%patch -P7 -p1 -b .newpoppler
 %endif
-%patch11 -p1 -b .annocheck
-%patch12 -p1
-%patch13 -p1
+%patch -P11 -p1 -b .annocheck
+%patch -P12 -p1
+%patch -P13 -p1
 pushd source
-%patch15 -p1
-%patch16 -p1
+%patch -P15 -p1
+%patch -P16 -p1
 popd
 # Setup copies of the licenses
 for l in `unxz -c %{SOURCE2} | tar t`; do
 ln -s %{_texdir}/licenses/$l $l
 done
-
+# covert to unix fileformat
+dos2unix source/texk/web2c/luatexdir/lua/luatex-core.lua
+%patch -P100 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Werror=format-security"
@@ -24644,26 +24651,22 @@ xz -dc %{SOURCE8033} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 # Patches to component tarballs
 pushd %{buildroot}%{_texdir}/texmf-dist
 patch -p1 < %{_sourcedir}/texlive-20180414-tlmgr-ignore-warning.patch
-# %%patch14 -p1
 popd
 
 # XML validity
 pushd %{buildroot}%{_texdir}/texmf-dist/
 patch -p0 < %{_sourcedir}/texlive-20180414-xml.patch
-# %%patch8 -p0
 rm -f doc/otherformats/xmltex/base/{englishutf16.xml,russiankoi8.xml}
 popd
 
 # support python3 and fix mangling shebang
 pushd %{buildroot}%{_texdir}/texmf-dist/
 patch -p0 < %{_sourcedir}/texlive-2017-python3.patch
-# %%patch9 -p0
 popd
 
 # Patch beamer.doc
 pushd %{buildroot}%{_texdir}/texmf-dist/
 patch -p0 < %{_sourcedir}/texlive-20180414-beamer-doc.patch
-# %%patch17 -p0
 popd
 
 # adjust python3 shebang to make it point at #!%%{_python3}
@@ -27261,9 +27264,12 @@ fi
 %doc %{_texdir}/texmf-dist/doc/latex/translator/
 
 %changelog
-* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 7:20180414-28
+* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 7:20180414-29
 - Rebuilt for MSVSphere 8.8
 
+* Thu May 25 2023 Than Ngo <than@redhat.com> - 7:20180414-29
+- Resolves: #2209870, CVE-2023-32700 
+
 * Mon Dec 12 2022 Than Ngo <than@redhat.com> - 7:20180414-28
 - Related: #2150727, fix rpminspect issues