Unmerge XML::Parser from Perl page as discussed. Add Libdbus page which installs D-Bus library to satisfy circular dependency between Systemd and D-Bus.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10281 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

6 files changed, 215 insertions, 30 deletions

diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 7f3f5a601..c0dfd87e3 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -52,6 +52,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expat.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inetutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xml-parser.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="diffutils.xml"/>
@@ -74,8 +75,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
diff --git a/chapter06/dbus.xml b/chapter06/dbus.xml
index b38ad86d5..bb0ea73f4 100644
--- a/chapter06/dbus.xml
+++ b/chapter06/dbus.xml
@@ -52,6 +52,8 @@
             --sysconfdir=/etc \
             --localstatedir=/var \
             --libexecdir=/usr/lib/dbus-1.0 \
+            --disable-static \
+            --enable-systemd \
             --docdir=/usr/share/doc/dbus-&dbus-version; \
             --with-console-auth-dir=/run/console/ \
             --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
@@ -60,6 +62,14 @@
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
+        <term><parameter>--enable-systemd</parameter></term>
+        <listitem>
+          <para>This enables support for authentication check using
+          Systemd Logind.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term><parameter>--with-console-auth-dir=/run/console</parameter></term>
         <listitem>
           <para>This specifies the location of the ConsoleKit auth
@@ -98,7 +108,7 @@
       <seglistitem>
         <seg>dbus-cleanup-sockets, dbus-daemon, dbus-launch, dbus-monitor,
         dbus-send and dbus-uuidgen</seg>
-        <seg>libdbus-1.{so,a}</seg>
+        <seg>libdbus-1.so</seg>
         <seg>/etc/dbus-1, /usr/include/dbus-1.0, /usr/lib/dbus-1.0,
         /usr/share/dbus-1, /usr/share/doc/dbus-&dbus-version; and
         /var/lib/dbus</seg>
@@ -172,7 +182,7 @@
       </varlistentry>
 
       <varlistentry id="libdbus">
-        <term><filename class="libraryfile">libdbus.{so,a}</filename></term>
+        <term><filename class="libraryfile">libdbus-1.so</filename></term>
         <listitem>
           <para>Contains API functions used to communicate with the D-Bus
           message bus.</para>
diff --git a/chapter06/libdbus.xml b/chapter06/libdbus.xml
new file mode 100644
index 000000000..ba3916d12
--- /dev/null
+++ b/chapter06/libdbus.xml
@@ -0,0 +1,102 @@
+<?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;
+]>
+
+<sect1 id="ch-system-libdbus" role="wrap">
+  <?dbhtml filename="libdbus.html"?>
+
+  <sect1info condition="script">
+    <productname>libdbus</productname>
+    <productnumber>&dbus-version;</productnumber>
+    <address>&dbus-url;</address>
+  </sect1info>
+
+  <title>Libdbus-&dbus-version;</title>
+
+  <indexterm zone="ch-system-libdbus">
+    <primary sortas="a-libdbus">Libdbus</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>Libdbus package provides a library to communicate with
+    D-Bus messagebus daemon. It is only installed to satisfy
+    circular dependency between Systemd and D-Bus.</para>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>&dbus-ch6-sbu;</seg>
+        <seg>&dbus-ch6-du;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Libdbus</title>
+
+    <para>Prepare Libdbus for compilation:</para>
+
+<screen><userinput remap="configure">./configure --prefix=/usr --disable-static</userinput></screen>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make -C dbus libdbus-1.la</userinput></screen>
+
+    <para>This package does come with a testsuite, but it is not
+    possible to run it because only part of the package is
+    installed.</para>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">make -C dbus lib_LTLIBRARIES=libdbus-1.la \
+     install-libLTLIBRARIES \
+     install-dbusincludeHEADERS \
+     install-nodist_dbusarchincludeHEADERS
+make install-pkgconfigDATA</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-libdbus" role="content">
+    <title>Contents of Libdbus</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directories</segtitle>
+
+      <seglistitem>
+        <seg>none</seg>
+        <seg>libdbus-1.so</seg>
+        <seg>/usr/include/dbus-1.0 and /usr/lib/dbus-1.0</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libdbus-lib">
+        <term><filename class="libraryfile">libdbus-1.so</filename></term>
+        <listitem>
+          <para>Contains API functions used to communicate with the D-Bus
+          message bus.</para>
+          <indexterm zone="ch-system-libdbus libdbus-lib">
+            <primary sortas="c-libdbus">libdbus</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index 955509b04..24f99adf0 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -121,33 +121,6 @@
 
   </sect2>
 
