Index: general.ent
===================================================================
--- general.ent	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ general.ent	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "01">                   <!-- Always 2 digits -->
+<!ENTITY day          "07">                   <!-- Always 2 digits -->
 <!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS systemd Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "April 1st, &year;">
+<!ENTITY releasedate  "April 7th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "systemd">                  <!-- svn|[release #] -->
Index: general/genlib/libinput.xml
===================================================================
--- general/genlib/libinput.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ general/genlib/libinput.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -7,8 +7,8 @@
   <!ENTITY libinput-download-http "http://www.freedesktop.org/software/libinput/libinput-&libinput-version;.tar.xz">
   <!ENTITY libinput-download-ftp  " ">
-  <!ENTITY libinput-md5sum        "3dda3e6dd7d0e865896dfe67f4fa0346">
-  <!ENTITY libinput-size          "792 KB">
-  <!ENTITY libinput-buildsize     "14 MB">
-  <!ENTITY libinput-time          "0.1 SBU">
+  <!ENTITY libinput-md5sum        "2b36d32362111c3e99f19c83bc535332">
+  <!ENTITY libinput-size          "844 KB">
+  <!ENTITY libinput-buildsize     "31 MB (with documentation)">
+  <!ENTITY libinput-time          "0.3 SBU (with documentation)">
 ]>
 
@@ -86,6 +86,7 @@
       <xref linkend="doxygen"/> and
       <xref linkend="graphviz"/> (to build the documentation)
-      <xref linkend="gtk3"/> (to build the GUI event viewer) and
-      <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink>
+      <xref linkend="gtk3"/> (to build the GUI event viewer),
+      <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink>, and
+      <ulink url="https://sourceforge.net/projects/linuxwacom/files/libwacom/">libwacom</ulink>
     </para>
 
@@ -103,6 +104,6 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
+<screen><userinput>./configure --prefix=/usr     \
+            --disable-libwacom \
             --with-udev-dir=/lib/udev &amp;&amp;
 make</userinput></screen>
@@ -142,6 +143,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
+    <para>
+      <parameter>--disable-libwacom</parameter>: Remove this 
+      option if you have the external library libwacom installed.
+    </para>
 
     <para>
Index: general/genlib/qca.xml
===================================================================
--- general/genlib/qca.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ general/genlib/qca.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -95,4 +95,15 @@
 <screen><userinput>sed -i 's/BSD/DEFAULT/' CMakeLists.txt</userinput></screen>
 
+    <para>This package can be built against <xref linkend="qt4"/> or
+    <xref linkend="qt5"/>. If using qt4, run:</para>
+
+<screen><userinput>QT_DIR=&qt4-dir; &amp;&amp;
+QT4_BUILD=ON</userinput></screen>
+
+    <para>If using qt5, run:</para>
+
+<screen><userinput>QT_DIR=&qt5-dir; &amp;&amp;
+QT4_BUILD=OFF</userinput></screen>
+
     <para>Install <application>Qca</application> by running the following
     commands:</para>
@@ -101,9 +112,10 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir;            \
+cmake -DCMAKE_INSTALL_PREFIX=$QT_DIR            \
       -DCMAKE_BUILD_TYPE=Release                \
-      -DQT4_BUILD=ON                            \
+      -DQT4_BUILD=$QT4_BUILD                    \
       -DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man \
       ..                                        &amp;&amp;
+unset QT_DIR QT4_BUILD                          &amp;&amp;
 
 make</userinput></screen>
Index: general/genlib/talloc.xml
===================================================================
--- general/genlib/talloc.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ general/genlib/talloc.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -7,7 +7,7 @@
   <!ENTITY talloc-download-http "https://www.samba.org/ftp/talloc/talloc-&talloc-version;.tar.gz">
   <!ENTITY talloc-download-ftp  " ">
-  <!ENTITY talloc-md5sum        "f497cb42b3d9622b721b72146f1fa3be">
+  <!ENTITY talloc-md5sum        "707010c6ede5821fd34397f5d9ec6ab8">
   <!ENTITY talloc-size          "428 KB">
-  <!ENTITY talloc-buildsize     "7.0 MB (additional 0.2 MB for tests)">
+  <!ENTITY talloc-buildsize     "7.1 MB (additional 0.2 MB for tests)">
   <!ENTITY talloc-time          "0.2 SBU (additional 0.2 SBU for tests)">
 ]>
@@ -134,9 +134,9 @@
         </seg>
         <seg>
-          libpytalloc-util.cpython-34m.so,
+          libpytalloc-util.cpython-35m-x86-64-linux-gnu.so,
           libpytalloc-util.so,
           libtalloc.so,
           talloc.so (Python-2 Module) and
-          talloc.cpython-34m.so (Python-3 Module)
+          talloc.cpython-35m-x86-64-linux-gnu.so (Python-3 Module)
         </seg>
         <seg>
Index: general/prog/cmake.xml
===================================================================
--- general/prog/cmake.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ general/prog/cmake.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -7,8 +7,8 @@
   <!ENTITY cmake-download-http "http://www.cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
   <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "4cb3ff35b2472aae70f542116d616e63">
