[blfs-book] r10443 - in trunk/BOOK: . general/graphlib gnome/core introduction/welcome postlfs/security

krejzi at linuxfromscratch.org krejzi at linuxfromscratch.org
Mon Jul 23 06:36:05 PDT 2012


Author: krejzi
Date: 2012-07-23 07:35:55 -0600 (Mon, 23 Jul 2012)
New Revision: 10443

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/graphlib/fontconfig.xml
   trunk/BOOK/general/graphlib/freetype2.xml
   trunk/BOOK/gnome/core/cantarell-fonts.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/postlfs/security/p11-kit.xml
Log:
FreeType 2.4.10, Fontconfig 2.10.0 and p11-kit 0.13.

Modified: trunk/BOOK/general/graphlib/fontconfig.xml
===================================================================
--- trunk/BOOK/general/graphlib/fontconfig.xml	2012-07-22 01:39:04 UTC (rev 10442)
+++ trunk/BOOK/general/graphlib/fontconfig.xml	2012-07-23 13:35:55 UTC (rev 10443)
@@ -6,10 +6,10 @@
 
   <!ENTITY fontconfig-download-http "http://fontconfig.org/release/fontconfig-&fontconfig-version;.tar.gz">
   <!ENTITY fontconfig-download-ftp  " ">
-  <!ENTITY fontconfig-md5sum        "26c83855ed256b5c032baae032fadc4f">
-  <!ENTITY fontconfig-size          "1.7 MB">
-  <!ENTITY fontconfig-buildsize     "20 MB">
-  <!ENTITY fontconfig-time          "0.3 SBU">
+  <!ENTITY fontconfig-md5sum        "3950e82cf5885b41cba8a2bf466aa6f9">
+  <!ENTITY fontconfig-size          "1.4 MB">
+  <!ENTITY fontconfig-buildsize     "16 MB">
+  <!ENTITY fontconfig-time          "0.4 SBU">
 ]>
 
 <sect1 id="fontconfig" xreflabel="Fontconfig-&fontconfig-version;">
@@ -29,87 +29,109 @@
   <sect2 role="package">
     <title>Introduction to Fontconfig</title>
 
-    <para>The <application>Fontconfig</application> package is a library
-    for configuring and customizing font access.</para>
+    <para>
+      The <application>Fontconfig</application> package contains
+      a library and support programs used for configuring and
+      customizing font access.
+    </para>
 
     &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&fontconfig-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&fontconfig-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&fontconfig-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&fontconfig-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &fontconfig-md5sum;</para>
+        <para>
+          Download MD5 sum: &fontconfig-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &fontconfig-size;</para>
+        <para>
+          Download size: &fontconfig-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &fontconfig-buildsize;</para>
+        <para>
+          Estimated disk space required: &fontconfig-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &fontconfig-time;</para>
+        <para>
+          Estimated build time: &fontconfig-time;
+        </para>
       </listitem>
     </itemizedlist>
 
-    <note>
-      <para>The numbering system of <application>Fontconfig</application> is
-      unusual. The beta versions of the package are numbered with a 9x in the
-      last portion of the release number. This means that 2.6.92 is a beta
-      release and the most current release is of the form
-      &fontconfig-version;</para>
-    </note>
-
     <bridgehead renderas="sect3">Fontconfig Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="freetype2"/> and either
-    <xref linkend="expat"/> or <xref linkend="libxml2"/> <!-- (requires
-    <xref linkend="pkgconfig"/>) --> </para>
+    <para role="required">
+      <xref linkend="freetype2"/> and either
+      <xref linkend="expat"/> or
+      <xref linkend="libxml2"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="docbook-utils"/></para>
+    <para role="optional">
+      <xref linkend="docbook-utils"/>
+    </para>
 
     <note>
-      <para>If you have <application>DocBook-utils</application> installed
-      and you remove the <parameter>--disable-docs</parameter> parameter from
-      the <command>configure</command> command below, you must have
-      <xref linkend="perl-sgmlspm"/> installed also, or the 
-      <application>Fontconfig</application> build will fail.</para>
+      <para>
+        If you have <application>DocBook Utils</application> installed and
+        you remove the <parameter>--disable-docs</parameter> parameter from
+        the <command>configure</command> command below, you must have
+        <xref linkend="perl-sgmlspm"/> installed also, or the 
+        <application>Fontconfig</application> build will fail.
+      </para>
     </note>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url='&blfs-wiki;/Fontconfig'/></para>
