r7074 - in trunk/BOOK: . basicnet/mailnews basicnet/netlibs basicnet/netutils basicnet/textweb gnome/core introduction/welcome postlfs/security pst/printing server/mail xsoft/other

randy at linuxfromscratch.org randy at linuxfromscratch.org
Thu Aug 16 15:34:29 PDT 2007


Author: randy
Date: 2007-08-16 16:34:29 -0600 (Thu, 16 Aug 2007)
New Revision: 7074

Added:
   trunk/BOOK/postlfs/security/gnutls.xml
Modified:
   trunk/BOOK/basicnet/mailnews/mutt.xml
   trunk/BOOK/basicnet/netlibs/curl.xml
   trunk/BOOK/basicnet/netlibs/libsoup.xml
   trunk/BOOK/basicnet/netutils/wireshark.xml
   trunk/BOOK/basicnet/textweb/lynx.xml
   trunk/BOOK/general.ent
   trunk/BOOK/gnome/core/gnome-vfs.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/introduction/welcome/credits.xml
   trunk/BOOK/postlfs/security/security.xml
   trunk/BOOK/pst/printing/cups.xml
   trunk/BOOK/server/mail/exim.xml
   trunk/BOOK/xsoft/other/pidgin.xml
Log:
Added new package GnuTLS-1.6.3

Modified: trunk/BOOK/basicnet/mailnews/mutt.xml
===================================================================
--- trunk/BOOK/basicnet/mailnews/mutt.xml	2007-08-16 21:31:01 UTC (rev 7073)
+++ trunk/BOOK/basicnet/mailnews/mutt.xml	2007-08-16 22:34:29 UTC (rev 7074)
@@ -55,9 +55,7 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="gnupg"/>,
-    <xref linkend="openssl"/> or
-    <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink> (requires
-    <xref linkend="libgcrypt"/>),
+    <xref linkend="openssl"/> or <xref linkend="gnutls"/>,
     an <xref linkend="server-mail"/> (that provides a <command>sendmail</command> command),
     <xref linkend="aspell"/>,
     <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>,
@@ -100,15 +98,15 @@
     </note>
 
     <caution>
-    <para>If you choose to link <application>Mutt</application> against
-    <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink>,
-    you won't have SSL client certificate support. Specifically the
-    <envar>ssl_client_cert</envar> configuration variable is recognized
-    as invalid. That means you will lose the ability to use
-    <command>mutt</command> via SMTP over TLS or in the case when 
-    a client certification is required for authentication on an IMAP server.
-    For these reasons it is recommended to link <application>Mutt</application>
-    against <xref linkend="openssl"/> if you want SSL/TLS support.</para>
+      <para>If you choose to link <application>Mutt</application> against
+      <xref linkend="gnutls"/>,
+      you won't have SSL client certificate support. Specifically the
+      <envar>ssl_client_cert</envar> configuration variable is recognized
+      as invalid. That means you will lose the ability to use
+      <command>mutt</command> via SMTP over TLS or in the case when 
+      a client certification is required for authentication on an IMAP server.
+      For these reasons it is recommended to link <application>Mutt</application>
+      against <xref linkend="openssl"/> if you want SSL/TLS support.</para>
     </caution>
 
     <para><application>Mutt</application> requires a group named

Modified: trunk/BOOK/basicnet/netlibs/curl.xml
===================================================================
--- trunk/BOOK/basicnet/netlibs/curl.xml	2007-08-16 21:31:01 UTC (rev 7073)
+++ trunk/BOOK/basicnet/netlibs/curl.xml	2007-08-16 22:34:29 UTC (rev 7074)
@@ -61,8 +61,7 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="pkgconfig"/>,
-    <xref linkend="openssl"/> or
-    <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink>,
+    <xref linkend="openssl"/> or <xref linkend="gnutls"/>,
     <xref linkend="openldap"/>,
     <xref linkend="libidn"/>,
     <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>,

Modified: trunk/BOOK/basicnet/netlibs/libsoup.xml
===================================================================
--- trunk/BOOK/basicnet/netlibs/libsoup.xml	2007-08-16 21:31:01 UTC (rev 7073)
+++ trunk/BOOK/basicnet/netlibs/libsoup.xml	2007-08-16 22:34:29 UTC (rev 7074)
@@ -67,8 +67,7 @@
     <xref linkend="php"/> compiled with
     <ulink url="http://xmlrpc-epi.sourceforge.net/main.php?t=php_about">XMLRPC-EPI</ulink>
       support (only used for the XMLRPC regression tests), and