+  <!ENTITY cmake-md5sum        "33c5d09d4c33d4ffcc63578a6ba8777e">
   <!ENTITY cmake-size          "6.5 MB">
-  <!ENTITY cmake-buildsize     "704 MB (with tests and cmake-gui)">
-  <!ENTITY cmake-time          "4 SBU, with parallelism = 4 (with tests and cmake-gui)">
+  <!ENTITY cmake-buildsize     "346 MB (648 MB with tests and cmake-gui)">
+  <!ENTITY cmake-time          "4.2 SBU (12.1 SBU with tests and cmake-gui)">
 ]>
 
@@ -124,10 +124,8 @@
       <replaceable>&lt;N&gt;</replaceable> is an integer between 1 and the
       number of system cores. For some systems, it may be necessary to run the
-      tests only for Qt4 using <command>source setq4</command>, then
-      <command>export CXXFLAGS="-std=c++11"</command> before the
-      <command>./bootstrap ...</command>) command.  If used, be sure to
-      <command>unset CXXFLAGS</command> after the tests.  One of the problematic
-      tests relates to the test procedures finding the correct Qt files. Eight
-      of 447 tests are known to fail under some circumstances related to Gtk+2
+      tests only for Qt4 using <command>source setq4</command> before the
+      <command>./bootstrap ...</command>) command. One of the problematic
+      tests relates to the test procedures finding the correct Qt files. One
+      of 444 tests is known to fail under some circumstances related to Gtk+2
       and c++ standards.
 
Index: general/prog/dbus-python.xml
===================================================================
--- general/prog/dbus-python.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ general/prog/dbus-python.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -7,8 +7,8 @@
   <!ENTITY dbus-python-download-http "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-&dbus-python-version;.tar.gz">
   <!ENTITY dbus-python-download-ftp  " ">
-  <!ENTITY dbus-python-md5sum        "b09cd2d1a057cc432ce944de3fc06bf7">
-  <!ENTITY dbus-python-size          "592 KB">
-  <!ENTITY dbus-python-buildsize     "11 MB">
-  <!ENTITY dbus-python-time          "0.3 SBU">
+  <!ENTITY dbus-python-md5sum        "7372a588c83a7232b4e08159bfd48fe5">
+  <!ENTITY dbus-python-size          "600 KB">
+  <!ENTITY dbus-python-buildsize     "9.3 MB (both versions with tests)">
+  <!ENTITY dbus-python-time          "0.4 SBU (both versions with tests)">
 ]>
 
Index: general/prog/gdb.xml
===================================================================
--- general/prog/gdb.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ general/prog/gdb.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -7,8 +7,8 @@
   <!ENTITY gdb-download-http "https://ftp.gnu.org/gnu/gdb/gdb-&gdb-version;.tar.xz">
   <!ENTITY gdb-download-ftp  "ftp://ftp.gnu.org/gnu/gdb/gdb-&gdb-version;.tar.xz">
-  <!ENTITY gdb-md5sum        "39e654460c9cdd80200a29ac020cfe11">
+  <!ENTITY gdb-md5sum        "b5c784685e1cde65ba135feea86b6d75">
   <!ENTITY gdb-size          "18 MB">
-  <!ENTITY gdb-buildsize     "419 MB (additional 349 MB for tests)">
-  <!ENTITY gdb-time          "2.4 SBU (add up to 7.8 SBU for tests)">
+  <!ENTITY gdb-buildsize     "399 MB (additional 173 MB for tests, additional 1.3 GB for documentation)">
+  <!ENTITY gdb-time          "2.6 SBU (add up to 13 SBU for tests)">
 ]>
 
@@ -124,17 +124,60 @@
       See <emphasis>gdb/testsuite/README</emphasis> and <ulink
       url="https://sourceware.org/gdb/wiki/TestingGDB">TestingGDB</ulink>.
