Changeset b51c6f5c

Timestamp:

12/05/2018 09:39:03 PM (5 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.4, 9.0, 9.1, bdubbs/svn, elogind, 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:

defb1338

Parents:

e1234ec5

Message:

Archive openssl10 and add qca patch.

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

Files:

• archive/openssl10.xml (moved) (moved from postlfs/security/openssl10.xml )
• general/genlib/qca.xml (modified) (5 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• postlfs/security/security.xml (modified) (1 diff)

general/genlib/qca.xml

@@ -56 +56 @@
       <listitem>
         <para>Estimated build time: &qca-time;</para>
+      </listitem>
+    </itemizedlist>
+    
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/qca-&qca-version;-openssl-1.patch"/>
+        </para>
       </listitem>
     </itemizedlist>
@@ -77 +87 @@
     <xref linkend="nss"/>,
     <xref linkend="nspr"/>,
-    <xref linkend="openssl10"/>,
     <xref linkend="p11-kit"/>,
     <xref linkend="doxygen"/>, and
@@ -90 +99 @@
   <sect2 role="installation">
     <title>Installation of Qca</title>
+
+    <para>Use <application>openssl-1.1</application>:</para>
+
+<screen><userinput>patch -Np1 -i ../qca-2.1.3-openssl-1.patch</userinput></screen>
 
     <para>Fix the location of the CA certificates:</para>
@@ -111 +124 @@
 make</userinput></screen>
 
-    <para>To test the results, issue <command>make test</command>.</para>
+    <para>To test the results, issue <command>make test</command>. One
+    test is known to fail.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -140 +154 @@
       <seglistitem>
         <seg>mozcerts-qt5 and qcatool-qt5</seg>
-        <seg>libqca-qt5.so</seg>
+        <seg>
+          libqca-qt5.so,
+          libqca-cyrus-sasl.so,
+          libqca-gcrypt.so,
+          libqca-gnupg.so,
+          libqca-logger.so,
+          libqca-nss.so,
+          libqca-ossl.so, and
+          libqca-softstore.so
+        </seg>
         <seg>
           &qt5-dir;/include/Qca-qt5,

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Archive openssl10 and add qca patch. Fixes
+          <ulink url="&blfs-ticket-root;11407">#11407</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[timtas] - Update to thunderbird-60.3.2. Fixes
           <ulink url="&blfs-ticket-root;11394">#11394</ulink>.</para>

postlfs/security/security.xml

@@ -67 +67 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nss.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssh.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssl.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssl10.xml"/>
+<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssl.xml"/> -->
+<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssl10.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="p11-kit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit.xml"/>