Index: archive/js60.xml
===================================================================
--- archive/js60.xml	(revision 8da5263d5f88e44da0c396fbfd29c51f1ec16632)
+++ archive/js60.xml	(revision 8da5263d5f88e44da0c396fbfd29c51f1ec16632)
@@ -0,0 +1,248 @@
+<?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 js60-download-http "http://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-&JS60-version;.tar.bz2">
+  <!ENTITY js60-download-ftp  "ftp://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-&JS60-version;.tar.bz2">
+  <!ENTITY js60-md5sum        "5eda38cc08a3594a3f2c3cc185d4f15b">
+  <!ENTITY js60-size          "31 MB">
+  <!ENTITY js60-buildsize     "640 MB"> <!-- The buildsize is over 4GB! Actually installed is much smaller. -->
+  <!ENTITY js60-time          "6.6 SBU">
+]>
+
+<sect1 id="js60" xreflabel="js60-&JS60-version;">
+  <?dbhtml filename="js60.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>JS-&JS60-version;</title>
+
+  <indexterm zone="js60">
+    <primary sortas="a-js60">js60</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to JS</title>
+
+    <para>
+      <application>JS</application> is Mozilla's JavaScript engine
+      written in C.
+    </para>
+
+    &lfs91_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&js60-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&js60-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &js60-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &js60-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &js60-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &js60-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+<!--
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/js60-&JS60-version;-security_fix-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+-->
+    <bridgehead renderas="sect3">JS60 Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="autoconf213"/>,
+      <xref linkend="icu"/>,
+      <xref linkend="python2"/>,
+      <xref linkend="which"/>,
+      <!--<xref linkend="yasm"/>,--> and
+      <xref linkend="zip"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/js60"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of JS</title>
+
+    <!--caution>
+      <para>
+        If you are upgrading JS60 from a previously installed old version,
+        save all work and exit your GNOME Session if you have one running.
+        Replacing the JS60 binary will cause the GNOME Shell to crash and return
+        you to your display manager or TTY. After installing the new version,
+        reinstall <xref linkend="gjs"/>. Polkit is unaffected.
+      </para>
+    </caution-->
+<!--
+    <para>
+      First, apply a security patch:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../js60-&JS60-version;-security_fix-1.patch</userinput></screen>
+-->
+    <para>
+      Install <application>JS</application> by running the following
+      commands:
+    </para>
+
+<!--    &shell-env;-->
+
+     <note>
+        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+         href="../../xincludes/mozshm.xml"/>
+
+        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+         href="../../xincludes/mozconfigure.xml"/>
+     </note>
+
+<screen><userinput>mkdir mozjs-build &amp;&amp;
+cd    mozjs-build &amp;&amp;
+
+../js/src/configure --prefix=/usr       \
+                    --with-intl-api     \
+                    --with-system-zlib  \
+                    --with-system-icu   \
+                    --disable-jemalloc  \
+                    --enable-readline   &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a working 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>
+      <parameter>--with-*</parameter>: These parameters allow the build system
+      to use system versions of the above libriares. These are required for
+      stability.
+    </para>
+
+    <para>
+      <parameter>--enable-readline</parameter>: This switch enables Readline
+      support in the JS shell.
+    </para>
+    
+    <para>
+      <parameter>--disable-jemalloc</parameter>: This switch disables the
+      internal memory allocator used in JS60. jemalloc causes a conflict with glibc.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          js60 and js60-config
+        </seg>
+        <seg>
+          libmozjs-60.so and libjs_static.ajs <!-- The AJS file doesn't
+          conflict with the one from js52 like originally thought -->
+        </seg>
+        <seg>
+          /usr/include/mozjs-60
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="js6-js60">
+        <term><command>js60</command></term>
+        <listitem>
+          <para>
+            provides a command line interface to the
+            <application>JavaScript</application> engine.
+          </para>
+          <indexterm zone="js60 js60">
+            <primary sortas="b-js60">js60</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="js60-config">
+        <term><command>js60-config</command></term>
+        <listitem>
+          <para>
+            is used to find the JS compiler and linker flags.
+          </para>
+          <indexterm zone="js60 js60-config">
+            <primary sortas="b-js60-config">js60-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libmozjs-60">
+        <term><filename class="libraryfile">libmozjs-60.so</filename></term>
+        <listitem>
+          <para>
+            contains the Mozilla JavaScript API functions.
+          </para>
+          <indexterm zone="js60 libmozjs-60">
+            <primary sortas="c-libmozjs60">libmozjs-60.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+</sect1>
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 53b511a8a29eac71aa4a482256101420d46fc2ee)
+++ general/genlib/genlib.xml	(revision 8da5263d5f88e44da0c396fbfd29c51f1ec16632)
@@ -82,5 +82,5 @@
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="js38.xml"/> -->
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="js52.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="js60.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="js60.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="js68.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="json-c.xml"/>
Index: neral/genlib/js60.xml
===================================================================
--- general/genlib/js60.xml	(revision 53b511a8a29eac71aa4a482256101420d46fc2ee)
+++ 	(revision )
@@ -1,248 +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 js60-download-http "http://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-&JS60-version;.tar.bz2">
-  <!ENTITY js60-download-ftp  "ftp://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-&JS60-version;.tar.bz2">
-  <!ENTITY js60-md5sum        "5eda38cc08a3594a3f2c3cc185d4f15b">
-  <!ENTITY js60-size          "31 MB">
-  <!ENTITY js60-buildsize     "640 MB"> <!-- The buildsize is over 4GB! Actually installed is much smaller. -->
-  <!ENTITY js60-time          "6.6 SBU">
-]>
-
-<sect1 id="js60" xreflabel="js60-&JS60-version;">
-  <?dbhtml filename="js60.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>JS-&JS60-version;</title>
-
-  <indexterm zone="js60">
-    <primary sortas="a-js60">js60</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JS</title>
-
-    <para>
-      <application>JS</application> is Mozilla's JavaScript engine
-      written in C.
-    </para>
-
-    &lfs91_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&js60-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&js60-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &js60-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &js60-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &js60-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &js60-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/js60-&JS60-version;-security_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">JS60 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="autoconf213"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="python2"/>,
-      <xref linkend="which"/>,
-      <!--<xref linkend="yasm"/>,--> and
-      <xref linkend="zip"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/js60"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JS</title>
-
-    <!--caution>
-      <para>
-        If you are upgrading JS60 from a previously installed old version,
-        save all work and exit your GNOME Session if you have one running.
-        Replacing the JS60 binary will cause the GNOME Shell to crash and return
-        you to your display manager or TTY. After installing the new version,
-        reinstall <xref linkend="gjs"/>. Polkit is unaffected.
-      </para>
-    </caution-->
-<!--
-    <para>
-      First, apply a security patch:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../js60-&JS60-version;-security_fix-1.patch</userinput></screen>
--->
-    <para>
-      Install <application>JS</application> by running the following
-      commands:
-    </para>
-
-<!--    &shell-env;-->
-
-     <note>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-         href="../../xincludes/mozshm.xml"/>
-
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-         href="../../xincludes/mozconfigure.xml"/>
-     </note>
-
-<screen><userinput>mkdir mozjs-build &amp;&amp;
-cd    mozjs-build &amp;&amp;
-
-../js/src/configure --prefix=/usr       \
-                    --with-intl-api     \
-                    --with-system-zlib  \
-                    --with-system-icu   \
-                    --disable-jemalloc  \
-                    --enable-readline   &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a working 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>
-      <parameter>--with-*</parameter>: These parameters allow the build system
-      to use system versions of the above libriares. These are required for
-      stability.
-    </para>
-
-    <para>
-      <parameter>--enable-readline</parameter>: This switch enables Readline
-      support in the JS shell.
-    </para>
-    
-    <para>
-      <parameter>--disable-jemalloc</parameter>: This switch disables the
-      internal memory allocator used in JS60. jemalloc causes a conflict with glibc.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          js60 and js60-config
-        </seg>
-        <seg>
-          libmozjs-60.so and libjs_static.ajs <!-- The AJS file doesn't
-          conflict with the one from js52 like originally thought -->
-        </seg>
-        <seg>
-          /usr/include/mozjs-60
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="js6-js60">
-        <term><command>js60</command></term>
-        <listitem>
-          <para>
-            provides a command line interface to the
-            <application>JavaScript</application> engine.
-          </para>
-          <indexterm zone="js60 js60">
-            <primary sortas="b-js60">js60</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="js60-config">
-        <term><command>js60-config</command></term>
-        <listitem>
-          <para>
-            is used to find the JS compiler and linker flags.
-          </para>
-          <indexterm zone="js60 js60-config">
-            <primary sortas="b-js60-config">js60-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmozjs-60">
-        <term><filename class="libraryfile">libmozjs-60.so</filename></term>
-        <listitem>
-          <para>
-            contains the Mozilla JavaScript API functions.
-          </para>
-          <indexterm zone="js60 libmozjs-60">
-            <primary sortas="c-libmozjs60">libmozjs-60.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 53b511a8a29eac71aa4a482256101420d46fc2ee)
+++ introduction/welcome/changelog.xml	(revision 8da5263d5f88e44da0c396fbfd29c51f1ec16632)
@@ -46,4 +46,8 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to polkit-cf22af32. Allows 
+          use of js68.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to cups-filters-1.27.5. Fixes
           <ulink url="&blfs-ticket-root;13206">#13206</ulink>.</para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 53b511a8a29eac71aa4a482256101420d46fc2ee)