-      There are many problems with the test suite. First one is that you need
-      to clean some directories, if re-running the tests. For that reason, it
-      is recommended to make a copy of the compiled source code directory,
-      before the tests, in case you need to run the tests again. Results depend
-      on installed compilers, there are differences if run locally or remotely,
-      a large number of timeouts (there is a variable that can be set to
-      increase time for timeout, but changing it, apparently the total number
-      of tests is not conserved), there are failures associated with system
-      readline 6.x, between others. A few tests assume that the header file
-      <filename>&lt;sys/sdt.h&gt;</filename>, part of <ulink
-      url="https://sourceware.org/systemtap/">SystemTap</ulink>, is present.
-      Unexpected failures are less than 0.3%.
-    </para>
+      There are many problems with the test suite:
+    </para>
+
+    <itemizedlist>
+      <listitem>
+        <para>
+          Clean directories ire needed if re-running the tests.  For that
+          reason, it is recommended to make a copy of the compiled source code
+          directory before the tests in case you need to run the tests again. 
+        </para>
+      </listitem>
+        
+      <listitem>
+        <para>
+          Results depend on installed compilers.
+        </para>
+      </listitem>
+        
+      <listitem>
+        <para>
+          If run remotely over an ssh connection, the tests will hang 
+          and require a hard (power cycle) reset of the sytem.
+        </para>
+      </listitem>
+        
+      <listitem>
+        <para>
+          There are a large number of timeouts (there is a variable 
+          that can be set to increase time for timeout, but 
+          changing it will result in a different number of tests being 
+          run.
+        </para>
+      </listitem>
+        
+      <listitem>
+        <para>
+          There are failures associated with system readline 6.x.
+        </para>
+      </listitem>
+        
+      <listitem>
+        <para>
+          A few tests assume that the header file
+          <filename>&lt;sys/sdt.h&gt;</filename>, part of <ulink
+          url="https://sourceware.org/systemtap/">SystemTap</ulink>, is
+          present.
+        </para>
+      </listitem>
+        
+      <listitem>
+        <para>
+          About 3% of the tests fail (out of over 35000 tests). 
+        </para>
+      </listitem>
+        
+    </itemizedlist>
 
     <para>
Index: general/prog/lua.xml
===================================================================
--- general/prog/lua.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ general/prog/lua.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -121,5 +121,5 @@
 
     <para>Some packages check for the <application>pkg-config</application> file
-    for <application>Lua</application>, wich is created with:</para>
+    for <application>Lua</application>, which is created with:</para>
 
 <screen role="root"><userinput>cat &gt; lua.pc &lt;&lt; "EOF"
Index: general/prog/nasm.xml
===================================================================
--- general/prog/nasm.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ general/prog/nasm.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -7,7 +7,7 @@
   <!ENTITY nasm-download-http "http://www.nasm.us/pub/nasm/releasebuilds/&nasm-version;/nasm-&nasm-version;.tar.xz">
   <!ENTITY nasm-download-ftp  " ">
-  <!ENTITY nasm-md5sum        "0d461a085b088a14dd6628c53be1ce28">
-  <!ENTITY nasm-size          "747 KB">
-  <!ENTITY nasm-buildsize     "22 MB" >
+  <!ENTITY nasm-md5sum        "cf17c2dc0993f94aa8a3a9e15589f6f3">
+  <!ENTITY nasm-size          "760 KB">
+  <!ENTITY nasm-buildsize     "31 MB" >
   <!ENTITY nasm-time          "0.1 SBU">
 ]>
Index: general/prog/perl-modules.xml
===================================================================
--- general/prog/perl-modules.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ general/prog/perl-modules.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -71,5 +71,5 @@
 
   <!ENTITY Net-DNS-download-http "http://www.cpan.org/authors/id/N/NL/NLNETLABS/Net-DNS-&Net-DNS-version;.tar.gz">
-  <!ENTITY Net-DNS-md5sum "5a6f6e6811d6bf8eefd84ce778c2bc2e">
+  <!ENTITY Net-DNS-md5sum "3e229b4c72e25f850af9dea9ba5082bd">
 
   <!ENTITY Readonly-XS-download-http "http://www.cpan.org/authors/id/R/RO/ROODE/Readonly-XS-&Readonly-XS-version;.tar.gz">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ introduction/welcome/changelog.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -45,4 +45,95 @@
 -->
     <listitem>
+      <para>April 7th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Merge changes from trunk to r17100.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to dbus-python-1.2.4. Merged from trunk
+          r17099.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to mariadb-10.1.12. Merged from trunk
+          r17099.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to cmake-3.5.0. Merged from trunk
+          r17099.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gdb-7.11. Merged from trunk r17099.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to xorg-server-1.18.2. Merged from trunk
+          r17097.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to videoproto-2.3.3. Merged from trunk
+          r17097.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to xterm-324. Merged from trunk r17096.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to libvdpau_va_gl-0.3.6. Merged from trunk
+          r17096.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to libinput-1.2.1. Merged from trunk
+          r17096.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to talloc-2.1.6. Merged from trunk r17096.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to libass-1.13.2. Merged from trunk
+          r17096.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to nasm-2.12. Merged from trunk r17095.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to traceroute-2.1.0. Merged from trunk
+          r17095.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to Net-DNS-1.05. Merged from trunk r17095.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to nano-2.5.3. Merged from trunk r17095.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to joe-4.2. Merged from trunk r17095.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Added librsvg as an optional dependency for Links.
+          Merged from trunk r17094.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to unbound-1.5.8. Merged from trunk
+          r17091.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to cifs-utils-6.5. Merged from trunk
+          r17091.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update lsof URL. Merged from trunk r17090.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to firefox-45.0. Merged from trunk r17084.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to nss-3.23. Merged from trunk r17083.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to Exim-4.86.2. Merged from trunk r17073 and
+          r17074.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 1st, 2016</para>
       <itemizedlist>
Index: multimedia/libdriv/libass.xml
===================================================================
--- multimedia/libdriv/libass.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ multimedia/libdriv/libass.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -7,7 +7,7 @@
   <!ENTITY libass-download-http "https://github.com/libass/libass/releases/download/&libass-version;/libass-&libass-version;.tar.xz">
   <!ENTITY libass-download-ftp  " ">
