Hello community,
here is the log from the commit of package texlive-bin for openSUSE:Factory checked in at 2011-10-26 15:48:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-bin (Old)
and /work/SRC/openSUSE:Factory/.texlive-bin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-bin", Maintainer is "werner@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-bin/texlive-bin.changes 2011-09-23 12:48:05.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.texlive-bin.new/texlive-bin.changes 2011-10-26 16:03:59.000000000 +0200
@@ -1,0 +2,53 @@
+Wed Oct 19 12:57:09 UTC 2011 - werner@suse.de
+
+- This update fixes bnc#721430 as well as bnc#722518 and includes
+ 4 fixes to avoid buffer overflows
+
+-------------------------------------------------------------------
+Wed Oct 19 12:22:24 UTC 2011 - werner@suse.de
+
+- Reenable MALLOC_PERTURB_
+
+-------------------------------------------------------------------
+Wed Oct 19 10:12:31 UTC 2011 - werner@suse.de
+
+- Add patch to avoid memory curruption in ptex as well (bnc#722518)
+
+-------------------------------------------------------------------
+Tue Oct 18 15:56:31 UTC 2011 - werner@suse.de
+
+- Add patch to avoid memory curruption in eptex, synctex, as well
+ as xetex (does not help with bnc#722518)
+
+-------------------------------------------------------------------
+Fri Oct 14 15:29:25 UTC 2011 - werner@suse.de
+
+- Avoid MALLOC_PERTURB_ in the environment as it does break eptex
+ dumping platex (bnc#722518)
+
+-------------------------------------------------------------------
+Thu Oct 13 12:12:04 UTC 2011 - werner@suse.de
+
+- Add ICU for ARM patch
+- Use luaTeX SVN 4356
+
+-------------------------------------------------------------------
+Tue Sep 20 13:21:49 UTC 2011 - werner@suse.de
+
+- Update to TeXLive 2011
+ * The biber program for bibliography processing is included on
+ common platforms. Its development is closely coupled with the
+ biblatex package, which completely reimplements the
+ bibliographical facilities provided by LaTeX.
+ * The MetaPost (mpost) program no longer creates or uses .mem
+ files. The needed files, such as plain.mp, are simply read on
+ every run. This is related to supporting MetaPost as a library,
+ which is another significant though not user-visible change.
+ * The updmap implementation in Perl, previously used only on
+ Windows, has been revamped and is now used on all platforms.
+ There shouldn’t be any user-visible changes as a result,
+ except that it runs much faster.
+- Make it build
+- Todo: make biber (which is a perl dump) for all platforms
+
+-------------------------------------------------------------------
Old:
----
texlive-20100722-source.tar.xz
texlive-20100722-texmf.tar.xz
texlive-20100826-extra.tar.xz
texlive-nomemrchr.patch
texmf-texinfo.dif
New:
----
biblatex-biber-0.9.3.tar.xz
cnf-to-paths.awk
source-luatex.dif
source-overflow.dif
texlive-20110705-extra.tar.xz
texlive-20110705-source.tar.xz
texlive-20110705-texmf.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-bin.spec ++++++
--- /var/tmp/diff_new_pack.rkVplo/_old 2011-10-26 16:12:25.000000000 +0200
+++ /var/tmp/diff_new_pack.rkVplo/_new 2011-10-26 16:12:25.000000000 +0200
@@ -21,17 +21,55 @@
Name: texlive-bin
# Remark: For package texlive its self see next sub package which is build for noarch
# Remark: In case of enabling ttf2pk we need also freetype(1) within the line of BuildRequires
-BuildRequires: bison cairo cairo-devel dialog ed expat fdupes fftw3-devel flex freeglut-devel freetype2-devel gcc-c++ gd-devel ghostscript_any gsl-devel jpeg libicu libicu-devel libjpeg-devel libpng-devel libpoppler-devel ncurses-devel netpbm readline-devel t1lib t1lib-devel unzip xaw3d-devel xorg-x11-devel xorg-x11-util-devel xz zip zziplib zziplib-devel
+BuildRequires: bison cairo cairo-devel dejavu dialog ed expat fdupes fftw3-devel flex freeglut-devel
+BuildRequires: freetype2-devel gcc-c++ gd-devel ghostscript_any gsl-devel jpeg libicu
+BuildRequires: libicu-devel libjpeg-devel libpng-devel libpoppler-devel ncurses-devel netpbm
+BuildRequires: pango-devel readline-devel t1lib t1lib-devel unzip xaw3d-devel
+BuildRequires: xorg-x11-devel xorg-x11-util-devel xz zip zziplib zziplib-devel
+%if %suse_version > 1130
+BuildRequires: pango-tools
+%else
+BuildRequires: pango
+%endif
+# Remark: Current gcc (4.6.1 20110801) does break eptex as it does not handle multi byte chars
+%if 0
+%global gnuc 4
+%global gnuc_minor 5
+%global gcc_version %{gnuc}%{gnuc_minor}
+BuildRequires: gcc%{gcc_version} gcc%{gcc_version}-c++
+%endif
+%if 0%{?_with_buildbiber}
+BuildRequires: perl(Config::General)
+BuildRequires: perl(Data::Compare)
+BuildRequires: perl(Data::Dump)
+BuildRequires: perl(Date::Simple)
+BuildRequires: perl(File::Slurp::Unicode)
+BuildRequires: perl(IPC::Run3)
+BuildRequires: perl(LWP::Simple)
+BuildRequires: perl(List::AllUtils)
+BuildRequires: perl(List::MoreUtils)
+BuildRequires: perl(Log::Log4perl)
+BuildRequires: perl(Readonly)
+BuildRequires: perl(Regexp::Common)
+BuildRequires: perl(Unicode::Collate) >= 0.74
+BuildRequires: perl(XML::LibXML::Simple)
+BuildRequires: perl(XML::LibXSLT)
+BuildRequires: perl(Config::AutoConf)
+BuildRequires: perl(ExtUtils::LibBuilder)
+BuildRequires: perl(Readonly::XS)
+%endif
Url: http://www.tug.org/texlive/
License: GPLv2+ ; TeX-License ..
Summary: Binary coded programs for package texlive
Requires(prereq): /bin/date /bin/ln
Group: Productivity/Publishing/TeX/Base
-Version: 2010
-Release: 11
-Source0: ftp://tug.org/historic/systems/texlive/2010/texlive-20100722-source.tar.xz
-Source1: ftp://tug.org/historic/systems/texlive/2010/texlive-20100722-texmf.tar.xz
-Source2: ftp://tug.org/historic/systems/texlive/2010/texlive-20100826-extra.tar.xz
+Version: 2011
+Release: 1
+Source0: ftp://tug.org/texlive/historic/2011/texlive-20110705-source.tar.xz
+Source1: ftp://tug.org/texlive/historic/2011/texlive-20110705-texmf.tar.xz
+Source2: ftp://tug.org/texlive/historic/2011/texlive-20110705-extra.tar.xz
+Source3: git://biblatex-biber.git.sourceforge.net/gitroot/biblatex-biber/biblatex-biber/biblatex-biber-0.9.3.tar.xz
+Source4: cnf-to-paths.awk
Source6: do.mklists
Source7: do.exec
Source8: sh.rellink
@@ -63,6 +101,8 @@
Patch11: source-lacheck.dif
Patch12: source-warns.dif
Patch13: source-x11r7.dif
+Patch14: source-luatex.dif
+Patch15: source-overflow.dif
Patch17: source-64.dif
Patch19: source-dvipng.dif
Patch40: texmf.dif
@@ -72,8 +112,6 @@
Patch44: texmf-pubform-bib.dif
Patch45: texmf-jadetex.dif
Patch46: texmf-bbold11.dif
-Patch47: texmf-texinfo.dif
-Patch48: texlive-nomemrchr.patch
AutoReqProv: on
Prefix: /
Prefix: /usr/bin
@@ -82,6 +120,7 @@
# not necessary required, enabling the resulting psutils
# in texlive-tools cause dependency on texlive package
%bcond_with psutils
+%bcond_with buildbiber
%{expand: %%global options %(mktemp /tmp/texlive-opts.XXXXXXXX)}
%global _varlib %{_localstatedir}/lib
@@ -107,6 +146,31 @@
%define _x11inc %{_includedir}
%define _appdefdir %{_x11data}/app-defaults
#
+%define _makeflags \\\
+ encdir=%{_texmf_dist}/fonts/enc/dvips/base \\\
+ glyphlistdir=%{_texmf_dist}/fonts/map/glyphlist \\\
+ btdocdir=%{_texmf_main}/doc/bibtex8 \\\
+ btdocdir=%{_texmf_main}/doc/bibtexu \\\
+ cmapdatadir=%{_texmf_main}/fonts/cmap/dvipdfmx \\\
+ configdatadir=%{_texmf_main}/dvipdfmx \\\
+ configdir=%{_texmf_main}/chktex \\\
+ csfdir=%{_texmf_dist}/bibtex/csf/base \\\
+ encdir=%{_texmf_dist}/fonts/enc/dvips/base \\\
+ glyphlistdatadir=%{_texmf_dist}/fonts/map/glyphlist \\\
+ glyphlistdir=%{_texmf_dist}/fonts/map/glyphlist \\\
+ gsftopkpsheaderdir=%{_texmf_main}/dvips/gsftopk \\\
+ mapdatadir=%{_texmf_main}/fonts/map/dvipdfm/dvipdfmx \\\
+ pdfdocdir=%{_texmf_main}/doc/chktex \\\
+ pixmapdir=%{_texmf_main}/xdvi/pixmap \\\
+ pkgdatadir=%{_texmf_main}/dvipdfm \\\
+ prologdir=%{_texmf_main}/dvips/base \\\
+ texconfdir=%{_prefix}/lib \\\
+ texconfigdir=%{_texmf_main}/texconfig \\\
+ texmf_dist_scriptsdir=%{_texmf_dist}/scripts \\\
+ texmf_scriptsdir=%{_texmf_main}/scripts \\\
+ web2cdir=%{_texmf_main}/web2c \\\
+ xdvidir=%{_texmf_main}/xdvi
+#
%define isbin() %{?1:%exclude %*}\
%nil
%define nobin() %{?1:%*}\
@@ -505,7 +569,7 @@
%package -n texlive-fonts-extra-doc
License: GPLv2+ ; TeX-License ..
-Summary: The documentation for extra fonts of TeX Live
+Summary: The documentation for extra fonts
Group: Productivity/Publishing/TeX/Base
AutoReqProv: on
BuildArch: noarch
@@ -975,6 +1039,13 @@
%ifarch ia64
RPM_OPT_FLAGS=$(echo "${RPM_OPT_FLAGS}"|sed -r 's/-O[0-9]?/-O1/g')
%endif
+%if 0%{?gcc_version}
+ CC=gcc-%{gnuc}.%{gnuc_minor}
+ CXX=g++-%{gnuc}.%{gnuc_minor}
+%else
+ CC=gcc
+ CXX=g++
+%endif
XCFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -D_POSIX_C_SOURCE=200803L -D_XOPEN_SOURCE=600 -D_BSD_SOURCE"
XCXXFLAGS="$XCFLAGS"
cflags ()
@@ -983,16 +1054,16 @@
case "${RPM_OPT_FLAGS}" in
*${flag}*) return
esac
- if test -n "$1" && gcc -Werror $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then
+ if test -n "$1" && $CC -Werror $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then
local var=$1; shift
eval $var=\${$var:+\$$var\ }$flag
fi
- if test -n "$1" && g++ -Werror $flag -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1 ; then
+ if test -n "$1" && $CXX -Werror $flag -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1 ; then
local var=$1; shift
eval $var=\${$var:+\$$var\ }$flag
fi
}
- gcc -v
+ $CC -v
cflags -std=gnu89 XCFLAGS
cflags -fno-const-strings XCFLAGS XCXXFLAGS
cflags -fPIC XCFLAGS XCXXFLAGS
@@ -1024,6 +1095,9 @@
exec 6>&1
exec 1>|%{options}
+ # Disable MALLOC_PERTURB_
+ # echo unset MALLOC_PERTURB_
+
# System wide configuration
echo CPU=\"$CPU\"
echo BINARY=\"${BINARY%%-gnu*}\"
@@ -1040,15 +1114,22 @@
# Do not include e.g. from manual build
echo unset TEXINPUTS TEXMF HOME
+ # Use a well defined multi byte locale
+ echo unset ${!LC_*}
+ echo LANG=POSIX
+ echo LC_CTYPE=en_US.UTF-8
+ echo export LANG LC_CTYPE
+
# Environment for configuration
echo CONFIG_SHELL=/bin/bash
+ echo CC=\"$CC\"
+ echo CXX=\"$CXX\"
echo CFLAGS=\"$XCFLAGS\"
echo CXXFLAGS=\"$XCXXFLAGS\"
echo LDFLAGS=\"-Wl,-warn-common $XLDFLAGS\"
- echo CXX=g++
echo VENDOR=\"${VENDOR}\"
echo ARCH_LIB=%{_lib}
- echo export CC CXX CFLAGS CXXFLAGS LDFLAGS VENDOR PATH CONFIG_SHELL ARCH_LIB
+ echo export CC CXX CFLAGS CXXFLAGS LDFLAGS VENDOR PATH CONFIG_SHELL ARCH_LIB LANG
# Do not run TeX engine in fmtutil with batchmode
echo batchmode=no
@@ -1086,6 +1167,7 @@
%setup -c -q -n texlive -T
tar --use-compress-program=xz --strip-components=1 -xf %{S:0}
+ tar --use-compress-program=xz --strip-components=1 --wildcards -xf %{S:2} -C %{buildroot}%{_texmf_main} \*/tlpkg/
ln -sf %{buildroot}%{_texmf_doc} %{_builddir}/texlive/texmf-doc
ln -sf %{buildroot}%{_texmf_dist} %{_builddir}/texlive/texmf-dist
@@ -1095,6 +1177,14 @@
rm -vf %{buildroot}%{_texmf_dist}/texmf
rm -vf %{buildroot}%{_texmf_main}/texmf
+ # Create compatibility links to avoid none-FHS TeXLive paths
+ ln -sf %{buildroot}%{_texmf_doc} %{buildroot}%{_libexecdir}/texmf-doc
+ ln -sf %{buildroot}%{_texmf_dist} %{buildroot}%{_libexecdir}/texmf-dist
+ ln -sf %{buildroot}%{_texmf_doc} %{buildroot}%{_datadir}/texmf-doc
+ ln -sf %{buildroot}%{_texmf_dist} %{buildroot}%{_datadir}/texmf-dist
+ ln -sf %{buildroot}%{_texmf_dist} %{buildroot}%{_prefix}/texmf-dist
+ ln -sf %{buildroot}%{_texmf_main} %{buildroot}%{_prefix}/texmf
+
%patch1 -p0 -b .configure
%patch2 -p0 -b .xdvizilla
%patch3 -p0 -b .arraysubs
@@ -1108,6 +1198,12 @@
%patch11 -p0 -b .lacheck
%patch12 -p0 -b .warns
%patch13 -p0 -b .x11r7
+%patch14 -p0 -b .luatex
+ rm -vf texk/web2c/luatexdir/pdf/pagetree.h
+ rm -vf texk/web2c/luatexdir/pdf/pagetree.w
+ ln -sf pdfpagetree.h texk/web2c/luatexdir/pdf/pagetree.h
+ ln -sf pdfpagetree.w texk/web2c/luatexdir/pdf/pagetree.w
+%patch15 -p0 -b .overflow
%patch17 -p0 -b .64
%patch19 -p0 -b .dvipng
%patch40 -p0
@@ -1117,10 +1213,13 @@
%patch44 -p0
%patch45 -p0
%patch46 -p0
-%patch47 -p0
-%patch48 -p0
%patch0 -p0
+ # Correct FHS paths
+ paths=$(find -name cnf-to-paths.awk)
+ test -n "$paths" || exit 1
+ cp -vf %{S:4} $paths
+
# Move texmf tree out of the way
rm -rf %{_tmppath}/%{name}-%{version}-backup
mv -v %{buildroot} %{_tmppath}/%{name}-%{version}-backup
@@ -1164,6 +1263,7 @@
--disable-multiplatform \
--prefix=%{_prefix} \
--datadir=%{_datadir} \
+ --datarootdir=%{_datadir} \
--exec-prefix=%{_texmf_dist} \
--bindir=%{_texbindir}/$BINARY \
--libdir=%{_libdir} \
@@ -1203,6 +1303,7 @@
--with-system-zlib \
--with-system-expat \
--with-system-unzip \
+ --with-system-poppler \
--with-system-xpdf \
--with-system-libpng \
--with-system-pnglib \
@@ -1210,9 +1311,9 @@
--with-system-gd \
--with-system-freetype \
--with-system-zziplib \
- --with-freetype-include=/usr/include/freetype \
+ --with-freetype-includes=/usr/include/freetype \
--with-system-freetype2 \
- --with-freetype2-include=/usr/include/freetype2 \
+ --with-freetype2-includes=/usr/include/freetype2 \
--with-tex-banner="TeX Live %version/${VENDOR}" \
${icu[0]:+"${icu[@]}"} \
--enable-epsfwin \
@@ -1226,8 +1327,15 @@
--with-xdvi-x-toolkit=xaw3d \
--with-editor='vi +%%d %%s'
+ # Broken TeXLive paths
+ find -name Makefile | xargs \
+ sed -ri -e 's@^(scriptsdir[[:blank:]]*=[[:blank:]]*)texmf/scripts@\1lib/texmf/scripts@' \
+ -e 's@^(scriptsdir[[:blank:]]*=[[:blank:]]*)texmf-dist/scripts@share/texmf/scripts@' \
+ -e 's@^([a-z_]*dir[[:blank:]]*=[[:blank:]]*\$\{prefix\}/)texmf/@\1lib/texmf/@p' \
+ -e 's@^([a-z_]*dir[[:blank:]]*=[[:blank:]]*\$\{prefix\}/)texmf-dist/@\1share/texmf/@p'
+
# Make the global configuration file and make a backup
- make -C texk/kpathsea/ texmf.cnf
+ make %{_makeflags} -C texk/kpathsea/ texmf.cnf
cp -p texk/kpathsea/texmf.cnf texmf.tmp
# Just make a configuration file for the build root environment
@@ -1244,10 +1352,10 @@
export KPATHSEA_WARNING
# Just make the binaries
- make
+ make %{_makeflags}
# build nobody
- gcc ${RPM_OPT_FLAGS} -o nobody %{S:50}
+ $CC ${RPM_OPT_FLAGS} -o nobody %{S:50}
%install
@@ -1402,7 +1510,13 @@
includedir=%{_includedir} \
texmf=%{_texmf_dist} \
texmfmain=%{_texmf_main} \
- vartexfonts=%{_fontcache}
+ vartexfonts=%{_fontcache} \
+ %{_makeflags}
+
+ # Someone makes a forbidden symlink
+ link=%{buildroot}
+ link=${link##*/}
+ rm -vf %{buildroot}/$link
# install nobody
install -m 0755 nobody %{buildroot}%{_texbindir}/$BINARY/nobody
@@ -1483,11 +1597,14 @@
%{buildroot}%{_texmf_dist}/tex/plain/cyrplain/makefmts.sh \
%{buildroot}%{_texmf_dist}/tex/generic/t2/cyrfinst/etc/showenc \
%{buildroot}%{_texmf_dist}/tex/fontinst/cyrfinst/etc/showenc \
+ %{buildroot}%{_texmf_dist}/tex/context/third/rst/*.lua \
+ %{buildroot}%{_texmf_main}/tex/generic/hyphen/bahyph.sh \
+ %{buildroot}%{_texmf_main}/tlpkg/TeXLive/trans.pl \
%{buildroot}%{_texmf_dist}/scripts/context/stubs/unix/* \
%{buildroot}%{_texmf_dist}/scripts/context/ruby/*.rb \
%{buildroot}%{_texmf_dist}/scripts/context/ruby/*/*.rb \
%{buildroot}%{_texmf_dist}/scripts/context/ruby/*/*/*.rb \
- %{buildroot}%{_texmf_main}/tex/generic/hyphen/bahyph.sh \
+ %{buildroot}%{_texmf_dist}/scripts/changes/delcmdchanges.bash \
%{buildroot}%{_texmf_dist}/scripts/context/lua/*.lua \
%{buildroot}%{_texmf_dist}/scripts/shipunov/*.sh \
%{buildroot}%{_texmf_dist}/scripts/shipunov/*.pl \
@@ -1496,8 +1613,8 @@
%{buildroot}%{_texmf_main}/scripts/texlive/*.pl
do
test -e $scr || continue
- case "$(file -be ascii $scr)" in
- *script\ text*|*executable*)
+ case "$(file -b $scr)" in
+ *script*text*|*executable*)
chmod 0755 $scr
esac
done
@@ -1528,6 +1645,11 @@
%{buildroot}%{_texmf_dist}/scripts/pkfix/pkfix.pl \
%{buildroot}%{_texmf_dist}/scripts/thumbpdf/thumbpdf.pl \
%{buildroot}%{_texmf_dist}/scripts/context/perl/mptopdf.pl \
+ %{buildroot}%{_texmf_dist}/scripts/context/ruby/*.rb \
+ %{buildroot}%{_texmf_dist}/scripts/context/ruby/*/*.rb \
+ %{buildroot}%{_texmf_dist}/scripts/context/ruby/*/*/*.rb \
+ %{buildroot}%{_texmf_dist}/scripts/luasseq/luasseq.lua \
+ %{buildroot}%{_texmf_dist}/scripts/lualatex-math/lualatex-math.lua \
%{buildroot}%{_texbindir}/$BINARY/vpe \
%{buildroot}%{_texbindir}/$BINARY/thumbpdf \
%{buildroot}%{_texbindir}/$BINARY/pkfix \
@@ -1575,6 +1697,7 @@
EOF
set +o noglob
esac
+ chmod 0755 $scr
done
# Clean up info and manual pages
@@ -1671,6 +1794,7 @@
chmod 755 "$musicdoc"
fi
rm -vf %{buildroot}%{_texmf_doc}/doc/generic/musixtex/*.bat
+ rm -vf %{buildroot}%{_texmf_dist}/scripts/musixtex/Windows/*.bat
musixdoc=$(find %{buildroot}%{_texmf_doc}/doc/ -name musixdoc.sh -a -type f)
if test -n "$musixdoc" -a -e "$musixdoc" ; then
chmod 755 "$musixdoc"
@@ -1721,26 +1845,28 @@
# Move scripts to noarch, symbolic links first
for f in %{buildroot}%{_texbindir}/$BINARY/* ; do
- test -e $f || continue
- case "$(file -b $f)" in
- *symbolic\ link*)
+ test -h $f || continue
+ if test ! -e $f ; then
+ t=$(readlink $f)
+ t=${t##*/}
+ t=$(find %{buildroot}%{_texmf}/ -name $t)
+ rellink $t $f
+ fi
t=$(readlink -f $f)
- case "$(file -b $t)" in
- *script\ text*)
- mv -v $f %{buildroot}%{_texscrdir}/
+ case "$(file -L -b $t)" in
+ *script*text*)
+ case "$t" in
+ */lib/texmf/bin/*) t=%{buildroot}%{_texscrdir}/${t##*/} ;;
+ */lib/texmf/*) continue
esac
+ mv -v $f %{buildroot}%{_texscrdir}/
+ f=%{buildroot}%{_texscrdir}/${f##*/}
+ rellink $t $f
esac
done
for f in %{buildroot}%{_texbindir}/$BINARY/* ; do
- if test ! -e $f ; then
- t=$(readlink $f)
- if test -e %{buildroot}%{_texscrdir}/$t ; then
- mv -v $f %{buildroot}%{_texscrdir}/
- fi
- continue
- fi
case "$(file -b $f)" in
- *script\ text*)
+ *script*text*)
mv -v $f %{buildroot}%{_texscrdir}/
esac
done
@@ -1789,6 +1915,15 @@
ln -sf $relpath/${f##*/} $f
done
+ # Move shared/dist texconfig files back to lib/main texconfig
+ for f in $(find %{buildroot}%{_texscrdir}/ -type l); do
+ test -e $f || continue
+ t=$(readlink -f $f) || true
+ case "$t" in
+ */lib/texmf/*) mv $f %{buildroot}%{_texbindir}/$BINARY/
+ esac
+ done
+
# Avoid build root string in format
ROOT=/tmp/=
TEXMFCNF=${ROOT}%{_texcnfdir}/web2c//
@@ -1919,30 +2054,63 @@
# Move scripts to noarch, symbolic links first
for f in %{buildroot}%{_texbindir}/$BINARY/* ; do
- test -e $f || continue
- case "$(file -b $f)" in
- *symbolic\ link*)
+ test -h $f || continue
+ if test ! -e $f ; then
+ t=$(readlink $f)
+ t=${t##*/}
+ t=$(find %{buildroot}%{_texmf}/ -name $t)
+ rellink $t $f
+ fi
t=$(readlink -f $f)
- case "$(file -b $t)" in
- *script\ text*)
- mv -v $f %{buildroot}%{_texscrdir}/
+ case "$(file -L -b $t)" in
+ *script*text*)
+ case "$t" in
+ */lib/texmf/bin/*) t=%{buildroot}%{_texscrdir}/${t##*/} ;;
+ */lib/texmf/*) continue
esac
+ mv -v $f %{buildroot}%{_texscrdir}/
+ f=%{buildroot}%{_texscrdir}/${f##*/}
+ rellink $t $f
esac
done
for f in %{buildroot}%{_texbindir}/$BINARY/* ; do
- if test ! -e $f ; then
- t=$(readlink $f)
- if test -e %{buildroot}%{_texscrdir}/$t ; then
- mv -v $f %{buildroot}%{_texscrdir}/
- fi
- continue
- fi
case "$(file -b $f)" in
- *script\ text*)
+ *script*text*)
mv -v $f %{buildroot}%{_texscrdir}/
esac
done
+ # Move shared/dist web2c files back to lib/main web2c
+ relpath=$(relpath %{_texmf_main}/web2c %{_texmf_dist}/web2c)
+ for f in %{buildroot}%{_texmf_dist}/web2c/* ; do
+ test -e $f || continue
+ test -L $f && continue
+ g=%{buildroot}%{_texmf_main}/web2c/${f##*/}
+ test -e $g || continue
+ mv -v $f $g
+ ln -sf $relpath/${f##*/} $f
+ done
+
+ # Move shared/dist texconfig files back to lib/main texconfig
+ relpath=$(relpath %{_texmf_main}/texconfig %{_texmf_dist}/texconfig)
+ for f in %{buildroot}%{_texmf_dist}/texconfig/* ; do
+ test -e $f || continue
+ test -L $f && continue
+ g=%{buildroot}%{_texmf_main}/texconfig/${f##*/}
+ test -e $g || continue
+ mv -v $f $g
+ ln -sf $relpath/${f##*/} $f
+ done
+
+ # Move shared/dist texconfig files back to lib/main texconfig
+ for f in $(find %{buildroot}%{_texscrdir}/ -type l); do
+ test -e $f || continue
+ t=$(readlink -f $f) || true
+ case "$t" in
+ */lib/texmf/*) mv $f %{buildroot}%{_texbindir}/$BINARY/
+ esac
+ done
+
# Relink programs after initialization to catch new links
relpath=$(relpath %{_texbindir}/$BINARY %{_bindir})
for f in %{buildroot}%{_texbindir}/$BINARY/* ; do
@@ -2010,11 +2178,11 @@
# Clean out not wanted file
if test -n "%{buildroot}" -a -d "%{buildroot}" ; then
- find %{buildroot}/ -name '*.orig' -o -name '*.log' -o -name '*.aux' \
+ find %{buildroot}/ -name '*.orig' -o -name '*.log' -o \( -name '*.aux' -a -not -name eplain.aux \) \
-o -name '*.ilg' -o -name '.cvsignore' -o -name '*.bak' -o -name '*.mx[1-9]'
else
find %{_texcnfdir}/ %{_texvardir}/ %{_texmf_doc}/ %{_texmf_dist}/ %{_texmf_main}/ \
- -name '*.orig' -o -name '*.log' -o -name '*.aux' \
+ -name '*.orig' -o -name '*.log' -o \( -name '*.aux' -a -not -name eplain.aux \) \
-o -name '*.ilg' -o -name '.cvsignore' -o -name '*.bak' -o -name '*.mx[1-9]'
fi | xargs -r rm -vf
@@ -2114,11 +2282,32 @@
echo $path
done < %{buildroot}/etc/permissions.d/texlive > %{buildroot}/%{_texcnfdir}/permlist
+ # Remove compatibility links
+ test -h %{buildroot}%{_libexecdir}/texmf-doc || exit 1
+ test -h %{buildroot}%{_libexecdir}/texmf-dist || exit 1
+ test -h %{buildroot}%{_datadir}/texmf-doc || exit 1
+ test -h %{buildroot}%{_datadir}/texmf-dist || exit 1
+ test -h %{buildroot}%{_prefix}/texmf-dist || exit 1
+ test -h %{buildroot}%{_prefix}/texmf || exit 1
+
+
+ rm -vf %{buildroot}%{_libexecdir}/texmf-doc
+ rm -vf %{buildroot}%{_libexecdir}/texmf-dist
+ rm -vf %{buildroot}%{_datadir}/texmf-doc
+ rm -vf %{buildroot}%{_datadir}/texmf-dist
+ rm -vf %{buildroot}%{_prefix}/texmf-dist
+ rm -vf %{buildroot}%{_prefix}/texmf
+
# Create the main file list
TMPDIR=${PWD}/lists
PATH=%{_sourcedir}:$PATH
export TMPDIR PATH
+ # Someone makes a forbidden symlink
+ link=%{buildroot}
+ link=${link##*/}
+ rm -vf %{buildroot}/$link
+
bash %{S:6} -b texlive -c
# Split off the specific file lists
@@ -2478,8 +2667,27 @@
%postunhash musictex
+%if %{defined verify_permissions}
%verifyscript -n texlive
%verify_permissions -f %{_texcnfdir}/permlist
+%verify_permissions -e %{_texvardir}/
+%verify_permissions -e %{_texvardir}/fonts/
+%verify_permissions -e %{_texvardir}/fonts/dvipdfm/
+%verify_permissions -e %{_texvardir}/fonts/dvips/
+%verify_permissions -e %{_texvardir}/fonts/ls-R
+%verify_permissions -e %{_texvardir}/fonts/pdftex/
+%verify_permissions -e %{_texvardir}/dist/
+%verify_permissions -e %{_texvardir}/dist/ls-R
+%verify_permissions -e %{_texvardir}/ls-R
+%verify_permissions -e %{_texvardir}/main/
+%verify_permissions -e %{_texvardir}/main/ls-R
+%verify_permissions -e %{_texcache}/
+%verify_permissions -e %{_fontcache}/
+%verify_permissions -e %{_fontcache}/pk/
+%verify_permissions -e %{_fontcache}/source/
+%verify_permissions -e %{_fontcache}/tfm/
+%endif
+
%if 0%{?opensuse_bs}
++++++ cnf-to-paths.awk ++++++
/^[ \t]*[A-Z0-9_]+[ \t]*=/ {
ident = $0
sub(/^[[:blank:]]*/, "", ident)
sub(/[[:blank:]]*=.*/, "", ident)
val = $0
sub(/^.*=[[:blank:]]*/, "", val)
sub(/[[:blank:]]*$/, "", val)
gsub(/;/, ":", val)
VAR[ident] = val
}
END {
for (ident in VAR) {
val = VAR[ident]
split(val, pieces, /[:,]/)
for (one in pieces) {
match(pieces[one], /\$\{?([[:upper:]]+)\}?/, arr)
if (RSTART == 0)
continue
if (arr[1] ~ /OSFONTDIR/)
continue
if (VAR[arr[1]] ~ /\$/)
continue
gsub(/\$\{?arr[1]\}?/, VAR[arr[1]], val)
}
print "#ifndef DEFAULT_" ident
print "#define DEFAULT_" ident " \"" val "\""
print "#endif"
print ""
}
}
++++++ do.mklists ++++++
--- /var/tmp/diff_new_pack.rkVplo/_old 2011-10-26 16:12:25.000000000 +0200
+++ /var/tmp/diff_new_pack.rkVplo/_new 2011-10-26 16:12:25.000000000 +0200
@@ -111,7 +111,8 @@
-e "$BINDIR" \
-e "s@^(/var/lib/texmf/fonts/map/.*\.map)\$@%verify(not link md5 mtime size) \1@g" \
-e "s@^(/var/lib/texmf/web2c/.*\.(fmt|mem|base))\$@%verify(not md5 mtime size) \1@g" \
- -e "s@^(/var/lib/texmf(|/dist|/main))/\$@%dir %attr(1755, root, root) \1@g" \
+ -e "s@^(/var/lib/texmf(|/dist|/main|/fonts))/\$@%dir %attr(1755, root, root) \1@g" \
+ -e "s@^(/var/lib/texmf/fonts/(dvipdfm|dvips|pdftex))/\$@%dir %attr(1755, root, root) \1@g" \
-e "s@^(/var/cache/texmf)/\$@%dir %attr(1755, root, root) \1@g" \
-e "s@^(/var/cache/texmf/fonts(|/pk|/source|/tfm))/\$@%dir %attr(1777, root, root) \1@g" \
-e "s@^(/usr/bin/[^/]*[^\*])\*\$@%isbin \1@g" \
++++++ sh.rellink ++++++
--- /var/tmp/diff_new_pack.rkVplo/_old 2011-10-26 16:12:25.000000000 +0200
+++ /var/tmp/diff_new_pack.rkVplo/_new 2011-10-26 16:12:25.000000000 +0200
@@ -86,10 +86,13 @@
{
local state=$- ; set +x
local relpath=$(relpath "${1%/*}" "${2%/*}" 2>/dev/null)
+ if test -h "$2" ; then
+ rm -f "$2"
+ fi
if test -d "$1" ; then
- ln -sf "$relpath/${1##*/}/" "$2"
+ ln -sf "${relpath:+${relpath}/}${1##*/}/" "$2"
else
- ln -sf "$relpath/${1##*/}" "$2"
+ ln -sf "${relpath:+${relpath}/}${1##*/}" "$2"
fi
[[ $state =~ x ]] && set -x
}
++++++ source-64.dif ++++++
--- /var/tmp/diff_new_pack.rkVplo/_old 2011-10-26 16:12:25.000000000 +0200
+++ /var/tmp/diff_new_pack.rkVplo/_new 2011-10-26 16:12:25.000000000 +0200
@@ -1,6 +1,6 @@
--- configure
+++ configure 2009-08-28 15:44:29.774401466 +0000
-@@ -12505,6 +12505,10 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -19120,6 +19120,10 @@ rm -f core conftest.err conftest.$ac_obj
# most powerpc-linux boxes support dynamic linking these days and
# people can always --disable-shared, the test was removed, and we
# assume the GNU/Linux dynamic linker is in use.
@@ -13,7 +13,7 @@
--- m4/libtool.m4
+++ m4/libtool.m4 2009-08-28 15:46:57.481902434 +0000
-@@ -2482,6 +2482,10 @@ linux* | k*bsd*-gnu)
+@@ -2622,6 +2622,10 @@ linux* | k*bsd*-gnu)
# most powerpc-linux boxes support dynamic linking these days and
# people can always --disable-shared, the test was removed, and we
# assume the GNU/Linux dynamic linker is in use.
++++++ source-arraysubs.dif ++++++
--- /var/tmp/diff_new_pack.rkVplo/_old 2011-10-26 16:12:25.000000000 +0200
+++ /var/tmp/diff_new_pack.rkVplo/_new 2011-10-26 16:12:25.000000000 +0200
@@ -11,7 +11,7 @@
argv++;
--- texk/web2c/bibtex.web
+++ texk/web2c/bibtex.web 2009-11-12 11:50:51.699429941 +0000
-@@ -4309,9 +4309,9 @@ special markers |quote_next_fn| and |end
+@@ -4315,9 +4315,9 @@ special markers |quote_next_fn| and |end
|wiz_functions| array.
@d insert_fn_loc(#) == begin
++++++ source-configure.dif ++++++
--- /var/tmp/diff_new_pack.rkVplo/_old 2011-10-26 16:12:25.000000000 +0200
+++ /var/tmp/diff_new_pack.rkVplo/_new 2011-10-26 16:12:25.000000000 +0200
@@ -1,18 +1,32 @@
--- configure
-+++ configure 2010-11-12 11:02:19.696426715 +0000
-@@ -19716,9 +19716,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
++++ configure 2011-09-13 14:13:35.252427069 +0000
+@@ -4688,13 +4688,6 @@ if test "${with_libgs_libdir+set}" = set
+ fi
+
+
+-## texk/dvisvgm/ac/libgs.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/
+-## configure checks for dvisvgm and libgs
+-if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then
+- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
+-fi
+-
+-
+ ## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
+ ## configure options and TL libraries required for gsftopk
+ # Check whether --enable-gsftopk was given.
+@@ -20437,9 +20430,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "x$syslib_status" = xno; then
- as_fn_error "some requested system libraries failed" "$LINENO" 5
+ as_fn_error $? "some requested system libraries failed" "$LINENO" 5
fi
-if test "x$syslib_used:$enable_native_texlive_build" = xyes:yes; then
-- as_fn_error "you can not use system libraries for a native TeX Live build" "$LINENO" 5
+- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
-fi
CPPFLAGS=$kpse_save_CPPFLAGS
LIBS=$kpse_save_LIBS
--- configure.ac
-+++ configure.ac 2010-11-12 11:02:58.713177393 +0000
-@@ -129,9 +129,6 @@ KPSE_FOR_PKGS([sys_libs], [m4_sinclude([
++++ configure.ac 2011-09-13 14:11:39.156427284 +0000
+@@ -131,9 +131,6 @@ KPSE_FOR_PKGS([sys_libs], [m4_sinclude([
if test "x$syslib_status" = xno; then
AC_MSG_ERROR([some requested system libraries failed])
fi
@@ -21,4 +35,61 @@
-fi
KPSE_RESTORE_FLAGS
- dnl AM_CONDITIONAL([build_kpathsea],
+ AM_CONDITIONAL([cross], [test "x$cross_compiling" = xyes])
+--- libs/configure
++++ libs/configure 2011-09-13 14:11:51.207926324 +0000
+@@ -4021,13 +4021,6 @@ if test "${with_libgs_libdir+set}" = set
+ fi
+
+
+-## texk/dvisvgm/ac/libgs.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/
+-## configure checks for dvisvgm and libgs
+-if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then
+- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
+-fi
+-
+-
+ ## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
+ ## configure options and TL libraries required for gsftopk
+ # Check whether --enable-gsftopk was given.
+--- texk/configure
++++ texk/configure 2011-09-13 14:12:16.719926873 +0000
+@@ -4041,13 +4041,6 @@ if test "${with_libgs_libdir+set}" = set
+ fi
+
+
+-## texk/dvisvgm/ac/libgs.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/
+-## configure checks for dvisvgm and libgs
+-if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then
+- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
+-fi
+-
+-
+ ## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
+ ## configure options and TL libraries required for gsftopk
+ # Check whether --enable-gsftopk was given.
+--- texk/dvisvgm/ac/libgs.ac
++++ texk/dvisvgm/ac/libgs.ac 2011-09-13 14:12:02.947925410 +0000
+@@ -4,6 +4,3 @@ dnl Copyright (C) 2009 Peter Breitenlohn
+ dnl You may freely use, modify and/or distribute this file.
+ dnl
+ ## configure checks for dvisvgm and libgs
+-if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then
+- AC_MSG_ERROR([you can not use system libraries for a native TeX Live build])
+-fi
+--- utils/configure
++++ utils/configure 2011-09-13 14:12:29.125501986 +0000
+@@ -4018,13 +4018,6 @@ if test "${with_libgs_libdir+set}" = set
+ fi
+
+
+-## texk/dvisvgm/ac/libgs.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/
+-## configure checks for dvisvgm and libgs
+-if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then
+- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
+-fi
+-
+-
+ ## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
+ ## configure options and TL libraries required for gsftopk
+ # Check whether --enable-gsftopk was given.
++++++ source-dvipng.dif ++++++
--- /var/tmp/diff_new_pack.rkVplo/_old 2011-10-26 16:12:25.000000000 +0200
+++ /var/tmp/diff_new_pack.rkVplo/_new 2011-10-26 16:12:25.000000000 +0200
@@ -1,5 +1,5 @@
---- texk/dvipng/dvipng-1.13/vf.c
-+++ texk/dvipng/dvipng-1.13/vf.c 2010-04-12 14:35:53.414925428 +0000
+--- texk/dvipng/dvipng-1.14/vf.c
++++ texk/dvipng/dvipng-1.14/vf.c 2010-04-12 14:35:53.414925428 +0000
@@ -115,7 +115,7 @@ void InitVF(struct font_entry * tfontp)
tcharptr->tfmw = (int32_t)
((int64_t) tcharptr->tfmw * tfontp->s / (1 << 20));
++++++ source-dviutils.dif ++++++
--- /var/tmp/diff_new_pack.rkVplo/_old 2011-10-26 16:12:25.000000000 +0200
+++ /var/tmp/diff_new_pack.rkVplo/_new 2011-10-26 16:12:25.000000000 +0200
@@ -258,7 +258,7 @@
{
--- texk/seetexk/configure
+++ texk/seetexk/configure 2009-09-04 13:23:18.898401799 +0000
-@@ -13394,7 +13394,7 @@ if test "x$with_kpathsea_libdir" != x &&
+@@ -14169,7 +14169,7 @@ if test "x$with_kpathsea_libdir" != x &&
KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS"
fi
else
++++++ source-lacheck.dif ++++++
--- /var/tmp/diff_new_pack.rkVplo/_old 2011-10-26 16:12:25.000000000 +0200
+++ /var/tmp/diff_new_pack.rkVplo/_new 2011-10-26 16:12:25.000000000 +0200
@@ -1,5 +1,5 @@
---- texk/lacheck/lacheck.l
-+++ texk/lacheck/lacheck.l 2008-03-05 13:59:37.000000000 +0000
+--- texk/lacheck/lacheck-1.26/lacheck.l
++++ texk/lacheck/lacheck-1.26/lacheck.l 2008-03-05 13:59:37.000000000 +0000
@@ -117,6 +117,7 @@
#include