[subversion-commit] SVN tetex-bin commit + diffs: r1796 - in tetex-bin/trunk/debian: . patches

[Frank Küster]

Author: frank
Date: 2006-10-12 15:50:37 +0000 (Thu, 12 Oct 2006)
New Revision: 1796

Modified:
   tetex-bin/trunk/debian/changelog
   tetex-bin/trunk/debian/patches/patch-texmfcnf
Log:
* Restrict the compile-time search path for texmf.cnf to directories
  that in fact exist on a Debian system, thanks to Toby Speight
  <T.M.Speight.90 at cantab.net> (closes: #392195) [frank]


Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog	2006-10-12 15:49:47 UTC (rev 1795)
+++ tetex-bin/trunk/debian/changelog	2006-10-12 15:50:37 UTC (rev 1796)
@@ -1,3 +1,11 @@
+tetex-bin (3.0-22~1) unstable; urgency=low
+
+  * Restrict the compile-time search path for texmf.cnf to directories
+    that in fact exist on a Debian system, thanks to Toby Speight
+    <T.M.Speight.90 at cantab.net> (closes: #392195) [frank]
+
+ -- Frank Küster <frank at debian.org>  Wed, 11 Oct 2006 07:59:47 +0200
+
 tetex-bin (3.0-21) unstable; urgency=medium
 
   * Really load the debianize-updmap script from tex-common (closes:

Modified: tetex-bin/trunk/debian/patches/patch-texmfcnf
===================================================================
--- tetex-bin/trunk/debian/patches/patch-texmfcnf	2006-10-12 15:49:47 UTC (rev 1795)
+++ tetex-bin/trunk/debian/patches/patch-texmfcnf	2006-10-12 15:50:37 UTC (rev 1796)
@@ -1,11 +1,11 @@
  texk/kpathsea/Makefile.in    |    1 +
- texk/kpathsea/texmf.in-teTeX |   17 +++++++++++------
- 2 files changed, 12 insertions(+), 6 deletions(-)
+ texk/kpathsea/texmf.in-teTeX |   22 +++++++++++++++-------
+ 2 files changed, 16 insertions(+), 7 deletions(-)
 
 Index: tetex-bin-3.0/texk/kpathsea/texmf.in-teTeX
 ===================================================================
---- tetex-bin-3.0.orig/texk/kpathsea/texmf.in-teTeX	2006-03-02 14:46:40.000000000 +0100
-+++ tetex-bin-3.0/texk/kpathsea/texmf.in-teTeX	2006-03-02 16:10:18.000000000 +0100
+--- tetex-bin-3.0.orig/texk/kpathsea/texmf.in-teTeX	2006-10-12 16:30:05.000000000 +0200
++++ tetex-bin-3.0/texk/kpathsea/texmf.in-teTeX	2006-10-12 16:31:32.000000000 +0200
 @@ -59,12 +59,15 @@
  TEXMFMAIN = @texmf@
  
@@ -62,10 +62,22 @@
  
  % Where to look for ls-R files.  There need not be an ls-R in the
  % directories in this path, but if there is one, Kpathsea will use it.
+@@ -382,7 +387,10 @@
+ %
+ % 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@
++% Debian-specific change: Restrict this to dirs that actually exist,
++% to silent e.g. automounters:
++TEXMFCNF = $TETEXDIR;$TEXMF/web2c;@web2c@
+ 
+ # $progname: kpathsea v. 3.5.3 or later overwrites this at runtime. To
+ # avoid empty expansions from binaries linked against an earlier
 Index: tetex-bin-3.0/texk/kpathsea/Makefile.in
 ===================================================================
---- tetex-bin-3.0.orig/texk/kpathsea/Makefile.in	2006-03-02 14:46:40.000000000 +0100
-+++ tetex-bin-3.0/texk/kpathsea/Makefile.in	2006-03-02 16:10:18.000000000 +0100
+--- tetex-bin-3.0.orig/texk/kpathsea/Makefile.in	2006-10-12 16:29:28.000000000 +0200
++++ tetex-bin-3.0/texk/kpathsea/Makefile.in	2006-10-12 16:30:08.000000000 +0200
 @@ -88,6 +88,7 @@
  	echo '/^[% ]*TEXMFCONFIG[ =]/s%\$$TEXMF%$(texmf)%' >>$@
  	echo '/^[% ]*TEXMFVAR[ =]/s%$(texmf)MAIN%\$$TEXMFMAIN%' >>$@