-  <!ENTITY libass-md5sum        "43b5f379e70b3aef15b2435e21e5b73c">
-  <!ENTITY libass-size          "312 KB">
-  <!ENTITY libass-buildsize     "6.2 MB">
+  <!ENTITY libass-md5sum        "1c8cbd5751aeb192bda04a65d0464fd9">
+  <!ENTITY libass-size          "344 KB">
+  <!ENTITY libass-buildsize     "6.3 MB">
   <!ENTITY libass-time          "0.1 SBU">
 ]>
Index: multimedia/libdriv/libvdpau-va-gl.xml
===================================================================
--- multimedia/libdriv/libvdpau-va-gl.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ multimedia/libdriv/libvdpau-va-gl.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -7,7 +7,7 @@
   <!ENTITY libvdpau-va-gl-download-http "https://github.com/i-rinat/libvdpau-va-gl/releases/download/v&libvdpau-va-gl-version;/libvdpau-va-gl-&libvdpau-va-gl-version;.tar.gz">
   <!ENTITY libvdpau-va-gl-download-ftp  " ">
-  <!ENTITY libvdpau-va-gl-md5sum        "09ceb2f75eafccc9b002d35ede0de6a5">
+  <!ENTITY libvdpau-va-gl-md5sum        "77ce5937c94c9a6747e15646fe5c4bb3">
   <!ENTITY libvdpau-va-gl-size          "100 KB">
-  <!ENTITY libvdpau-va-gl-buildsize     "4.0 MB">
+  <!ENTITY libvdpau-va-gl-buildsize     "2.8 MB">
   <!ENTITY libvdpau-va-gl-time          "less than 0.1 SBU">
 ]>
Index: networking/netprogs/cifsutils.xml
===================================================================
--- networking/netprogs/cifsutils.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ networking/netprogs/cifsutils.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -7,6 +7,6 @@
   <!ENTITY cifsutils-download-http "https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-&cifsutils-version;.tar.bz2">
   <!ENTITY cifsutils-download-ftp  " ">
-  <!ENTITY cifsutils-md5sum        "b7d75b67fd3987952896d27256c7293d">
-  <!ENTITY cifsutils-size          "384 KB">
+  <!ENTITY cifsutils-md5sum        "74b2c398ce83a8b792faabc414cec314">
+  <!ENTITY cifsutils-size          "393 KB">
   <!ENTITY cifsutils-buildsize     "3.1 MB">
   <!ENTITY cifsutils-time          "less than 0.1 SBU">
Index: networking/netutils/traceroute.xml
===================================================================
--- networking/netutils/traceroute.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ networking/netutils/traceroute.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -7,7 +7,7 @@
   <!ENTITY traceroute-download-http "&sourceforge-repo;/traceroute/traceroute-&traceroute-version;.tar.gz">
   <!ENTITY traceroute-download-ftp  " ">
-  <!ENTITY traceroute-md5sum        "79289adabd6f3ebf9160fc0815ab3150">
-  <!ENTITY traceroute-size          "68 KB">
-  <!ENTITY traceroute-buildsize     "912 KB">
+  <!ENTITY traceroute-md5sum        "84d329d67abc3fb83fc8cb12aeaddaba">
+  <!ENTITY traceroute-size          "72 KB">
+  <!ENTITY traceroute-buildsize     "588 KB">
   <!ENTITY traceroute-time          "less than 0.1 SBU">
 ]>
Index: networking/textweb/links.xml
===================================================================
--- networking/textweb/links.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ networking/textweb/links.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -75,5 +75,6 @@
     can utilize
     <xref linkend="libpng"/>,
-    <xref linkend="libjpeg"/>, and
+    <xref linkend="libjpeg"/>,
+    <xref linkend="librsvg"/>, and
     <xref linkend="libtiff"/></para>
 
Index: packages.ent
===================================================================
--- packages.ent	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ packages.ent	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -26,11 +26,11 @@
 <!ENTITY mitkrb-version               "&mitkrb-major-version;">
 <!ENTITY nettle-version               "3.2">
-<!ENTITY nss-minor-version            "22">
-<!-- normal-->
+<!ENTITY nss-minor-version            "23">
+<!-- normal
 <!ENTITY nss-micro-version            "1">
 <!ENTITY nss-version                  "3.&nss-minor-version;.&nss-micro-version;">
 
-<!-- major and minor only
-<!ENTITY nss-version                  "3.&nss-minor-version;"> -->
+major and minor only -->
+<!ENTITY nss-version                  "3.&nss-minor-version;">
 <!ENTITY openssh-version              "7.2p2">
 <!ENTITY openssl-version              "1.0.2g">
@@ -60,6 +60,6 @@
 <!ENTITY ed-version                   "1.13">
 <!ENTITY emacs-version                "24.5">
-<!ENTITY joe-version                  "4.1">
-<!ENTITY nano-version                 "2.5.2">
+<!ENTITY joe-version                  "4.2">
+<!ENTITY nano-version                 "2.5.3">
 <!ENTITY vim-version                  "7.4">
 
