Ignore:
Timestamp:
01/24/2016 08:01:02 AM (8 years ago)
Author:
DJ Lucas <dj@…>
Branches:
systemd-13485
Children:
f587275
Parents:
54789f3
Message:

Merge Chapter 9 changes from trunk.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@16835 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:
1 edited

Legend:

Unmodified
Added
Removed

  • general/genlib/qca-systemd.xml

    r54789f3 r83f6c770  
    55  %general-entities;
    66
    7   <!ENTITY qca-download-http "http://delta.affinix.com/download/qca/2.0/qca-&qca-version;.tar.gz">
     7  <!ENTITY qca-download-http "http://download.kde.org/stable/qca/&qca-version;/src/qca-&qca-version;.tar.xz">
    88  <!ENTITY qca-download-ftp  " ">
    9   <!ENTITY qca-md5sum        "c2b00c732036244701bae4853a2101cf">
    10   <!ENTITY qca-size          "956 KB">
    11   <!ENTITY qca-buildsize     "33 MB">
    12   <!ENTITY qca-time          "1.5 SBU">
     9  <!ENTITY qca-md5sum        "657cc701316600199199a6b6cb2c73c9">
     10  <!ENTITY qca-size          "676 KB">
     11  <!ENTITY qca-buildsize     "28 MB">
     12  <!ENTITY qca-time          "1.2 SBU (additional 0.3 SBU for the tests)">
    1313]>
    1414
    15 <sect1 id="qca" xreflabel="Qca-&qca-version;">
     15<sect1 id="qca" xreflabel="qca-&qca-version;">
    1616  <?dbhtml filename="qca.html"?>
    1717
    … …  
    2424
    2525  <indexterm zone="qca">
    26     <primary sortas="a-Qca">Qca</primary>
     26    <primary sortas="a-qca">qca</primary>
    2727  </indexterm>
    2828
    … …  
    3030    <title>Introduction to Qca</title>
    3131
    32     <para>
    33       <application>Qca</application> aims to provide a straightforward
    34       and cross-platform crypto API, using <application>Qt</application>
    35       datatypes and conventions. <application>Qca</application> separates
    36       the API from the implementation, using plugins known as Providers.
    37     </para>
     32    <para><application>Qca</application> aims to provide a straightforward
     33    and cross-platform crypto API, using <application>Qt</application> datatypes
     34    and conventions. <application>Qca</application> separates the API from
     35    the implementation, using plugins known as Providers.</para>
    3836
    39     &lfs77_checked;
     37    &lfs78_checked;
    4038
    4139    <bridgehead renderas="sect3">Package Information</bridgehead>
    4240    <itemizedlist spacing="compact">
    4341      <listitem>
    44         <para>
    45           Download (HTTP): <ulink url="&qca-download-http;"/>
    46         </para>
     42        <para>Download (HTTP): <ulink url="&qca-download-http;"/></para>
    4743      </listitem>
    4844      <listitem>
    49         <para>
    50           Download (FTP): <ulink url="&qca-download-ftp;"/>
    51         </para>
     45        <para>Download (FTP): <ulink url="&qca-download-ftp;"/></para>
    5246      </listitem>
    5347      <listitem>
    54         <para>
    55           Download MD5 sum: &qca-md5sum;
    56         </para>
     48        <para>Download MD5 sum: &qca-md5sum;</para>
    5749      </listitem>
    5850      <listitem>
    59         <para>
    60           Download size: &qca-size;
    61         </para>
     51        <para>Download size: &qca-size;</para>
    6252      </listitem>
    6353      <listitem>
    64         <para>
    65           Estimated disk space required: &qca-buildsize;
    66         </para>
     54        <para>Estimated disk space required: &qca-buildsize;</para>
    6755      </listitem>
    6856      <listitem>
    69         <para>
    70           Estimated build time: &qca-time;
    71         </para>
     57        <para>Estimated build time: &qca-time;</para>
    7258      </listitem>
    7359    </itemizedlist>
    … …  
    7763    <bridgehead renderas="sect4">Required</bridgehead>
    7864    <para role="required">
    79       <xref linkend="cmake"/> and
    80       <xref linkend="qt4"/>
    81     </para>
    82 
    83     <bridgehead renderas="sect4">Recommended</bridgehead>
    84     <para role="recommended">
    85       <xref linkend="cacerts"/>
     65    <xref linkend="cacerts"/>,
     66    <xref linkend="cmake"/>,
     67    <xref linkend="qt4"/> or <xref linkend="qt5"/>, and
     68    <xref linkend="which"/>
    8669    </para>
    8770
    8871    <bridgehead renderas="sect4">Optional</bridgehead>
    89     <para role="optional">
    90       <xref linkend="cyrus-sasl"/>,
    91       <xref linkend="gnupg2"/>,
    92       <xref linkend="libgcrypt"/>,
    93       <xref linkend="nss"/>,
    94       <xref linkend="openssl"/>,
    95       <xref linkend="qt5"/>,
    96       <ulink url="http://botan.randombit.net/">Botan</ulink> and
    97       <ulink url="https://github.com/OpenSC/pkcs11-helper">pkcs11-helper</ulink>
     72    <para role="Optional">
     73    <xref linkend="cyrus-sasl"/>,
     74    <xref linkend="gnupg2"/>,
     75    <xref linkend="libgcrypt"/>,
     76    <xref linkend="libgpg-error"/>,
     77    <xref linkend="nss"/>,
     78    <xref linkend="nspr"/>,
     79    <xref linkend="openssl"/>,
     80    <xref linkend="p11-kit"/>,
     81    <xref linkend="doxygen"/>, and
     82    <xref linkend="which"/>
    9883    </para>
    9984
    100     <note>
    101       <para>
    102         Even though this package can be built against
    103         <application>Qt5</application>, the instructions below don't
    104         cover such installation because the changes needed to the
    105         instructions below are too invasive. If you need
    106         <application>Qt5</application> version of the library, check
    107         the "KDE Frameworks 5" chapter for instructions.
    108       </para>
    109     </note>
     85    <para condition="html" role="usernotes">User Notes:
     86    <ulink url="&blfs-wiki;/qca"/></para>
    11087
    111     <para condition="html" role="usernotes">User Notes:
    112       <ulink url="&blfs-wiki;/qca"/>
    113     </para>
    11488  </sect2>
    11589
    … …  
    11791    <title>Installation of Qca</title>
    11892
    119     <para>
    120       First, silence a lot of warnings caused by using the latest toolchain
    121       by running the following command:
    122     </para>
     93    <para>If desired, remove a lot of irritating warnings when building:</para>
    12394
    124 <screen><userinput>sed -i "/BSD_SOURCE/d" CMakeLists.txt</userinput></screen>
     95<screen><userinput>sed -i 's/BSD/DEFAULT/' CMakeLists.txt</userinput></screen>
    12596
    126     <para>
    127       Install <application>Qca</application> by running the following
    128       commands:
    129     </para>
     97    <para>Install <application>Qca</application> by running the following
     98    commands:</para>
    13099
    131100<screen><userinput>mkdir build &amp;&amp;
    132101cd    build &amp;&amp;
    133102
    134 cmake -DCMAKE_INSTALL_PREFIX=/usr \
    135       -DCMAKE_BUILD_TYPE=Release  \
    136       -DQT4_BUILD=ON              \
    137       -DQCA_DOC_INSTALL_DIR=/usr/share/doc/qca-&qca-version;            \
    138       -DQCA_FEATURE_INSTALL_DIR=/usr/share/qt4/mkspecs/features \
    139       -DQCA_INCLUDE_INSTALL_DIR=/usr/include/qt4                \
    140       -DQCA_PRIVATE_INCLUDE_INSTALL_DIR=/usr/include/qt4        \
    141       -DQCA_PLUGINS_INSTALL_DIR=/usr/lib/qt4/plugins            \
    142       -Wno-dev .. &amp;&amp;
     103cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir;            \
     104      -DCMAKE_BUILD_TYPE=Release                \
     105      -DQT4_BUILD=ON                            \
     106      -DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man \
     107      ..                                        &amp;&amp;
    143108
    144109make</userinput></screen>
    145110
    146     <para>
    147       To test the results, issue <command>make test</command>.
    148     </para>
     111    <para>To test the results, issue <command>make test</command>.</para>
    149112
    150     <para>
    151       Now, as the <systemitem class="username">root</systemitem> user:
    152     </para>
     113    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
    153114
    154115<screen role="root"><userinput>make install</userinput></screen>
    155 
    156     <para>
    157       If <application>Qt4</application> isn't installed in
    158       <filename class="directory">/usr</filename>, ensure
    159       it can properly find the modules installed by this
    160       package by running the following commands as the
    161       <systemitem class="username">root</systemitem> user:
    162     </para>
    163 
    164 <screen role="root"><userinput>if [[ ${QT4DIR} != "/usr" ]]
    165 then
    166    ln -sfv /usr/include/qt4/QtCrypto                  \
    167            ${QT4DIR}/include/qt4/                     &amp;&amp;
    168    ln -sfv /usr/share/qt4/mkspecs/features/crypto.prf \
    169            ${QT4DIR}/share/qt4/mkspecs/features/      &amp;&amp;
    170 
    171    install -v -dm755 ${QT4DIR}/lib/qt4/plugins/crypto &amp;&amp;
    172 
    173    for file in /usr/lib/qt4/plugins/crypto/*
    174    do
    175        ln -sfv ${file} ${QT4DIR}/lib/qt4/plugins/crypto/
    176    done &amp;&amp;
    177 
    178    unset file
    179 fi</userinput></screen>
    180 
    181     <note>
    182       <para>
    183         If you upgrade <application>Qt4</application> per BLFS
    184         instructions, make sure you re-run the commands above.
    185       </para>
    186     </note>
    187116
    188117  </sect2>
    … …  
    191120    <title>Command Explanations</title>
    192121
    193     <para>
    194       <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
    195       to apply higher level of the compiler optimizations.
    196     </para>
     122    <para><parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
     123    used to apply a higher level of compiler optimizations.</para>
    197124
    198     <para>
    199       <parameter>-DQT4_BUILD=ON</parameter>: This switch is used to ensure
    200       that  <application>Qt4</application> version of the library is built
    201       even if <application>Qt5</application> is present.
    202     </para>
     125    <para><parameter>-DQT4_BUILD=ON</parameter>: This switch is used to force
     126    building with Qt4 even if Qt5 is found. There are no packages in BLFS
     127    that use the Qt5 version of Qca.</para>
    203128
    204     <para>
    205       <parameter>-DQCA_*_INSTALL_DIR=...</parameter>: These switches are used
    206       to ensure that files depending on the <application>Qt4</application>
    207       installation prefix are installed in the correct locations.
    208     </para>
     129    <para><parameter>-DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man</parameter>:
     130    Install the qca man page in the normal location.</para>
    209131
    210132  </sect2>
    … …  
    219141
    220142      <seglistitem>
     143        <seg>mozcerts and qcatool (if building with Qt5, the binaries have a -qt5 suffix)</seg>
     144        <seg>libqca.so (libqca-qt5.so if building with Qt5) and plugins at &qt4-dir;/lib/qca/crypto</seg>
    221145        <seg>
    222           mozcerts and qcatool
    223         </seg>
    224         <seg>
    225           libqca.so
    226         </seg>
    227         <seg>
    228           /usr/include/qt4/QtCrypto,
    229           /usr/lib/cmake/Qca,
    230           /usr/lib/qt4/plugins/crypto and,
    231           depending on the <application>Qt4</application>
    232           installation prefix,
    233           $QT4DIR/include/qt4/QtCrypto and
    234           $QT4DIR/lib/qt4/plugins/crypto
     146          &qt4-dir;/include/QtCrypto (or &qt5-dir;/include/Qca-qt5),
     147          &qt4-dir;/lib/cmake/Qca (or &qt5-dir;/lib/cmake/Qca-qt5) and
     148          &qt4-dir;/lib/qca (or &qt5-dir;/lib/qca-qt5)
    235149        </seg>
    236150      </seglistitem>
    … …  
    245159        <term><command>mozcerts</command></term>
    246160        <listitem>
    247           <para>
    248             is a command line tool for converting certdata.txt into
    249             outfile.pem files.
    250           </para>
     161          <para>is a command line tool for converting certdata.txt into
     162          outfile.pem files.</para>
    251163          <indexterm zone="qca mozcerts">
    252164            <primary sortas="b-mozcerts">mozcerts</primary>
    … …  
    258170        <term><command>qcatool</command></term>
    259171        <listitem>
    260           <para>
    261             is a command line tool for performing various cryptographic
    262             operations with <application>Qca</application>.
    263           </para>
     172          <para>is a command line tool for performing various cryptographic
     173          operations with Qca.</para>
    264174          <indexterm zone="qca qcatool">
    265175            <primary sortas="b-qcatool">qcatool</primary>
    … …  
    269179
    270180      <varlistentry id="libqca">
    271         <term><filename class="libraryfile">libqca.so</filename></term>
     181        <term><filename class='libraryfile'>libqca.so</filename></term>
    272182        <listitem>
    273           <para>
    274             is the Qt Cryptography Architecture (Qca) library.
    275           </para>
     183          <para>is the Qt Cryptography Architecture (Qca) library.</para>
    276184          <indexterm zone="qca libqca">
    277185            <primary sortas="c-libqca">libqca.so</primary>
Note: See TracChangeset for help on using the changeset viewer.