-  <sect2 role="installation">
-    <title>Installation of XML::Parser</title>
-
-    <para>Extract the XML::Parser tarball and change to the extracted
-    directory:</para>
-
-<screen><userinput remap="pre">tar xf ../XML-Parser-&xml-parser-version;.tar.gz
-cd XML-Parser-&xml-parser-version;</userinput></screen>
-
-    <para>Prepare XML::Parser for compilation:</para>
-
-<screen><userinput remap="configure">perl Makefile.PL</userinput></screen>
-
-    <para>Compile the package:</para>
-
-<screen><userinput remap="make">make</userinput></screen>
-
-    <para>To test the results, issue:</para>
-
-<screen><userinput remap="test">make test</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput remap="install">make install</userinput></screen>
-
-  </sect2>
-
   <sect2 id="contents-perl" role="content">
     <title>Contents of Perl</title>
 
diff --git a/chapter06/xml-parser.xml b/chapter06/xml-parser.xml
new file mode 100644
index 000000000..08155ecdf
--- /dev/null
+++ b/chapter06/xml-parser.xml
@@ -0,0 +1,96 @@
+<?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;
+]>
+
+<sect1 id="ch-system-xml-parser" role="wrap">
+  <?dbhtml filename="xml-parser.html"?>
+
+  <sect1info condition="script">
+    <productname>xml-parser</productname>
+    <productnumber>&xml-parser-version;</productnumber>
+    <address>&xml-parser-url;</address>
+  </sect1info>
+
+  <title>XML::Parser-&xml-parser-version;</title>
+
+  <indexterm zone="ch-system-xml-parser">
+    <primary sortas="a-Xml-Parser">XML::Parser</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The XML::Parser module is a Perl interface to James Clark's
+    XML parser, Expat.</para>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>&xml-parser-ch6-sbu;</seg>
+        <seg>&xml-parser-ch6-du;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of XML::Parser</title>
+
+    <para>Prepare XML::Parser for compilation:</para>
+
+<screen><userinput remap="configure">perl Makefile.PL</userinput></screen>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>To test the results, issue:</para>
+
+<screen><userinput remap="test">make test</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-xml-parser" role="content">
+    <title>Contents of XML::Parser</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directories</segtitle>
+
+      <seglistitem>
+        <seg>none</seg>
+        <seg>Expat.so</seg>
+        <seg>none</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="Expat">
+        <term><filename class="libraryfile">Expat.so</filename></term>
+        <listitem>
+          <para>provides the Perl Expat interface.</para>
+          <indexterm zone="ch-system-xml-parser Expat">
+            <primary sortas="c-Expat">Expat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
diff --git a/packages.ent b/packages.ent
index 795960d9c..0d01b9ffa 100644
--- a/packages.ent
+++ b/packages.ent
@@ -616,6 +616,8 @@
 <!ENTITY xml-parser-url "http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/XML-Parser-&xml-parser-version;.tar.gz">
 <!ENTITY xml-parser-md5 "c320d2ffa459e6cdc6f9f59c1185855e">
 <!ENTITY xml-parser-home "https://github.com/chorny/XML-Parser">
+<!ENTITY xml-parser-ch6-du "2.5 MB">
+<!ENTITY xml-parser-ch6-sbu "0.1 SBU">
 
 <!ENTITY xz-version "5.0.4">
 <!ENTITY xz-size "894 KB">