@@ -130,5 +130,5 @@
 <!ENTITY libidn-version               "1.32">
 <!ENTITY libiodbc-version             "3.52.10">
-<!ENTITY libinput-version             "1.1.8">
+<!ENTITY libinput-version             "1.2.1">
 <!ENTITY libksba-version              "1.3.3">
 <!ENTITY liblinear-version            "2.1">
@@ -162,5 +162,5 @@
 <!ENTITY qjson-version                "0.8.1">
 <!ENTITY sbc-version                  "1.3">
-<!ENTITY talloc-version               "2.1.5">
+<!ENTITY talloc-version               "2.1.6">
 <!ENTITY wayland-version              "1.10.0">
 <!ENTITY wv-version                   "1.2.9">
@@ -273,6 +273,6 @@
 <!ENTITY check-version                "0.10.0">
 <!ENTITY clisp-version                "2.49">
-<!ENTITY cmake-major-version          "3.4">
-<!ENTITY cmake-minor-version          "3">
+<!ENTITY cmake-major-version          "3.5">
+<!ENTITY cmake-minor-version          "0">
 <!ENTITY cmake-version                "&cmake-major-version;.&cmake-minor-version;">
 <!ENTITY cvs-version                  "1.11.23">
@@ -285,5 +285,5 @@
 <!ENTITY gcc-ada-version              "5.3.0">
 <!ENTITY gc-version                   "7.4.2">
-<!ENTITY gdb-version                  "7.10.1">
+<!ENTITY gdb-version                  "7.11">
 <!ENTITY git-version                  "2.7.1">
 <!ENTITY guile-version                "2.0.11">
@@ -292,5 +292,5 @@
 <!ENTITY lua-version                  "5.3.2">
 <!ENTITY mercurial-version            "3.7.1">
-<!ENTITY nasm-version                 "2.11.08">
+<!ENTITY nasm-version                 "2.12">
 <!ENTITY npapi-sdk-version            "0.27.2">
 <!ENTITY php-version                  "7.0.3">
@@ -343,5 +343,5 @@
 <!ENTITY LWP-Protocol-https-version   "6.06">
 <!ENTITY Module-Build-version         "0.4216">
-<!ENTITY Net-DNS-version              "1.04">
+<!ENTITY Net-DNS-version              "1.05">
 <!ENTITY Regexp-Common-version        "2016020301">
 <!ENTITY SGMLSpm-version              "1.1">
@@ -364,5 +364,5 @@
 <!-- Python module versions used in the Python Modules instructions -->
 <!ENTITY Beaker-version               "1.7.0">
-<!ENTITY dbus-python-version          "1.2.0">
+<!ENTITY dbus-python-version          "1.2.4">
 <!ENTITY Jinja2-version               "2.7.3">
 <!ENTITY MarkupSafe-version           "0.23">
@@ -385,5 +385,5 @@
 <!-- Chapter 15 -->
 <!ENTITY bridgeutils-version          "1.5">
-<!ENTITY cifsutils-version            "6.4">
+<!ENTITY cifsutils-version            "6.5">
 <!ENTITY ncftp-version                "3.2.5">
 <!ENTITY net-tools-version            "CVS_20101030">
@@ -404,5 +404,5 @@
 <!ENTITY NetworkManager-version       "1.0.10">
 <!ENTITY nmap-version                 "7.01">
-<!ENTITY traceroute-version           "2.0.21">
+<!ENTITY traceroute-version           "2.1.0">
 <!ENTITY whois-version                "5.2.11">
 <!ENTITY wicd-version                 "1.7.4">
@@ -453,5 +453,5 @@
 <!ENTITY dovecot-version              "&dovecot-major;.&dovecot-minor;.&dovecot-micro;">
 
-<!ENTITY exim-version                 "4.86">
+<!ENTITY exim-version                 "4.86.2">
 <!ENTITY postfix-version              "3.0.2">
 <!ENTITY sendmail-version             "8.15.2">
@@ -460,5 +460,5 @@
 <!ENTITY db-version                   "6.1.26">
 <!ENTITY lmdb-version                 "0.9.18">
-<!ENTITY mariadb-version              "10.1.11">
+<!ENTITY mariadb-version              "10.1.12">
 <!ENTITY postgresql-version           "9.5.1">
 <!ENTITY sqlite-version               "3.11.0">
@@ -467,5 +467,5 @@
 <!ENTITY openldap-version             "2.4.44">
 <!ENTITY soprano-version              "2.9.4">
-<!ENTITY unbound-version              "1.5.7">
+<!ENTITY unbound-version              "1.5.8">
 <!ENTITY virtuoso-version             "6.1.8">
 <!ENTITY xinetd-version               "2.3.15">
@@ -490,7 +490,7 @@
 <!ENTITY xcb-util-wm-version          "0.4.1">
 <!ENTITY xcb-util-cursor-version      "0.1.2">
-<!ENTITY xorg-server-version          "1.18.1">
+<!ENTITY xorg-server-version          "1.18.2">
 <!ENTITY twm-version                  "1.0.9">
