[blfs-book] r11302 - in branches/systemd: . archive general/genlib general/genutils general/prog general/sysutils gnome/applications gnome/core kde/core multimedia/audioutils multimedia/cdwriteutils multimedia/libdriv multimedia/videoutils networking/netprogs networking/netutils postlfs/security postlfs/shells postlfs/virtualization pst/printing pst/ps server/major server/other x/lib xfce/core xsoft/office xsoft/other

krejzi at higgs.linuxfromscratch.org krejzi at higgs.linuxfromscratch.org
Mon Jun 17 03:13:46 PDT 2013


Author: krejzi
Date: Mon Jun 17 03:13:45 2013
New Revision: 11302

Log:
Remove packages that are now in lfs systemd from blfs.

Added:
   branches/systemd/archive/acl.xml
      - copied unchanged from r11299, branches/systemd/postlfs/security/acl.xml
   branches/systemd/archive/attr.xml
      - copied unchanged from r11299, branches/systemd/postlfs/security/attr.xml
   branches/systemd/archive/consolekit.xml
      - copied unchanged from r11299, branches/systemd/postlfs/security/consolekit.xml
   branches/systemd/archive/gperf.xml
      - copied unchanged from r11299, branches/systemd/general/genutils/gperf.xml
   branches/systemd/archive/libcap2.xml
      - copied unchanged from r11299, branches/systemd/postlfs/security/libcap2.xml
   branches/systemd/archive/udev-extras.xml
      - copied unchanged from r11299, branches/systemd/general/sysutils/udev-extras.xml
   branches/systemd/archive/udev.xml
      - copied unchanged from r11299, branches/systemd/general/sysutils/udev.xml
   branches/systemd/general/sysutils/systemd.xml   (contents, props changed)
Deleted:
   branches/systemd/general/genutils/gperf.xml
   branches/systemd/general/sysutils/udev-extras.xml
   branches/systemd/general/sysutils/udev.xml
   branches/systemd/postlfs/security/acl.xml
   branches/systemd/postlfs/security/attr.xml
   branches/systemd/postlfs/security/consolekit.xml
   branches/systemd/postlfs/security/libcap2.xml
Modified:
   branches/systemd/general.ent
   branches/systemd/general/genlib/glib2.xml
   branches/systemd/general/genlib/libgcrypt.xml
   branches/systemd/general/genlib/libgusb.xml
   branches/systemd/general/genutils/genutils.xml
   branches/systemd/general/genutils/pinentry.xml
   branches/systemd/general/prog/vala.xml
   branches/systemd/general/sysutils/bluez.xml
   branches/systemd/general/sysutils/colord.xml
   branches/systemd/general/sysutils/dbus-bindings.xml
   branches/systemd/general/sysutils/libarchive.xml
   branches/systemd/general/sysutils/strigi.xml
   branches/systemd/general/sysutils/sysutils.xml
   branches/systemd/general/sysutils/udisks.xml
   branches/systemd/general/sysutils/udisks2.xml
   branches/systemd/general/sysutils/upower.xml
   branches/systemd/gnome/applications/cheese.xml
   branches/systemd/gnome/applications/empathy.xml
   branches/systemd/gnome/core/dconf.xml
   branches/systemd/gnome/core/evolution-data-server.xml
   branches/systemd/gnome/core/gdm.xml
   branches/systemd/gnome/core/gnome-bluetooth.xml
   branches/systemd/gnome/core/gnome-control-center.xml
   branches/systemd/gnome/core/gnome-keyring.xml
   branches/systemd/gnome/core/gnome-session.xml
   branches/systemd/gnome/core/gvfs.xml
   branches/systemd/gnome/core/libgnome-keyring.xml
   branches/systemd/gnome/core/libwacom.xml
   branches/systemd/kde/core/kde-workspace.xml
   branches/systemd/kde/core/kdelibs.xml
   branches/systemd/multimedia/audioutils/audacious.xml
   branches/systemd/multimedia/cdwriteutils/libisoburn.xml
   branches/systemd/multimedia/cdwriteutils/libisofs.xml
   branches/systemd/multimedia/libdriv/gst-plugins-base.xml
   branches/systemd/multimedia/libdriv/gst10-plugins-good.xml
   branches/systemd/multimedia/libdriv/pulseaudio.xml
   branches/systemd/multimedia/videoutils/vlc.xml
   branches/systemd/networking/netprogs/cifsutils.xml
   branches/systemd/networking/netprogs/ntp.xml
   branches/systemd/networking/netprogs/rsync.xml
   branches/systemd/networking/netprogs/samba3.xml
   branches/systemd/networking/netprogs/wpa_supplicant.xml
   branches/systemd/networking/netutils/bind-utils.xml
   branches/systemd/networking/netutils/networkmanager.xml
   branches/systemd/postlfs/security/security.xml
   branches/systemd/postlfs/shells/zsh.xml
   branches/systemd/postlfs/virtualization/qemu.xml
   branches/systemd/pst/printing/cups.xml
   branches/systemd/pst/ps/a2ps.xml
   branches/systemd/server/major/bind.xml
   branches/systemd/server/major/vsftpd.xml
   branches/systemd/server/other/soprano.xml
   branches/systemd/x/lib/at-spi2-core.xml
   branches/systemd/x/lib/qt4.xml
   branches/systemd/x/lib/webkitgtk.xml
   branches/systemd/x/lib/webkitgtk2.xml
   branches/systemd/xfce/core/thunar-volman.xml
   branches/systemd/xfce/core/thunar.xml
   branches/systemd/xfce/core/xfce4-session.xml
   branches/systemd/xsoft/office/libreoffice.xml
   branches/systemd/xsoft/other/gimp.xml
   branches/systemd/xsoft/other/pidgin.xml

