From 66fb7ad934fa2575e8d71a8960bc4ab2ad5cc7bbd25653fc73753cc6b78b5f3b Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 22 Apr 2020 06:57:36 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=360 --- source-overflow.dif | 14 +++++++++++++- texlive.changes | 7 +++++++ texlive.spec | 6 +++++- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/source-overflow.dif b/source-overflow.dif index e6b0c7e..f175334 100644 --- a/source-overflow.dif +++ b/source-overflow.dif @@ -1,6 +1,7 @@ --- + texk/upmendex/convert.c | 2 +- utils/lacheck/lacheck.test | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + 2 files changed, 3 insertions(+), 2 deletions(-) --- utils/lacheck/lacheck.test +++ utils/lacheck/lacheck.test 2018-04-10 08:57:17.672625041 +0000 @@ -12,3 +13,14 @@ +test -e $srcdir/test.old || > $srcdir/test.old +diff $srcdir/test.old test.out || true +--- texk/upmendex/convert.c ++++ texk/upmendex/convert.c 2020-04-22 06:10:54.285427585 +0000 +@@ -187,7 +187,7 @@ static int dcomp(const void *bf1, const + int convert(UChar *buff1, UChar *buff2) + { + int i=0,j=0,k; +- char errbuff[BUFFERLEN],errbuff2[BUFFERLEN]; ++ char errbuff[BUFFERLEN+42],errbuff2[BUFFERLEN]; + int wclen; + UChar buff3[3]; + diff --git a/texlive.changes b/texlive.changes index e61103a..6b034bd 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 22 06:18:45 UTC 2020 - Dr. Werner Fink + +- Extend patch source-overflow.dif to catch an overflow found + by fortify on ppc64 +- TeXLive 2020 requires harfbuzz >= 2.6 + ------------------------------------------------------------------- Mon Apr 20 07:02:13 UTC 2020 - Dr. Werner Fink diff --git a/texlive.spec b/texlive.spec index 72a3504..172a4db 100644 --- a/texlive.spec +++ b/texlive.spec @@ -127,7 +127,9 @@ BuildRequires: ghostscript-library BuildRequires: glibc-devel BuildRequires: graphite2-devel BuildRequires: gsl-devel -BuildRequires: harfbuzz-devel +%if 0%{?sle_version} >= 150200 +BuildRequires: harfbuzz-devel >= 2.6 +%endif BuildRequires: jpeg BuildRequires: libOSMesa-devel BuildRequires: libicu-devel @@ -3996,7 +3998,9 @@ fi --with-system-cairo \ --with-system-includes=/usr/include/cairo \ --with-system-mpfr \ +%if 0%{?sle_version} >= 150200 --with-system-harfbuzz \ +%endif --with-system-icu \ --with-system-graphite2 \ --with-system-potrace \