-
+      <ulink url='&blfs-wiki;/Fontconfig'/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of Fontconfig</title>
 
-    <para>Install <application>Fontconfig</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Fontconfig</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
+            --docdir=/usr/share/doc/fontconfig-&fontconfig-version; \
             --disable-docs \
-            --docdir=/usr/share/doc/fontconfig-&fontconfig-version; &&
+            --disable-static &&
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>If you did not remove the <parameter>--disable-docs</parameter>
-    parameter from the <command>configure</command> command, you can install
-    the pre-generated documentation by using the following commands as the
-    <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      If you did not remove the <parameter>--disable-docs</parameter>
+      parameter from the <command>configure</command> command, you can install
+      the pre-generated documentation by using the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>install -v -m755 \
     -d /usr/share/{man/man{3,5},doc/fontconfig-&fontconfig-version;/fontconfig-devel} &&
@@ -126,21 +148,24 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><parameter>--localstatedir=/var</parameter>: This switch places
-    the system font cache files in <filename
-    class='directory'>/var/cache/fontconfig</filename>.</para>
+    <para>
+      <parameter>--docdir=/usr/share/doc/fontconfig-&fontconfig-version;</parameter>:
+      Though this parameter seems counter-intuitive following the preceding
+      parameter to the <command>configure</command> command, it is used so that
+      if the builder removes the <parameter>--disable-docs</parameter> parameter,
+      the documentation will be installed in a versioned directory name instead
+      of the default
+      <filename class='directory'>/usr/share/doc/fontconfig</filename>.
+    </para>
 
-    <para><parameter>--disable-docs</parameter>: This switch avoids building
-    the documentation (the release tarball includes pre-generated
-    documentation).</para>
+    <para>
+      <option>--disable-docs</option>: This switch avoids building the
+      documentation (the release tarball includes pre-generated
+      documentation).
+    </para>
 
-    <para><parameter>--with-docdir=/usr/share/doc/fontconfig-&fontconfig-version;</parameter>:
-    Though this parameter seems counter-intuitive following the preceding
-    parameter to the <command>configure</command> command, it is used so that
-    if the builder removes the <parameter>--disable-docs</parameter> parameter,
-    the documentation will be installed in a versioned directory name instead
-    of the default
-    <filename class='directory'>/usr/share/doc/fontconfig</filename>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
 
@@ -150,8 +175,13 @@
     <sect3 id="fontconfig-config">
       <title>Config Files</title>
 
