[gentoo-commits] gentoo commit in src/patchsets/texlive/2009/texlive-core: 010_all_icu_CVE-2007-4770.patch 020_all_poppler.patch 030_all_installedscripts.patch 040_all_texmfdirs.patch series

[Alexis Ballier (aballier)]

aballier    10/01/07 14:59:24

  Added:                010_all_icu_CVE-2007-4770.patch
                        020_all_poppler.patch
                        030_all_installedscripts.patch
                        040_all_texmfdirs.patch series
  Log:
  add tl 2009 patches

Revision  Changes    Path
1.1                  src/patchsets/texlive/2009/texlive-core/010_all_icu_CVE-2007-4770.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/texlive/2009/texlive-core/010_all_icu_CVE-2007-4770.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/texlive/2009/texlive-core/010_all_icu_CVE-2007-4770.patch?rev=1.1&content-type=text/plain

Index: 010_all_icu_CVE-2007-4770.patch
===================================================================
Index: texlive-20091107-source/libs/icu/icu-xetex/common/uvectr32.cpp
===================================================================
--- texlive-20091107-source.orig/libs/icu/icu-xetex/common/uvectr32.cpp
+++ texlive-20091107-source/libs/icu/icu-xetex/common/uvectr32.cpp
@@ -1,6 +1,6 @@
 /*
 ******************************************************************************
-* Copyright (C) 1999-2003, International Business Machines Corporation and   *
+* Copyright (C) 1999-2008, International Business Machines Corporation and   *
 * others. All Rights Reserved.                                               *
 ******************************************************************************
 *   Date        Name        Description
@@ -26,6 +26,7 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(UVect
 UVector32::UVector32(UErrorCode &status) :
     count(0),
     capacity(0),
+    maxCapacity(0),
     elements(NULL)
 {
     _init(DEFUALT_CAPACITY, status);
@@ -34,6 +35,7 @@ UVector32::UVector32(UErrorCode &status)
 UVector32::UVector32(int32_t initialCapacity, UErrorCode &status) :
     count(0),
     capacity(0),
+    maxCapacity(0),
     elements(0)
 {
     _init(initialCapacity, status);
@@ -46,6 +48,9 @@ void UVector32::_init(int32_t initialCap
     if (initialCapacity < 1) {
         initialCapacity = DEFUALT_CAPACITY;
     }
+    if (maxCapacity>0 && maxCapacity<initialCapacity) {
+        initialCapacity = maxCapacity;
+    }
     elements = (int32_t *)uprv_malloc(sizeof(int32_t)*initialCapacity);
     if (elements == 0) {
         status = U_MEMORY_ALLOCATION_ERROR;
@@ -189,21 +194,35 @@ int32_t UVector32::indexOf(int32_t key, 
 UBool UVector32::expandCapacity(int32_t minimumCapacity, UErrorCode &status) {
     if (capacity >= minimumCapacity) {
         return TRUE;
-    } else {
-        int32_t newCap = capacity * 2;
-        if (newCap < minimumCapacity) {
-            newCap = minimumCapacity;
-        }
-        int32_t* newElems = (int32_t *)uprv_malloc(sizeof(int32_t)*newCap);
-        if (newElems == 0) {
-            status = U_MEMORY_ALLOCATION_ERROR;
-            return FALSE;
-        }
-        uprv_memcpy(newElems, elements, sizeof(elements[0]) * count);
-        uprv_free(elements);
-        elements = newElems;
-        capacity = newCap;
-        return TRUE;
+    }
+    if (maxCapacity>0 && minimumCapacity>maxCapacity) {
+        status = U_BUFFER_OVERFLOW_ERROR;
+        return FALSE;
+    }
+    int32_t newCap = capacity * 2;
+    if (newCap < minimumCapacity) {
+        newCap = minimumCapacity;
+    }
+    if (maxCapacity > 0 && newCap > maxCapacity) {
+        newCap = maxCapacity;
+    }
+    int32_t* newElems = (int32_t *)uprv_malloc(sizeof(int32_t)*newCap);
+    if (newElems == 0) {
+        status = U_MEMORY_ALLOCATION_ERROR;
+        return FALSE;
+    }
+    uprv_memcpy(newElems, elements, sizeof(elements[0]) * count);
+    uprv_free(elements);
+    elements = newElems;
+    capacity = newCap;
+    return TRUE;
+}
+
+void UVector32::setMaxCapacity(int32_t limit) {
+    U_ASSERT(limit >= 0);
+    maxCapacity = limit;
+    if (maxCapacity < 0) {
+        maxCapacity = 0;
     }
 }
 
Index: texlive-20091107-source/libs/icu/icu-xetex/common/uvectr32.h
===================================================================
--- texlive-20091107-source.orig/libs/icu/icu-xetex/common/uvectr32.h
+++ texlive-20091107-source/libs/icu/icu-xetex/common/uvectr32.h
@@ -61,6 +61,8 @@ private:
     int32_t   count;
 
     int32_t   capacity;
+    
+    int32_t   maxCapacity;   // Limit beyond which capacity is not permitted to grow.
 
     int32_t*  elements;
 
@@ -162,6 +164,14 @@ public:
     int32_t *getBuffer() const;
 
     /**
+     * Set the maximum allowed buffer capacity for this vector/stack.
+     * Default with no limit set is unlimited, go until malloc() fails.
+     * A Limit of zero means unlimited capacity.
+     * Units are vector elements (32 bits each), not bytes.
+     */
+    void setMaxCapacity(int32_t limit);
+
+    /**
      * ICU "poor man's RTTI", returns a UClassID for this class.
      */
     static UClassID U_EXPORT2 getStaticClassID();
