Changeset 40f85060 for postlfs


Ignore:
Timestamp:
02/06/2016 05:34:31 AM (8 years ago)
Author:
DJ Lucas <dj@…>
Branches:
systemd-13485
Children:
64d8aebd
Parents:
421f60a
Message:

Update from trunk r16902 and r16905.

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • postlfs/security/gnutls.xml

    r421f60a r40f85060  
    77  <!ENTITY gnutls-download-http " ">
    88  <!ENTITY gnutls-download-ftp  "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-&gnutls-version;.tar.xz">
    9   <!ENTITY gnutls-md5sum        "a26e6dd8d5ad92016e3f068795b89624">
     9  <!ENTITY gnutls-md5sum        "1b3b6d55d0e2b6d01a54f53129f1da9b">
    1010  <!ENTITY gnutls-size          "6.4 MB">
    11   <!ENTITY gnutls-buildsize     "128 MB (144 MB with tests)">
    12   <!ENTITY gnutls-time          "0.8 SBU (4.3 SBU with tests)">
     11  <!ENTITY gnutls-buildsize     "129 MB (144 MB, with tests)">
     12  <!ENTITY gnutls-time          "0.8 SBU (3.8 SBU, with tests)">
    1313]>
    1414
     
    111111      <xref linkend="libidn"/>,
    112112      <xref linkend="texlive"/> or <xref linkend="tl-installer"/>,
    113       <xref linkend="unbound"/> (to build the DANE library), 
     113      <xref linkend="unbound"/> (to build the DANE library),
    114114      <xref linkend="valgrind"/> (used during the test suite),
    115       <ulink url="http://ftp.gnu.org/gnu/autogen/">Autogen</ulink>, and
     115      <ulink url="http://ftp.gnu.org/gnu/autogen/">autogen</ulink>,
     116      <ulink url="http://ftp.debian.org/debian/pool/main/d/datefudge/">datefudge</ulink> (used during the test suite), and
    116117      <ulink url="http://sourceforge.net/projects/trousers/files/trousers/">Trousers</ulink> (Trusted Platform Module support)
    117118    </para>
     
    137138
    138139<screen><userinput>./configure --prefix=/usr \
    139                --with-default-trust-store-file=/etc/ssl/ca-bundle.crt &amp;&amp;
     140            --with-default-trust-store-file=/etc/ssl/ca-bundle.crt &amp;&amp;
    140141make</userinput></screen>
    141142
    142143    <para>
    143       To test the results, issue: <command>make check</command>.
    144       If a prior version of <application>GnuTLS</application> has been installed, some
     144      To test the results, issue: <command>make check</command>.  If a prior
     145      version of <application>GnuTLS</application> has been installed, some
    145146      tests may fail. If <filename>/usr/lib/libgnutls.so</filename> is removed,
    146       all tests sould pass. The installation procedure restores <filename>libgnutls.so</filename>.
     147      all tests should pass and the install procedure restores
     148      <filename>libgnutls.so</filename>.
    147149    </para>
    148150
     
    170172    <title>Command Explanations</title>
    171173
     174    <para>
     175      <parameter>--with-default-trust-store-file=/etc/ssl/ca-bundle.crt</parameter>:
     176      This switch tells <command>configure</command> where to find the
     177      CA Certificates.
     178    </para>
     179
    172180    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    173181      href="../../xincludes/gtk-doc-rebuild.xml"/>
    174182
    175183    <para>
    176       <option>--with-default-trust-store-file=/etc/ssl/ca-bundle.crt</option>:
    177       This switch tells the configure script where to find the
    178       <xref linkend="cacerts"/>.
    179     </para>
    180 
    181     <para>
    182       <option>--enable-openssl-compatibility</option>: Use this switch if you
    183       want to build the OpenSSL compatibility library.
    184     </para>
    185 
    186     <para>
    187       <option>--without-p11-kit</option>: Use this switch if you have not
     184      <option>--enable-openssl-compatibility</option>:
     185      Use this switch if you wish to build the OpenSSL compatibility library.
     186    </para>
     187
     188    <para>
     189      <option>--without-p11-kit</option>: use this switch if you have not
    188190      installed <application>p11-kit</application>.
    189191    </para>
     
    201203      <seglistitem>
    202204        <seg>
    203           certtool,
    204           crywrap,
    205           danetool,
    206           gnutls-cli,
    207           gnutls-cli-debug,
    208           gnutls-serv,
    209           ocsptool,
    210           p11tool,
    211           psktool,
    212           and srptool
     205          certtool, crywrap, danetool, gnutls-cli, gnutls-cli-debug,
     206          gnutls-serv, ocsptool, p11tool, psktool, and srptool
    213207        </seg>
    214208        <seg>
    215           libgnutls.so,
    216           libgnutls-dane.so,
    217           libgnutlsxx.so, and
    218           guile-gnutls-v-2.so (<application>Guile</application> Module)
     209          libgnutls.so, libgnutls-dane.so, libgnutlsxx.so, and
     210          /usr/lib/guile/2.0/guile-gnutls-v-2.so
    219211        </seg>
    220212        <seg>
    221           /usr/include/gnutls,
    222           /usr/share/gtk-doc/html/gnutls, and
    223           /usr/share/guile/site/gnutls
     213          /usr/{include,share/gtk-doc/html,share/guile/site}/gnutls
    224214        </seg>
    225215      </seglistitem>
Note: See TracChangeset for help on using the changeset viewer.