+++ packages.ent	(revision 8da5263d5f88e44da0c396fbfd29c51f1ec16632)
@@ -36,5 +36,5 @@
 <!ENTITY openssl10-version            "1.0.2q">
 <!ENTITY p11-kit-version              "0.23.20">
-<!ENTITY polkit-version               "0.116">
+<!ENTITY polkit-version               "cf22af32">
 <!ENTITY polkit-gnome-version         "0.105">
 <!ENTITY shadow-version               "4.8.1">
Index: postlfs/security/polkit.xml
===================================================================
--- postlfs/security/polkit.xml	(revision 53b511a8a29eac71aa4a482256101420d46fc2ee)
+++ postlfs/security/polkit.xml	(revision 8da5263d5f88e44da0c396fbfd29c51f1ec16632)
@@ -5,12 +5,20 @@
   %general-entities;
 
-  <!ENTITY polkit-download-http
-           "https://www.freedesktop.org/software/polkit/releases/polkit-&polkit-version;.tar.gz">
-  <!ENTITY polkit-download-ftp  " ">
-  <!ENTITY polkit-md5sum        "4b37258583393e83069a0e2e89c0162a">
-  <!ENTITY polkit-size          "1.5 MB">
-  <!ENTITY polkit-buildsize     "15 MB (with tests)">
-  <!ENTITY polkit-time          "0.4 SBU (with tests)">
+  <!ENTITY polkit-download-http "&sources-anduin-http;/polkit/polkit-&polkit-version;.tar.xz">
+  <!ENTITY polkit-download-ftp  "&sources-anduin-ftp;/polkit/polkit-&polkit-version;.tar.xz">
+  <!ENTITY polkit-md5sum        "3178fb1dcc6896178515861fe6910c6b">
+  <!ENTITY polkit-size          "656 KB">
+  <!ENTITY polkit-buildsize     "21 MB (with tests)">
+  <!ENTITY polkit-time          "0.4 SBU (Using parallelism=4; with tests)">
 ]>