-<!ENTITY xterm-version                "322">
+<!ENTITY xterm-version                "324">
 <!ENTITY xclock-version               "1.0.7">
 <!ENTITY xinit-version                "1.3.4">
@@ -675,5 +675,5 @@
 <!-- Chapter 44 -->
 <!ENTITY seamonkey-version            "2.39">
-<!ENTITY firefox-version              "44.0.2">
+<!ENTITY firefox-version              "45.0">
 
 <!-- Chapter 45 -->
@@ -733,5 +733,5 @@
 <!ENTITY liba52-version               "0.7.4">
 <!ENTITY libao-version                "1.2.0">
-<!ENTITY libass-version               "0.13.1">
+<!ENTITY libass-version               "0.13.2">
 <!ENTITY libcanberra-version          "0.30">
 <!ENTITY libcdio-version              "0.93">
@@ -755,5 +755,5 @@
 <!ENTITY libva-vdpau-driver-version   "0.7.4">
 <!ENTITY libvdpau-version             "1.1.1">
-<!ENTITY libvdpau-va-gl-version       "0.3.4">
+<!ENTITY libvdpau-va-gl-version       "0.3.6">
 <!ENTITY libvorbis-version            "1.3.5">
 <!ENTITY libvpx-version               "1.5.0">
Index: postlfs/editors/joe.xml
===================================================================
--- postlfs/editors/joe.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ postlfs/editors/joe.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -6,6 +6,6 @@
 
   <!ENTITY joe-download-http "&sourceforge-repo;/joe-editor/joe-&joe-version;.tar.gz">
-  <!ENTITY joe-download-ftp  "&gentoo-ftp-repo;/joe-&joe-version;.tar.gz">
-  <!ENTITY joe-md5sum        "b8c9ab4295e3208ddbbaa9c1141564f9">
+  <!ENTITY joe-download-ftp  " ">
+  <!ENTITY joe-md5sum        "0a70057cc4493320f9838822451857ef">
   <!ENTITY joe-size          "1.3 MB">
   <!ENTITY joe-buildsize     "20 MB">
Index: postlfs/editors/nano.xml
===================================================================
--- postlfs/editors/nano.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ postlfs/editors/nano.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -7,5 +7,5 @@
   <!ENTITY nano-download-http "http://ftp.gnu.org/gnu/nano/nano-&nano-version;.tar.gz">
   <!ENTITY nano-download-ftp  "ftp://ftp.gnu.org/gnu/nano/nano-&nano-version;.tar.gz">
-  <!ENTITY nano-md5sum        "036830de22b8a76a0e6f84c0cb36ff12">
+  <!ENTITY nano-md5sum        "a04d77611422ab4b6a7b489650c7a793">
   <!ENTITY nano-size          "1.9 MB">
   <!ENTITY nano-buildsize     "13 MB">
Index: postlfs/security/nss.xml
===================================================================
--- postlfs/security/nss.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ postlfs/security/nss.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -7,15 +7,16 @@
 <!-- for when .0 is not part of the new tarball name, but always referneced -->
   <!ENTITY nss-url "ftp.mozilla.org/pub/mozilla.org/security/nss/releases">
-
+<!--
 <!ENTITY nss-download-http "https://&nss-url;/NSS_3_&nss-minor-version;_&nss-micro-version;_RTM/src/nss-&nss-version;.tar.gz">
+-->
 <!ENTITY nss-download-ftp " ">
 <!-- <!ENTITY nss-download-ftp "ftp://&nss-url;/NSS_3_&nss-minor-version;_&nss-micro-version;_RTM/src/nss-&nss-version;.tar.gz"> -->
-<!-- no micro versions
-<!ENTITY nss-download-http "https://&nss-url;/NSS_3_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz"> -->
+<!-- no micro versions -->
+<!ENTITY nss-download-http "https://&nss-url;/NSS_3_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz">
 <!--<!ENTITY nss-download-ftp "ftp://&nss-url;/NSS_3_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz">-->
 
-  <!ENTITY nss-md5sum        "66175367b13bbe41295d62fce4efb88b">
-  <!ENTITY nss-size          "6.7 MB">
-  <!ENTITY nss-buildsize     "87 MB">
+  <!ENTITY nss-md5sum        "21c3fed84441b2ab4c50ac626f6517e7">
+  <!ENTITY nss-size          "7.3 MB">
+  <!ENTITY nss-buildsize     "96 MB">
   <!ENTITY nss-time          "1.0 SBU">
 ]>
Index: server/databases/mariadb.xml
===================================================================
--- server/databases/mariadb.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ server/databases/mariadb.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -7,8 +7,8 @@
   <!ENTITY mariadb-download-http "https://downloads.mariadb.org/interstitial/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">
   <!ENTITY mariadb-download-ftp  "ftp://mirrors.fe.up.pt/pub/mariadb/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">
-  <!ENTITY mariadb-md5sum        "c199608ae4282f16007dc8c270ff2439">
+  <!ENTITY mariadb-md5sum        "a2c0809f27ec112139c2c50f03569b2b">
   <!ENTITY mariadb-size          "53 MB">
