Index: postlfs/security/consolekit.xml
===================================================================
--- postlfs/security/consolekit.xml	(revision b71b5c8632e6fb812400f51ee3b8eba0a0766f26)
+++ 	(revision )
@@ -1,409 +1,0 @@
-<?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>
-
-    &lfs76_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="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 \
-            --enable-udev-acl    \
-            --enable-pam-module  \
-            --with-systemdsystemunitdir=no &amp;&amp;
-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>
-
-    <para>
-      <option>--with-systemdsystemunitdir=no</option>: Disable
-      attempting to build with systemd libraries.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring ConsoleKit</title>
-
-    <sect3>
-      <title>PAM Module Configuration</title>
-
-      <para>
-        If you use <application>Linux PAM</application>, it needs to be
-        configured 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 &gt;&gt; /etc/pam.d/system-session &lt;&lt; "EOF"
-<literal># Begin ConsoleKit addition
-
-session   optional    pam_loginuid.so
-session   optional    pam_ck_connector.so nox11
-
-# End ConsoleKit addition</literal>
-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 &gt; /usr/lib/ConsoleKit/run-session.d/pam-foreground-compat.ck &lt;&lt; "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" &gt;&gt; "$TAGFILE"
-fi
-
-if [ "$1" = "session_removed" ] &amp;&amp; [ -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>list sessions with respective properties. Also good for
-          debugging purposes.</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>
Index: postlfs/security/polkit-systemd.xml
===================================================================
--- postlfs/security/polkit-systemd.xml	(revision cb9c6940382641529d9a72b7e326ba3190239b74)
+++ postlfs/security/polkit-systemd.xml	(revision cb9c6940382641529d9a72b7e326ba3190239b74)
@@ -0,0 +1,363 @@
+<?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 polkit-download-http
+           "http://www.freedesktop.org/software/polkit/releases/polkit-&polkit-version;.tar.gz">
+  <!ENTITY polkit-download-ftp  " ">
+  <!ENTITY polkit-md5sum        "b0f2fa00a55f47c6a5d88e9b73f80127">
+  <!ENTITY polkit-size          "1.4 MB">
+  <!ENTITY polkit-buildsize     "17 MB">
+  <!ENTITY polkit-time          "0.2 SBU">
+]>
+
+<sect1 id="polkit" xreflabel="Polkit-&polkit-version;">
+  <?dbhtml filename="polkit.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Polkit-&polkit-version;</title>
+
+  <indexterm zone="polkit">
+    <primary sortas="a-Polkit">Polkit</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Polkit</title>
+
+    <para>
+      <application>Polkit</application> is a toolkit for defining and handling
+      authorizations. It is used for allowing unprivileged processes to
+      communicate with privileged processes.
+    </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&polkit-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&polkit-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &polkit-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &polkit-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &polkit-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &polkit-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Polkit Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="glib2"/>, and
+      <xref linkend="JS"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="linux-pam"/>
+    </para>
+
+    <note>
+      <para>
+        Since <command>systemd-logind</command> uses PAM to register user
+        sessions, it is a good idea to build  <application>Polkit</application>
+        with PAM support so <command>systemd-logind</command> can track
+        <application>Polkit</application> sessions.
+      </para>
+    </note>
+
+    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="DocBook"/>,
+      <xref linkend="docbook-xsl"/>,
+      <xref linkend="gtk-doc"/>, and
+      <xref linkend="libxslt"/>
+    </para>
+
+    <bridgehead renderas="sect4">Required Runtime Dependencies</bridgehead>
+    <para role="required">
+      <xref linkend="systemd"/> (for Logind)
+    </para>
+
+    <note>
+      <para>
+        If <xref linkend="libxslt"/> is installed, then <xref linkend="DocBook"/>
+        and <xref linkend="docbook-xsl"/> are required. If you have installed
+        <xref linkend="libxslt"/>, but you do not want to install any of the
+        DocBook packages mentioned, you will need to use
+        <option>--disable-man-pages</option> in the instructions below.
+      </para>
+    </note>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/polkit"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Polkit</title>
+
+    <para>
+      There should be a dedicated user and group to take control
+      of the <command>polkitd</command> daemon after it is
+      started. Issue the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>groupadd -fg 27 polkitd &amp;&amp;
+useradd -c "PolicyKit Daemon Owner" -d /etc/polkit-1 -u 27 \
+        -g polkitd -s /bin/false polkitd</userinput></screen>
+
+    <note>
+      <para>
+        When building <application>Polkit</application> with
+        <application>systemd</application> logind support, the
+        <command>configure</command> script explicitly checks if
+        system is booted using <application>systemd</application>.
+        This can cause problems if building the package in chroot,
+        where the <command>configure</command> would fail to
+        detect <application>systemd</application>. To workaround
+        the problem, simply run the following command:
+      </para>
+
+<screen><userinput>sed -i "s:/sys/fs/cgroup/systemd/:/sys:g" configure</userinput></screen>
+    </note>
+
+    <para>
+      Install <application>Polkit</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr        \
+            --sysconfdir=/etc    \
+            --localstatedir=/var \
+            --disable-static     &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+      Note that system <application>D-Bus</application> daemon
+      must be running for the testsuite to complete. There is
+      also a warning about <application>ConsoleKit</application>
+      database not present, but that one can be safely ignored.
+    </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"/>
+
+    <para>
+      <option>--with-authfw=shadow</option>: This switch enables the
+      package to use the <application>Shadow</application> rather than the
+      <application>Linux PAM</application> Authentication framework. Use it
+      if you have not installed <application>Linux PAM</application>.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Polkit</title>
+
+    <sect3>
+      <title>PAM Configuration</title>
+
+      <note>
+        <para>
+          If you did not build <application>Polkit</application> with
+          <application>Linux PAM</application> support, you can skip this section.
+        </para>
+      </note>
+
+      <para>
+        If you have built <application>Polkit</application> with
+        <application>Linux PAM</application> support, you need to modify
+        the default PAM configuration file which was installed by default to get
+        <application>Polkit</application> to work correctly with BLFS. Issue the
+        following commands as the <systemitem class="username">root</systemitem>
+        user to create the configuration file for <application>Linux PAM</application>:
+      </para>
+
+<screen role="root"><userinput>cat &gt; /etc/pam.d/polkit-1 &lt;&lt; "EOF"
+<literal># Begin /etc/pam.d/polkit-1
+
+auth     include        system-auth
+account  include        system-account
+password include        system-password
+session  include        system-session
+
+# End /etc/pam.d/polkit-1</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>
+          pkaction, pkcheck, pk-example-frobnicate, pkexec,
+          pkttyagent and polkitd
+        </seg>
+        <seg>
+          libpolkit-agent-1.so and
+          libpolkit-gobject-1.so
+        </seg>
+        <seg>
+          /etc/polkit-1,
+          /usr/include/polkit-1,
+          /usr/lib/polkit-1,
+          /usr/share/gtk-doc/html/polkit-1 and
+          /usr/share/polkit-1
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="pkaction">
+        <term><command>pkaction</command></term>
+        <listitem>
+          <para>
+            is used to obtain information about registered PolicyKit actions.
+          </para>
+          <indexterm zone="polkit pkaction">
+            <primary sortas="b-pkaction">pkaction</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pkcheck">
+        <term><command>pkcheck</command></term>
+        <listitem>
+          <para>
+            is used to check whether a process is authorized for action.
+          </para>
+          <indexterm zone="polkit pkcheck">
+            <primary sortas="b-pkcheck">pkcheck</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pkexec">
+        <term><command>pkexec</command></term>
+        <listitem>
+          <para>
+            allows an authorized user to execute a command as another user.
+          </para>
+          <indexterm zone="polkit pkexec">
+            <primary sortas="b-pkexec">pkexec</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pkttyagent">
+        <term><command>pkttyagent</command></term>
+        <listitem>
+          <para>
+            is used to start a textual authentication agent for the subject.
+          </para>
+          <indexterm zone="polkit pkttyagent">
+            <primary sortas="b-pkttyagent">pkttyagent</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="polkitd">
+        <term><command>polkitd</command></term>
+        <listitem>
+          <para>
+            provides the org.freedesktop.PolicyKit1 <application>D-Bus</application>
+            service on the system message bus.
+          </para>
+          <indexterm zone="polkit polkitd">
+            <primary sortas="b-polkitd">polkitd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libpolkit-agent-1">
+        <term><filename class='libraryfile'>libpolkit-agent-1.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Polkit</application> authentication
+            agent API functions.
+          </para>
+          <indexterm zone="polkit libpolkit-agent-1">
+            <primary sortas="c-libpolkit-agent-1">libpolkit-agent-1.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libpolkit-gobject-1">
+        <term><filename class='libraryfile'>libpolkit-gobject-1.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Polkit</application> authorization API functions.
+          </para>
+          <indexterm zone="polkit libpolkit-gobject-1">
+            <primary sortas="c-libpolkit-gobject-1">libpolkit-gobject-1.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: postlfs/security/polkit.xml
===================================================================
--- postlfs/security/polkit.xml	(revision b71b5c8632e6fb812400f51ee3b8eba0a0766f26)
+++ 	(revision )
@@ -1,339 +1,0 @@
-<?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 polkit-download-http
-           "http://www.freedesktop.org/software/polkit/releases/polkit-&polkit-version;.tar.gz">
-  <!ENTITY polkit-download-ftp  " ">
-  <!ENTITY polkit-md5sum        "b0f2fa00a55f47c6a5d88e9b73f80127">
-  <!ENTITY polkit-size          "1.4 MB">
-  <!ENTITY polkit-buildsize     "17 MB">
-  <!ENTITY polkit-time          "0.2 SBU">
-]>
-
-<sect1 id="polkit" xreflabel="Polkit-&polkit-version;">
-  <?dbhtml filename="polkit.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Polkit-&polkit-version;</title>
-
-  <indexterm zone="polkit">
-    <primary sortas="a-Polkit">Polkit</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Polkit</title>
-
-    <para>
-      <application>Polkit</application> is a toolkit for defining and handling
-      authorizations. It is used for allowing unprivileged processes to
-      communicate with privileged processes.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&polkit-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&polkit-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &polkit-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &polkit-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &polkit-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &polkit-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Polkit Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>, and
-      <xref linkend="JS"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
-    <para role="optional">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libxslt"/> and
-      <xref linkend="linux-pam"/>
-    </para>
-
-    <note>
-      <para>
-        If <xref linkend="libxslt"/> is installed, then <xref linkend="DocBook"/>
-        and <xref linkend="docbook-xsl"/> are required. If you have installed
-        <xref linkend="libxslt"/>, but you do not want to install any of the
-        DocBook packages mentioned, you will need to use
-        <option>--disable-man-pages</option> in the instructions below.
-      </para>
-    </note>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/polkit"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Polkit</title>
-
-    <para>
-      There should be a dedicated user and group to take control
-      of the <command>polkitd</command> daemon after it is
-      started. Issue the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -fg 27 polkitd &amp;&amp;
-useradd -c "PolicyKit Daemon Owner" -d /etc/polkit-1 -u 27 \
-        -g polkitd -s /bin/false polkitd</userinput></screen>
-
-    <para>
-      Install <application>Polkit</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                \
-            --sysconfdir=/etc            \
-            --localstatedir=/var         \
-            --disable-static             \
-            --enable-libsystemd-login=no \
-            --with-authfw=shadow         &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-      Note that system <application>D-Bus</application> daemon
-      must be running for the testsuite to complete. There is
-      also a warning about <application>ConsoleKit</application>
-      database not present, but that one can be safely ignored.
-    </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>
-      <parameter>--enable-libsystemd-login=no</parameter>: This parameter fixes
-      building without <application>systemd</application>, which is not part
-      of LFS/BLFS. If you use <application>systemd</application>,
-      replace "no" by "yes".
-    </para>
-
-    <para>
-      <parameter>--with-authfw=shadow</parameter>: This parameter configures the
-      package to use the <application>Shadow</application> rather than the
-      <application>Linux PAM</application> Authentication framework. Remove it
-      if you would like to use <application>Linux PAM</application>.
-    </para>
-
-    <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 Polkit</title>
-
-    <sect3>
-      <title>PAM Configuration</title>
-
-      <note>
-        <para>
-          If you did not build <application>Polkit</application> with
-          <application>Linux PAM</application> support, you can skip this section.
-        </para>
-      </note>
-
-      <para>
-        If you have built <application>Polkit</application> with
-        <application>Linux PAM</application> support, you need to modify
-        the default PAM configuration file which was installed by default to get
-        <application>Polkit</application> to work correctly with BLFS. Issue the
-        following commands as the <systemitem class="username">root</systemitem>
-        user to create the configuration file for <application>Linux PAM</application>:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/polkit-1 &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/polkit-1
-
-auth     include        system-auth
-account  include        system-account
-password include        system-password
-session  include        system-session
-
-# End /etc/pam.d/polkit-1</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>
-          pkaction, pkcheck, pk-example-frobnicate, pkexec,
-          pkttyagent and polkitd
-        </seg>
-        <seg>
-          libpolkit-agent-1.so and
-          libpolkit-gobject-1.so
-        </seg>
-        <seg>
-          /etc/polkit-1,
-          /usr/include/polkit-1,
-          /usr/lib/polkit-1,
-          /usr/share/gtk-doc/html/polkit-1 and
-          /usr/share/polkit-1
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pkaction">
-        <term><command>pkaction</command></term>
-        <listitem>
-          <para>
-            is used to obtain information about registered PolicyKit actions.
-          </para>
-          <indexterm zone="polkit pkaction">
-            <primary sortas="b-pkaction">pkaction</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pkcheck">
-        <term><command>pkcheck</command></term>
-        <listitem>
-          <para>
-            is used to check whether a process is authorized for action.
-          </para>
-          <indexterm zone="polkit pkcheck">
-            <primary sortas="b-pkcheck">pkcheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pkexec">
-        <term><command>pkexec</command></term>
-        <listitem>
-          <para>
-            allows an authorized user to execute a command as another user.
-          </para>
-          <indexterm zone="polkit pkexec">
-            <primary sortas="b-pkexec">pkexec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pkttyagent">
-        <term><command>pkttyagent</command></term>
-        <listitem>
-          <para>
-            is used to start a textual authentication agent for the subject.
-          </para>
-          <indexterm zone="polkit pkttyagent">
-            <primary sortas="b-pkttyagent">pkttyagent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="polkitd">
-        <term><command>polkitd</command></term>
-        <listitem>
-          <para>
-            provides the org.freedesktop.PolicyKit1 <application>D-Bus</application>
-            service on the system message bus.
-          </para>
-          <indexterm zone="polkit polkitd">
-            <primary sortas="b-polkitd">polkitd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpolkit-agent-1">
-        <term><filename class='libraryfile'>libpolkit-agent-1.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Polkit</application> authentication
-            agent API functions.
-          </para>
-          <indexterm zone="polkit libpolkit-agent-1">
-            <primary sortas="c-libpolkit-agent-1">libpolkit-agent-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpolkit-gobject-1">
-        <term><filename class='libraryfile'>libpolkit-gobject-1.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Polkit</application> authorization API functions.
-          </para>
-          <indexterm zone="polkit libpolkit-gobject-1">
-            <primary sortas="c-libpolkit-gobject-1">libpolkit-gobject-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: postlfs/security/security.xml
===================================================================
--- postlfs/security/security.xml	(revision b71b5c8632e6fb812400f51ee3b8eba0a0766f26)
+++ postlfs/security/security.xml	(revision cb9c6940382641529d9a72b7e326ba3190239b74)
@@ -43,5 +43,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vulnerabilities.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"/>
@@ -60,5 +59,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="p11-kit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ssh-askpass.xml"/>