-    <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink> (requires
-    <xref linkend="libgcrypt"/>)</para>
+    <xref linkend="gnutls"/></para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/libsoup"/></para>

Modified: trunk/BOOK/basicnet/netutils/wireshark.xml
===================================================================
--- trunk/BOOK/basicnet/netutils/wireshark.xml	2007-08-16 21:31:01 UTC (rev 7073)
+++ trunk/BOOK/basicnet/netutils/wireshark.xml	2007-08-16 22:34:29 UTC (rev 7074)
@@ -92,8 +92,7 @@
     <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
     <xref linkend="python"/>,
     <xref linkend="pcre"/>,
-    <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink> (requires
-    <xref linkend="libgcrypt"/>),
+    <xref linkend="gnutls"/>,
     <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>,
     <ulink url="http://www.gnu.org/software/adns/adns.html">adns</ulink>, and
     <ulink url="http://www.lua.org/">Lua</ulink></para>

Modified: trunk/BOOK/basicnet/textweb/lynx.xml
===================================================================
--- trunk/BOOK/basicnet/textweb/lynx.xml	2007-08-16 21:31:01 UTC (rev 7073)
+++ trunk/BOOK/basicnet/textweb/lynx.xml	2007-08-16 22:34:29 UTC (rev 7074)
@@ -56,9 +56,8 @@
     <bridgehead renderas="sect3">Lynx Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openssl"/> or experimentaly,
-    <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink> (requires
-    <xref linkend="libgcrypt"/>),
+    <para role="optional"><xref linkend="openssl"/> or
+    <xref linkend="gnutls"/> (experimental),
     <xref linkend="zip"/>,
     <xref linkend="unzip"/>,
     an <xref linkend="server-mail"/> (that provides a <command>sendmail</command> command), and

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2007-08-16 21:31:01 UTC (rev 7073)
+++ trunk/BOOK/general.ent	2007-08-16 22:34:29 UTC (rev 7074)
@@ -63,6 +63,7 @@
 <!ENTITY openssl-version              "0.9.8e">
 <!-- End special note about Heimdal -->
 
+<!ENTITY gnutls-version               "1.6.3">
 <!ENTITY cracklib-version             "2.8.10">
 <!ENTITY linux-pam-version            "0.99.7.1">
 <!ENTITY shadow-version               "4.0.18.1">

Modified: trunk/BOOK/gnome/core/gnome-vfs.xml
===================================================================
--- trunk/BOOK/gnome/core/gnome-vfs.xml	2007-08-16 21:31:01 UTC (rev 7073)
+++ trunk/BOOK/gnome/core/gnome-vfs.xml	2007-08-16 22:34:29 UTC (rev 7074)
@@ -69,9 +69,7 @@
     <xref linkend="gtk-doc"/>,
     <xref linkend="intltool"/>,
     <xref linkend="openssh"/>,
-    <xref linkend="openssl"/> or
-    <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink> (requires
-    <xref linkend="libgcrypt"/>),
+    <xref linkend="openssl"/> or <xref linkend="gnutls"/>,
     <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
     <ulink url="http://www.avahi.org">Avahi</ulink>,
     <ulink url="http://www.openafs.org/">OpenAFS</ulink>, and

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2007-08-16 21:31:01 UTC (rev 7073)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2007-08-16 22:34:29 UTC (rev 7074)
@@ -45,6 +45,9 @@
       <para>August 16th, 2007</para>
       <itemizedlist>
         <listitem>
+          <para>[randy] - Added new package GnuTLS-1.6.3.</para>
+        </listitem>
+        <listitem>
           <para>[manuel] - Added upstream asmrules_fix_20061231.diff
           patch to Mplayer-1.0rc1.</para>
         </listitem>

Modified: trunk/BOOK/introduction/welcome/credits.xml
===================================================================
--- trunk/BOOK/introduction/welcome/credits.xml	2007-08-16 21:31:01 UTC (rev 7073)
+++ trunk/BOOK/introduction/welcome/credits.xml	2007-08-16 22:34:29 UTC (rev 7074)
@@ -273,7 +273,7 @@
         additions), Expect, FOP, FreeTTS, FriBidi, GC, GCC (rewrite), GMime,
         gnome-audio, gnome-backgrounds, gnome-menus, gnome-mount,
         gnome-screensaver, gnome-volume-manager, GNOME Doc Utils,