-  <!ENTITY mariadb-buildsize     "1.6 GB (with tests)">
-  <!ENTITY mariadb-time          "4 SBU, (with tests - all using parallelism=4)">
+  <!ENTITY mariadb-buildsize     "1.2 GB (with tests)">
+  <!ENTITY mariadb-time          "4.5 SBU, (with parallelism=4 and tests)">
 ]>
 
@@ -72,6 +72,6 @@
     </itemizedlist>
 
-    <note><para>The installed size of MariaDB is 388 MB, but this can be
-    reduced by about 168 MB, if desired, by removing the /usr/share/mysql/test
+    <note><para>The installed size of MariaDB is 422 MB, but this can be
+    reduced by about 177 MB, if desired, by removing the /usr/share/mysql/test
     directory after installation.</para></note>
 
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ server/mail/exim.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -9,10 +9,10 @@
   <!ENTITY exim-download-http   "http://ftp.exim.org/pub/exim/exim4/exim-&exim-version;.tar.bz2"> -->
 
-  <!ENTITY exim-download-http   "http://mirrors-uk.go-parts.com/eximftp/exim/exim4/exim-&exim-version;.tar.bz2">
+  <!ENTITY exim-download-http   "http://mirrors-usa.go-parts.com/eximftp/exim/exim4/exim-&exim-version;.tar.bz2">
   <!ENTITY exim-download-ftp    "ftp://ftp.exim.org/pub/exim/exim4/exim-&exim-version;.tar.bz2">
   <!-- if above don't work, please use one of the official mirrors at
        http://www.exim.org/mirmon/ftp_mirrors.html -->
-  <!ENTITY exim-md5sum          "797f248ef3e0c0e2f178e915f88fc4e9">
-  <!ENTITY exim-size            "1.8 MB">
+  <!ENTITY exim-md5sum          "1443a4a88d6b78ad9b6a681c51437b55">
+  <!ENTITY exim-size            "1.7 MB">
   <!ENTITY exim-buildsize       "17 MB">
   <!ENTITY exim-time            "0.2 SBU">