@@ -221,7 +231,9 @@ inline void UVector32::addElement(int32_
 }
 
 inline int32_t *UVector32::reserveBlock(int32_t size, UErrorCode &status) {
-    ensureCapacity(count+size, status);
+    if (ensureCapacity(count+size, status) == FALSE) {
+        return NULL;
+    }
     int32_t  *rp = elements+count;
     count += size;
     return rp;
Index: texlive-20091107-source/libs/icu/icu-xetex/i18n/regexcmp.cpp
===================================================================
--- texlive-20091107-source.orig/libs/icu/icu-xetex/i18n/regexcmp.cpp
+++ texlive-20091107-source/libs/icu/icu-xetex/i18n/regexcmp.cpp
@@ -1186,14 +1186,17 @@ UBool RegexCompile::doParseActions(int32
             // Because capture groups can be forward-referenced by back-references,
             //  we fill the operand with the capture group number.  At the end
             //  of compilation, it will be changed to the variable's location.
-            U_ASSERT(groupNum > 0);
-            int32_t  op;
-            if (fModeFlags & UREGEX_CASE_INSENSITIVE) {
-                op = URX_BUILD(URX_BACKREF_I, groupNum);
+            if (groupNum < 1) { 
+                error(U_REGEX_INVALID_BACK_REF);
             } else {
-                op = URX_BUILD(URX_BACKREF, groupNum);
+                int32_t  op;
+                if (fModeFlags & UREGEX_CASE_INSENSITIVE) {
+                    op = URX_BUILD(URX_BACKREF_I, groupNum);
+                } else {
+                    op = URX_BUILD(URX_BACKREF, groupNum);
+                }
+                fRXPat->fCompiledPat->addElement(op, *fStatus);
             }
-            fRXPat->fCompiledPat->addElement(op, *fStatus);
         }
         break;
 
Index: texlive-20091107-source/libs/icu/icu-xetex/i18n/rematch.cpp
===================================================================
--- texlive-20091107-source.orig/libs/icu/icu-xetex/i18n/rematch.cpp
+++ texlive-20091107-source/libs/icu/icu-xetex/i18n/rematch.cpp
@@ -30,6 +30,15 @@
 
 U_NAMESPACE_BEGIN
 
+// Limit the size of the back track stack, to avoid system failures caused
+//   by heap exhaustion.  Units are in 32 bit words, not bytes.
+// This value puts ICU's limits higher than most other regexp implementations,
+//  which use recursion rather than the heap, and take more storage per
+//  backtrack point.
+// This constant is _temporary_.  Proper API to control the value will added.
+//
+static const int32_t BACKTRACK_STACK_CAPACITY = 8000000;
+
 //-----------------------------------------------------------------------------
 //
 //   Constructor and Destructor
@@ -53,6 +62,8 @@ RegexMatcher::RegexMatcher(const RegexPa
     }
     if (fStack == NULL || fData == NULL) {
         fDeferredStatus = U_MEMORY_ALLOCATION_ERROR;
+    } else {
+        fStack->setMaxCapacity(BACKTRACK_STACK_CAPACITY);
     }
         
     reset(RegexStaticSets::gStaticSets->fEmptyString);
@@ -78,6 +89,8 @@ RegexMatcher::RegexMatcher(const Unicode
     }
     if (fStack == NULL || fData == NULL) {
         status = U_MEMORY_ALLOCATION_ERROR;
+    } else {
+        fStack->setMaxCapacity(BACKTRACK_STACK_CAPACITY);
     }
     reset(input);
 }
@@ -102,6 +115,8 @@ RegexMatcher::RegexMatcher(const Unicode
     }
     if (fStack == NULL || fData == NULL) {
         status = U_MEMORY_ALLOCATION_ERROR;
+    } else {
+        fStack->setMaxCapacity(BACKTRACK_STACK_CAPACITY);
     }
     reset(RegexStaticSets::gStaticSets->fEmptyString);
 }