-        GNOME Keyring Manager, GnuCash (version 2), GOffice, Graphviz,
+        GNOME Keyring Manager, GnuCash (version 2), GnuTLS, GOffice, Graphviz,
         GStreamer Base Plug-ins, GStreamer Good Plug-ins, GStreamer Ugly
         Plug-ins, HAL, Heimdal, HTML Tidy, icon-naming-utils, ISO Codes,
         JadeTeX, Java Access Bridge, JUnit, K3b, Libassuan, LessTif (rewrite),

Added: trunk/BOOK/postlfs/security/gnutls.xml
===================================================================
--- trunk/BOOK/postlfs/security/gnutls.xml	                        (rev 0)
+++ trunk/BOOK/postlfs/security/gnutls.xml	2007-08-16 22:34:29 UTC (rev 7074)
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY gnutls-download-http "http://www.gnu.org/software/gnutls/releases/gnutls-&gnutls-version;.tar.bz2">
+  <!ENTITY gnutls-download-ftp  "ftp://ftp.gnutls.org/pub/gnutls/gnutls-&gnutls-version;.tar.bz2">
+  <!ENTITY gnutls-md5sum        "73da68a4248d34c4d38491ce2119af0f">
+  <!ENTITY gnutls-size          "4.2 MB">
+  <!ENTITY gnutls-buildsize     "49 MB">
+  <!ENTITY gnutls-time          "0.5 SBU">
+]>
+
+<sect1 id="gnutls" xreflabel="GnuTLS-&gnutls-version;">
+  <?dbhtml filename="gnutls.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>GnuTLS-&gnutls-version;</title>
+
+  <indexterm zone="gnutls">
+    <primary sortas="a-GnuTLS">GnuTLS</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GnuTLS</title>
+
+    <para>The <application>GnuTLS</application> package contains a library and
+    userspace tools which provide a secure layer over a reliable transport
+    layer. Currently the <application>GnuTLS</application> library implements
+    the proposed standards by the IETF's TLS working group. Quoting from the
+    TLS protocol specification:</para>
+
+    <para><quote>The TLS protocol provides communications privacy over the
+    Internet. The protocol allows client/server applications to communicate in
+    a way that is designed to prevent eavesdropping, tampering, or message
+    forgery.</quote></para>
+
+    <para><application>GnuTLS</application> provides support for TLS 1.1, TLS
+    1.0 and SSL 3.0 protocols, TLS extensions, including server name and max
+    record size. Additionally, the library supports authentication using the
+    SRP protocol, X.509 certificates and OpenPGP keys, along with support for
+    the TLS Pre-Shared-Keys (PSK) extension, the Inner Application (TLS/IA)
+    extension and X.509 and OpenPGP certificate handling.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gnutls-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gnutls-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gnutls-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gnutls-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gnutls-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gnutls-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GnuTLS Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="libgcrypt"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="gtk-doc"/>,
+    <ulink url="http://www.gnu.org/software/gnutls/download.html">OpenCDK</ulink>,
+    <ulink url="http://www.gnu.org/software/gnutls/download.html">Tiny ASN.1</ulink>,
+    <!-- <ulink url="http://platon.sk/projects/libcfg+">libcfg+</ulink>, -->
+    <ulink url="http://webscripts.softpedia.com/script/Development-Scripts-js/C-C-Library/libcfg--26570.html">libcfg+</ulink>,
+    <xref linkend="LZO"/>, and
+    <ulink url="http://valgrind.org/">Valgrind</ulink> (used during the test suite)</para>
+
+    <bridgehead renderas="sect4">Optional Debugging Libraries</bridgehead>
+    <para role="optional"><ulink url="http://dmalloc.com/">Dmalloc</ulink> and
+    <ulink url="http://perens.com/FreeSoftware/ElectricFence/">Electric Fence</ulink></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnutls"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GnuTLS</title>
+
+    <para>Install <application>GnuTLS</application> by running the
+    following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr &&
+make</userinput></screen>
+
+    <para>To test the results, issue: <command>make check</command>.</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/gnutls-&gnutls-version;/reference &&
+install -v -m644    doc/reference/html/* \
+                    /usr/share/doc/gnutls-&gnutls-version;/reference &&
+install -v -m644    doc/*.{html,png,eps,pdf,ps} \
+                    /usr/share/doc/gnutls-&gnutls-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>certtool, gnutls-cli, gnutls-cli-debug, gnutls-serv,
+        libgnutls-config, libgnutls-extra-config, psktool, and srptool</seg>
+        <seg>libgnutls.{so,a}, libgnutls-extra.{so,a},
+        libgnutls-openssl.{so,a}, and libgnutlsxx.{so,a}</seg>
+        <seg>/usr/include/gnutls and
+        /usr/share/doc/gnutls-&gnutls-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="certtool">
+        <term><command>certtool</command></term>
+        <listitem>
+          <para>is used to generate X.509 certificates, certificate requests,
+          and private keys.</para>
+          <indexterm zone="gnutls certtool">
+            <primary sortas="b-certtool">certtool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gnutls-cli">
+        <term><command>gnutls-cli</command></term>
+        <listitem>
+          <para>is a simple client program to set up a TLS connection to some
+          other computer.</para>
+          <indexterm zone="gnutls gnutls-cli">
+            <primary sortas="b-gnutls-cli">gnutls-cli</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gnutls-cli-debug">
+        <term><command>gnutls-cli-debug</command></term>
+        <listitem>
+          <para>is a simple client program to set up a TLS connection to some
+          other computer and produces very verbose progress results.</para>
+          <indexterm zone="gnutls gnutls-cli-debug">
+            <primary sortas="b-gnutls-cli-debug">gnutls-cli-debug</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gnutls-serv">
+        <term><command>gnutls-serv</command></term>
+        <listitem>
+          <para>is a simple server program that listens to incoming TLS
+          connections.</para>
+          <indexterm zone="gnutls gnutls-serv">
+            <primary sortas="b-gnutls-serv">gnutls-serv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gnutls-config">
+        <term><command>gnutls-config</command></term>
+        <listitem>
+          <para>is a utility used to configure and build applications based on
+          the gnutls(3) library. It can be used to query the C compiler and
+          linker flags which are required to correctly compile and link the
+          application against the gnutls(3) library.</para>
+          <indexterm zone="gnutls gnutls-config">
+            <primary sortas="b-gnutls-config">gnutls-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gnutls-extra-config">
+        <term><command>gnutls-extra-config</command></term>
+        <listitem>
+          <para>is a utility used to configure and build applications based on
+          the gnutls-extra(3) library. It can be used to query the C compiler and
+          linker flags which are required to correctly compile and link the
+          application against the gnutls-extra(3) library.</para>
+          <indexterm zone="gnutls gnutls-extra-config">
+            <primary sortas="b-gnutls-extra-config">gnutls-extra-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="psktool">
+        <term><command>psktool</command></term>
+        <listitem>
+          <para>is a simple program that generates random keys for use with
+          TLS-PSK.</para>
+          <indexterm zone="gnutls psktool">
+            <primary sortas="b-psktool">psktool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="srptool">
+        <term><command>srptool</command></term>
+        <listitem>
+          <para>is a simple program that emulates the programs in the Stanford
+          SRP (Secure Remote Password) libraries using GNU TLS.</para>
+          <indexterm zone="gnutls srptool">
+            <primary sortas="b-srptool">srptool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgnutls">
+        <term><filename class='libraryfile'>libgnutls.{so,a}</filename></term>
+        <listitem>
+          <para>contains the core API functions and X.509 certificate 
+          API functions.</para>
+          <indexterm zone="gnutls libgnutls">
+            <primary sortas="c-libgnutls">libgnutls.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>


Property changes on: trunk/BOOK/postlfs/security/gnutls.xml
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date

Modified: trunk/BOOK/postlfs/security/security.xml
===================================================================
--- trunk/BOOK/postlfs/security/security.xml	2007-08-16 21:31:01 UTC (rev 7073)
+++ trunk/BOOK/postlfs/security/security.xml	2007-08-16 22:34:29 UTC (rev 7074)
@@ -40,6 +40,7 @@
   "signatures" and compares for files that have been changed.</para>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="openssl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnutls.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cracklib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="linux-pam.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="shadow.xml"/>

Modified: trunk/BOOK/pst/printing/cups.xml
===================================================================
--- trunk/BOOK/pst/printing/cups.xml	2007-08-16 21:31:01 UTC (rev 7073)
+++ trunk/BOOK/pst/printing/cups.xml	2007-08-16 22:34:29 UTC (rev 7074)
@@ -77,9 +77,7 @@
     <para role="optional"><xref linkend="pkgconfig"/>,
     <xref linkend="dbus"/>,
     <xref linkend="openldap"/>,
-    <xref linkend="openssl"/> or
-    <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink> (requires
-    <xref linkend="libgcrypt"/>),
+    <xref linkend="openssl"/> or <xref linkend="gnutls"/>,
     <xref linkend="linux-pam"/>,
     <xref linkend="php"/>,
     <xref linkend="python"/>,
@@ -89,7 +87,7 @@
     <ulink url="ftp://oss.sgi.com/projects/xfs/cmd_tars/">libacl</ulink> (requires
     <ulink url="ftp://oss.sgi.com/projects/xfs/cmd_tars/">libattr</ulink>),
     <ulink url="http://www.easysw.com/htmldoc/">HTMLDOC</ulink>, and
-    <ulink url="http://valgrind.kde.org/">Valgrind</ulink> (optionally used if
+    <ulink url="http://valgrind.org/">Valgrind</ulink> (optionally used if
       running the test suites)</para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/server/mail/exim.xml
===================================================================
--- trunk/BOOK/server/mail/exim.xml	2007-08-16 21:31:01 UTC (rev 7073)
+++ trunk/BOOK/server/mail/exim.xml	2007-08-16 22:34:29 UTC (rev 7074)
@@ -88,8 +88,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="x-window-system"/>,
     <xref linkend="openldap"/>,
-    <xref linkend="openssl"/> or
-    <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink>,
+    <xref linkend="openssl"/> or <xref linkend="gnutls"/>,
     <xref linkend="cyrus-sasl"/>,
     <xref linkend="mysql"/>,
     <xref linkend="postgresql"/>,

Modified: trunk/BOOK/xsoft/other/pidgin.xml
===================================================================
--- trunk/BOOK/xsoft/other/pidgin.xml	2007-08-16 21:31:01 UTC (rev 7073)
+++ trunk/BOOK/xsoft/other/pidgin.xml	2007-08-16 22:34:29 UTC (rev 7074)
@@ -63,21 +63,18 @@
     <xref linkend="perl-xml-parser"/></para>
 
     <bridgehead renderas="sect4">Optional for SSL Support</bridgehead>
-    <para role="optional"><ulink url="http://ftp.gnupg.org/gcrypt/gnutls/">GnuTLS</ulink> (requires
-    <xref linkend="libgcrypt"/>) or
-    <xref linkend="nss"/></para>
+    <para role="optional"><xref linkend="gnutls"/> or <xref linkend="nss"/></para>
 
-    <para>SSL support is required for MSN and Google Talk support and
-      <application>GnuTLS</application> is the preferred method. Note that one of
+    <para>SSL support is required for MSN Messenger and Google Talk.
+    <application>GnuTLS</application> is the preferred method. Note that one of
     <xref linkend="firefox"/>,
     <xref linkend="thunderbird"/>,
-    <xref linkend="seamonkey"/>,or
-    <ulink url="http://www.mozilla.org/products/mozilla1.x/">Mozilla</ulink> can be used instead
-      of NSS.</para>
+    <xref linkend="seamonkey"/>, or
+    <ulink url="http://www.mozilla.org/products/mozilla1.x/">Mozilla</ulink>
+    can be used instead of NSS.</para>
 
     <bridgehead renderas="sect4">Optional GUI Tools</bridgehead>
-    <para role="optional">
-    <xref linkend="gtk2"/>
+    <para role="optional"><xref linkend="gtk2"/>
       (required to build the GUI interface),
     <ulink url="http://gtkspell.sourceforge.net/">Gtkspell</ulink>
       (for spell-check support and only used if <application>Gtk+</application> is installed),
@@ -89,11 +86,9 @@
       (used for session management support)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <xref linkend="intltool"/>,
+    <para role="optional"><xref linkend="intltool"/>,
     <xref linkend="GConf"/>,
-    <xref linkend="dbus-glib"/> (requires
-    <xref linkend="python"/> also),
+    <xref linkend="dbus-glib"/> (requires <xref linkend="python"/> also),
     <ulink url="http://silcnet.org/software/">SILC Client</ulink>,
     <ulink url="http://silcnet.org/software/">SILC Toolkit</ulink>,
     <ulink url="http://packages.debian.org/stable/source/zephyr">zephyr</ulink>,




More information about the blfs-book mailing list