- fix fmtutil to not to hang in infinite loop, thanks to Stepan Kasal
(#437008) - fix search paths in texmf.cnf, thanks to Patrice Dumas (#436949)
This commit is contained in:
parent
a590a0f387
commit
e12b8252cc
@ -60,7 +60,7 @@ diff -up texlive/texk/kpathsea/texmf.in.fedora_paths texlive/texk/kpathsea/texmf
|
|||||||
% For security reasons, it is better not to have . part of the path.
|
% For security reasons, it is better not to have . part of the path.
|
||||||
%
|
%
|
||||||
-TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c};/.$TETEXDIR;$TEXMF/web2c;@web2c@
|
-TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c};/.$TETEXDIR;$TEXMF/web2c;@web2c@
|
||||||
+TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c};@sysconfdir@/texmf;/usr/local/share/texmf/web2c;$TEXMF/web2c;@web2c@
|
+TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf-local/web2c};@sysconfdir@/texmf/web2c;/usr/local/share/texmf/web2c;$TEXMF/web2c;@web2c@
|
||||||
|
|
||||||
# $progname: kpathsea v. 3.5.3 or later overwrites this at runtime. To
|
# $progname: kpathsea v. 3.5.3 or later overwrites this at runtime. To
|
||||||
# avoid empty expansions from binaries linked against an earlier
|
# avoid empty expansions from binaries linked against an earlier
|
||||||
|
16
texlive.spec
16
texlive.spec
@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
Name: texlive
|
Name: texlive
|
||||||
Version: %{texlive_ver}
|
Version: %{texlive_ver}
|
||||||
Release: 24%{?dist}
|
Release: 25%{?dist}
|
||||||
Summary: Binaries for the TeX formatting system
|
Summary: Binaries for the TeX formatting system
|
||||||
|
|
||||||
Group: Applications/Publishing
|
Group: Applications/Publishing
|
||||||
@ -73,6 +73,7 @@ Patch10: texlive-2007-dvipdfm-security.patch
|
|||||||
Patch11: texlive-2007-makej.patch
|
Patch11: texlive-2007-makej.patch
|
||||||
Patch12: texlive-2007-badscript.patch
|
Patch12: texlive-2007-badscript.patch
|
||||||
Patch17: texlive-2007-tmpcleanup.patch
|
Patch17: texlive-2007-tmpcleanup.patch
|
||||||
|
Patch18: texlive-fmtutil-infloop.patch
|
||||||
Patch19: texlive-2007-kpse-extensions.patch
|
Patch19: texlive-2007-kpse-extensions.patch
|
||||||
Patch20: texlive-CVE-2007-4033.patch
|
Patch20: texlive-CVE-2007-4033.patch
|
||||||
Patch25: texlive-dvipsoverflow.patch
|
Patch25: texlive-dvipsoverflow.patch
|
||||||
@ -441,6 +442,8 @@ chmod -x texk/dvipdfm/encodings.c
|
|||||||
# Always cleanup temporary directories for texconfig, updmap, fmtutil
|
# Always cleanup temporary directories for texconfig, updmap, fmtutil
|
||||||
# (RH #172534)
|
# (RH #172534)
|
||||||
%patch17 -p1 -b .tmpcleanup
|
%patch17 -p1 -b .tmpcleanup
|
||||||
|
# fmtutil won't hang in infinite loop (#437008)
|
||||||
|
%patch18 -p1 -b .infloop
|
||||||
%patch19 -p0 -b .kpse-extensions
|
%patch19 -p0 -b .kpse-extensions
|
||||||
%patch20 -p1 -b .CVE-2007-4033
|
%patch20 -p1 -b .CVE-2007-4033
|
||||||
%patch21 -p1 -b .more_paths
|
%patch21 -p1 -b .more_paths
|
||||||
@ -622,10 +625,16 @@ mkdir -p %{buildroot}%{_texmf_conf}
|
|||||||
|
|
||||||
export LD_LIBRARY_PATH=`pwd`/texk/kpathsea/.libs
|
export LD_LIBRARY_PATH=`pwd`/texk/kpathsea/.libs
|
||||||
|
|
||||||
|
# a temporary placeholder for texmf.cnf
|
||||||
|
mkdir -p %{buildroot}%{_datadir}/texmf-local/web2c
|
||||||
|
cp -a texk/kpathsea/texmf.cnf %{buildroot}%{_datadir}/texmf-local/web2c
|
||||||
|
|
||||||
%makeinstall \
|
%makeinstall \
|
||||||
texmf=%{buildroot}%{_texmf_main} \
|
texmf=%{buildroot}%{_texmf_main} \
|
||||||
texmfmain=%{buildroot}%{_texmf_main}
|
texmfmain=%{buildroot}%{_texmf_main}
|
||||||
|
|
||||||
|
rm -rf %{buildroot}%{_datadir}/texmf-local/
|
||||||
|
|
||||||
# remove all .la files
|
# remove all .la files
|
||||||
rm -f %{buildroot}%{_infodir}/dir
|
rm -f %{buildroot}%{_infodir}/dir
|
||||||
find %{buildroot} | grep -e "\\.la$" | xargs rm -f
|
find %{buildroot} | grep -e "\\.la$" | xargs rm -f
|
||||||
@ -1240,6 +1249,11 @@ fi
|
|||||||
%{_mandir}/man1/texutil.1*
|
%{_mandir}/man1/texutil.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 12 2008 Jindrich Novy <jnovy@redhat.com> - 2007-25
|
||||||
|
- fix fmtutil to not to hang in infinite loop, thanks to
|
||||||
|
Stepan Kasal (#437008)
|
||||||
|
- fix search paths in texmf.cnf, thanks to Patrice Dumas (#436949)
|
||||||
|
|
||||||
* Sat Mar 08 2008 Jindrich Novy <jnovy@redhat.com> - 2007-24
|
* Sat Mar 08 2008 Jindrich Novy <jnovy@redhat.com> - 2007-24
|
||||||
- put back dvipdfmx requires for xelatex (#433225)
|
- put back dvipdfmx requires for xelatex (#433225)
|
||||||
- don't compile unpackaged stuff
|
- don't compile unpackaged stuff
|
||||||
|
Loading…
Reference in New Issue
Block a user