Changeset d53d455

Timestamp:

08/17/2021 02:47:55 PM (3 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 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/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

4cb0c8f

Parents:

66b0fa5

Message:

Package update and a relevant buildfix:

Update to JDK-16.0.2
Adjust FOP to build with JDK-16.0.2

Files:

• general/prog/java.xml (modified) (2 diffs)
• general/prog/openjdk.xml (modified) (3 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• pst/ps/fop.xml (modified) (1 diff)

general/prog/java.xml

@@ -8 +8 @@
     the directory: this saves more than 70 MB. -->
   <!ENTITY anduin-download             "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
-  <!ENTITY openjdk-download-binary-x86 "&sources-anduin-http;/OpenJDK/OpenJDK-15.0.2/OpenJDK-15.0.2+7-i686-bin.tar.xz">
-  <!ENTITY openjdk-bin-md5sum-x86      "8093b7f2d38fbfc39c63abd57462315b">
-  <!ENTITY openjdk-bin-size-x86        "148 MB">
-  <!ENTITY openjdk-bin-buildsize-x86   "281 MB">
+  <!ENTITY openjdk-download-binary-x86 "&sources-anduin-http;/OpenJDK/OpenJDK-16.0.2/OpenJDK-16.0.2+7-i686-bin.tar.xz">
+  <!ENTITY openjdk-bin-md5sum-x86      "45410ad7ec9045c379f9e736488696c3">
+  <!ENTITY openjdk-bin-size-x86        "152 MB">
+  <!ENTITY openjdk-bin-buildsize-x86   "29 MB">
 
 <!-- Not uploaded to anduin, since this file is now available under GNU GPLv2
      licence.-->
   <!ENTITY openjdk-download-binary-x64 "https://download.java.net/java/GA/jdk&openjdk-version;/0d1cfde4252546c6931946de8db48ee2/&openjdk-build;/GPL/openjdk-&openjdk-version;_linux-x64_bin.tar.gz">
-  <!ENTITY openjdk-bin-md5sum-x64      "9209edbd74358ccb1c54cf54004f0bb9">
-  <!ENTITY openjdk-bin-size-x64        "186 MB">
-  <!ENTITY openjdk-bin-buildsize-x64   "321 MB">
+  <!ENTITY openjdk-bin-md5sum-x64      "31c344e9097bd034c892b97c5ac45c27">
+  <!ENTITY openjdk-bin-size-x64        "176 MB">
+  <!ENTITY openjdk-bin-buildsize-x64   "303 MB">
 ]>
 
@@ -40 +40 @@
       Java is different from most of the packages in LFS and BLFS. It
       is a programming language that works with files of byte codes to obtain
-      instructions and executes then in a Java Virtual Machine (JVM). An
+      instructions and executes them in a Java Virtual Machine (JVM). An
       introductory java program looks like:
     </para>

general/prog/openjdk.xml

@@ -11 +11 @@
   <!ENTITY anduin-download           "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
 
-  <!ENTITY ojdk-md5sum               "e516e5e14ded6f91a89c9b4c83a87005">
-  <!ENTITY ojdk-size                 "97 MB">
+  <!ENTITY ojdk-md5sum               "08b1c057136a6756cd8e4609dc517339">
+  <!ENTITY ojdk-size                 "100 MB">
 
   <!ENTITY jtreg-version             "4.2.0-tip">
@@ -19 +19 @@
   <!ENTITY jtreg-size                "6.9 MB">
 
-  <!ENTITY ojdk-bdsize               "4.5 GB (add 399 MB for tests)">
-  <!ENTITY ojdk-time                 "4.5 SBU with 4 jobs (add 55 SBU for tests with 4 jobs)">
+  <!ENTITY ojdk-bdsize               "4.7 GB (add 456 MB for tests)">
+  <!ENTITY ojdk-time                 "5.2 SBU with 4 jobs (add 59 SBU for tests with 4 jobs)">
 ]>
 
@@ -193 +193 @@
       <xref linkend="git"/>,
       <xref linkend="graphviz"/>,
-      <xref linkend="mercurial"/>, and
+      <xref linkend="mercurial"/>,
 <!-- not needed now, it seems
       an X Window manager such as <xref linkend="twm"/> (for the tests), and
--->   <ulink url="https://pandoc.org/">pandoc</ulink>
+-->   <ulink url="https://pandoc.org/">pandoc</ulink>, and
+      <ulink url="https://zlib.net/pigz">pigz</ulink>
     </para>
 

introduction/welcome/changelog.xml

@@ -42 +42 @@
     </listitem>
     -->
+    <listitem>
+      <para>August 17th, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to OpenJDK-16.0.2 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;15357">#15357</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>August 16th, 2021</para>

packages.ent

@@ -393 +393 @@
 <!ENTITY hamcrest-version             "1.3">
 -->
-<!ENTITY openjdk-version              "15.0.2">
+<!ENTITY openjdk-version              "16.0.2">
 <!ENTITY openjdk-build                "7">
 

pst/ps/fop.xml

@@ -237 +237 @@
     -i fop/build.xml</userinput></screen>
 -->
+      <para>
+        Fix building with JDK-16 due to an outdated Apache Maven plugin:
+      </para>
+
+<screen><userinput remap="pre">sed -i 's/&lt;war.plugin.version&gt;2.2/&lt;war.plugin.version&gt;3.3.1/' pom.xml</userinput></screen>
+
       <para>
         The <filename>build.xml</filename> file calls for an old version of