From 2198a3224bc5a1c999e3fff336401b9b2ae790f0 Mon Sep 17 00:00:00 2001 From: DJ Lucas Date: Sat, 24 Feb 2018 23:05:35 +0000 Subject: [PATCH] Rename make-ca page. git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@19860 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general/genlib/qca.xml | 2 +- general/prog/mercurial.xml | 2 +- general/prog/ojdk-conf.xml | 4 +-- general/prog/openjdk.xml | 17 ++++++----- general/sysutils/systemd.xml | 2 +- gnome/platform/rest.xml | 4 +-- networking/netlibs/curl.xml | 4 +-- networking/netlibs/glib-networking.xml | 2 +- networking/netlibs/ldns.xml | 2 +- networking/netprogs/wget.xml | 4 +-- postlfs/security/gnutls.xml | 2 +- postlfs/security/{cacerts.xml => make-ca.xml} | 30 +++++++++---------- postlfs/security/nss.xml | 2 +- postlfs/security/p11-kit.xml | 2 +- postlfs/security/security.xml | 2 +- x/lib/qt5.xml | 2 +- xsoft/graphweb/chromium.xml | 2 +- 17 files changed, 42 insertions(+), 43 deletions(-) rename postlfs/security/{cacerts.xml => make-ca.xml} (91%) diff --git a/general/genlib/qca.xml b/general/genlib/qca.xml index 3ee57b7861..0f8e4cc722 100644 --- a/general/genlib/qca.xml +++ b/general/genlib/qca.xml @@ -62,7 +62,7 @@ Required - , + , , , and diff --git a/general/prog/mercurial.xml b/general/prog/mercurial.xml index 771db84bc2..5bf3ac70a0 100644 --- a/general/prog/mercurial.xml +++ b/general/prog/mercurial.xml @@ -198,7 +198,7 @@ EOF disabled extensions, and more information, such as how to enable or disable them using configuration files. - If you have installed the and want + If you have installed and want Mercurial to use them, as the root user, issue: diff --git a/general/prog/ojdk-conf.xml b/general/prog/ojdk-conf.xml index 259f08ec3d..b666e99b35 100644 --- a/general/prog/ojdk-conf.xml +++ b/general/prog/ojdk-conf.xml @@ -75,10 +75,8 @@ mkdir -p /var/cache/man mandb -c /opt/jdk/man - The installation of the JRE Certificate Authority Certificates (cacerts) + The installation of the JRE certificate authority bundle is described in the section. - If you are using the binary version, those certificates may already be - installed. diff --git a/general/prog/openjdk.xml b/general/prog/openjdk.xml index d804db3bb4..c0ea029616 100644 --- a/general/prog/openjdk.xml +++ b/general/prog/openjdk.xml @@ -191,7 +191,7 @@ Recommended - , + , , , , @@ -450,8 +450,8 @@ EOF --with-cacerts-file=/etc/ssl/java/cacerts.jks: Specifies where to find a cacerts file, - /etc/ssl/java/cacerts on a BLFS - system. Otherwise, an empty one is created. You can use the + /etc/ssl/java/ on a BLFS system. Otherwise, an empty + one is created. You can use the /usr/sbin/make-ca --force command to generate it, once you have installed the Java binaries. @@ -501,13 +501,14 @@ EOF CA certificates. Those certificates are located in a file named /etc/ssl/java/cacerts.jks. That file should be generated using the system PKI trust store. The instructions - on the page should be used to update the file - located in /etc/ssl/java. Setup a symlink in the - default location as the root - user: + on the page should be used to update the file + located in /etc/ssl/java. Run the conversion and + setup a symlink in the default location as the root user: -ln -sfv /etc/ssl/java/cacerts.jks /opt/jdk/lib/security/cacerts +/usr/sbin/make-ca --force && +ln -sfv /etc/ssl/java/cacerts.jks /opt/jdk/lib/security/cacerts Use the following commands to check if the cacerts diff --git a/general/sysutils/systemd.xml b/general/sysutils/systemd.xml index 21d2bbf94f..7a79d77139 100644 --- a/general/sysutils/systemd.xml +++ b/general/sysutils/systemd.xml @@ -78,7 +78,7 @@ Optional - , + , , , diff --git a/gnome/platform/rest.xml b/gnome/platform/rest.xml index 385bb69a53..ed264f9262 100644 --- a/gnome/platform/rest.xml +++ b/gnome/platform/rest.xml @@ -76,7 +76,7 @@ Required - and + and @@ -125,7 +125,7 @@ make --with-ca-certificates=/etc/ssl/ca-bundle.crt: This - switch sets the location of the BLFS bundle. + switch sets the location of the BLFS certificate authority bundle. Recommended - (runtime) + (runtime) Optional @@ -237,7 +237,7 @@ cp -v -R docs/* /usr/share/doc/curl-&curl-version; --with-ca-path=/etc/ssl/certs: This - switch sets the location of the BLFS . + switch sets the location of the BLFS Certificate Authority store. diff --git a/networking/netlibs/glib-networking.xml b/networking/netlibs/glib-networking.xml index 8f551a072c..5ece28a121 100644 --- a/networking/netlibs/glib-networking.xml +++ b/networking/netlibs/glib-networking.xml @@ -83,7 +83,7 @@ Recommended - and + and diff --git a/networking/netlibs/ldns.xml b/networking/netlibs/ldns.xml index 9acdcc4d2f..7d38061aba 100644 --- a/networking/netlibs/ldns.xml +++ b/networking/netlibs/ldns.xml @@ -81,7 +81,7 @@ --> Optional - and + and (for example programs), and (for Python bindings), and diff --git a/networking/netprogs/wget.xml b/networking/netprogs/wget.xml index e5fca8bdce..8a454e0ce3 100644 --- a/networking/netprogs/wget.xml +++ b/networking/netprogs/wget.xml @@ -76,7 +76,7 @@ Recommended - (runtime) + (runtime) Optional @@ -164,7 +164,7 @@ make diff --git a/x/lib/qt5.xml b/x/lib/qt5.xml index 8d35065572..87070356db 100644 --- a/x/lib/qt5.xml +++ b/x/lib/qt5.xml @@ -88,7 +88,7 @@ Recommended , - , + , , , (QtMultimedia backend), diff --git a/xsoft/graphweb/chromium.xml b/xsoft/graphweb/chromium.xml index b281f8d52b..df53978300 100644 --- a/xsoft/graphweb/chromium.xml +++ b/xsoft/graphweb/chromium.xml @@ -135,7 +135,7 @@ Recommended - (runtime), + (runtime), , ,