Changeset c1cd435e for general/prog

Timestamp:

09/06/2018 12:36:36 AM (6 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, 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:

11759d2

Parents:

4d7d99d

Message:

Update to make-ca-0.9. Fixes #11114.

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

Location:

general/prog

Files:

• ojdk-conf.xml (modified) (2 diffs)
• openjdk.xml (modified) (3 diffs)

general/prog/ojdk-conf.xml

@@ -89 +89 @@
       <envar>$JAVA_HOME</envar><filename>/lib/security/cacerts</filename> by
       default. In order to keep all the certificates in one place, we use
-      <filename>/etc/ssl/java/cacerts.jks</filename>. That file should be
+      <filename>/etc/ssl/java/cacerts</filename>. That file should be
       generated using the system PKI trust store. The instructions
       on the <xref linkend="make-ca"/> page should be used to update the file
@@ -98 +98 @@
 
 <screen role="root"><userinput>/usr/sbin/make-ca -g --force &amp;&amp;
-ln -sfv /etc/ssl/java/cacerts.jks /opt/jdk/lib/security/cacerts</userinput></screen>
+ln -sfv /etc/ssl/java/cacerts /opt/jdk/lib/security/cacerts</userinput></screen>
 
     <para>

general/prog/openjdk.xml

@@ -241 +241 @@
                --with-version-pre=""        \
                --with-version-opt=""        \
-               --with-cacerts-file=/etc/ssl/java/cacerts.jks &&
+               --with-cacerts-file=/etc/ssl/java/cacerts &&
 make images</userinput></screen>
 
@@ -394 +394 @@
 
     <para>
-      <parameter>--with-cacerts-file=/etc/ssl/java/cacerts.jks</parameter>:
+      <parameter>--with-cacerts-file=/etc/ssl/java/cacerts</parameter>:
       Specifies where to find a <filename>cacerts</filename> file,
       <filename>/etc/ssl/java/</filename> on a BLFS system. Otherwise, an empty
@@ -444 +444 @@
 
       <para>
-        If you have run the instructions for <xref linkend="ojdk-certs"/>,
-        you only need to create a symlink in the default location for
-        those certificates. As user <systemitem
+        If you have run the instructions on the <xref linkend="make-ca"/> page,
+        you only need to create a symlink in the default location for the
+        <filename>cacerts</filename> file. As user <systemitem
         class="username">root</systemitem>:
       </para>
 
-<screen role="root"><userinput>ln -sfv /etc/ssl/java/cacerts.jks /opt/jdk/lib/security/cacerts</userinput></screen>
+<screen role="root"><userinput>ln -sfv /etc/ssl/java/cacerts /opt/jdk/lib/security/cacerts</userinput></screen>
 
       <para>
-        To check the installatiion, as when <xref linkend="ojdk-certs"/>, issue:
+        To check the installatiion, issue:
       </para>