Changeset 322b688

Timestamp:

10/09/2018 06:43:22 PM (6 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 8.4, 9.0, 9.1, bdubbs/svn, elogind, gimp3, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

ecbf490

Parents:

91219185

Message:

Texlive - update patch for vulnerability fixes, and to build with poppler-0.68.0, 0.69.0. Tested on 8.3/p-0.67, svn/p-0.68, 8.2/p-0.62, 8.1 with shipped poppler, p-0.57 was too old. Thanks to Douglas for notifying me of this.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@20608 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• pst/typesetting/texlive.xml (modified) (4 diffs)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "08">                   <!-- Always 2 digits -->
+<!ENTITY day          "09">                   <!-- Always 2 digits -->
 <!ENTITY month        "10">                   <!-- Always 2 digits -->
 <!ENTITY year         "2018">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "October 8th, &year;">
+<!ENTITY releasedate  "October 9th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

introduction/welcome/changelog.xml

@@ -44 +44 @@
 
     <listitem>
+      <para>October 7th, 2018</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Update texlive patch (security fix) and allow it to
+          build with both poppler-0.68.0 and -0.69.0. Fixes
+          <ulink url="&blfs-ticket-root;11223">#11223</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>October 8th, 2018</para>
       <itemizedlist>

pst/typesetting/texlive.xml

@@ -104 +104 @@
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/texlive-&texlive-version;-source-upstream_fixes-1.patch"/></para>
+        url="&patch-root;/texlive-&texlive-version;-source-upstream_fixes-2.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -162 +162 @@
         variable to let <systemitem class="username">root</systemitem> use it.
       </para>
+
+      <para>
+        If you came here to update an old system (because of the recent
+        vulnerability) where the poppler version is before 0.62.0, such as
+        BLFS-8.1, do NOT use the commands in the <literal>MYPOPPLER</literal>
+        block of instructions, nor the <literal>--with-system-poppler</literal>
+        or <literal>--with-system-xpdf</literal> options when configuring.
+      </para>
     </note>
 
@@ -169 +177 @@
 <screen><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
 
-patch -Np1 -i ../texlive-&texlive-version;-source-upstream_fixes-1.patch &amp;&amp;
-
-mv -v texk/web2c/pdftexdir/pdftoepdf{-newpoppler,}.cc &amp;&amp;
-mv -v texk/web2c/pdftexdir/pdftosrc{-newpoppler,}.cc  &amp;&amp;
+patch -Np1 -i ../texlive-&texlive-version;-source-upstream_fixes-2.patch &amp;&amp;
+
+let MYPOPPLER=$(pkg-config --modversion poppler | cut -d '.' -f2)
+mv -v texk/web2c/pdftexdir/pdftosrc{-newpoppler,}.cc
+if [ $MYPOPPLER -lt 68 ]; then
+  mv -v texk/web2c/pdftexdir/pdftoepdf{-newpoppler,}.cc
+elif [ $MYPOPPLER -lt 69 ]; then
+  mv -v texk/web2c/pdftexdir/pdftoepdf{-poppler0.68.0,}.cc
+else
+  mv -v texk/web2c/pdftexdir/pdftoepdf{-poppler0.69.0,}.cc
+fi &amp;&amp;
+unset MYPOPPLER &amp;&amp;
 
 mkdir texlive-build &amp;&amp;
@@ -260 +276 @@
 
     <para>
-      <command>patch -Np1 -i ../texlive-&texlive-version;-source-upstream_fixes-1.patch</command>:
+      <command>patch -Np1 -i ../texlive-&texlive-version;-source-upstream_fixes-2.patch</command>:
       various problems have come to light since the shipped source was frozen to
       be committed to DVDs. In particular, a segmentation fault in dvipdfm-x from
-      XeTeX and changes in upstream poppler-0.64.0.
-    </para>
-
-    <para>
-      <command>mv -v texk/web2c/pdftexdir/pdftoepdf{-newpoppler,}.cc ...</command>:
-      The &texlive-year; version of texlive ships with support for poppler-0.57.0
-      and older, but it includes alternative newpoppler files which enable building
-      with poppler-0.62.0 or newer.
+      XeTeX and changes in newer versions of <application>poppler</application>,
+      also an important vulnerability fix.
+    </para>
+
+    <para>
+      <command>let MYPOPPLER=...</command>: Because the vulnerability fix applies to
+      many past years of <application>texlive</application>, the tests aim to allow
+      updating using system versions of poppler since 0.62.0. The amended files for
+      newer versions of poppler need to be copied over the original versions,
+      depending on which version is being used.
     </para>