@@ -134,9 +134,10 @@
 <!-- dev note: make INSTALL_ARG=-no_chown DESTDIR=<DESTDIR> install -->
 
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m644 doc/exim.8 /usr/share/man/man8 &amp;&amp;
-install -v -d -m755 /usr/share/doc/exim-&exim-version; &amp;&amp;
+<screen role="root"><userinput>make install                                              &amp;&amp;
+install -v -m644 doc/exim.8 /usr/share/man/man8           &amp;&amp;
+install -v -d -m755 /usr/share/doc/exim-&exim-version;    &amp;&amp;
 install -v -m644 doc/* /usr/share/doc/exim-&exim-version; &amp;&amp;
-ln -sfv exim /usr/sbin/sendmail</userinput></screen>
+ln -sfv exim /usr/sbin/sendmail                           &amp;&amp;
+install -v -m750 -o exim -g exim /var/spool/exim</userinput></screen>
 
   </sect2>
@@ -182,4 +183,12 @@
     <application>Exim</application> will accept most
     <application>Sendmail</application> command-line options.</para>
+
+    <para><command>install -v -m750 -o exim -g exim /var/spool/exim</command>:
+    Since /var/spool is owned by root and this version of 
+    <command>exim</command> drops <systemitem class="username">root</systemitem>
+    privileges early, to run as user
+    <systemitem class="username">exim</systemitem>, it cannot create the
+    <filename class="directory">/var/spool/exim</filename> directory. As a work
+    around, it is created manually.</para>
 
   </sect2>
Index: server/other/unbound.xml
===================================================================
--- server/other/unbound.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ server/other/unbound.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -7,5 +7,5 @@
   <!ENTITY unbound-download-http "http://www.unbound.net/downloads/unbound-&unbound-version;.tar.gz">
   <!ENTITY unbound-download-ftp  " ">
-  <!ENTITY unbound-md5sum        "a1253cbbb339dbca03404dcc58365d71">
+  <!ENTITY unbound-md5sum        "1c34282bae0c625b86374ee9caaef6f7">
   <!ENTITY unbound-size          "4.7 MB">
   <!ENTITY unbound-buildsize     "47 MB (with tests)">
Index: x/icons/oxygen-icons.xml
===================================================================
--- x/icons/oxygen-icons.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ x/icons/oxygen-icons.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY oxygen-icons-download-http "&kde-download-http;applications/&oxygen-icons-version;/src/oxygen-icons-&oxygen-icons-version;.tar.xz">
+  <!ENTITY oxygen-icons-download-http "&kde-download-attic;/&oxygen-icons-version;/src/oxygen-icons-&oxygen-icons-version;.tar.xz">
   <!ENTITY oxygen-icons-download-ftp  " ">
   <!ENTITY oxygen-icons-md5sum        "4f24f975fb90d8daab833fc719ce39a3">
Index: x/installing/x7proto.xml
===================================================================
--- x/installing/x7proto.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ x/installing/x7proto.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -62,6 +62,6 @@
   <!ENTITY scrnsaverproto-md5sum           "edd8a73775e8ece1d69515dd17767bfb">
 
-  <!ENTITY videoproto-version              "2.3.2">
-  <!ENTITY videoproto-md5sum               "e658641595327d3990eab70fdb55ca8b">
+  <!ENTITY videoproto-version              "2.3.3">
+  <!ENTITY videoproto-md5sum               "fe86de8ea3eb53b5a8f52956c5cd3174">
 
   <!ENTITY xcmiscproto-version             "1.2.2">
Index: x/installing/xorg-server.xml
===================================================================
--- x/installing/xorg-server.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ x/installing/xorg-server.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -7,5 +7,5 @@
   <!ENTITY xorg-server-download-http "&xorg-download-http;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
   <!ENTITY xorg-server-download-ftp  "&xorg-download-ftp;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
-  <!ENTITY xorg-server-md5sum        "1b9e85420c3790dd487addd50313f4da">
+  <!ENTITY xorg-server-md5sum        "052fc1b4b12a5df0a3e35a1b46a52db3">
   <!ENTITY xorg-server-size          "5.6 MB">
   <!ENTITY xorg-server-buildsize     "544 MB (with tests)">
@@ -79,4 +79,5 @@
         </para>
       </listitem>
+<!--  Seems to have been included in version 1.18.2
       <listitem>
         <para>
@@ -84,5 +85,5 @@
           <ulink url="&patch-root;/xorg-server-&xorg-server-version;-wayland_190-1.patch"/>
         </para>
-      </listitem>
+      </listitem>-->
     </itemizedlist>
 
@@ -130,5 +131,5 @@
     <title>Installation of Xorg Server</title>
 
-    <para>
+<!--    <para>
       If you have downloaded the optional patch, apply it by running the
       following command:
@@ -136,5 +137,5 @@
 
 <screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-add_prime_support-1.patch</userinput></screen>
-
+-->
     <para>
       If you have downloaded the recommended patch, apply it by running the
Index: x/installing/xterm.xml
===================================================================
--- x/installing/xterm.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ x/installing/xterm.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -7,8 +7,8 @@
   <!ENTITY xterm-download-http " ">
   <!ENTITY xterm-download-ftp  "ftp://invisible-island.net/xterm/xterm-&xterm-version;.tgz">
-  <!ENTITY xterm-md5sum        "9ea4c83ac7275fdecf39fde9db781fac">
+  <!ENTITY xterm-md5sum        "7c325c29d67637cf7ff8e904a23c222e">
   <!ENTITY xterm-size          "1.2 MB">
-  <!ENTITY xterm-buildsize     "15 MB">
-  <!ENTITY xterm-time          "0.1 SBU">
+  <!ENTITY xterm-buildsize     "11.8 MB">
+  <!ENTITY xterm-time          "0.2 SBU">
 ]>
 
Index: x/lib/qt5.xml
===================================================================
--- x/lib/qt5.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ x/lib/qt5.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -101,4 +101,5 @@
       <xref linkend="libtiff"/>,
       <xref linkend="libwebp"/>,
+      <xref linkend="libxkbcommon"/>,
       <xref linkend="mesa"/>,
       <xref linkend="mtdev"/>,
@@ -125,7 +126,6 @@
       <xref linkend="postgresql"/>,
       <xref linkend="pulseaudio"/>,
-      <xref linkend="unixodbc"/>,
-      <ulink url="https://code.google.com/p/ibus/">IBus</ulink>, and 
-      <ulink url="http://xkbcommon.org/">libxkbcommon</ulink>
+      <xref linkend="unixodbc"/>, and
+      <ulink url="https://code.google.com/p/ibus/">IBus</ulink>.
     </para>
 
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ xsoft/graphweb/firefox.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -9,8 +9,8 @@
   <!ENTITY firefox-download-ftp "&mozilla-ftp;/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2"> -->
   <!ENTITY firefox-download-ftp " ">
-  <!ENTITY firefox-md5sum        "9596accec2ce7031eaab5c33373a1af4">
-  <!ENTITY firefox-size          "174 MB">
+  <!ENTITY firefox-md5sum        "09cbada824841f9e1d77f095e7cd02c1">
+  <!ENTITY firefox-size          "176 MB">
   <!ENTITY firefox-buildsize     "4.4 GB (80 MB installed)">
-  <!ENTITY firefox-time          "10 SBU (with parallelism=4)">
+  <!ENTITY firefox-time          "11 SBU (with parallelism=4)">
 ]>
 
Index: xsoft/other/fontforge.xml
===================================================================
--- xsoft/other/fontforge.xml	(revision 02d46cb788b48fea46f3ac28e957db457c47c8b3)
+++ xsoft/other/fontforge.xml	(revision 9ea9aa7a03eb4585b4ef60dcb737a801043055e6)
@@ -150,5 +150,5 @@
       </para>
 
-<screen><userinput>sed -e '/Exec/ s/fontforge/&amp; -new/' \
+<screen role="root"><userinput>sed -e '/Exec/ s/fontforge/&amp; -new/' \
     -i /usr/share/applications/fontforge.desktop</userinput></screen>
     </note>