+
+<!-- 
+  The tarball above was generated from a merge request using 
+        git fetch "https://gitlab.freedesktop.org/xry111/polkit.git" "js68"
+  and merging the polkit-0.116 patch and running autogen.sh NOCONFIGURE=1
+
+  If/when this is actually merged with a new release, we need 
+  to go back to that.
+-->
 
 <sect1 id="polkit" xreflabel="Polkit-&polkit-version;">
@@ -72,5 +80,5 @@
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3" revision="sysv">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact" revision="sysv">
@@ -82,5 +90,5 @@
       </listitem>
     </itemizedlist>
-
+-->
     <bridgehead renderas="sect3">Polkit Dependencies</bridgehead>
 
@@ -88,5 +96,5 @@
     <para role="required">
       <xref linkend="glib2"/> and
-      <xref linkend="js60"/>
+      <xref linkend="js68"/>
     </para>
 
@@ -117,4 +125,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="dbus-python"/> and 
+      <xref linkend="python-dbusmock"/> (for tests),
       <xref linkend="DocBook"/>,
       <xref linkend="docbook-xsl"/>,
@@ -187,5 +197,5 @@
 <screen><userinput>sed -i "s:/sys/fs/cgroup/systemd/:/sys:g" configure</userinput></screen>
     </note>
-
+<!--
     <para revision="sysv">
       Fix an issue introduced in recent <application>Polkit</application>
@@ -195,4 +205,5 @@
 <screen revision="sysv"><userinput>patch -Np1 -i ../polkit-&polkit-version;-fix_elogind_detection-1.patch &amp;&amp;
 autoreconf -fi</userinput></screen>
+-->
     <para>
       Install <application>Polkit</application> by running the following
