Changeset 615961f

Timestamp:

11/10/2014 03:11:34 PM (9 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, 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:

2bb31ce

Parents:

0f1ea40

Message:

Update to qca-2.1.0.

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

Files:

• general.ent (modified) (2 diffs)
• general/genlib/qca.xml (modified) (6 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)

general.ent

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

general/genlib/qca.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY qca-download-http "http://delta.affinix.com/download/qca/2.0/qca-&qca-version;.tar.bz2">
+  <!ENTITY qca-download-http "http://delta.affinix.com/download/qca/2.0/qca-&qca-version;.tar.gz">
   <!ENTITY qca-download-ftp  " ">
-  <!ENTITY qca-md5sum        "fc15bd4da22b8096c51fcfe52d2fa309">
-  <!ENTITY qca-size          "4.3 MB">
-  <!ENTITY qca-buildsize     "110 MB">
-  <!ENTITY qca-time          "2.2 SBU">
+  <!ENTITY qca-md5sum        "c2b00c732036244701bae4853a2101cf">
+  <!ENTITY qca-size          "956 KB">
+  <!ENTITY qca-buildsize     "30 MB">
+  <!ENTITY qca-time          "1.2 SBU (additional 0.3 SBU for the tests)">
 ]>
 
@@ -63 +63 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+    <xref linkend="cacerts"/>,
+    <xref linkend="cmake"/>,
     <xref linkend="qt4"/> and
+    <xref linkend="which"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="Optional">
+    <xref linkend="cyrus-sasl"/>,
+    <xref linkend="gnupg2"/>,
+    <xref linkend="libgcrypt"/>,
+    <xref linkend="libgpg-error"/>,
+    <xref linkend="nss"/>,
+    <xref linkend="nspr"/>,
+    <xref linkend="openssl"/>,
+    <xref linkend="p11-kit"/>,
+    <xref linkend="qt5"/>,
+    <xref linkend="doxygen"/>, and
     <xref linkend="which"/>
     </para>
@@ -78 +95 @@
     commands:</para>
 
-<screen><userinput>sed -i '217s@set@this->set@' src/botantools/botan/botan/secmem.h &amp;&amp;
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
 
-./configure --prefix=/usr            \
-                 --no-separate-debug-info \
-            --certstore-path=/etc/ssl/ca-bundle.crt &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
+      -DCMAKE_BUILD_TYPE=Release     \
+      -DQT4_BUILD=ON                 \
+      ..                             &amp;&amp;
+
 make</userinput></screen>
 
@@ -96 +116 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i '217s@set@...</command>: This sed fixes compiling with
-    <application>GCC</application> 4.7 and newer. It is safe to omit when compiling
-    with older <application>GCC</application> versions.</para>
+    <para><parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
+    used to apply a higher level of compiler optimizations.</para>
 
-    <para><option>--certstore-path=/etc/ssl/ca-bundle.crt</option>: Causes
-    the build to use the system-installed CA Certificates instead of a bundled
-    copy.</para>
-  
-    <para><option>--no-separate-debug-info</option>: Prevents installation
-    of a separate library and program file with debug information.</para>
+    <para><parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
+    used to force building with Qt4 even if Qt5 is found.</para>
 
   </sect2>
@@ -118 +133 @@
 
       <seglistitem>
-        <seg>qcatool2</seg>
-        <seg>libqca.so</seg>
-        <seg>&qt4-dir;/include/QtCrypto</seg>
+        <seg>mozcerts and qcatool</seg>
+        <seg>libqca.so and plugins at &qt4-dir;/lib/qca/crypto</seg>
+        <seg>
+          &qt4-dir;/include/QtCrypto,
+          &qt4-dir;/lib/cmake/Qca and
+          &qt4-dir;/lib/qca
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -129 +148 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="qcatool2">
-        <term><command>qcatool2</command></term>
+      <varlistentry id="mozcerts">
+        <term><command>mozcerts</command></term>
+        <listitem>
+          <para>is a command line tool for converting certdata.txt into
+          outfile.pem files.</para>
+          <indexterm zone="qca mozcerts">
+            <primary sortas="b-mozcerts">mozcerts</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qcatool">
+        <term><command>qcatool</command></term>
         <listitem>
           <para>is a command line tool for performing various cryptographic
-          operations with Qca.</para>
-          <indexterm zone="qca qcatool2">
-            <primary sortas="b-qcatool2">qcatool2</primary>
+          operations with Qca.</para>
+          <indexterm zone="qca qcatool">
+            <primary sortas="b-qcatool">qcatool</primary>
           </indexterm>
         </listitem>

introduction/welcome/changelog.xml

@@ -46 +46 @@
 
     <listitem>
+      <para>November 10th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to qca-2.1.0.  Fixes
+          <ulink url="&blfs-ticket-root;5781">#5781</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 9th, 2014</para>
       <itemizedlist>

packages.ent

@@ -142 +142 @@
 <!ENTITY pth-version                  "2.0.7">
 <!ENTITY ptlib-version                "2.10.10">
-<!ENTITY qca-version                  "2.0.3">
+<!ENTITY qca-version                  "2.1.0">
 <!ENTITY qjson-version                "0.8.1">
 <!ENTITY sbc-version                  "1.3">