-      <para><filename>/etc/fonts/*, /etc/fonts/conf.avail/*, and
-      /etc/fonts/conf.d/*</filename></para>
+      <para>
+        <filename>
+          /etc/fonts/*,
+          /etc/fonts/conf.d/* and
+          /usr/share/fontconfig/conf.avail/*
+        </filename>
+      </para>
 
       <indexterm zone="fontconfig fontconfig-config">
         <primary sortas="e-etc-fonts">/etc/fonts/*</primary>
@@ -162,7 +192,7 @@
       </indexterm>
 
       <indexterm zone="fontconfig fontconfig-config">
-        <primary sortas="e-etc-fonts-conf.avail">/etc/fonts/conf.avail/*</primary>
+        <primary sortas="e-usr-share-fontconfig-conf.avail">/usr/share/fontconfig/conf.avail/*</primary>
       </indexterm>
 
     </sect3>
@@ -170,17 +200,19 @@
     <sect3>
       <title>Configuration Information</title>
 
-      <para>The main configuration file for <application>Fontconfig</application>
-      is <filename>/etc/fonts/fonts.conf</filename>. Generally you do not want
-      to edit this file. It will also read <filename>/etc/fonts/local.conf</filename>
-      and any files in <filename class='directory'>/etc/fonts/conf.d</filename>.
-      To put a new font directory in the configuration, create
-      (or update) the <filename>/etc/fonts/local.conf</filename> file with your
-      local information or add a new file in
-      <filename class='directory'>/etc/fonts/conf.d</filename>. The default
-      location of fonts in <application>Fontconfig</application> is:</para>
+      <para>
+        The main configuration file for <application>Fontconfig</application> is
+        <filename>/etc/fonts/fonts.conf</filename>. Generally you do not want
+        to edit this file. It will also read <filename>/etc/fonts/local.conf</filename>
+        and any files in <filename class="directory">/etc/fonts/conf.d</filename>.
+        To put a new font directory in the configuration, create
+        (or update) the <filename>/etc/fonts/local.conf</filename> file with your
+        local information or add a new file in
+        <filename class="directory">/etc/fonts/conf.d</filename>. The default
+        location of fonts in <application>Fontconfig</application> is:
+      </para>
 
-      <itemizedlist spacing='compact'>
+      <itemizedlist spacing="compact">
         <listitem>
           <para>/usr/share/fonts</para>
         </listitem>
@@ -189,13 +221,16 @@
         </listitem>
       </itemizedlist>
 
-      <para><application>Fontconfig</application> also ships many example
-      configuration files in the <filename
-      class='directory'>/etc/fonts/conf.avail</filename> directory. Symlinking
-      to specific files from <filename class='directory'>/etc/fonts/conf.d</filename>
-      will enable them. The default setup is generally good enough for most
-      users. See <filename>/etc/fonts/conf.avail/README</filename> for a
-      description of the configuration files.</para>
+      <para>
+        <application>Fontconfig</application> also ships many example
+        configuration files in the
+        <filename class="directory">/usr/share/fontconfig/conf.avail</filename>
+        directory. Symlinking specific files to
+        <filename class="directory">/etc/fonts/conf.d</filename>
+        will enable them. The default setup is generally good enough for
+        most users. See <filename>/etc/fonts/conf.d/README</filename>
+        for a description of the configuration files.
+      </para>
 
       <indexterm zone="fontconfig fontconfig-config">
         <primary sortas="g-usr-share-fonts">/usr/share/fonts</primary>
@@ -205,10 +240,10 @@
         <primary sortas="g-AA.fonts">~/.fonts</primary>
       </indexterm>
 
-      <para>More information about configuring
-      <application>Fontconfig</application> can be found in the user's manual
-      in <ulink
-      url="file:///usr/share/doc/fontconfig-&fontconfig-version;/fontconfig-user.html"/>.
+      <para>
+        More information about configuring <application>Fontconfig</application>
+        can be found in the user's manual in <ulink
+        url="file:///usr/share/doc/fontconfig-&fontconfig-version;/fontconfig-user.html"/>
       </para>
 
     </sect3>
@@ -224,11 +259,18 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>fc-cache, fc-cat, fc-list, fc-match, fc-query, and fc-scan</seg>
-        <seg>libfontconfig.{so,a}</seg>
-        <seg>/etc/fonts, /usr/include/fontconfig,
-        /usr/share/doc/fontconfig-&fontconfig-version; and
-        /var/cache/fontconfig</seg>
+        <seg>
+          fc-cache, fc-cat, fc-list, fc-match, fc-query and fc-scan
+        </seg>
+        <seg>
+          libfontconfig.so
+        </seg>
+        <seg>
+          /etc/fonts,
+          /usr/include/fontconfig,
+          /usr/share/doc/fontconfig-&fontconfig-version; and
+          /var/cache/fontconfig
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -240,7 +282,9 @@
       <varlistentry id="fc-cache">
         <term><command>fc-cache</command></term>
         <listitem>
-          <para>is used to create font information caches.</para>
+          <para>
+            is used to create font information caches.
+          </para>
           <indexterm zone="fontconfig fc-cache">
             <primary sortas="b-fc-cache">fc-cache</primary>
           </indexterm>
@@ -250,7 +294,9 @@
       <varlistentry id="fc-cat">
         <term><command>fc-cat</command></term>
         <listitem>
-          <para>is used to read font information caches.</para>
+          <para>
+            is used to read font information caches.
+          </para>
           <indexterm zone="fontconfig fc-cat">
             <primary sortas="b-fc-cat">fc-cat</primary>
           </indexterm>
@@ -260,7 +306,9 @@
       <varlistentry id="fc-list">
         <term><command>fc-list</command></term>
         <listitem>
-          <para>is used to create font lists.</para>
+          <para>
+            is used to create font lists.
+          </para>
           <indexterm zone="fontconfig fc-list">
             <primary sortas="b-fc-list">fc-list</primary>
           </indexterm>
@@ -270,8 +318,10 @@
       <varlistentry id="fc-match">
         <term><command>fc-match</command></term>
         <listitem>
-          <para>is used to match available fonts, or find fonts that match
-          a given pattern.</para>
+          <para>
+            is used to match available fonts, or find fonts that match
+            a given pattern.
+          </para>
           <indexterm zone="fontconfig fc-match">
             <primary sortas="b-fc-match">fc-match</primary>
           </indexterm>
@@ -281,7 +331,8 @@
       <varlistentry id="fc-query">
         <term><command>fc-query</command></term>
         <listitem>
-          <para>is used to query fonts files and print resulting patterns.
+          <para>
+            is used to query fonts files and print resulting patterns.
           </para>
           <indexterm zone="fontconfig fc-query">
             <primary sortas="b-fc-query">fc-query</primary>
@@ -292,8 +343,10 @@
       <varlistentry id="fc-scan">
         <term><command>fc-scan</command></term>
         <listitem>
-          <para>is used to scan font files and directories, and print resulting
-          patterns.</para>
+          <para>
+            is used to scan font files and directories, and print resulting
+            patterns.
+          </para>
           <indexterm zone="fontconfig fc-scan">
             <primary sortas="b-fc-scan">fc-scan</primary>
           </indexterm>
@@ -301,13 +354,15 @@
       </varlistentry>
 
       <varlistentry id="libfontconfig">
-        <term><filename class='libraryfile'>libfontconfig.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libfontconfig.so</filename></term>
         <listitem>
-          <para>contains functions used by the
-          <application>Fontconfig</application> programs and also by other
-          programs to configure or customize font access.</para>
+          <para>
+            contains functions used by the <application>Fontconfig</application>
+            programs and also by other programs to configure or customize font
+            access.
+          </para>
           <indexterm zone="fontconfig libfontconfig">
-            <primary sortas="c-libfontconfig">libfontconfig.{so,a}</primary>
+            <primary sortas="c-libfontconfig">libfontconfig.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>

Modified: trunk/BOOK/general/graphlib/freetype2.xml
===================================================================
--- trunk/BOOK/general/graphlib/freetype2.xml	2012-07-22 01:39:04 UTC (rev 10442)
+++ trunk/BOOK/general/graphlib/freetype2.xml	2012-07-23 13:35:55 UTC (rev 10443)
@@ -6,15 +6,15 @@
 
   <!ENTITY freetype2-download-http "&sourceforge-repo;/freetype/freetype-&freetype2-version;.tar.bz2">
   <!ENTITY freetype2-download-ftp  "&gentoo-ftp-repo;/freetype-&freetype2-version;.tar.bz2">
-  <!ENTITY freetype2-md5sum        "77a893dae81fd5b896632715ca041179">
+  <!ENTITY freetype2-md5sum        "13286702e9390a91661f980608adaff1">
   <!ENTITY freetype2-size          "1.5 MB">
-  <!ENTITY freetype2-buildsize     "41 MB (includes installing additional documentation)">
+  <!ENTITY freetype2-buildsize     "26 MB (includes installing additional documentation)">
   <!ENTITY freetype2-time          "0.3 SBU">
 
   <!ENTITY freetype2-doc-download-http "&sourceforge-repo;/freetype/freetype-doc-&freetype2-version;.tar.bz2">
   <!ENTITY freetype2-doc-download-ftp  "&gentoo-ftp-repo;/freetype-doc-&freetype2-version;.tar.bz2">
-  <!ENTITY freetype2-doc-md5sum        "39c0881d426db837aa6ff1856e44af86">
-  <!ENTITY freetype2-doc-size          "105 KB">
+  <!ENTITY freetype2-doc-md5sum        "2611613f2b1d0d846c6b33d49d4933ed">
+  <!ENTITY freetype2-doc-size          "108 KB">
 ]>
 
 <sect1 id="freetype2" xreflabel="FreeType-&freetype2-version;">
@@ -34,31 +34,45 @@
   <sect2 role="package">
     <title>Introduction to FreeType2</title>
 
-  <para>The <application>FreeType2</application> package
-  contains a library to allow applications to properly render
-  <application>TrueType</application> fonts.</para>
+    <para>
+      The <application>FreeType2</application> package contains
+      a library which allows applications to properly render
+      <application>TrueType</application> fonts.
+    </para>
 
     &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&freetype2-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&freetype2-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&freetype2-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&freetype2-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &freetype2-md5sum;</para>
+        <para>
+          Download MD5 sum: &freetype2-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &freetype2-size;</para>
+        <para>
+          Download size: &freetype2-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &freetype2-buildsize;</para>
+        <para>
+          Estimated disk space required: &freetype2-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &freetype2-time;</para>
+        <para>
+          Estimated build time: &freetype2-time;
+        </para>
       </listitem>
     </itemizedlist>
 
@@ -66,44 +80,60 @@
     <itemizedlist spacing="compact">
       <title>Additional Documentation</title>
       <listitem>
-        <para>Download (HTTP): <ulink url="&freetype2-doc-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&freetype2-doc-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&freetype2-doc-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&freetype2-doc-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &freetype2-doc-md5sum;</para>
+        <para>
+          Download MD5 sum: &freetype2-doc-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &freetype2-doc-size;</para>
+        <para>
+          Download size: &freetype2-doc-size;
+        </para>
       </listitem>
     </itemizedlist>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/freetype2"/></para>
-
+      <ulink url="&blfs-wiki;/freetype2"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of FreeType2</title>
 
-    <para>If you downloaded the additional documentation, unpack it into the
-    source tree using the following command:</para>
+    <para>
+      If you downloaded the additional documentation, unpack it into the
+      source tree using the following command:
+    </para>
 
 <screen><userinput>tar -xf ../freetype-doc-&freetype2-version;.tar.bz2 \
     --strip-components=2 -C docs</userinput></screen>
 
-    <para>Install <application>FreeType2</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>FreeType2</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>sed -i -r 's:.*(#.*SUBPIXEL.*) .*:\1:' \
           include/freetype/config/ftoption.h &&
-./configure --prefix=/usr &&
+./configure --prefix=/usr --disable-static &&
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install &&
 install -v -m755 -d /usr/share/doc/freetype-&freetype2-version; &&
@@ -114,14 +144,19 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>sed -i -r 's:.*(#.*SUBPIXEL.*) .*:\1:'
-    include/freetype/config/ftoption.h</command>:
-    This command enables LCD optimized rendering. This option results in improved
-    rendering of fonts, but may have patent restrictions. Be sure to read the
-    <literal>'Other patent issues'</literal> part of
-    <ulink url="http://www.freetype.org/patents.html"/> before enabling this
-    option.</para>
+    <para>
+      <command>sed -i -r 's:.*(#.*SUBPIXEL.*) .*:\1:'
+      include/freetype/config/ftoption.h</command>:
+      This command enables LCD optimized rendering. This option results in improved
+      rendering of fonts, but may have patent restrictions. Be sure to read the
+      <literal>'Other patent issues'</literal> part of
+      <ulink url="http://www.freetype.org/patents.html"/> before enabling this
+      option.
+    </para>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
   </sect2>
 
   <sect2 role="content">
@@ -133,9 +168,16 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>freetype-config</seg>
-        <seg>libfreetype.{so,a}</seg>
-        <seg>/usr/include/freetype2 and /usr/share/doc/freetype-&freetype2-version;</seg>
+        <seg>
+          freetype-config
+        </seg>
+        <seg>
+          libfreetype.so
+        </seg>
+        <seg>
+          /usr/include/freetype2 and
+          /usr/share/doc/freetype-&freetype2-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -147,8 +189,10 @@
       <varlistentry id="freetype-config">
         <term><command>freetype-config</command></term>
         <listitem>
-          <para>is used to get <application>FreeType</application> compilation
-          and linking information.</para>
+          <para>
+            is used to get <application>FreeType</application> compilation
+            and linking information.
+          </para>
           <indexterm zone="freetype2 freetype-config">
             <primary sortas="b-freetype-config">freetype-config</primary>
           </indexterm>
@@ -156,12 +200,14 @@
       </varlistentry>
 
       <varlistentry id="libfreetype">
-        <term><filename class='libraryfile'>libfreetype.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libfreetype.so</filename></term>
         <listitem>
-          <para>contains functions for rendering various font types, such
-          as TrueType and Type1.</para>
+          <para>
+            contains functions for rendering various font types, such
+            as TrueType and Type1.
+          </para>
           <indexterm zone="freetype2 libfreetype">
-            <primary sortas="c-libfreetype">libfreetype.{so,a}</primary>
+            <primary sortas="c-libfreetype">libfreetype.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2012-07-22 01:39:04 UTC (rev 10442)
+++ trunk/BOOK/general.ent	2012-07-23 13:35:55 UTC (rev 10443)
@@ -3,13 +3,13 @@
 $Date$
 -->
 
-<!ENTITY day          "21">                   <!-- Always 2 digits -->
+<!ENTITY day          "23">                   <!-- Always 2 digits -->
 <!ENTITY month        "07">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "July 21st, &year;">
+<!ENTITY releasedate  "July 23rd, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -138,7 +138,7 @@
 <!ENTITY nss-version                  "3.&nss-major-version;.&nss-minor-version;">
 <!ENTITY openssh-version              "6.0p1">
 <!ENTITY openssl-version              "1.0.1c">
-<!ENTITY p11-kit-version              "0.12">
+<!ENTITY p11-kit-version              "0.13">
 <!ENTITY polkit-version               "0.107">
 <!ENTITY shadow-version               "4.1.5">
 <!ENTITY stunnel-version              "4.52">
@@ -277,8 +277,8 @@
 <!ENTITY aalib-version                "1.4rc5">
 <!ENTITY babl-version                 "0.1.10">
 <!ENTITY exiv2-version                "0.22">
-<!ENTITY freetype2-version            "2.4.9">
-<!ENTITY fontconfig-version           "2.9.0">
+<!ENTITY freetype2-version            "2.4.10">
+<!ENTITY fontconfig-version           "2.10.0">
 <!ENTITY fribidi-version              "0.19.2">
 <!ENTITY gegl-version                 "0.2.0">
 <!ENTITY giflib-version               "4.1.6">

Modified: trunk/BOOK/gnome/core/cantarell-fonts.xml
===================================================================
--- trunk/BOOK/gnome/core/cantarell-fonts.xml	2012-07-22 01:39:04 UTC (rev 10442)
+++ trunk/BOOK/gnome/core/cantarell-fonts.xml	2012-07-23 13:35:55 UTC (rev 10443)
@@ -105,8 +105,7 @@
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make install &&
-mv -v /usr/share/fontconfig/conf.avail/31-cantarell.conf /etc/fonts/conf.avail</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2012-07-22 01:39:04 UTC (rev 10442)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2012-07-23 13:35:55 UTC (rev 10443)
@@ -43,7 +43,23 @@
     </listitem>
 
 -->
+
     <listitem>
+      <para>July 23rd, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - FreeType2 2.4.10.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Fontconfig 2.10.0.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - p11-kit 0.13.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>July 21st, 2012</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/postlfs/security/p11-kit.xml
===================================================================
--- trunk/BOOK/postlfs/security/p11-kit.xml	2012-07-22 01:39:04 UTC (rev 10442)
+++ trunk/BOOK/postlfs/security/p11-kit.xml	2012-07-23 13:35:55 UTC (rev 10443)
@@ -6,10 +6,10 @@
 
   <!ENTITY p11-kit-download-http "http://p11-glue.freedesktop.org/releases/p11-kit-&p11-kit-version;.tar.gz">
   <!ENTITY p11-kit-download-ftp  " ">
-  <!ENTITY p11-kit-md5sum        "66baf7ddde982d1b7294d3bd63be7446">
-  <!ENTITY p11-kit-size          "520 KB">
-  <!ENTITY p11-kit-buildsize     "6.0 MB">
-  <!ENTITY p11-kit-time          "less than 0.1 SBU">
+  <!ENTITY p11-kit-md5sum        "3892bc07ff54b1b391aad4628911801d">
+  <!ENTITY p11-kit-size          "532 KB">
+  <!ENTITY p11-kit-buildsize     "8.3 MB">
+  <!ENTITY p11-kit-time          "0.1 SBU">
 ]>
 
 <sect1 id="p11-kit" xreflabel="p11-kit-&p11-kit-version;">
@@ -29,51 +29,77 @@
   <sect2 role="package">
     <title>Introduction to p11-kit</title>
 
-    <para>The <application>p11-kit</application> package Provides a way to load
-    and enumerate PKCS #11 (a Cryptographic Token Interface Standard) modules.
+    <para>
+      The <application>p11-kit</application> package Provides a way to load and
+      enumerate PKCS #11 (a Cryptographic Token Interface Standard) modules.
     </para>
 
-    &lfs70_checked;
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&p11-kit-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&p11-kit-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&p11-kit-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&p11-kit-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &p11-kit-md5sum;</para>
+        <para>
+          Download MD5 sum: &p11-kit-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &p11-kit-size;</para>
+        <para>
+          Download size: &p11-kit-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &p11-kit-buildsize;</para>
+        <para>
+          Estimated disk space required: &p11-kit-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &p11-kit-time;</para>
+        <para>
+          Estimated build time: &p11-kit-time;
+        </para>
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">p11-kit Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
+
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/p11-kit"/></para>
-
+      <ulink url="&blfs-wiki;/p11-kit"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of p11-kit</title>
 
-    <para>Install <application>p11-kit</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>p11-kit</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &&
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
@@ -82,12 +108,8 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><parameter>--sysconfdir=/etc</parameter>: This parameter creates
-    the <filename class="directory">pkcs11</filename> directory in
-    <filename class="directory">/etc</filename> instead of
-    <filename class="directory">/usr/etc</filename>. If you are building
-    this for a server rather than a desktop, you might prefer to put this in
-    <filename class="directory">/var/lib</filename>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
 
@@ -100,9 +122,17 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>p11-kit</seg>
-        <seg>libp11-kit.so and p11-kit-proxy.so</seg>
-        <seg>/etc/pkcs11,/usr/{include/p11-kit-1/p11-kit,share/gtk-doc/html/p11-kit}</seg>
+        <seg>
+          p11-kit
+        </seg>
+        <seg>
+          libp11-kit.so and p11-kit-proxy.so
+        </seg>
+        <seg>
+          /etc/pkcs11,
+          /usr/include/p11-kit-1 and
+          /usr/share/gtk-doc/html/p11-kit
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -114,8 +144,10 @@
       <varlistentry id="libp11-kit">
         <term><filename class='libraryfile'>libp11-kit.so</filename></term>
         <listitem>
-          <para>contains functions used to coordinate initialization and 
-          finalization of any PKCS#11 module.</para>
+          <para>
+            contains functions used to coordinate initialization and 
+            finalization of any PKCS#11 module.
+          </para>
           <indexterm zone="p11-kit libp11-kit">
             <primary sortas="c-libp11-kit">libp11-kit.so</primary>
           </indexterm>
@@ -125,7 +157,9 @@
       <varlistentry id="p11-kit-proxy">
         <term><filename class='libraryfile'>p11-kit-proxy.so</filename></term>
         <listitem>
-          <para>is PKCS#11 proxy module.</para>
+          <para>
+            is the PKCS#11 proxy module.
+          </para>
           <indexterm zone="p11-kit p11-kit-proxy">
             <primary sortas="c-p11-kit-proxy">p11-kit-proxy.so</primary>
           </indexterm>




More information about the blfs-book mailing list