@@ -1014,6 +1029,14 @@ UBool RegexMatcher::isUWordBoundary(int3
 inline REStackFrame *RegexMatcher::StateSave(REStackFrame *fp, int32_t savePatIdx, int32_t frameSize, UErrorCode &status) {
     // push storage for a new frame. 
     int32_t *newFP = fStack->reserveBlock(frameSize, status);
+    if (newFP == NULL) {
+        // Heap allocation error on attempted stack expansion.
+        // We need to return a writable stack frame, so just return the
+        //    previous frame.  The match operation will stop quickly
+        //    becuase of the error status, after which the frame will never
+        //    be looked at again.
+        return fp;
+    }
     fp = (REStackFrame *)(newFP - frameSize);  // in case of realloc of stack.
     
     // New stack frame = copy of old top frame.
@@ -1029,8 +1052,8 @@ inline REStackFrame *RegexMatcher::State
     fp->fPatIdx = savePatIdx;
     return (REStackFrame *)newFP;
 }
-    
-            
+
+
 //--------------------------------------------------------------------------------
 //
 //   MatchAt      This is the actual matching engine.
@@ -2261,6 +2284,7 @@ GC_Done:
         }
 
         if (U_FAILURE(status)) {
+            isMatch = FALSE;
             break;
         }
     }
Index: texlive-20091107-source/libs/icu/icu-xetex/test/intltest/regextst.cpp
===================================================================
--- texlive-20091107-source.orig/libs/icu/icu-xetex/test/intltest/regextst.cpp
+++ texlive-20091107-source/libs/icu/icu-xetex/test/intltest/regextst.cpp
@@ -66,6 +66,10 @@ void RegexTest::runIndexedTest( int32_t 
         case 6: name = "PerlTests";
             if (exec) PerlTests();
             break;
+        case 7: name = "Bug 6149";
+            if (exec) Bug6149();
+            break;
+            
 
 
         default: name = "";
@@ -1640,6 +1644,13 @@ void RegexTest::Errors() {
     // Ticket 5389
     REGEX_ERR("*c", 1, 1, U_REGEX_RULE_SYNTAX);
 
+    
+    // Invalid Back Reference \0
+    //    For ICU 3.8 and earlier
+    //    For ICU versions newer than 3.8, \0 introduces an octal escape.
+    //
+    REGEX_ERR("(ab)\\0", 1, 6, U_REGEX_INVALID_BACK_REF);
+
 }
 
 
@@ -2122,6 +2133,26 @@ void RegexTest::PerlTests() {
 }
 
 
+//--------------------------------------------------------------
+//
+//  Bug6149   Verify limits to heap expansion for backtrack stack.
+//             Use this pattern,
+//                 "(a?){1,}"
+//             The zero-length match will repeat forever.
+//                (That this goes into a loop is another bug)
+//
+//---------------------------------------------------------------
+void RegexTest::Bug6149() {
+    UnicodeString pattern("(a?){1,}");
+    UnicodeString s("xyz");
+    uint32_t flags = 0;
+    UErrorCode status = U_ZERO_ERROR;
+    
+    RegexMatcher  matcher(pattern, s, flags, status);
+    UBool result = false;
+    REGEX_ASSERT_FAIL(result=matcher.matches(status), U_BUFFER_OVERFLOW_ERROR);
+    REGEX_ASSERT(result == FALSE);
+ }
 
 #endif  /* !UCONFIG_NO_REGULAR_EXPRESSIONS  */
 
Index: texlive-20091107-source/libs/icu/icu-xetex/test/intltest/regextst.h
===================================================================
--- texlive-20091107-source.orig/libs/icu/icu-xetex/test/intltest/regextst.h
+++ texlive-20091107-source/libs/icu/icu-xetex/test/intltest/regextst.h
@@ -30,6 +30,7 @@ public:
     virtual void Extended();
     virtual void Errors();
     virtual void PerlTests();
+    virtual void Bug6149();
 
     // The following functions are internal to the regexp tests.
     virtual UBool doRegexLMTest(const char *pat, const char *text, UBool looking, UBool match, int32_t line);



1.1                  src/patchsets/texlive/2009/texlive-core/020_all_poppler.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/texlive/2009/texlive-core/020_all_poppler.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/texlive/2009/texlive-core/020_all_poppler.patch?rev=1.1&content-type=text/plain

Index: 020_all_poppler.patch
===================================================================
Index: texlive-20091107-source/texk/web2c/pdftexdir/pdftoepdf.cc
===================================================================
--- texlive-20091107-source.orig/texk/web2c/pdftexdir/pdftoepdf.cc
+++ texlive-20091107-source/texk/web2c/pdftexdir/pdftoepdf.cc
@@ -650,7 +650,7 @@ static void writeEncodings()
     }
     for (r = encodingList; r != 0; r = n) {
         n = r->next;
-        delete r->font;
+        r->font->decRefCnt();
         delete r;
     }
 }
