From aeaab8ec6533fcb29f880541dec8df92cecb58e4 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2018 08:00:37 +0000 Subject: import texlive-2012-43.20130427_r30134.el7 --- diff --git a/SOURCES/texlive-2012-memset-warning.patch b/SOURCES/texlive-2012-memset-warning.patch new file mode 100644 index 0000000..6741db6 --- /dev/null +++ b/SOURCES/texlive-2012-memset-warning.patch @@ -0,0 +1,12 @@ +diff -up texlive-2012/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/encoding.c.me texlive-2012/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/encoding.c +--- texlive-2012/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/encoding.c.me 2018-07-22 10:49:42.862075024 +0200 ++++ texlive-2012/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/encoding.c 2018-07-22 10:52:00.667236454 +0200 +@@ -541,6 +541,8 @@ return( NULL ); + base = 256; + else if ( enc->char_cnt<=0x10000 ) + base = 0x10000; ++ if (base==0) ++return( NULL ); + encoded = galloc(base*sizeof(int)); + memset(encoded,-1,base*sizeof(int)); + unencoded = galloc(sf->glyphcnt*sizeof(int)); diff --git a/SOURCES/texlive-2012-warning.patch b/SOURCES/texlive-2012-warning.patch new file mode 100644 index 0000000..6e887bd --- /dev/null +++ b/SOURCES/texlive-2012-warning.patch @@ -0,0 +1,20 @@ +diff -up texmf-dist/scripts/tetex/updmap.pl.me texmf-dist/scripts/tetex/updmap.pl +--- texmf-dist/scripts/tetex/updmap.pl.me 2018-07-11 17:04:20.267484075 +0200 ++++ texmf-dist/scripts/tetex/updmap.pl 2018-07-11 17:04:05.611892683 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # mupdmap: utility to maintain map files for outline fonts. + # $Id: updmap.pl 27264 2012-07-31 05:10:29Z preining $ + # +@@ -2071,8 +2071,8 @@ sub reset_root_home { + my (undef,undef,undef,undef,undef,undef,undef,$roothome) = getpwuid(0); + if (defined($roothome)) { + if ($envhome ne $roothome) { +- warning("$prg: resetting \$HOME value (was $envhome) to root's " +- . "actual home ($roothome).\n"); ++ # warning("$prg: resetting \$HOME value (was $envhome) to root's " ++ # . "actual home ($roothome).\n"); + $ENV{'HOME'} = $roothome; + } else { + # envhome and roothome do agree, nothing to do, that is the good case diff --git a/SPECS/texlive.spec b/SPECS/texlive.spec index d16d496..1fb77f9 100644 --- a/SPECS/texlive.spec +++ b/SPECS/texlive.spec @@ -1,6 +1,6 @@ %global source_date 20130427_r30134 %global tl_version 2012 -%global tl_rel 38 +%global tl_rel 43 %global tl_release %{tl_rel}.%{source_date}%{?dist} %global tl_noarch_release %{tl_rel}%{?dist} %global source_name texlive-%{source_date}-source @@ -51,6 +51,10 @@ Patch2: texlive-multilib.patch Patch3: texlive-poppler-0.26.5-bz#1217556.patch # fix selinux context issue Patch4: texlive-2012-selinux.patch +# disable warning +Patch5: texlive-2012-warning.patch +# fix memset warning +Patch6: texlive-2012-memset-warning.patch Source0: %{source_name}.tar.xz Source1: texlive.tlpdb Source2: texlive-licenses.tar.xz @@ -4385,7 +4389,7 @@ AutoReqProv: No Provides: kpathsea = %{tl_version} Obsoletes: kpathsea < %{tl_version} Requires: texlive-kpathsea-bin, tex-kpathsea -Requires(post,postun): /sbin/install-info +Requires(post,postun): info, coreutils Requires: texlive-kpathsea-bin Provides: tex(fmtutil.cnf) = %{tl_version} Provides: tex(mktex.cnf) = %{tl_version} @@ -13670,6 +13674,10 @@ Summary: Binaries for tetex Version: svn27344.0 Requires: texlive-base Requires: tex-tetex +# fix bz#1350485 +Requires: texlive-texlive.infra +Requires: perl(Digest::MD5) +Requires: texlive-texconfig-bin Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -19727,6 +19735,7 @@ Version: svn14050.0 Requires: texlive-base Requires: tex-latex-bin Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} +Requires: texlive-texconfig-bin Release: %{tl_release} BuildArch: noarch @@ -25507,6 +25516,8 @@ Requires: texlive-tetex-bin, tex-tetex Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base Requires: tex-xetexconfig Requires: texlive-xetex-bin +# fix bz#1320337 +Requires: tex(xetex.def) Provides: tex(qx-unicode.map) = %{tl_version} Provides: tex(tex-text.map) = %{tl_version} @@ -31289,6 +31300,7 @@ done %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch6 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-overflow" @@ -31469,6 +31481,9 @@ xz -dc %{SOURCE254} | tar x -C %{buildroot}%{_texdir} xz -dc %{SOURCE6012} | tar x -C %{buildroot} xz -dc %{SOURCE255} | tar x -C %{buildroot}%{_texdir}/texmf-dist xz -dc %{SOURCE256} | tar x -C %{buildroot}%{_texdir} +pushd %{buildroot}%{_texdir}/ +patch -p0 < %{_sourcedir}/texlive-2012-warning.patch +popd xz -dc %{SOURCE257} | tar x -C %{buildroot}%{_texdir} xz -dc %{SOURCE6013} | tar x -C %{buildroot} xz -dc %{SOURCE258} | tar x -C %{buildroot}%{_texdir} @@ -37808,7 +37823,7 @@ fi %{_texdir}/texmf/web2c/cp852-pl.tcx %{_texdir}/texmf/web2c/cp8bit.tcx %{_texdir}/texmf/web2c/empty.tcx -%config(noreplace) %{_texdir}/texmf/web2c/fmtutil.cnf +%config(noreplace) %verify(not md5 size mtime) %{_texdir}/texmf/web2c/fmtutil.cnf %{_texdir}/texmf/web2c/il1-t1.tcx %{_texdir}/texmf/web2c/il2-cs.tcx %{_texdir}/texmf/web2c/il2-pl.tcx @@ -46537,7 +46552,7 @@ fi %{_mandir}/man1/texlinks.1* %{_mandir}/man1/updmap-sys.1* %{_mandir}/man1/updmap.1* -%config(noreplace) %{_texdir}/texmf/web2c/updmap.cfg +%config(noreplace) %verify(not md5 size mtime) %{_texdir}/texmf/web2c/updmap.cfg %{_texdir}/texmf-dist/scripts/tetex/allcm.sh %{_texdir}/texmf-dist/scripts/tetex/allneeded.sh %{_texdir}/texmf-dist/scripts/tetex/dvi2fax.sh @@ -61463,6 +61478,24 @@ fi %changelog +* Sun Jul 22 2018 Than Ngo - 2:2012-43.20130427_r30134 +- Related: #1337981 - fixed memset warning detected by rpmdiff + +* Wed Jul 18 2018 Than Ngo - 2:2012-42.20130427_r30134 +- Related: #1337981 - fixed VerifyTest + +* Wed Jul 11 2018 Than Ngo - 2:2012-41.20130427_r30134 +- Related: #1337981 - silence the warning + +* Tue May 29 2018 Than Ngo - 2:2012-40.20130427_r30134 +- Resolves: #1337981 - silence the warning + +* Thu May 17 2018 Than Ngo - 2:2012-39.20130427_r30134 +- Resolves: #1320337 - dependiency on texlive-xetex-def +- Resolves: #1350485 - updmap from texlive-tetex-bin cannot be executed +- Resolves: #1337925 - scriptlet errors +- Resolves: #1186825 - add coreutils for post/unpost + * Mon Sep 21 2015 Than Ngo - 2:2012-38.20130427_r30134 - Resolves: bz#1198299, directory not owned by any package issue