Copied: branches/systemd/archive/acl.xml (from r11299, branches/systemd/postlfs/security/acl.xml)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/systemd/archive/acl.xml	Mon Jun 17 03:13:45 2013	(r11302, copy of r11299, branches/systemd/postlfs/security/acl.xml)
@@ -0,0 +1,208 @@
+<?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 acl-download-http "http://download.savannah.gnu.org/releases/acl/acl-&acl-version;.src.tar.gz">
+  <!ENTITY acl-download-ftp  " ">
+  <!ENTITY acl-md5sum        "3fc0ce99dc5253bdcce4c9cd437bc267">
+  <!ENTITY acl-size          "380 KB">
+  <!ENTITY acl-buildsize     "5.5 MB">
+  <!ENTITY acl-time          "0.1 SBU">
+]>
+
+<sect1 id="acl" xreflabel="acl-&acl-version;">
+  <?dbhtml filename="acl.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>acl-&acl-version;</title>
+
+  <indexterm zone="acl">
+    <primary sortas="a-acl">acl</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to acl</title>
+
+    <para>The <application>acl</application> package contains utilities to
+    administer Access Control Lists, which are used to define more fine-grained
+    discretionary access rights for files and directories.</para>
+
+    &lfs73_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&acl-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&acl-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &acl-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &acl-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &acl-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &acl-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">acl Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="attr"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/acl"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of acl</title>
+
+    <para>Install <application>acl</application> by running the following
+    commands:</para>
+
+<screen><userinput>sed -i -e 's|/@pkg_name@|&- at pkg_version@|' \
+     include/builddefs.in &&
+
+INSTALL_USER=root  \
+INSTALL_GROUP=root \
+./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib &&
+make</userinput></screen>
+
+    <para>For meaningful results, the tests need to be carried out on a file
+    system that supports extended attributes. It is also required that
+    <application>Coreutils</application> is re-installed after
+    <application>acl</application> is installed so that the extra acl bit
+    displays correctly on a <command>ls</command> command.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<!-- Package uses DIST_ROOT instead of DESTDIR -->
+<screen role="root"><userinput>make install install-dev install-lib                           &&
+chmod -v 0755 /lib/libacl.so.1.1.0                             &&
+rm -v /lib/libacl.{a,la,so}                                    &&
+ln -sfv ../../lib/libacl.so.1 /usr/lib/libacl.so               &&
+sed -i "s|libdir='/lib'|libdir='/usr/lib'|" /usr/lib/libacl.la &&
+install -v -m644 doc/*.txt /usr/share/doc/acl-&acl-version;</userinput></screen>
+
+    <para>You should now re-install <application><ulink
+    url="&lfs-root;/chapter06/coreutils.html">Coreutils</ulink>
+    </application> and proceed to run the test suite.</para>
+
+    <para>There are three sets of tests that come with this package. Issue the
+    following to execute all three:
+    <command>make tests root-tests ext-tests</command>.</para>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>sed -i ... include/builddefs.in</command>: This command
+    modifies the documentation directory so that it is a versioned
+    directory.</para>
+
+    <para><command>sed -i ... /usr/lib/libacl.la</command>: This command
+    corrects the location of the installed static library as referenced
+    in the libtool archive.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring acl</title>
+    <sect3><title>Configuration Information</title>
+
+      <para>There is no configuration to <application>acl</application> itself,
+      but to get any use out of <application>acl</application>, a filesystem
+      needs to support access control lists.</para>
+
+      <para>One way to achieve this is to add the acl option to an ext3
+      filesystem in the <filename>/etc/fstab</filename> file as shown
+      below:</para>
+
+<screen># file system  mount-point  type   options                 dump  fsck
+#                                                                order
+
+/dev/sda1      /            ext3   defaults,acl,user_xattr 0     2</screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>chacl, getfacl, and setfacl</seg>
+        <seg>libacl.{so,a}</seg>
+        <seg>/usr/{include/acl,share/doc/acl-&acl-version;}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="chacl">
+        <term><command>chacl</command></term>
+        <listitem>
+          <para>changes the access control list of a file or directory.</para>
+          <indexterm zone="acl chacl">
+            <primary sortas="b-chacl">chacl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="getfacl">
+        <term><command>getfacl</command></term>
+        <listitem>
+          <para>gets file access control lists.</para>
+          <indexterm zone="acl getfacl">
+            <primary sortas="b-getfacl">getfacl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setfacl">
+        <term><command>setfacl</command></term>
+        <listitem>
+          <para>sets file access control lists.</para>
+          <indexterm zone="acl setfacl">
+            <primary sortas="b-setfacl">setfacl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libacl">
+        <term><filename class='libraryfile'>libacl.{so,a}</filename></term>
+        <listitem>
+          <para>contains the <application>acl</application> API functions.</para>
+          <indexterm zone="acl libacl">
+            <primary sortas="c-libacl">libacl.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Copied: branches/systemd/archive/attr.xml (from r11299, branches/systemd/postlfs/security/attr.xml)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/systemd/archive/attr.xml	Mon Jun 17 03:13:45 2013	(r11302, copy of r11299, branches/systemd/postlfs/security/attr.xml)
@@ -0,0 +1,190 @@
+<?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 attr-download-http "http://download.savannah.gnu.org/releases/attr/attr-&attr-version;.src.tar.gz">
+  <!ENTITY attr-download-ftp  " ">
+  <!ENTITY attr-md5sum        "84f58dec00b60f2dc8fd1c9709291cc7">
+  <!ENTITY attr-size          "336 KB">
+  <!ENTITY attr-buildsize     "3.5 MB">
+  <!ENTITY attr-time          "0.1 SBU">
+]>
+
+<sect1 id="attr" xreflabel="attr-&attr-version;">
+  <?dbhtml filename="attr.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>attr-&attr-version;</title>
+
+  <indexterm zone="attr">
+    <primary sortas="a-attr">attr</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to attr</title>
+
+    <para>The <application>attr</application> package contains utilities to
+    administer the extended attributes on filesystem objects.</para>
+
+    &lfs73_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&attr-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&attr-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &attr-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &attr-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &attr-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &attr-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/attr"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of attr</title>
+
+    <para>Install <application>attr</application> by running the following
+    commands:</para>
+
+<screen><userinput>sed -i -e 's|/@pkg_name@|&- at pkg_version@|' include/builddefs.in &&
+
+INSTALL_USER=root  \
+INSTALL_GROUP=root \
+./configure --prefix=/usr --disable-static &&
+make</userinput></screen>
+
+    <para>There are three sets of tests that come with this package. Issue the
+    following to execute all three:
+    <command>make tests root-tests ext-tests</command>.  For meaningful results,
+    the tests need to be carried out on a file system that supports extended
+    attributes.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<!-- Package uses DIST_ROOT instead of DESTDIR -->
+<screen role="root"><userinput>make install install-dev install-lib &&
+chmod -v 755 /usr/lib/libattr.so.1.1.0 &&
+mv -v /usr/lib/libattr.so.* /lib &&
+ln -sfv ../../lib/libattr.so.1 /usr/lib/libattr.so</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>sed ... include/builddefs.in</command>: This command
+    modifies the documentation directory so that it is a versioned
+    directory.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring attr</title>
+    <sect3><title>Configuration Information</title>
+
+      <para>There is no configuration to <application>attr</application> itself,
+      but to get any use out of <application>attr</application>, a filesystem
+      needs to support extended attributes.</para>
+
+      <para>One way to achieve this is to add the user_xattr option to an ext3
+      filesystem in the <filename>/etc/fstab</filename> file as shown
+      below:</para>
+
+<screen># file system  mount-point  type   options                 dump  fsck
+#                                                                order
+
+/dev/sda1      /            ext3   defaults,acl,user_xattr 0     2</screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>attr, getfattr, and setfattr</seg>
+        <seg>libattr.so</seg>
+        <seg>/usr/{include/attr,share/doc/attr-&attr-version;}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="attr-prog">
+        <term><command>attr</command></term>
+        <listitem>
+          <para>extends attributes on filesystem objects.</para>
+          <indexterm zone="attr attr">
+            <primary sortas="b-attr">attr</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="getfattr">
+        <term><command>getfattr</command></term>
+        <listitem>
+          <para>gets the extended attributes of filesystem objects.</para>
+          <indexterm zone="attr getfattr">
+            <primary sortas="b-getfattr">getfattr</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setfattr">
+        <term><command>setfattr</command></term>
+        <listitem>
+          <para>sets the extended attributes of filesystem objects.</para>
+          <indexterm zone="attr setfattr">
+            <primary sortas="b-setfattr">setfattr</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libattr">
+        <term><filename class='libraryfile'>libattr.so</filename></term>
+        <listitem>
+          <para>contains the <application>attr</application> API functions.</para>
+          <indexterm zone="attr libattr">
+            <primary sortas="c-libattr">libattr.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Copied: branches/systemd/archive/consolekit.xml (from r11299, branches/systemd/postlfs/security/consolekit.xml)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/systemd/archive/consolekit.xml	Mon Jun 17 03:13:45 2013	(r11302, copy of r11299, branches/systemd/postlfs/security/consolekit.xml)
@@ -0,0 +1,405 @@
+<?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 consolekit-download-http "&sources-anduin-http;/c/ConsoleKit-&consolekit-version;.tar.xz">
+  <!ENTITY consolekit-download-ftp  " ">
+  <!ENTITY consolekit-md5sum        "6aaadf5627d2f7587aa116727e2fc1da">
+  <!ENTITY consolekit-size          "356 KB">
+  <!ENTITY consolekit-buildsize     "8.0 MB">
+  <!ENTITY consolekit-time          "0.3 SBU">
+]>
+
+<sect1 id="consolekit" xreflabel="ConsoleKit-&consolekit-version;">
+  <?dbhtml filename="consolekit.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>ConsoleKit-&consolekit-version;</title>
+
+  <indexterm zone="consolekit">
+    <primary sortas="a-ConsoleKit">ConsoleKit</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to ConsoleKit</title>
+
+    <para>
+      The <application>ConsoleKit</application> package is a framework for
+      keeping track of the various users, sessions, and seats present on a system.
+      It provides a mechanism for software to react to changes of any of these
+      items or of any of the metadata associated with them.
+    </para>
+
+    &lfs72_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&consolekit-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&consolekit-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &consolekit-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &consolekit-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &consolekit-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &consolekit-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">ConsoleKit Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="acl"/>,
+      <xref linkend="dbus-glib"/> and
+      <xref linkend="xorg7-lib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="linux-pam"/> and
+      <xref linkend="polkit"/>
+    </para>
+
+    <warning>
+      <para>
+        If you intend <emphasis role="strong">NOT</emphasis> to install
+        <application>polkit</application>, you will need to manually edit the
+        ConsoleKit.conf file to lock down the service. Failure to do so may be a
+        huge SECURITY HOLE.
+      </para>
+    </warning>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="xmlto"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/consolekit"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of ConsoleKit</title>
+
+    <para>
+      Install <application>ConsoleKit</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --localstatedir=/var \
+            --libexecdir=/usr/lib/ConsoleKit \
+            --enable-udev-acl \
+            --enable-pam-module &&
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <option>--enable-udev-acl</option>: This switch enables building of the
+      <command>udev-acl</command> tool, which is used to allow normal users
+      to access device nodes normally only accessible to
+      <systemitem class="username">root</systemitem>.
+    </para>
+
+    <para>
+      <option>--enable-pam-module</option>: This switch enables building of the
+      <application>ConsoleKit</application> <application>PAM</application>
+      module which is needed for <application>ConsoleKit</application> to
+      work correctly with <application>PAM</application>. Remove if
+      <application>Linux PAM</application> is
+      <emphasis role="strong">NOT</emphasis> installed.
+    </para>
+
+    <para>
+      <option>--enable-docbook-docs</option>: Use this switch if
+      <application>xmlto</application> is installed and you wish to
+      build the API documentation.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring ConsoleKit</title>
+
+    <sect3>
+      <title>PAM Module Configuration</title>
+
+      <para>
+        If you use <application>Linux PAM</application> you need to
+        configure <application>Linux PAM</application> to activate
+        <application>ConsoleKit</application> upon user login.
+        This can be achieved by editing the
+        <filename>/etc/pam.d/system-session</filename> file as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>cat >> /etc/pam.d/system-session << "EOF"
+# Begin ConsoleKit addition
+
+session   optional    pam_loginuid.so
+session   optional    pam_ck_connector.so nox11
+
+# End ConsoleKit addition
+EOF</userinput></screen>
+
+      <para>
+        You will also need a helper script that creates a file in
+        <filename class="directory">/var/run/console</filename>
+        named as the currently logged in user and that contains the
+        <application>D-Bus</application> address of the session. You
+        can create the script by running the following commands as
+        the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>cat > /usr/lib/ConsoleKit/run-session.d/pam-foreground-compat.ck << "EOF"
+#!/bin/sh
+TAGDIR=/var/run/console
+
+[ -n "$CK_SESSION_USER_UID" ] || exit 1
+[ "$CK_SESSION_IS_LOCAL" = "true" ] || exit 0
+
+TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`"
+
+if [ "$1" = "session_added" ]; then
+    mkdir -p "$TAGDIR"
+    echo "$CK_SESSION_ID" >> "$TAGFILE"
+fi
+
+if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then
+    sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE"
+    [ -s "$TAGFILE" ] || rm -f "$TAGFILE"
+fi
+EOF
+chmod -v 755 /usr/lib/ConsoleKit/run-session.d/pam-foreground-compat.ck</userinput></screen>
+
+      <para>
+        See /usr/share/doc/ConsoleKit/spec/ConsoleKit.html for more
+        configuration.
+      </para>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          ck-history, ck-launch-session, ck-list-sessions,
+          ck-log-system-restart, ck-log-system-start,
+          ck-log-system-stop and console-kit-daemon
+        </seg>
+        <seg>
+          libck-connector.so and pam_ck_connector.so
+        </seg>
+        <seg>
+          /etc/ConsoleKit,
+          /usr/include/ConsoleKit,
+          /usr/lib/ConsoleKit,
+          /usr/share/doc/ConsoleKit and
+          /var/log/ConsoleKit
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+<!--
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="ck-history">
+        <term><command>ck-history</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="consolekit ck-history">
+            <primary sortas="b-ck-history">ck-history</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ck-launch-session">
+        <term><command>ck-launch-session</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="consolekit ck-launch-session">
+            <primary sortas="b-ck-launch-session">ck-launch-session</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ck-list-sessions">
+        <term><command>ck-list-sessions</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="consolekit ck-list-sessions">
+            <primary sortas="b-ck-list-sessions">ck-list-sessions</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ck-log-system-restart">
+        <term><command>ck-log-system-restart</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="consolekit ck-log-system-restart">
+            <primary sortas="b-ck-log-system-restart">ck-log-system-restart</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ck-log-system-start">
+        <term><command>ck-log-system-start</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="consolekit ck-log-system-start">
+            <primary sortas="b-ck-log-system-start">ck-log-system-start</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ck-log-system-stop">
+        <term><command>ck-log-system-stop</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="consolekit ck-log-system-stop">
+            <primary sortas="b-ck-log-system-stop">ck-log-system-stop</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="console-kit-daemon">
+        <term><command>console-kit-daemon</command></term>
+        <listitem>
+          <para>is the <application>ConsoleKit</application> daemon.</para>
+          <indexterm zone="consolekit console-kit-daemon">
+            <primary sortas="b-console-kit-daemon">console-kit-daemon</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ck-collect-session-info">
+        <term><command>ck-collect-session-info</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="consolekit ck-collect-session-info">
+            <primary sortas="b-ck-collect-session-info">ck-collect-session-info</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ck-get-x11-display-device">
+        <term><command>ck-get-x11-display-device</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="consolekit ck-get-x11-display-device">
+            <primary sortas="b-ck-get-x11-display-device">ck-get-x11-display-device</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ck-get-x11-server-pid">
+        <term><command>ck-get-x11-server-pid</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="consolekit ck-get-x11-server-pid">
+            <primary sortas="b-ck-get-x11-server-pid">ck-get-x11-server-pid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ck-system-restart">
+        <term><command>ck-system-restart</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="consolekit ck-system-restart">
+            <primary sortas="b-ck-system-restart">ck-system-restart</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ck-system-stop">
+        <term><command>ck-system-stop</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="consolekit ck-system-stop">
+            <primary sortas="b-ck-system-stop">ck-system-stop</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libck-connector">
+        <term><filename class='libraryfile'>libck-connector.so</filename></term>
+        <listitem>
+          <para>contains functions that .....</para>
+          <indexterm zone="consolekit libck-connector">
+            <primary sortas="c-libck-connector">libck-connector.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pam_ck_connector">
+        <term><filename class='libraryfile'>pam_ck_connector.so</filename></term>
+        <listitem>
+          <para>contains functions that .....</para>
+          <indexterm zone="consolekit pam_ck_connector">
+            <primary sortas="c-pam_ck_connector">pam_ck_connector.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+-->
+
+  </sect2>
+
+</sect1>

Copied: branches/systemd/archive/gperf.xml (from r11299, branches/systemd/general/genutils/gperf.xml)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/systemd/archive/gperf.xml	Mon Jun 17 03:13:45 2013	(r11302, copy of r11299, branches/systemd/general/genutils/gperf.xml)
@@ -0,0 +1,152 @@
+<?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 gperf-download-http "http://ftp.gnu.org/gnu/gperf/gperf-&gperf-version;.tar.gz">
+  <!ENTITY gperf-download-ftp  "ftp://ftp.gnu.org/gnu/gperf/gperf-&gperf-version;.tar.gz">
+  <!ENTITY gperf-md5sum        "c1f1db32fb6598d6a93e6e88796a8632">
+  <!ENTITY gperf-size          "968 KB">
+  <!ENTITY gperf-buildsize     "6.5 MB">
+  <!ENTITY gperf-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="gperf" xreflabel="Gperf-&gperf-version;">
+  <?dbhtml filename="gperf.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Gperf-&gperf-version;</title>
+
+  <indexterm zone="gperf">
+    <primary sortas="a-Gperf">Gperf</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Gperf</title>
+
+    <para><application>Gperf</application> generates a perfect hash function
+    from a key set.</para>
+
+    &lfs73_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gperf-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gperf-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gperf-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gperf-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gperf-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gperf-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gperf"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Gperf</title>
+
+    <para>Install <application>Gperf</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/gperf-&gperf-version; &&
+make</userinput></screen>
+
+<!--  gperf.texi is broken.  Fixing the texi file breaks 'make install'
+      without TeXlive installed.
+    <para>If desired, create a text version of the documentation by issuing
+    the following command:</para>
+
+<screen><userinput>makeinfo -o doc/gperf.txt - -plaintext doc/gperf.texi</userinput></screen>
+-->
+
+    <para>To test the results, issue: <command>make check</command>. There
+    should be no output from the <command>diff</command> commands.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install &&
+<!--install -m644 -v doc/gperf.{dvi,ps,pdf,txt} \ -->
+install -m644 -v doc/gperf.{dvi,ps,pdf} \
+                 /usr/share/doc/gperf-&gperf-version; &&
+
+pushd /usr/share/info &&
+rm -v dir &&
+for FILENAME in *; do
+    install-info $FILENAME dir 2>/dev/null
+done &&
+popd</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+<!--
+    <para><command>install -m644 -v doc/gperf.{dvi,ps,pdf,txt} ...</command>:
+    This command installs documentation. Modify the command (remove ',txt') if
+    you did not build the text version.</para>
+-->
+
+    <para><command>install -m644 -v doc/gperf.{dvi,ps,pdf} ...</command>:
+    This command installs documentation.</para>
+
+    <para><command>pushd ... popd</command>: This set of commands rebuilds the
+    <filename>/usr/share/info/dir</filename> file as the installation failed
+    to do so.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>gperf</seg>
+        <seg>None</seg>
+        <seg>/usr/share/doc/gperf-&gperf-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gperf-prog">
+        <term><command>gperf</command></term>
+        <listitem>
+          <para>generates a perfect hash function from a key set.</para>
+          <indexterm zone="gperf gperf-prog">
+            <primary sortas="b-gperf">gperf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Copied: branches/systemd/archive/libcap2.xml (from r11299, branches/systemd/postlfs/security/libcap2.xml)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/systemd/archive/libcap2.xml	Mon Jun 17 03:13:45 2013	(r11302, copy of r11299, branches/systemd/postlfs/security/libcap2.xml)
@@ -0,0 +1,180 @@
+<?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;
+
+  <!-- Change to kernel.org when it gets back there. -->
+  <!ENTITY libcap2-download-http "http://ftp.de.debian.org/debian/pool/main/libc/libcap2/libcap2_&libcap2-version;.orig.tar.gz">
+  <!ENTITY libcap2-download-ftp  "ftp://ftp.de.debian.org/debian/pool/main/libc/libcap2/libcap2_&libcap2-version;.orig.tar.gz">
+  <!ENTITY libcap2-md5sum        "b4896816b626bea445f0b3849bdd4077">
+  <!ENTITY libcap2-size          "72 KB">
+  <!ENTITY libcap2-buildsize     "1.3 MB">
+  <!ENTITY libcap2-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="libcap2" xreflabel="libcap2-&libcap2-version;">
+  <?dbhtml filename="libcap2.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libcap2-&libcap2-version;</title>
+
+  <indexterm zone="libcap2">
+    <primary sortas="a-libcap2">libcap2</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libcap2</title>
+
+    <para>The <application>libcap2</application> package implements the
+    user-space interfaces to the POSIX 1003.1e capabilities available in Linux
+    kernels. These capabilities are a partitioning of the all powerful root
+    privilege into a set of distinct privileges.  </para>
+
+    &lfs73_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libcap2-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libcap2-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libcap2-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libcap2-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libcap2-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libcap2-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libcap2 Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="attr"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="linux-pam"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libcap2"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libcap2</title>
+
+    <para>Install <application>libcap2</application> by running the following
+    commands:</para>
+
+<screen><userinput>make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>
+      If you want to disable installing the static library, use this sed:
+    </para>
+
+<screen><userinput>sed -i '/install.*STALIBNAME/ s/^/#/' libcap/Makefile</userinput></screen>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make RAISE_SETFCAP=no install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>RAISE_SETFCAP=no</parameter>: This parameter skips trying
+    to use <application>setcap</application> on itself.  This avoids an installation
+    error if the kernel or file system do not support extended capabilities.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>capsh, getcap, getpcaps, and setcap</seg>
+        <seg>libcap.{so,a}</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="capsh">
+        <term><command>capsh</command></term>
+        <listitem>
+          <para>is a shell wrapper to exploredand constraine capability support.</para>
+          <indexterm zone="libcap2 capsh">
+            <primary sortas="b-capsh">capsh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="getcap">
+        <term><command>getcap</command></term>
+        <listitem>
+          <para>examines file capabilities.</para>
+          <indexterm zone="libcap2 getcap">
+            <primary sortas="b-getcap">getcap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="getpcaps">
+        <term><command>getpcaps</command></term>
+        <listitem>
+          <para>displays the capabilities on the queried process(es).</para>
+          <indexterm zone="libcap2 getpcaps">
+            <primary sortas="b-getpcaps">getpcaps</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setcap">
+        <term><command>setcap</command></term>
+        <listitem>
+          <para>sets file file capabilities.</para>
+          <indexterm zone="libcap2 setcap">
+            <primary sortas="b-setcap">setcap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcap2-lib">
+        <term><filename class='libraryfile'>libcap.{so,a}</filename></term>
+        <listitem>
+          <para>contains the <application>libcap2</application> API functions.</para>
+          <indexterm zone="libcap2 libcap2-lib">
+            <primary sortas="c-libcap2">libcap.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Copied: branches/systemd/archive/udev-extras.xml (from r11299, branches/systemd/general/sysutils/udev-extras.xml)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/systemd/archive/udev-extras.xml	Mon Jun 17 03:13:45 2013	(r11302, copy of r11299, branches/systemd/general/sysutils/udev-extras.xml)
@@ -0,0 +1,230 @@
+<?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 systemd-download-http "http://www.freedesktop.org/wiki/Software/systemd/">
+  <!ENTITY systemd-download-ftp  " ">
+  <!-- <!ENTITY udev-md5sum        " "> -->
+  <!ENTITY systemd-size          "~1.3 MB">
+  <!ENTITY systemd-buildsize     "~16 MB">
+  <!ENTITY systemd-time          "~0.1 SBU">
+]>
+
+<sect1 id="udev-extras" xreflabel="udev-extras (from systemd)">
+  <?dbhtml filename="udev-extras.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Udev Extras (from systemd)</title>
+
+  <indexterm zone="udev-extras">
+    <primary sortas="a-udev-extras">udev extras (from systemd)</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Udev Extras</title>
+
+    <para>In 2012, the <application>Udev</application> code distribution was
+    merged with <application>systemd</application>.
+    <application>Systemd</application> is a set of programs that replace the
+    <application>SysVInit</application> package used by LFS and is much more
+    complex.  It is not compatible with the LFS bootscripts and has many
+    problems and few advantages for most LFS users.</para>
+
+    <para>The procedures below extract libraries and programs from the systemd
+    sources that could not be built in LFS due to library dependency
+    issues.</para>
+
+    <para>Unlike any other package in the BLFS book, there is no set version
+    of <application>systemd</application> specified to download. Several version
+    updates to LFS and BLFS means there are probably many different
+    versions of <application>Udev</application> on the platforms that BLFS is
+    being built upon. Therefore, you should download and use the version of
+    <application>systemd</application> your computer currently uses. The BLFS
+    team has no experience updating (or reverting to an older version) the
+    <application>Udev</application> programs <quote>on the fly.</quote> To
+    discover the version of <application>Udev</application> your computer
+    currently uses, issue <command>/sbin/udevadm --version</command>.</para>
+
+    &lfs73_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&systemd-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&systemd-download-ftp;"/></para>
+      </listitem>
+      <!-- <listitem>
+        <para>Download MD5 sum: &systemd-md5sum;</para>
+      </listitem> -->
+      <listitem>
+        <para>Download size: &systemd-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &systemd-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &systemd-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Udev Extras Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <ulink url="http://anduin.linuxfromscratch.org/sources/other/"/>
+      (match the udev-lfs-???.tar.bz2 tarball version to the systemd version used in LFS).
+      <xref linkend="glib2"/> (for the gudev library),
+      <xref linkend="gperf"/> (for keymap), and
+      <xref linkend="gobject-introspection"/> (for gir-data, needed for Gnome)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="acl"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional Runtime Dependencies</bridgehead>
+    <para role="optional">
+      <xref linkend="pciutils"/> and
+      <xref linkend="usbutils"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/udev-extras"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Udev Extras</title>
+
+    <para>First, put the custom LFS files in place:</para>
+
+<screen><userinput>tar -xf ../udev-lfs-186.tar.bz2</userinput></screen>
+
+     <note><para>For udev-lfs-197-2.tar.bz2, there is a minor error
+     in the Makefile.  For that version, run:</para>
+
+     <screen><userinput>sed -i -e '/samsung-9/d' udev-lfs-197-2/makefile-incl.keymap</userinput></screen></note>
+
+    <sect3>
+    <title>keymap</title>
+    <para>Support for special keys for many laptops is provided by the
+    <command>keymap</command> program and supporting files.  If the
+    <command>keymap</command> capability is desired, use:</para>
+
+<screen><userinput>make -f udev-lfs-186/Makefile.lfs keymap</userinput></screen>
+
+    <para>To install <command>keymap</command> and its associated files,
+    issue the following command as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make -f udev-lfs-186/Makefile.lfs install-keymap</userinput></screen>
+
+    </sect3>
+
+    <sect3>
+    <title>gudev</title>
+
+    <para>To build the <application>libgudev-1.0</application> library and
+    interface files, run:</para>
+
+<screen><userinput>make -f udev-lfs-186/Makefile.lfs gudev</userinput></screen>
+
+    <para>Install the <filename class='libraryfile'>gudev</filename> library,
+    run, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make -f udev-lfs-186/Makefile.lfs install-gudev</userinput></screen>
+
+    </sect3>
+
+    <sect3>
+    <title>GObject Files</title>
+
+    <para>To build the <application>gobject-introspection</application>
+    interface (gir) files for the <filename
+    class='libraryfile'>libgudev-1.0</filename> library, run:</para>
+
+<screen><userinput>make -f udev-lfs-186/Makefile.lfs gir-data</userinput></screen>
+
+    <para>Install the gir data, as the <systemitem
+    class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make -f udev-lfs-186/Makefile.lfs install-gir-data</userinput></screen>
+
+    <caution><para>There is a shortcut to build and install all of the
+    <application>udev</application> components at once using the
+    <emphasis>all</emphasis> and <emphasis>install-all</emphasis>
+    <filename>Makefile.lfs</filename> targets.  The installation of this target
+    will overwrite the base LFS udev files and has not been thoroughly tested
+    at the time of this writing.  If using this procedure, the udev daemon
+    should be stopped before overwriting the existing <filename>udevd</filename>
+    and udev libraries.</para></caution>
+
+    </sect3>
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <para>A list of the installed files, along with their short descriptions
+    can be found at
+    <ulink url="&lfs-root;/chapter06/udev.html#contents-udev"/>.</para>
+
+    <para>The following is some additional content information.</para>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>findkeyboards, keyboard-force-release.sh, and keymap</seg>
+
+        <seg>libgudev-1.0.so</seg>
+
+        <seg>/lib/udev/keymaps/force-release,
+             /usr/include/gudev-1.0/gudev,
+             /usr/lib/girepository-1.0,
+             /usr/share/gir-1.0, and
+             /usr/share/gtk-doc/html/gudev</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="keymap-systemd">
+        <term><command>keymap</command></term>
+        <listitem>
+          <para>configures computer model specific key mappings.</para>
+          <indexterm zone="udev-extras keymap-systemd">
+            <primary sortas="b-keymap">keymap (from systemd)</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgudev-1.0-systemd">
+        <term><filename class='libraryfile'>libgudev-1.0.so</filename></term>
+        <listitem>
+          <para>is a GObject-based wrapper library for libudev.</para>
+          <indexterm zone="udev-extras libgudev-1.0-systemd">
+            <primary sortas="c-libgudev-1.0-systemd">libgudev-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Copied: branches/systemd/archive/udev.xml (from r11299, branches/systemd/general/sysutils/udev.xml)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/systemd/archive/udev.xml	Mon Jun 17 03:13:45 2013	(r11302, copy of r11299, branches/systemd/general/sysutils/udev.xml)
@@ -0,0 +1,199 @@
+<?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 udev-download-http "http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-&udev-version;.tar.bz2"> -->
+  <!ENTITY udev-download-http "http://www.kernel.org/pub/linux/utils/kernel/hotplug/">
+  <!ENTITY udev-download-ftp  " ">
+  <!-- <!ENTITY udev-md5sum        "aeae0e6273dcbec246c3c1b9868ebed1"> -->
+  <!ENTITY udev-size          "~500 KB">
+  <!ENTITY udev-buildsize     "~10 MB">
+  <!ENTITY udev-time          "~1.8 SBU">
+]>
+
+<sect1 id="udev" xreflabel="udev-&udev-version;">
+  <?dbhtml filename="udev.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Udev-&udev-version;</title>
+
+  <indexterm zone="udev">
+    <primary sortas="a-udev">udev</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Udev</title>
+
+    <note><para>If you installed LFS from SVN-20120719, LFS-7.2, or later,
+    use <xref linkend='udev-extras'/> instead of this page.</para></note>
+
+    <para><application>Udev</application> was indeed installed in LFS and there
+    is no reason to reinstall it unless you are going to install a package such
+    as <application>UPower</application>. This installation of
+    <application>Udev</application> enables extra features which includes
+    <application>gudev</application>, a requirement for
+    <application>UPower</application> and optionally used by other
+    packages.</para>
+
+    <para>Unlike any other package in the BLFS book, there is no set version
+    of <application>Udev</application> specified to download. Several version
+    updates to LFS and none to BLFS means there are probably many different
+    versions of <application>Udev</application> on the platforms that BLFS is
+    being built upon. Therefore, you should download and use the version of
+    <application>Udev</application> your computer currently uses. The BLFS
+    team has no experience updating (or reverting to an older version) the
+    <application>Udev</application> package <quote>on the fly.</quote> To
+    discover the version of <application>Udev</application> your computer
+    currently uses, issue <command>/sbin/udevadm --version</command>.</para>
+
+    <para>You should look at the LFS instructions for the version you used, to
+    check that you are using the correct testfiles (for some versions, this was a
+    separate tarball, extracted in the udev directory with --strip-components=1)
+    and to compare the configure options you are about to use against those which
+    you used to build the version you are running (sometimes, the options change).
+    </para>
+
+    <para>This package is known to build and work properly using an LFS-7.0
+    platform. (Using Udev-173)</para>
+
+    <para>This package is known to build and work properly using an LFS-7.1
+    platform. (Using Udev-182)</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&udev-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&udev-download-ftp;"/></para>
+      </listitem>
+      <!-- <listitem>
+        <para>Download MD5 sum: &udev-md5sum;</para>
+      </listitem> -->
+      <listitem>
+        <para>Download size: &udev-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &udev-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &udev-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Udev Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="acl"/>,
+    <xref linkend="glib2"/>,
+    <xref linkend="gperf"/>,
+    <xref linkend="pciutils"/>, and
+    <xref linkend="usbutils"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="gobject-introspection"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/udev"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Udev</title>
+
+    <para>Install <application>Udev</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr                  \
+            --sysconfdir=/etc              \
+            --sbindir=/sbin                \
+            --with-rootlibdir=/lib         \
+            --libexecdir=/lib              \
+            --with-systemdsystemunitdir=no \
+            --disable-introspection        \
+            --docdir=/usr/share/doc/<udev-&udev-version;> &&
+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</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+    <para><option>--disable-introspection</option>: Remove this option if
+    the optional dependency gobject-introspection is installed.</para>
+
+    <para><option>--with-systemdsystemunitdir=no</option>: systemd is not used
+    in (B)LFS.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <para>A list of the installed files, along with their short descriptions
+    can be found at
+    <ulink url="&lfs-root;/chapter06/udev.html#contents-udev"/>.</para>
+
+    <para>The following is some additional content information.</para>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>findkeyboards, firmware, input_id,
+        keyboard-force-release.sh, keymap, modem-modeswitch, pci-db, udev-acl,
+        usb-db, and v4l_id</seg>
+        <seg>libgudev-1.0.so</seg>
+        <seg>/lib/udev/keymaps/force-release,
+        /usr/{include/gudev-1.0/gudev,share/{doc/udev-&udev-version;,
+        gtk-doc/html/gudev}}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="keymap">
+        <term><command>keymap</command></term>
+        <listitem>
+          <para>configures computer model specific key mappings.</para>
+          <indexterm zone="udev keymap">
+            <primary sortas="b-keymap">keymap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgudev-1.0">
+        <term><filename class='libraryfile'>libgudev-1.0.so</filename></term>
+        <listitem>
+          <para>is a GObject-based wrapper library for libudev.</para>
+          <indexterm zone="udev libgudev-1.0">
+            <primary sortas="c-libgudev-1.0">libgudev-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Modified: branches/systemd/general.ent
==============================================================================
--- branches/systemd/general.ent	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/general.ent	Mon Jun 17 03:13:45 2013	(r11302)
@@ -144,9 +144,6 @@
 
 <!-- Chapter 4 -->
 
-<!ENTITY acl-version                  "2.2.51">
-<!ENTITY attr-version                 "2.4.47">
-<!ENTITY consolekit-version           "0.4.6">
 <!ENTITY cracklib-version             "2.8.22">
 <!ENTITY cyrus-sasl-version           "2.1.26">
 <!ENTITY gnupg-version                "1.4.13">
@@ -154,7 +151,6 @@
 <!ENTITY gnutls-version               "3.2.0">
 <!ENTITY gpgme-version                "1.4.1">
 <!ENTITY iptables-version             "1.4.18">
-<!ENTITY libcap2-version              "2.22">
 <!ENTITY liboauth-version             "1.0.1">
 <!ENTITY libpwquality-version         "1.2.1">
 <!ENTITY linux-pam-version            "1.1.6">
@@ -310,7 +306,6 @@
 <!ENTITY bc-version                   "1.06.95">
 <!ENTITY compface-version             "1.5.2">
 <!ENTITY desktop-file-utils-version   "0.21">
-<!ENTITY gperf-version                "3.0.4">
 <!ENTITY graphviz-version             "2.30.1">
 <!ENTITY gtk-doc-version              "1.18">
 <!ENTITY hd2u-version                 "1.0.3">
@@ -357,7 +352,6 @@
 <!ENTITY sg3_utils-version            "1.35">
 <!ENTITY strigi-version               "0.7.8">
 <!ENTITY sysstat-version              "10.0.5">
-<!ENTITY udev-version                 "Installed LFS Version">
 <!ENTITY udisks-version               "1.0.4">
 <!ENTITY udisks2-version              "2.1.0">
 <!ENTITY unrar-version                "4.2.4">

Modified: branches/systemd/general/genlib/glib2.xml
==============================================================================
--- branches/systemd/general/genlib/glib2.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/general/genlib/glib2.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -87,8 +87,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="attr"/>,
-      <xref linkend="dbus"/> (required to run the tests) and
       <xref linkend="gtk-doc"/>
     </para>
 

Modified: branches/systemd/general/genlib/libgcrypt.xml
==============================================================================
--- branches/systemd/general/genlib/libgcrypt.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/general/genlib/libgcrypt.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -82,7 +82,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libcap2"/> and
       <xref linkend="pth"/>
     </para>
 

Modified: branches/systemd/general/genlib/libgusb.xml
==============================================================================
--- branches/systemd/general/genlib/libgusb.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/general/genlib/libgusb.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -83,8 +83,7 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="gobject-introspection"/>,
-      <xref linkend="udev"/> or
-      <xref linkend="udev-extras"/> (for GUdev) and
+      <xref linkend="systemd"/> (for GUdev) and
       <xref linkend="vala"/>
     </para>
 

Modified: branches/systemd/general/genutils/genutils.xml
==============================================================================
--- branches/systemd/general/genutils/genutils.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/general/genutils/genutils.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -24,7 +24,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="compface.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="desktop-file-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="graphviz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-doc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hd2u.xml"/>

Modified: branches/systemd/general/genutils/pinentry.xml
==============================================================================
--- branches/systemd/general/genutils/pinentry.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/general/genutils/pinentry.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -69,8 +69,7 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk2"/>,
-      <xref linkend="libcap2"/> and
+      <xref linkend="gtk2"/> and
       <xref linkend="qt4"/>
     </para>
 

Modified: branches/systemd/general/prog/vala.xml
==============================================================================
--- branches/systemd/general/prog/vala.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/general/prog/vala.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -82,7 +82,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="dbus"/> (Required for the tests) and
       <xref linkend="libxslt"/> (Required for generating the documentation)
     </para>
 

Modified: branches/systemd/general/sysutils/bluez.xml
==============================================================================
--- branches/systemd/general/sysutils/bluez.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/general/sysutils/bluez.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -74,7 +74,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="dbus"/> and
       <xref linkend="glib2"/>
     </para>
 

Modified: branches/systemd/general/sysutils/colord.xml
==============================================================================
--- branches/systemd/general/sysutils/colord.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/general/sysutils/colord.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -77,7 +77,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="dbus"/>,
       <xref linkend="libgusb"/>,
       <xref linkend="lcms2"/> and
       <xref linkend="sqlite"/>
@@ -87,8 +86,7 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>,
       <xref linkend="polkit"/>,
-      <xref linkend="udev"/> or
-      <xref linkend="udev-extras"/> (for GUdev) and
+      <xref linkend="systemd"/> (for GUdev) and
       <xref linkend="vala"/>
     </para>
 

Modified: branches/systemd/general/sysutils/dbus-bindings.xml
==============================================================================
--- branches/systemd/general/sysutils/dbus-bindings.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/general/sysutils/dbus-bindings.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -113,7 +113,6 @@
 
       <bridgehead renderas="sect5">Required</bridgehead>
       <para role="required">
-        <xref linkend="dbus"/>,
         <xref linkend="expat"/> and
         <xref linkend="glib2"/>
       </para>

Modified: branches/systemd/general/sysutils/libarchive.xml
==============================================================================
--- branches/systemd/general/sysutils/libarchive.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/general/sysutils/libarchive.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -40,8 +40,8 @@
     <itemizedlist spacing="compact">
       <listitem>
         <para>
-Download (HTTP): <ulink url="&libarchive-download-http;"/>
-</para>
+          Download (HTTP): <ulink url="&libarchive-download-http;"/>
+        </para>
       </listitem>
       <listitem>
         <para>
@@ -74,7 +74,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="acl"/>,
       <xref linkend="libxml2"/> or
       <xref linkend="expat"/>,
       <xref linkend="LZO"/>,

Modified: branches/systemd/general/sysutils/strigi.xml
==============================================================================
--- branches/systemd/general/sysutils/strigi.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/general/sysutils/strigi.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -65,8 +65,7 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-    <xref linkend="qt4"/> and
-    <xref linkend="dbus"/>
+    <xref linkend="qt4"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>

Added: branches/systemd/general/sysutils/systemd.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/systemd/general/sysutils/systemd.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -0,0 +1,256 @@
+<?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 systemd-download-http "http://www.freedesktop.org/software/systemd/">
+  <!ENTITY systemd-size          "?? MB">
+  <!ENTITY systemd-buildsize     "?? MB">
+  <!ENTITY systemd-time          "?? SBU">
+]>
+
+<sect1 id="systemd" xreflabel="Systemd">
+  <?dbhtml filename="systemd.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Systemd</title>
+
+  <indexterm zone="systemd">
+    <primary sortas="a-Systemd">Systemd</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Systemd</title>
+
+    <para>
+      <application>Systemd</application> was installed in LFS. These
+      instructions are necesary for building some of its advanced
+      features that could not be built in LFS due to dependency
+      problems like <command>systemd-logind</command> PAM support
+      libraries, <application>GUdev</application> libraries and
+      <application>GObject Introspection</application> data which are
+      necesary for desktops like <application>GNOME</application> and
+      <application>KDE</application>.
+    </para>
+
+    <para>
+      Unlike any other package in the BLFS book, there is no set version
+      of <application>Systemd</application> specified to download.
+      Several version updates to LFS and BLFS means there are probably
+      many different versions of <application>Systemd</application> on
+      the platforms that BLFS is being built upon. Therefore, you should
+      download and use the version of <application>Systemd</application>
+      your computer currently uses. To discover the version of
+      <application>Systemd</application> your computer currently uses,
+      issue <command>systemctl --version</command>.
+    </para>
+
+    &lfs73_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&systemd-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &systemd-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &systemd-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &systemd-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Systemd Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/systemd"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Systemd</title>
+
+    <warning>
+      <para>
+        The instructions below will overwrite all files
+        installed by <application>Systemd</application> in LFS.
+        It is best to run <command>make install</command> from
+        a TTY console, running as few programs as possible to
+        avoid unexpected failures.
+      </para>
+    </warning>
+
+    <para>
+      Install <application>Systemd</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &&
+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</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring systemd</title>
+
+    <sect3 id="systemd-config">
+      <title>Config Files</title>
+      <para>
+        <filename>~/.Configfilename1</filename> and
+        <filename>/etc/path/Configfilename2</filename>
+      </para>
+
+      <indexterm zone="systemd systemd-config">
+        <primary sortas="e-AA.Configfilename1">~/.Configfilename1</primary>
+      </indexterm>
+
+      <indexterm zone="systemd systemd-config">
+        <primary
+        sortas="e-etc-path-Configfilename2">/etc/path/Configfilename2</primary>
+      </indexterm>
+    </sect3>
+
+    <sect3><title>Configuration Information</title>
+
+      <para>
+        Blah blah blah about config.
+      </para>
+
+<screen><userinput>USER CONFIG COMMANDS</userinput></screen>
+
+<screen role="root"><userinput>ROOT CONFIG COMMANDS</userinput></screen>
+
+      <para>
+        Create the file .... for ...
+      </para>
+
+<screen role="root"><userinput>cat >> /PATH/FILENAME << "EOF"
+<literal># Begin FILENAME
+
+TEXT
+
+# End FILENAME</literal>
+EOF</userinput></screen>
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          PROGRAM1, PROGRAM2 and PROGRAM3
+        </seg>
+        <seg>
+          libLIBRARY1.so, libLIBRARY2.so and libLIBRARY3.so
+        </seg>
+        <seg>
+          /etc/systemd, /usr/include/systemd, /usr/lib/systemd
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="PROGRAM1">
+        <term><command>PROGRAM1</command></term>
+        <listitem>
+          <para>
+            does this ..... (end the sentence with a period).
+          </para>
+          <indexterm zone="systemd PROGRAM1">
+            <primary sortas="b-PROGRAM1">PROGRAM1</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="PROGRAM2">
+        <term><command>PROGRAM2</command></term>
+        <listitem>
+          <para>
+            does this ..... (end the sentence with a period).
+          </para>
+          <indexterm zone="systemd PROGRAM2">
+            <primary sortas="b-PROGRAM2">PROGRAM2</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libLIBRARY1">
+        <term><filename class="libraryfile">libLIBRARY1.so</filename></term>
+        <listitem>
+          <para>
+            contains functions that ..... (end the sentence with a period).
+          </para>
+          <indexterm zone="systemd libLIBRARY1">
+            <primary sortas="c-libLIBRARY1">libLIBRARY1.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Modified: branches/systemd/general/sysutils/sysutils.xml
==============================================================================
--- branches/systemd/general/sysutils/sysutils.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/general/sysutils/sysutils.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -45,8 +45,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sg3_utils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strigi.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysstat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev-extras.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="udisks.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udisks2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unrar.xml"/>

Modified: branches/systemd/general/sysutils/udisks.xml
==============================================================================
--- branches/systemd/general/sysutils/udisks.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/general/sysutils/udisks.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -80,8 +80,8 @@
       <xref linkend="lvm2"/>,
       <xref linkend="parted"/>,
       <xref linkend="polkit"/>,
-      <xref linkend="sg3_utils"/>, and
-      <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for gudev)
+      <xref linkend="sg3_utils"/> and
+      <xref linkend="systemd"/> (for gudev)
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -91,8 +91,8 @@
     </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/udisks"/></para>
-
+      <ulink url="&blfs-wiki;/udisks"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">

Modified: branches/systemd/general/sysutils/udisks2.xml
==============================================================================
--- branches/systemd/general/sysutils/udisks2.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/general/sysutils/udisks2.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -75,11 +75,10 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="acl"/>,
       <xref linkend="libatasmart"/>,
       <xref linkend="libxslt"/>,
-      <xref linkend="polkit"/>,  and
-      <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for GUdev)
+      <xref linkend="polkit"/> and
+      <xref linkend="systemd"/> (for GUdev)
     </para>
 
     <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>

Modified: branches/systemd/general/sysutils/upower.xml
==============================================================================
--- branches/systemd/general/sysutils/upower.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/general/sysutils/upower.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -79,9 +79,8 @@
       <xref linkend="dbus-glib"/>,
       <xref linkend="intltool"/>,
       <xref linkend="libusb"/>,
-      <xref linkend="polkit"/>, and
-      <xref linkend="udev"/> or
-      <xref linkend="udev-extras"/> (for GUdev)
+      <xref linkend="polkit"/> and
+      <xref linkend="systemd"/> (for GUdev)
     </para>
 
     <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>

Modified: branches/systemd/gnome/applications/cheese.xml
==============================================================================
--- branches/systemd/gnome/applications/cheese.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/gnome/applications/cheese.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -83,8 +83,7 @@
       <xref linkend="libgee"/>,
       <xref linkend="libcanberra"/>,
       <xref linkend="librsvg"/>,
-      <xref linkend="udev"/> or
-      <xref linkend="udev-extras"/> (for GUdev) and
+      <xref linkend="systemd"/> (for GUdev) and
       <xref linkend="yelp-xsl"/>
     </para>
 

Modified: branches/systemd/gnome/applications/empathy.xml
==============================================================================
--- branches/systemd/gnome/applications/empathy.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/gnome/applications/empathy.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -94,8 +94,7 @@
       <xref linkend="enchant"/> and
       <xref linkend="iso-codes"/>,
       <xref linkend="nautilus-sendto"/> and
-      <xref linkend="udev"/> or
-      <xref linkend="udev-extras"/> (for GUdev)
+      <xref linkend="systemd"/> (for GUdev)
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>

Modified: branches/systemd/gnome/core/dconf.xml
==============================================================================
--- branches/systemd/gnome/core/dconf.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/gnome/core/dconf.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -75,7 +75,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="dbus"/>,
       <xref linkend="gtk3"/> and
       <xref linkend="libxml2"/>
     </para>

Modified: branches/systemd/gnome/core/evolution-data-server.xml
==============================================================================
--- branches/systemd/gnome/core/evolution-data-server.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/gnome/core/evolution-data-server.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -82,7 +82,6 @@
     <para role="required">
       <xref linkend="db"/>,
       <xref linkend="gnome-online-accounts"/>,
-      <xref linkend="gperf"/>,
       <xref linkend="libgdata"/>,
       <xref linkend="libical"/> and
       <xref linkend="nss"/>

Modified: branches/systemd/gnome/core/gdm.xml
==============================================================================
--- branches/systemd/gnome/core/gdm.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/gnome/core/gdm.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -97,7 +97,6 @@
 
     <bridgehead renderas="sect4">Runtime Dependencies</bridgehead>
     <para role="required">
-      <xref linkend="consolekit"/>,
       <xref linkend="gnome-session"/> and either
       <xref linkend="gnome-shell"/> or
       <xref linkend="metacity"/>

Modified: branches/systemd/gnome/core/gnome-bluetooth.xml
==============================================================================
--- branches/systemd/gnome/core/gnome-bluetooth.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/gnome/core/gnome-bluetooth.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -95,8 +95,7 @@
 
     <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
     <para role="optional">
-      <xref linkend="bluez"/>,
-      <xref linkend="consolekit"/> and
+      <xref linkend="bluez"/> and
       <xref linkend="obexd"/>
       (Required for bluetooth-sendto to work)
     </para>
@@ -141,14 +140,10 @@
 <literal># Get access to /dev/rfkill for users
 # See https://bugzilla.redhat.com/show_bug.cgi?id=514798
 #
-# Updated for udev >= 154
-# http://bugs.debian.org/582188
-# https://bugzilla.redhat.com/show_bug.cgi?id=588660
-
-ENV{ACL_MANAGE}=="0", GOTO="gnome_bluetooth_end"
-ACTION!="add|change", GOTO="gnome_bluetooth_end"
-KERNEL=="rfkill", TAG+="udev-acl"
-LABEL="gnome_bluetooth_end"</literal>
+# Simplified by Kay Sievers
+# https://bugzilla.redhat.com/show_bug.cgi?id=733326
+
+KERNEL=="rfkill", SUBSYSTEM=="misc", TAG+="uaccess"</literal>
 EOF</userinput></screen>
 
   </sect2>

Modified: branches/systemd/gnome/core/gnome-control-center.xml
==============================================================================
--- branches/systemd/gnome/core/gnome-control-center.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/gnome/core/gnome-control-center.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -87,8 +87,7 @@
 
     <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
     <para role="required">
-      <xref linkend="accountsservice"/> and
-      <xref linkend="consolekit"/>
+      <xref linkend="accountsservice"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>

Modified: branches/systemd/gnome/core/gnome-keyring.xml
==============================================================================
--- branches/systemd/gnome/core/gnome-keyring.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/gnome/core/gnome-keyring.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -77,7 +77,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="dbus"/> and
       <xref linkend="gcr"/>
     </para>
 

Modified: branches/systemd/gnome/core/gnome-session.xml
==============================================================================
--- branches/systemd/gnome/core/gnome-session.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/gnome/core/gnome-session.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -87,12 +87,6 @@
       <xref linkend="xmlto"/>
     </para>
 
-    <bridgehead renderas="sect4">Runtime Dependencies</bridgehead>
-    <para role="required">
-      <xref linkend="consolekit"/> (if you intend to use startx to initiate
-      your <application>GNOME</application> desktop)
-    </para>
-
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/gnome-session"/>
     </para>

Modified: branches/systemd/gnome/core/gvfs.xml
==============================================================================
--- branches/systemd/gnome/core/gvfs.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/gnome/core/gvfs.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -75,7 +75,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="dbus"/>,
       <xref linkend="glib2"/> and
       <xref linkend="intltool"/>
     </para>
@@ -84,7 +83,8 @@
     <para role="recommended">
       <xref linkend="gtk3"/>,
       <xref linkend="libsecret"/>,
-      <xref linkend="libsoup"/> and
+      <xref linkend="libsoup"/>,
+      <xref linkend="systemd"/> (for Logind) and
       <xref linkend="udisks2"/>
     </para>
 

Modified: branches/systemd/gnome/core/libgnome-keyring.xml
==============================================================================
--- branches/systemd/gnome/core/libgnome-keyring.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/gnome/core/libgnome-keyring.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -77,7 +77,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="dbus"/>,
       <xref linkend="glib2"/>,
       <xref linkend="intltool"/> and
       <xref linkend="libgcrypt"/>

Modified: branches/systemd/gnome/core/libwacom.xml
==============================================================================
--- branches/systemd/gnome/core/libwacom.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/gnome/core/libwacom.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -76,8 +76,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="udev"/> or
-      <xref linkend="udev-extras"/> (for GUdev)
+      <xref linkend="systemd"/> (for GUdev)
     </para>
 
     <para condition="html" role="usernotes">

Modified: branches/systemd/kde/core/kde-workspace.xml
==============================================================================
--- branches/systemd/kde/core/kde-workspace.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/kde/core/kde-workspace.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -81,12 +81,13 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+      <xref linkend="dbus"/>,
       <xref linkend="kdepimlibs"/>,
       <xref linkend="nepomuk-core"/>,
       <xref linkend="boost"/>,
       <xref linkend="freetype2"/>,
-      <xref linkend="pciutils"/>, and
-      <xref linkend="consolekit"/>
+      <xref linkend="pciutils"/> and
+      <xref linkend="systemd"/> (for Logind)
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>

Modified: branches/systemd/kde/core/kdelibs.xml
==============================================================================
--- branches/systemd/kde/core/kdelibs.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/kde/core/kdelibs.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -97,7 +97,6 @@
     <xref linkend="pcre"/>,
     <xref linkend="avahi"/>,
     <xref linkend="openssl"/>,
-    <xref linkend="acl"/>,
     <xref linkend="aspell"/>,
     <xref linkend="enchant"/>,
     <ulink url="http://hspell.ivrix.org.il/">Hspell</ulink>,

Modified: branches/systemd/multimedia/audioutils/audacious.xml
==============================================================================
--- branches/systemd/multimedia/audioutils/audacious.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/multimedia/audioutils/audacious.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -130,7 +130,6 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="optional">
-      <xref linkend="dbus"/> and
       <xref linkend="alsa"/>
     </para>
 

Modified: branches/systemd/multimedia/cdwriteutils/libisoburn.xml
==============================================================================
--- branches/systemd/multimedia/cdwriteutils/libisoburn.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/multimedia/cdwriteutils/libisoburn.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -85,8 +85,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para>
-      <xref linkend="acl"/>,
-      <xref linkend="attr"/>,
       <xref linkend="doxygen"/> (to generate HTML documentation) and
       <xref linkend="tk"/> (for <command>xorriso-tcltk</command>)
     </para>

Modified: branches/systemd/multimedia/cdwriteutils/libisofs.xml
==============================================================================
--- branches/systemd/multimedia/cdwriteutils/libisofs.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/multimedia/cdwriteutils/libisofs.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -71,14 +71,6 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">libisofs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para>
-      <xref linkend="acl"/> and
-      <xref linkend="attr"/>
-    </para>
-
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/libisofs"/>
     </para>

Modified: branches/systemd/multimedia/libdriv/gst-plugins-base.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/gst-plugins-base.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/multimedia/libdriv/gst-plugins-base.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -95,7 +95,7 @@
       <xref linkend="libogg"/>,
       <xref linkend="libtheora"/>,
       <xref linkend="libvorbis"/>,
-      <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for gudev), and
+      <xref linkend="systemd"/> (for gudev) and
       <xref linkend="xorg7-lib"/>
     </para>
 

Modified: branches/systemd/multimedia/libdriv/gst10-plugins-good.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/gst10-plugins-good.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/multimedia/libdriv/gst10-plugins-good.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -100,7 +100,7 @@
       <xref linkend="libdv"/>,
       <xref linkend="pulseaudio"/>,
       <xref linkend="taglib"/>,
-      <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for GUdev),
+      <xref linkend="systemd"/> (for GUdev),
       <ulink url="http://jackaudio.org/">JACK</ulink>,
       <ulink url="http://caca.zoy.org/wiki/libcaca">libcaca</ulink>,
       <ulink url="http://sourceforge.net/projects/libraw1394/">libiec61883</ulink>,

Modified: branches/systemd/multimedia/libdriv/pulseaudio.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/pulseaudio.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/multimedia/libdriv/pulseaudio.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -86,8 +86,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="alsa-lib"/>,
-      <xref linkend="dbus"/>,
-      <xref linkend="libcap2"/>,
       <xref linkend="openssl"/>,
       <xref linkend="speex"/> and
       <xref linkend="xorg7-lib"/> <!-- Useful for KDE, too -->

Modified: branches/systemd/multimedia/videoutils/vlc.xml
==============================================================================
--- branches/systemd/multimedia/videoutils/vlc.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/multimedia/videoutils/vlc.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -91,7 +91,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="alsa-lib"/>,
-      <xref linkend="dbus"/>,
       <xref linkend="ffmpeg"/>,
       <xref linkend="gnutls"/>,
       <xref linkend="liba52"/>,

Modified: branches/systemd/networking/netprogs/cifsutils.xml
==============================================================================
--- branches/systemd/networking/netprogs/cifsutils.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/networking/netprogs/cifsutils.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -64,9 +64,8 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="keyutils"/>,
-      <xref linkend="libcap2"/>, and
-      <xref linkend="mitkrb"/> and
+      <xref linkend="keyutils"/> and
+      <xref linkend="mitkrb"/>
     </para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: branches/systemd/networking/netprogs/ntp.xml
==============================================================================
--- branches/systemd/networking/netprogs/ntp.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/networking/netprogs/ntp.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -69,11 +69,6 @@
 -->
     <bridgehead renderas="sect3">ntp Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libcap2"/>
-    </para>
-
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="openssl"/> and

Modified: branches/systemd/networking/netprogs/rsync.xml
==============================================================================
--- branches/systemd/networking/netprogs/rsync.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/networking/netprogs/rsync.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -61,8 +61,7 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="popt"/>,
-    <xref linkend="attr"/>,
-    <xref linkend="acl"/></para>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/rsync"/></para>

Modified: branches/systemd/networking/netprogs/samba3.xml
==============================================================================
--- branches/systemd/networking/netprogs/samba3.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/networking/netprogs/samba3.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -80,13 +80,11 @@
     <xref linkend="cups"/>,
     <xref linkend="openldap"/>,
     <xref linkend="gamin"/>,
-    <xref linkend="acl"/>,
     <xref linkend="xfsprogs"/>,
     <xref linkend="mitkrb"/>,
     <xref linkend="python2"/> (used only in parts of the test suite),
     <ulink url="http://tdb.samba.org/">tdb</ulink>,
     <ulink url="http://ctdb.samba.org/">ctdb</ulink>,
-    <xref linkend="libcap2"/>,
     <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink>,
     <xref linkend="avahi"/>,
     <ulink url="http://www.openafs.org/">OpenAFS</ulink>,

Modified: branches/systemd/networking/netprogs/wpa_supplicant.xml
==============================================================================
--- branches/systemd/networking/netprogs/wpa_supplicant.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/networking/netprogs/wpa_supplicant.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -86,8 +86,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="dbus"/>,
-      <xref linkend="libxml2"/> and
       <xref linkend="qt4"/>
     </para>
 
@@ -164,17 +162,6 @@
 CONFIG_SMARTCARD=y
 CONFIG_WPS=y
 CFLAGS += -I/usr/include/libnl3
-EOF</userinput></screen>
-
-    <para>
-      If you wish to use <application>WPA Supplicant</application> with
-      <xref linkend="NetworkManager"/>, make sure that you have installed
-      <xref linkend="dbus"/> and <xref linkend="libxml2"/>, then add the
-      following options to the <application>WPA Supplicant</application>
-      build configuration file by running the following command:
-    </para>
-
-<screen><userinput>cat >> wpa_supplicant/.config << "EOF"
 CONFIG_CTRL_IFACE_DBUS=y
 CONFIG_CTRL_IFACE_DBUS_NEW=y
 CONFIG_CTRL_IFACE_DBUS_INTRO=y
@@ -209,17 +196,8 @@
 
 <screen role="root"><userinput>install -v -m755 wpa_{cli,passphrase,supplicant} /sbin/ &&
 install -v -m644 doc/docbook/wpa_supplicant.conf.5 /usr/share/man/man5/ &&
-install -v -m644 doc/docbook/wpa_{cli,passphrase,supplicant}.8 /usr/share/man/man8/</userinput></screen>
-
-    <para>
-      If you have built <application>WPA Supplicant</application> with
-      <application>D-Bus</application> support, you will need to install
-      <application>D-Bus</application> configuration files. Install them
-      by running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m644 dbus/fi.{epitest.hostap.WPASupplicant,w1.wpa_supplicant1}.service \
+install -v -m644 doc/docbook/wpa_{cli,passphrase,supplicant}.8 /usr/share/man/man8/ &&
+install -v -m644 dbus/fi.{epitest.hostap.WPASupplicant,w1.wpa_supplicant1}.service \
                  /usr/share/dbus-1/system-services/ &&
 install -v -m644 dbus/dbus-wpa_supplicant.conf \
                  /etc/dbus-1/system.d/wpa_supplicant.conf</userinput></screen>

Modified: branches/systemd/networking/netutils/bind-utils.xml
==============================================================================
--- branches/systemd/networking/netutils/bind-utils.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/networking/netutils/bind-utils.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -66,7 +66,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libcap2"/>,
       <xref linkend="libxml2"/> and
       <xref linkend="openssl"/>
     </para>

Modified: branches/systemd/networking/netutils/networkmanager.xml
==============================================================================
--- branches/systemd/networking/netutils/networkmanager.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/networking/netutils/networkmanager.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -93,13 +93,11 @@
       <xref linkend="intltool"/>,
       <xref linkend="libnl"/>,
       <xref linkend="nss"/> and
-      <xref linkend="udev"/> or
-      <xref linkend="udev-extras"/> (for GUdev)
+      <xref linkend="systemd"/> (for GUdev and Logind)
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="consolekit"/>,
       <xref linkend="dhcpcd"/> or
       <xref linkend="dhcp"/> (client only),
       <xref linkend="gobject-introspection"/>,

Modified: branches/systemd/postlfs/security/security.xml
==============================================================================
--- branches/systemd/postlfs/security/security.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/postlfs/security/security.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -41,10 +41,7 @@
   "signatures" and compares for files that have been changed.</para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vulnerabilities.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cacerts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="consolekit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cracklib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cyrus-sasl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnupg.xml"/>
@@ -53,7 +50,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpgme.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iptables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="firewalling.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liboauth.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpwquality.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="linux-pam.xml"/>

Modified: branches/systemd/postlfs/shells/zsh.xml
==============================================================================
--- branches/systemd/postlfs/shells/zsh.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/postlfs/shells/zsh.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -75,8 +75,7 @@
     <bridgehead renderas="sect3">zsh Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="pcre"/> and
-    <xref linkend="libcap2"/>
+    <para role="optional"><xref linkend="pcre"/>
     </para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: branches/systemd/postlfs/virtualization/qemu.xml
==============================================================================
--- branches/systemd/postlfs/virtualization/qemu.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/postlfs/virtualization/qemu.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -78,7 +78,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="alsa"/>,
-      <xref linkend="attr"/>,
       <xref linkend="check"/>,
       <xref linkend="curl"/>,
       <xref linkend="esound"/>,

Modified: branches/systemd/pst/printing/cups.xml
==============================================================================
--- branches/systemd/pst/printing/cups.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/pst/printing/cups.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -86,14 +86,12 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="colord"/>,
-      <xref linkend="dbus"/> and
+      <xref linkend="colord"/> and
       <xref linkend="libusb"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="acl"/>,
       <xref linkend="avahi"/>,
       <xref linkend="gnutls"/> or <xref linkend="openssl"/>,
       <ulink

Modified: branches/systemd/pst/ps/a2ps.xml
==============================================================================
--- branches/systemd/pst/ps/a2ps.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/pst/ps/a2ps.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -80,9 +80,6 @@
 
     <bridgehead renderas="sect3">a2ps Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gperf"/></para>
-
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="psutils"/>, and

Modified: branches/systemd/server/major/bind.xml
==============================================================================
--- branches/systemd/server/major/bind.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/server/major/bind.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -72,7 +72,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libcap2"/>,
       <xref linkend="libxml2"/>,
       <xref linkend="mitkrb"/> and
       <xref linkend="openssl"/>

Modified: branches/systemd/server/major/vsftpd.xml
==============================================================================
--- branches/systemd/server/major/vsftpd.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/server/major/vsftpd.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -61,9 +61,8 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="linux-pam"/>,
-      <xref linkend="openssl"/> and
-      <xref linkend="libcap2"/>
+      <xref linkend="linux-pam"/> and
+      <xref linkend="openssl"/>
     </para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: branches/systemd/server/other/soprano.xml
==============================================================================
--- branches/systemd/server/other/soprano.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/server/other/soprano.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -76,7 +76,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="dbus"/>,
       <xref linkend="cmake"/>,
       <xref linkend="qt4"/> and
       <xref linkend="redland"/>

Modified: branches/systemd/x/lib/at-spi2-core.xml
==============================================================================
--- branches/systemd/x/lib/at-spi2-core.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/x/lib/at-spi2-core.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -78,7 +78,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="dbus"/>,
       <xref linkend="glib2"/>,
       <xref linkend="intltool"/> and
       <xref linkend="xorg7-lib"/>

Modified: branches/systemd/x/lib/qt4.xml
==============================================================================
--- branches/systemd/x/lib/qt4.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/x/lib/qt4.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -84,7 +84,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="cacerts"/>,
-      <xref linkend="dbus"/>,
       <xref linkend="glib2"/>,
       <xref linkend="icu"/> (unicode support),
       <xref linkend="libjpeg"/>,
@@ -283,11 +282,6 @@
       ibase, mysql, psql, sqlite and odbc.
     </para>
 
-    <para>
-      <parameter>-no-dbus</parameter>: Use this switch if you don't have
-      <application>D-Bus</application> installed.
-    </para>
-
   </sect2>
 
   <sect2 role="configuration">

Modified: branches/systemd/x/lib/webkitgtk.xml
==============================================================================
--- branches/systemd/x/lib/webkitgtk.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/x/lib/webkitgtk.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -85,7 +85,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gperf"/>,
       <xref linkend="gst-plugins-base"/>,
       <xref linkend="gtk2"/>,
       <xref linkend="icu"/>,

Modified: branches/systemd/x/lib/webkitgtk2.xml
==============================================================================
--- branches/systemd/x/lib/webkitgtk2.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/x/lib/webkitgtk2.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -75,7 +75,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gperf"/>,
       <xref linkend="gst10-plugins-base"/>,
       <xref linkend="gtk3"/>,
       <xref linkend="icu"/>,
@@ -85,8 +84,7 @@
       <xref linkend="mesalib"/>,
       <xref linkend="ruby"/>,
       <xref linkend="sqlite"/>,
-      <xref linkend="udev"/> or
-      <xref linkend="udev-extras"/> (for GUdev) and
+      <xref linkend="systemd"/> (for GUdev) and
       <xref linkend="which"/>
     </para>
 

Modified: branches/systemd/xfce/core/thunar-volman.xml
==============================================================================
--- branches/systemd/xfce/core/thunar-volman.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/xfce/core/thunar-volman.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -78,8 +78,7 @@
     <para role="required">
       <xref linkend="exo"/>,
       <xref linkend="libxfce4ui"/> and
-      <xref linkend="udev"/> or
-      <xref linkend="udev-extras"/> (for GUdev)
+      <xref linkend="systemd"/> (for GUdev)
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>

Modified: branches/systemd/xfce/core/thunar.xml
==============================================================================
--- branches/systemd/xfce/core/thunar.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/xfce/core/thunar.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -84,8 +84,7 @@
     <para role="recommended">
       <xref linkend="libnotify"/>,
       <xref linkend="startup-notification"/>,
-      <xref linkend="udev"/> or
-      <xref linkend="udev-extras"/> (for GUdev) and
+      <xref linkend="systemd"/> (for GUdev) and
       <xref linkend="xfce4-panel"/>
     </para>
 

Modified: branches/systemd/xfce/core/xfce4-session.xml
==============================================================================
--- branches/systemd/xfce/core/xfce4-session.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/xfce/core/xfce4-session.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -130,7 +130,7 @@
     <para>
       There are several optional run time dependencies for
       <application>Xfce4</application>:
-      <xref linkend="consolekit"/>,
+      <xref linkend="dbus"/>,
       <xref linkend="gnupg2"/>,
       <xref linkend="hicolor-icon-theme"/> and
       <xref linkend="openssh"/>
@@ -138,11 +138,10 @@
 
     <para>
       To launch <application>Xfce4</application> use the command
-      <command>startxfce4</command>. If you have <xref linkend="consolekit"/>
-      installed, use <command>startxfce4 --with-ck-launch</command>.
-      <application>ConsoleKit</application> is required to perform any
-      task that requires administrative access, including shut down
-      and reboot.
+      <command>startxfce4</command>.
+      <application>Systemd Logind</application> is required to
+      perform any task that requires administrative access,
+      including shut down and reboot.
     </para>
 
   </sect2>

Modified: branches/systemd/xsoft/office/libreoffice.xml
==============================================================================
--- branches/systemd/xsoft/office/libreoffice.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/xsoft/office/libreoffice.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -143,7 +143,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gperf"/>,
       <xref linkend="gtk2"/>,
       <application>Perl Modules</application>
       <xref linkend="perl-archive-zip"/> and
@@ -167,7 +166,6 @@
       <xref linkend="boost"/>,
       <xref linkend="cups"/>,
       <xref linkend="curl"/>,
-      <xref linkend="dbus"/>,
       <xref linkend="expat"/>,
       <xref linkend="gst-plugins-base"/> or
       <xref linkend="gst10-plugins-base"/>,

Modified: branches/systemd/xsoft/other/gimp.xml
==============================================================================
--- branches/systemd/xsoft/other/gimp.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/xsoft/other/gimp.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -144,7 +144,7 @@
       <xref linkend="poppler"/>,
       an <xref linkend="server-mail"/> (that provides a
       <command>sendmail</command> program),
-      <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for GUdev),
+      <xref linkend="systemd"/> (for GUdev),
       <xref linkend="webkitgtk"/> and
       <xref linkend="gtk-doc"/>
     </para>

Modified: branches/systemd/xsoft/other/pidgin.xml
==============================================================================
--- branches/systemd/xsoft/other/pidgin.xml	Sun Jun 16 07:11:46 2013	(r11301)
+++ branches/systemd/xsoft/other/pidgin.xml	Mon Jun 17 03:13:45 2013	(r11302)
@@ -187,7 +187,7 @@
 
     <para>
       <option>--disable-dbus</option>: Remove this switch if you've installed
-      <xref linkend="dbus"/>.
+      <xref linkend="dbus-glib"/>.
     </para>
 
     <para>



More information about the blfs-book mailing list