@@ -690,7 +690,7 @@ read_pdf_info(char *image_name, char *pa
     Page *page;
     int rotate;
     PDFRectangle *pagebox;
-    float pdf_version_found, pdf_version_wanted;
+    int minor_pdf_version_found, major_pdf_version_found;
     // initialize
     if (!isInit) {
         globalParams = new GlobalParams();
@@ -705,15 +705,15 @@ read_pdf_info(char *image_name, char *pa
     // this works only for PDF 1.x -- but since any versions of PDF newer
     // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
     // then have to changed drastically anyway.
-    pdf_version_found = pdf_doc->doc->getPDFVersion();
-    pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
-    if (pdf_version_found > pdf_version_wanted) {
+    minor_pdf_version_found = pdf_doc->doc->getPDFMinorVersion();
+    major_pdf_version_found = pdf_doc->doc->getPDFMajorVersion();
+    if (major_pdf_version_found > 1 || ((major_pdf_version_found == 1) && (minor_pdf_version_found > minor_pdf_version_wanted))) {
         char msg[] =
-            "PDF inclusion: found PDF version <%.1f>, but at most version <%.1f> allowed";
+            "PDF inclusion: found PDF version <%d.%d>, but at most version <1.%d> allowed";
         if (pdf_inclusion_errorlevel > 0) {
-            pdftex_fail(msg, pdf_version_found, pdf_version_wanted);
+            pdftex_fail(msg, major_pdf_version_found, minor_pdf_version_found, minor_pdf_version_wanted);
         } else {
-            pdftex_warn(msg, pdf_version_found, pdf_version_wanted);
+            pdftex_warn(msg, major_pdf_version_found, minor_pdf_version_found, minor_pdf_version_wanted);
         }
     }
     epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();



1.1                  src/patchsets/texlive/2009/texlive-core/030_all_installedscripts.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/texlive/2009/texlive-core/030_all_installedscripts.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/texlive/2009/texlive-core/030_all_installedscripts.patch?rev=1.1&content-type=text/plain

Index: 030_all_installedscripts.patch
===================================================================
Index: texlive-20091107-source/texk/texlive/linked_scripts/Makefile.in
===================================================================
--- texlive-20091107-source.orig/texk/texlive/linked_scripts/Makefile.in
+++ texlive-20091107-source/texk/texlive/linked_scripts/Makefile.in
@@ -156,83 +156,30 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 bin_SCRIPTS = 
-scriptxdir = ${prefix}/texmf/scripts
+scriptxdir = ${prefix}/share/texmf/scripts
 nobase_dist_scriptx_SCRIPTS = \
 	a2ping/a2ping.pl \
 	getnonfreefonts/getnonfreefonts.pl \
-	simpdftex/simpdftex \
 	tetex/e2pall.pl \
 	tetex/texdoctk.pl \
 	texdoc/texdoc.tlu \
-	texlive/rungs.tlu \
-	texlive/tlmgr.pl
 
-scriptdir = ${prefix}/texmf-dist/scripts
+scriptdir = ${prefix}/share/texmf-dist/scripts
 nobase_dist_script_SCRIPTS = \
-	accfonts/mkt1font \
-	accfonts/vpl2ovp \
-	accfonts/vpl2vpl \
-	bengali/ebong.py \
-	cachepic/cachepic.tlu \
-	context/lua/luatools.lua \
-	context/lua/mtxrun.lua \
-	context/ruby/texmfstart.rb \
-	context/stubs/unix/context \
-	context/stubs/unix/ctxtools \
-	context/stubs/unix/makempy \
-	context/stubs/unix/mpstools \
-	context/stubs/unix/mptopdf \
-	context/stubs/unix/mtxtools \
-	context/stubs/unix/pdftools \
-	context/stubs/unix/pstopdf \
-	context/stubs/unix/rlxtools \
-	context/stubs/unix/runtools \
-	context/stubs/unix/texexec \
-	context/stubs/unix/texfont \
-	context/stubs/unix/textools \
-	context/stubs/unix/texutil \
-	context/stubs/unix/tmftools \
-	context/stubs/unix/xmltools \
 	dviasm/dviasm.py \
-	epspdf/epspdf \
-	epspdf/epspdftk \
-	epstopdf/epstopdf.pl \
-	fig4latex/fig4latex \
 	findhyph/findhyph \
-	fontools/afm2afm \
-	fontools/autoinst \
-	fontools/cmap2enc \
-	fontools/font2afm \
-	fontools/ot2kpx \
-	fontools/pfm2kpx \
-	fontools/showglyphs \
 	fragmaster/fragmaster.pl \
-	glossaries/makeglossaries \
 	latex2man/latex2man \
-	latexmk/latexmk.pl \
 	listings-ext/listings-ext.sh \
 	mkjobtexmf/mkjobtexmf.pl \
-	mkgrkindex/mkgrkindex \
-	oberdiek/pdfatfi.pl \
-	pax/pdfannotextractor.pl \
 	pdfcrop/pdfcrop.pl \
-	perltex/perltex \
 	pkfix/pkfix.pl \
 	pkfix-helper/pkfix-helper \
-	ppower4/pdfthumb.tlu \
-	ppower4/ppower4.tlu \
-	pst-pdf/ps4pdf \
-	pst2pdf/pst2pdf.pl \
 	purifyeps/purifyeps \
-	splitindex/perl/splitindex.pl \
-	svn-multi/svn-multi.pl \
 	texcount/texcount.pl \
 	texdiff/texdiff \
 	texdirflatten/texdirflatten \
 	texloganalyser/texloganalyser \
-	thumbpdf/thumbpdf.pl \
-	ulqda/ulqda.pl \
-	vpe/vpe.pl
 
 all: all-am
 
@@ -542,8 +489,8 @@ uninstall-am: uninstall-binSCRIPTS unins
 
 install-data-hook:
 	case "$(bindir)" in \
-	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
-	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
+	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=../share install-links;; \
+	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../../share install-links;; \
 	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
 	     exit 1;; \
 	esac
Index: texlive-20091107-source/texk/tetex/Makefile.in
===================================================================
--- texlive-20091107-source.orig/texk/tetex/Makefile.in
+++ texlive-20091107-source/texk/tetex/Makefile.in
@@ -197,7 +197,6 @@ dist_bin_SCRIPTS = \
 	kpsetool \
 	kpsewhere \
 	ps2frag \
-	ps4pdf \
 	pslatex \
 	rubibtex \
 	rumakeindex \



1.1                  src/patchsets/texlive/2009/texlive-core/040_all_texmfdirs.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/texlive/2009/texlive-core/040_all_texmfdirs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/texlive/2009/texlive-core/040_all_texmfdirs.patch?rev=1.1&content-type=text/plain

Index: 040_all_texmfdirs.patch
===================================================================
Index: texlive-20091107-source/texk/tetex/Makefile.in
===================================================================
--- texlive-20091107-source.orig/texk/tetex/Makefile.in
+++ texlive-20091107-source/texk/tetex/Makefile.in
@@ -253,14 +253,14 @@ dist_man5_MANS = \
 	fmtutil.cnf.5 \
 	updmap.cfg.5
 
-tetexdocdir = ${prefix}/texmf/doc/tetex
+tetexdocdir = ${prefix}/share/texmf/doc/tetex
 dist_tetexdoc_DATA = \
 	doc/TETEXDOC.dvi \
 	doc/TETEXDOC.pdf \
 	doc/TETEXDOC.ps \
 	doc/teTeX-FAQ
 
-texconfdir = ${prefix}
+texconfdir = ${prefix}/share/
 nobase_dist_texconf_DATA = \
 	texmf/texconfig/README \
 	texmf/texconfig/g/generic \
@@ -268,10 +268,10 @@ nobase_dist_texconf_DATA = \
 	texmf/texconfig/v/vt100 \
 	texmf/texconfig/x/xterm
 
-texconfigdir = ${prefix}/texmf/texconfig
+texconfigdir = ${prefix}/share/texmf/texconfig
 dist_texconfig_SCRIPTS = tcfmgr
 dist_texconfig_DATA = tcfmgr.map
-web2cdir = ${prefix}/texmf/web2c
+web2cdir = ${prefix}/share/texmf/web2c
 dist_web2c_DATA = fmtutil.cnf
 EXTRA_DIST = README.a2ping README.texdoctk doc/Makefile \
 	doc/TETEXDOC.bib doc/TETEXDOC.tex fontinst.bat pdfetex-pl.pool \
Index: texlive-20091107-source/texk/dvipsk/Makefile.in
===================================================================
--- texlive-20091107-source.orig/texk/dvipsk/Makefile.in
+++ texlive-20091107-source/texk/dvipsk/Makefile.in
@@ -376,7 +376,7 @@ dist_prologues = \
 	tex.lpro \
 	texps.lpro
 
-prologdir = ${prefix}/texmf/dvips/base
+prologdir = ${prefix}/share/texmf/dvips/base
 prologues = $(dist_prologues:.lpro=.pro) texc.pro
 SUFFIXES = .pro .lpro
 EXTRA_DIST = $(dist_prologues) texc.script dvips.test pfbincl.test \
Index: texlive-20091107-source/texk/gsftopk/Makefile.in
===================================================================
--- texlive-20091107-source.orig/texk/gsftopk/Makefile.in
+++ texlive-20091107-source/texk/gsftopk/Makefile.in
@@ -256,7 +256,7 @@ gsftopk_SOURCES = \
 gsftopk_DEPENDENCIES = $(KPATHSEA_DEPEND)
 LDADD = $(KPATHSEA_LIBS)
 dist_gsftopkpsheader_DATA = render.ps
-gsftopkpsheaderdir = ${prefix}/texmf/dvips/gsftopk
+gsftopkpsheaderdir = ${prefix}/share/texmf/dvips/gsftopk
 nodist_man1_MANS = gsftopk.1
 DISTCLEANFILES = gsftopk.1 sedscript
 EXTRA_DIST = gsftopk1.sed mksedscript
Index: texlive-20091107-source/texk/bibtex8/Makefile.in
===================================================================
--- texlive-20091107-source.orig/texk/bibtex8/Makefile.in
+++ texlive-20091107-source/texk/bibtex8/Makefile.in
@@ -263,7 +263,7 @@ bibtex8_SOURCES = \
 
 bibtex8_DEPENDENCIES = $(KPATHSEA_DEPEND)
 LDADD = $(KPATHSEA_LIBS)	
-csfdir = ${prefix}/texmf-dist/bibtex/csf/base
+csfdir = ${prefix}/share/texmf-dist/bibtex/csf/base
 dist_csf_DATA = \
 	csf/88591lat.csf \
 	csf/88591sca.csf \
@@ -274,7 +274,7 @@ dist_csf_DATA = \
 	csf/cp866rus.csf \
 	csf/csfile.txt
 
-btdocdir = ${prefix}/texmf/doc/bibtex8
+btdocdir = ${prefix}/share/texmf/doc/bibtex8
 dist_btdoc_DATA = \
 	00readme.txt \
 	HISTORY \
Index: texlive-20091107-source/texk/kpathsea/Makefile.in
===================================================================
--- texlive-20091107-source.orig/texk/kpathsea/Makefile.in
+++ texlive-20091107-source/texk/kpathsea/Makefile.in
@@ -432,7 +432,7 @@ DISTCLEANFILES = paths.h stamp-paths kpa
 kpseaccess_SOURCES = access.c
 kpsereadlink_SOURCES = readlink.c
 kpsewhich_LDADD = libkpathsea.la
-web2cdir = ${prefix}/texmf/web2c
+web2cdir = ${prefix}/share/texmf/web2c
 dist_web2c_SCRIPTS = mktexdir mktexnam mktexupd
 dist_web2c_DATA = mktex.opt mktexdir.opt mktexnam.opt
 dist_noinst_SCRIPTS = mktexlsr mktexmf mktexpk mktextfm



1.1                  src/patchsets/texlive/2009/texlive-core/series

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/texlive/2009/texlive-core/series?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/texlive/2009/texlive-core/series?rev=1.1&content-type=text/plain

Index: series
===================================================================
010_all_icu_CVE-2007-4770.patch
020_all_poppler.patch
030_all_installedscripts.patch
040_all_texmfdirs.patch