Author: renodr
Date: Sat May 14 13:19:09 2016
New Revision: 17354

Log:
Merge to trunk r17352

Modified:
   branches/systemd/general.ent
   branches/systemd/general/genlib/libinput.xml
   branches/systemd/general/genlib/libksba.xml
   branches/systemd/general/genlib/talloc.xml
   branches/systemd/general/genutils/imagemagick.xml
   branches/systemd/general/prog/java.xml
   branches/systemd/general/prog/openjdk.xml
   branches/systemd/general/prog/perl-modules.xml
   branches/systemd/general/sysutils/mc.xml
   branches/systemd/introduction/welcome/changelog.xml
   branches/systemd/multimedia/libdriv/fdk-aac.xml
   branches/systemd/multimedia/libdriv/xine-lib.xml
   branches/systemd/networking/mailnews/mutt.xml
   branches/systemd/networking/netprogs/samba.xml
   branches/systemd/packages.ent
   branches/systemd/postlfs/filesystems/smartmontools.xml
   branches/systemd/postlfs/security/gnupg2.xml
   branches/systemd/postlfs/security/linux-pam.xml
   branches/systemd/postlfs/security/openssl.xml
   branches/systemd/postlfs/security/stunnel.xml
   branches/systemd/pst/printing/cups-filters.xml
   branches/systemd/pst/typesetting/asymptote.xml
   branches/systemd/x/installing/mesa.xml
   branches/systemd/x/installing/x7proto.xml
   branches/systemd/x/installing/xcb-util-cursor.xml
   branches/systemd/x/lib/goffice010.xml
   branches/systemd/x/lib/gtk3.xml
   branches/systemd/xsoft/graphweb/firefox.xml
   branches/systemd/xsoft/office/gnumeric.xml
   branches/systemd/xsoft/other/inkscape.xml

Modified: branches/systemd/general.ent
==============================================================================
--- branches/systemd/general.ent        Sat May 14 05:12:34 2016        (r17353)
+++ branches/systemd/general.ent        Sat May 14 13:19:09 2016        (r17354)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "10">                   <!-- Always 2 digits -->
+<!ENTITY day          "14">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS systemd Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "May 10th, &year;">
+<!ENTITY releasedate  "May 14th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "systemd">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "systemd">          <!-- x.y|development] -->

Modified: branches/systemd/general/genlib/libinput.xml
==============================================================================
--- branches/systemd/general/genlib/libinput.xml        Sat May 14 05:12:34 
2016        (r17353)
+++ branches/systemd/general/genlib/libinput.xml        Sat May 14 13:19:09 
2016        (r17354)
@@ -4,14 +4,14 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY libinput-version "1.2.4">
+  <!ENTITY libinput-version "1.3.0">
 
   <!ENTITY libinput-download-http 
"http://www.freedesktop.org/software/libinput/libinput-&libinput-version;.tar.xz";>
   <!ENTITY libinput-download-ftp  " ">
-  <!ENTITY libinput-md5sum        "1cbaa34f04a336f2703906d564e0a37a">
-  <!ENTITY libinput-size          "840 KB">
-  <!ENTITY libinput-buildsize     "31 MB (with documentation)">
-  <!ENTITY libinput-time          "0.3 SBU (with documentation)">
+  <!ENTITY libinput-md5sum        "5f8bc2c746bfbc9454143f78e5b477a9">
+  <!ENTITY libinput-size          "860 KB">
+  <!ENTITY libinput-buildsize     "32 MB">
+  <!ENTITY libinput-time          "0.3 SBU">
 ]>
 
 <sect1 id="libinput" xreflabel="libinput-&libinput-version;">

Modified: branches/systemd/general/genlib/libksba.xml
==============================================================================
--- branches/systemd/general/genlib/libksba.xml Sat May 14 05:12:34 2016        
(r17353)
+++ branches/systemd/general/genlib/libksba.xml Sat May 14 13:19:09 2016        
(r17354)
@@ -6,9 +6,9 @@
 
   <!ENTITY libksba-download-http " ">
   <!ENTITY libksba-download-ftp  
"ftp://ftp.gnupg.org/gcrypt/libksba/libksba-&libksba-version;.tar.bz2";>
-  <!ENTITY libksba-md5sum        "a5dd3c57fca254935f5cf8db26e39065">
+  <!ENTITY libksba-md5sum        "2bfc3d69053db7b6983b5627706033f4">
   <!ENTITY libksba-size          "608 KB">
-  <!ENTITY libksba-buildsize     "6.5 MB">
+  <!ENTITY libksba-buildsize     "9.1 MB">
   <!ENTITY libksba-time          "0.1 SBU">
 ]>
 

Modified: branches/systemd/general/genlib/talloc.xml
==============================================================================
--- branches/systemd/general/genlib/talloc.xml  Sat May 14 05:12:34 2016        
(r17353)
+++ branches/systemd/general/genlib/talloc.xml  Sat May 14 13:19:09 2016        
(r17354)
@@ -6,10 +6,10 @@
 
   <!ENTITY talloc-download-http 
"https://www.samba.org/ftp/talloc/talloc-&talloc-version;.tar.gz";>
   <!ENTITY talloc-download-ftp  " ">
-  <!ENTITY talloc-md5sum        "707010c6ede5821fd34397f5d9ec6ab8">
+  <!ENTITY talloc-md5sum        "d6763d65d03d627816ae1d50c74576fe">
   <!ENTITY talloc-size          "428 KB">
-  <!ENTITY talloc-buildsize     "7.1 MB (additional 0.2 MB for tests)">
-  <!ENTITY talloc-time          "0.2 SBU (additional 0.2 SBU for tests)">
+  <!ENTITY talloc-buildsize     "6.9 MB (add 0.2 MB for tests)">
+  <!ENTITY talloc-time          "0.2 SBU (add 0.2 SBU for tests)">
 ]>
 
 <sect1 id="talloc" xreflabel="Talloc-&talloc-version;">
@@ -99,6 +99,7 @@
 
     <para>
       To check the results, issue <command>make check</command>.
+      The python tests fail due to missing files.
     </para>
 
     <para>

Modified: branches/systemd/general/genutils/imagemagick.xml
==============================================================================
--- branches/systemd/general/genutils/imagemagick.xml   Sat May 14 05:12:34 
2016        (r17353)
+++ branches/systemd/general/genutils/imagemagick.xml   Sat May 14 13:19:09 
2016        (r17354)
@@ -4,14 +4,14 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY imagemagick-patch-version "5">
+  <!ENTITY imagemagick-patch-version "1">
 
   <!ENTITY imagemagick-download-http 
"https://www.imagemagick.org/pub/download/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz";>
   <!ENTITY imagemagick-download-ftp 
"ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz";>
-  <!ENTITY imagemagick-md5sum        "af1c85b8b8f817e919f9ca4408d86782">
-  <!ENTITY imagemagick-size          "8.4 MB">
-  <!ENTITY imagemagick-buildsize     "193 MB, with typical dependencies (222 
MB with the test suite, reputedly 450 MB with all dependencies)">
-  <!ENTITY imagemagick-time          "2.0 SBU - typical build (additional 1.6 
SBU to run the test suite and 1.4 SBU to run the validation suite)">
+  <!ENTITY imagemagick-md5sum        "24673d00fcc8aa00313eeca6aa20fd3c">
+  <!ENTITY imagemagick-size          "7.9 MB">
+  <!ENTITY imagemagick-buildsize     "200 MB, with typical dependencies (add 
31 MB for the test suite)">
+  <!ENTITY imagemagick-time          "2.9 SBU - typical build (add 1.8 SBU for 
the test suite and 1.5 SBU for the validation suite)">
 ]>
 
 <!-- Editors: It is highly unlikely that the buildsize (disk space used) will
@@ -21,9 +21,14 @@
      dependencies are installed, which is what we want.
 
      Marked as 'typical' because nobody builds ALL the optional extras [ken]
+
+     [bdubbs] I do; at least the interal ones. I still only got 200 MB.
+
      Saved the "full" 450MB as a comment - feel free to update this iff you
      do build all dependencies, it's probably a lot bigger now.
 
+     [bdubbs] - Just removed it. I don't think it adds anything.
+
      Also, please look over the output from the configure command for any
      additional dependencies that need to be listed, as ImageMagick is
      constantly adding additional features and dependencies.
@@ -157,6 +162,7 @@
       <ulink url="http://djvu.sourceforge.net/";>DjVuLibre</ulink>,
       <ulink url="ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/";>
       FlashPIX (libfpx)</ulink>,
+      <ulink url="https://github.com/FLIF-hub/FLIF/releases";>FLIF</ulink>,
       <ulink url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/";>JBIG-KIT</ulink>,
       <ulink url="&gnome-download-http;/libgxps/">libgxps</ulink>,
       <ulink url="https://github.com/HOST-Oman/libraqm/";>libraqm</ulink>,
@@ -210,7 +216,9 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr     \
+<screen><userinput>sed -i '/seems to be moved/ s/^/true #/' config/ltmain.sh 
&amp;&amp;
+
+./configure --prefix=/usr     \
             --sysconfdir=/etc \
             --enable-hdri     \
             --with-modules    \
@@ -245,6 +253,10 @@
     <title>Command Explanations</title>
 
     <para>
+      <command>sed ...</command>: Removes a lot of invalid warnings.
+    </para>
+
+    <para>
       <parameter>--enable-hdri</parameter>: Enables building of a
       high dynamic range version of ImageMagick.
     </para>
@@ -320,22 +332,23 @@
 
       <seglistitem>
         <seg>
-          animate, compare, composite, conjure, convert, display,
-          identify, import, Magick-config, Magick++-config, MagickCore-config,
-          MagickWand-config, mogrify, montage, stream, and Wand-config
+          magick, Magick++-config, MagickCore-config, and MagickWand-config.
+          (animate, compare, composite, conjure, convert, display,
+          identify, import, magick-script, mogrify, montage, and stream
+          are all symbolic links to magick)
         </seg>
         <seg>
-          libMagickCore-6.Q16HDRI.so,
-          libMagickWand-6.Q16HDRI.so and
-          libMagick++-6.Q16HDRI.so
+          libMagickCore-7.Q16HDRI.so,
+          libMagickWand-7.Q16HDRI.so and
+          libMagick++-7.Q16HDRI.so
         </seg>
         <seg>
-          /etc/ImageMagick-6,
-          /usr/include/ImageMagick-6,
+          /etc/ImageMagick-7,
+          /usr/include/ImageMagick-7,
           /usr/lib/ImageMagick-&imagemagick-version;,
-          /usr/lib/perl5/site_perl/&lfs-perl-version;/{,auto}/Image/Magick,
+          /usr/lib/perl5/site_perl/&lfs-perl-version;/$(uname 
-m)-linux/{,auto}/Image/Magick,
           /usr/share/doc/ImageMagick-&imagemagick-version;, and
-          /usr/share/ImageMagick-6
+          /usr/share/ImageMagick-7
         </seg>
       </seglistitem>
     </segmentedlist>
@@ -426,7 +439,7 @@
     </varlistentry>
 
     <varlistentry id="magick-config">
-      <term><command>Magick{,++,Core,Wand}-config</command></term>
+      <term><command>Magick{++,Core,Wand}-config</command></term>
       <listitem>
         <para>show information about the installed versions of the
         <application>ImageMagick</application> libraries.</para>
@@ -466,16 +479,6 @@
         </indexterm>
       </listitem>
     </varlistentry>
-
-    <varlistentry id="wand-config">
-      <term><command>Wand-config</command></term>
-      <listitem>
-        <para>shows the options required to use the Wand library.</para>
-        <indexterm zone="imagemagick wand-config">
-          <primary sortas="b-Wand-config">Wand-config</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
 
     <varlistentry id="perlmagick">
       <term><filename class='libraryfile'>Image::Magick</filename></term>

Modified: branches/systemd/general/prog/java.xml
==============================================================================
--- branches/systemd/general/prog/java.xml      Sat May 14 05:12:34 2016        
(r17353)
+++ branches/systemd/general/prog/java.xml      Sat May 14 13:19:09 2016        
(r17354)
@@ -6,12 +6,12 @@
 
   <!ENTITY anduin-download             
"&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
   <!ENTITY openjdk-download-binary-x86 
"&anduin-download;/OpenJDK-&openjdk-version;-i686-bin.tar.xz">
-  <!ENTITY openjdk-bin-md5sum-x86      "41f3f4f87573e92ca4ab0350f0ff0d2f">
+  <!ENTITY openjdk-bin-md5sum-x86      "ce3fc99377496a27d56ba0728bc7c776">
   <!ENTITY openjdk-bin-size-x86        "57 MB">
   <!ENTITY openjdk-bin-buildsize-x86   "166 MB">
 
   <!ENTITY openjdk-download-binary-x64 
"&anduin-download;/OpenJDK-&openjdk-version;-x86_64-bin.tar.xz">
-  <!ENTITY openjdk-bin-md5sum-x64      "5a9b1b6d2e105eef2fbb1a965b17b3e9">
+  <!ENTITY openjdk-bin-md5sum-x64      "6f81546ce8284d692e77ba95b0c88068">
   <!ENTITY openjdk-bin-size-x64        "58 MB">
   <!ENTITY openjdk-bin-buildsize-x64   "169 MB">
 ]>

Modified: branches/systemd/general/prog/openjdk.xml
==============================================================================
--- branches/systemd/general/prog/openjdk.xml   Sat May 14 05:12:34 2016        
(r17353)
+++ branches/systemd/general/prog/openjdk.xml   Sat May 14 13:19:09 2016        
(r17354)
@@ -4,24 +4,24 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY ojdk-upd                  "77">
-  <!ENTITY ojdk-bd                   "b03">
+  <!ENTITY ojdk-upd                  "92">
+  <!ENTITY ojdk-bd                   "b14">
   <!ENTITY ojdk-tarball              "jdk8u&ojdk-upd;-&ojdk-bd;.tar.bz2">
   <!ENTITY ojdk-repo                 "http://hg.openjdk.java.net/jdk8u/jdk8u";>
   <!ENTITY ojdk-download             "&ojdk-repo;/archive/&ojdk-tarball;">
 
   <!ENTITY anduin-download           
"&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
 
-  <!ENTITY ojdk-md5sum               "1954ffeb123a7f4552472ba9f9e38b0d">
-  <!ENTITY ojdk-size                 "398 KB">
+  <!ENTITY ojdk-md5sum               "226f9051e34b70fbff031ec9d959773d">
+  <!ENTITY ojdk-size                 "399 KB">
 
-  <!ENTITY corba-md5sum              "eb7695323d3340214792114ad8e3bdce">
-  <!ENTITY hotspot-md5sum            "434e3dd4272d39b255ba9269838647b9">
-  <!ENTITY jaxp-md5sum               "fcc49430937eba2c64f8a53475edf99d">
-  <!ENTITY jaxws-md5sum              "f05a009f2e0fdb710c3405723ed42199">
-  <!ENTITY jdk-md5sum                "ffe70c01fc0fe513e329f170f4c922c1">
-  <!ENTITY langtools-md5sum          "a7e0ff3378d02e075284db7fe4a8dfbf">
-  <!ENTITY nashorn-md5sum            "1dee0e478002e80f87b235ae982edf6e">
+  <!ENTITY corba-md5sum              "9619e84a600aaf81737f7ed71430d3aa">
+  <!ENTITY hotspot-md5sum            "21e8fdc20ab17e7399752ef74c8e03e2">
+  <!ENTITY jaxp-md5sum               "567189edafbe0aabaff2d75d86c05456">
+  <!ENTITY jaxws-md5sum              "3e7db7d843ebbcd5eb2ba0a9e7e275d7">
+  <!ENTITY jdk-md5sum                "b06f2e3504357820bb3dd29e19ccfc0d">
+  <!ENTITY langtools-md5sum          "afbe0e3a8c0e9e2beac5567e1084f3ee">
+  <!ENTITY nashorn-md5sum            "e3641526c2875b5d4d1414980769f6ea">
   <!ENTITY total-download-size       "63 MB">
 
   <!ENTITY jtreg-version             "4.1-b12-496">
@@ -31,8 +31,8 @@
 
   <!ENTITY icedtea-web-download      
"http://icedtea.classpath.org/download/source/icedtea-web-&icedtea-web-version;.tar.gz";>
 
-  <!ENTITY ojdk-buildsize           "3.7 GB (additional 547 MB for tests)">
-  <!ENTITY ojdk-time                "11 SBU (additional 108 SBU for tests)">
+  <!ENTITY ojdk-buildsize           "3.7 GB (additional 546 MB for tests)">
+  <!ENTITY ojdk-time                "12 SBU (additional 130 SBU for tests)">
 ]>
 
 <sect1 id="openjdk"
@@ -273,7 +273,9 @@
    --enable-unlimited-crypto  \
    --with-zlib=system         \
    --with-giflib=system       &amp;&amp;
-make DEBUG_BINARIES=true all  &amp;&amp;
+   --with-extra-cflags="-std=c++98 -Wno-error -fno-delete-null-pointer-checks 
-fno-lifetime-dse" \
+   --with-extra-cxxflags="-std=c++98 -fno-delete-null-pointer-checks 
-fno-lifetime-dse" &amp;&amp;
+make DEBUG_BINARIES=true SCTP_WERROR= all  &amp;&amp;
 find build/*/images/j2sdk-image -iname \*.diz -delete
 </userinput></screen>
 
@@ -483,6 +485,13 @@
     </para>
 
     <para>
+      <parameter>--with-extra-cflags=... --with-extra-cxxflags=...</parameter>:
+      Works around some defects in the code brought to light by the GCC 6
+      compiler's more rigorous checking of the C/C++ constructs. Remove these
+      switches if compiling with GCC 5.
+    </para>
+
+    <para>
       <option>--with-jobs=N</option>: Allows setting the number
       of jobs for <command>make</command> equal to N. The default is the
       result of a calculation involving the available memory and the number
@@ -500,8 +509,10 @@
     </para>
 
     <para>
-      <command>make DEBUG_BINARIES=true all</command>: The build fails on
-      32 bit machines if DEBUG_BINARIES is not set to true.
+      <command>make DEBUG_BINARIES=true SCTP_WERROR=  all</command>: The build 
+      fails on 32 bit machines if DEBUG_BINARIES is not set to true. Unsetting
+      SCTP_WERROR is part of the workarounds needed to use GCC 6. You may omit
+      that part of the command if you are using GCC 5.
     </para>
 
     <para>

Modified: branches/systemd/general/prog/perl-modules.xml
==============================================================================
--- branches/systemd/general/prog/perl-modules.xml      Sat May 14 05:12:34 
2016        (r17353)
+++ branches/systemd/general/prog/perl-modules.xml      Sat May 14 13:19:09 
2016        (r17354)
@@ -61,7 +61,7 @@
   <!ENTITY libwww-perl-md5sum "6888c9d8728cd6f3ea3c9754461c9f94">
 
   <!ENTITY List-AllUtils-download-http 
"http://www.cpan.org/authors/id/D/DR/DROLSKY/List-AllUtils-&List-AllUtils-version;.tar.gz";>
-  <!ENTITY List-AllUtils-md5sum "3e2dfeeef80c4e1952443c6b7d48583c">
+  <!ENTITY List-AllUtils-md5sum "a17e4239bd9bdfa272a104954678336a">
 
   <!ENTITY List-MoreUtils-download-http 
"http://www.cpan.org/authors/id/R/RE/REHSACK/List-MoreUtils-&List-MoreUtils-version;.tar.gz";>
   <!ENTITY List-MoreUtils-md5sum "a8e42767dd4f41f51b96749efe5ef31a">

Modified: branches/systemd/general/sysutils/mc.xml
==============================================================================
--- branches/systemd/general/sysutils/mc.xml    Sat May 14 05:12:34 2016        
(r17353)
+++ branches/systemd/general/sysutils/mc.xml    Sat May 14 13:19:09 2016        
(r17354)
@@ -6,9 +6,9 @@
 
   <!ENTITY mc-download-http 
"http://ftp.midnight-commander.org/mc-&mc-version;.tar.xz";>
   <!ENTITY mc-download-ftp  
"ftp://ftp.osuosl.org/pub/midnightcommander/mc-&mc-version;.tar.xz";>
-  <!ENTITY mc-md5sum        "5df626a64592ccc5891afd3923edcdbf">
+  <!ENTITY mc-md5sum        "0b3965f3267a76d895ce8ab90df2402b">
   <!ENTITY mc-size          "2.3 MB">
-  <!ENTITY mc-buildsize     "169 MB (with tests)">
+  <!ENTITY mc-buildsize     "198 MB (with tests)">
   <!ENTITY mc-time          "1.1 SBU (with tests)">
 ]>
 

Modified: branches/systemd/introduction/welcome/changelog.xml
==============================================================================
--- branches/systemd/introduction/welcome/changelog.xml Sat May 14 05:12:34 
2016        (r17353)
+++ branches/systemd/introduction/welcome/changelog.xml Sat May 14 13:19:09 
2016        (r17354)
@@ -45,6 +45,120 @@
 -->
 
     <listitem>
+      <para>May 14th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Merged to trunk r17352.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to OpenJDK-1.8.0.92. Merged from trunk
+          r17333.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Removed explanations from Firefox instructions
+          for commands that are no longer used.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to talloc-2.1.7. Merged from trunk
+          r17337.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to gnupg-2.1.12. Merged from trunk
+          r17337.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to libksba-1.3.4. Merged from trunk
+          r17337.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to stunnel-5.32. Merged from trunk
+          r17337.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to OpenSSL-1.0.2h. Merged from trunk
+          r17337.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to ImageMagick-7.0.1-1. Merged from trunk
+          r17325. Note that this package will be updated to 7.0.1-3 at the
+          minimum ASAP due to security problems.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Fixed a build problem with Inkscape. Merged from
+          trunk r17325.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Fixed an issue with xine-lib and ImageMagick.
+          Merged from trunk r17325.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to List-AllUtils-0.10. Merged from trunk
+          r17339.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to Linux-PAM-1.3.0. Merged from trunk
+          r17339.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Add --disable-avahi to cups-filters with
+          a command explanation. Merged from trunk r17339.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to mc-4.8.17. Merged from trunk
+          r17341.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to smartmontools-6.5. Merged from trunk
+          r17341.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to samba-4.4.3. Merged from trunk
+          r17341.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to gnumeric-1.12.29. Merged from trunk
+          r17342.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to goffice-0.10.29. Merged from trunk
+          r17342.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to mesa-11.2.2. Merged from trunk
+          r17342.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Fixed building fdk-aac with GCC 6. Merged from trunk
+          r17348.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to mutt-1.6.1. Merged from trunk
+          r17349.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to asymptote-2.38. Merged from trunk
+          r17350.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to gtk+-3.20.4. Merged from trunk
+          r17351.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to libinput-1.3.0. Merged from trunk
+          r17352.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Updated to xcb-util-cursor-0.1.3. Merged from trunk
+          r17352.</para>
+        </listitem>
+        <listitem>
+          <para>{renodr] - Updated to xproto-7.0.29. Merged from trunk
+          r17352.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 10th, 2016</para>
       <itemizedlist>
         <listitem>

Modified: branches/systemd/multimedia/libdriv/fdk-aac.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/fdk-aac.xml     Sat May 14 05:12:34 
2016        (r17353)
+++ branches/systemd/multimedia/libdriv/fdk-aac.xml     Sat May 14 13:19:09 
2016        (r17354)
@@ -85,7 +85,9 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+<screen><userinput>CXX='g++ -Wno-narrowing'     \
+./configure --prefix=/usr    \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
     <para>
@@ -103,6 +105,12 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para>
+      <command>CXX='g++ -Wno-narrowing' ...</command>: GCC 6 does not support
+      integer narrowing. Setting CXX this way allows to suppress the
+      associated error.
+    </para>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
       href="../../xincludes/static-libraries.xml"/>
 

Modified: branches/systemd/multimedia/libdriv/xine-lib.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/xine-lib.xml    Sat May 14 05:12:34 
2016        (r17353)
+++ branches/systemd/multimedia/libdriv/xine-lib.xml    Sat May 14 13:19:09 
2016        (r17354)
@@ -127,7 +127,10 @@
 <screen><userinput>sed -e 's/avcodec_alloc_frame/av_frame_alloc/'          \
         -e 's/avcodec_free_frame/av_frame_free/'          \
         -i src/combined/ffmpeg/ff_{audio,video}_decoder.c \
-           src/dxr3/ffmpeg_encoder.c
+           src/dxr3/ffmpeg_encoder.c &amp;&amp;
+
+sed -e 's|wand/magick_wand.h|MagickWand/MagickWand.h|' \
+    -i src/video_dec/image.c &amp;&amp;
 
 ./configure --prefix=/usr          \
             --disable-vcd          \
@@ -168,8 +171,8 @@
     <title>Command Explanations</title>
 
     <para>
-      <command>sed ...</command>: This command enables the package to be
-      built with <xref linkend="ffmpeg"/>.
+      <command>sed ...</command>: These commands enables the package to be
+      built with <xref linkend="ffmpeg"/> and <xref linkend="imagemagick"/>.
     </para>
 
     <para>

Modified: branches/systemd/networking/mailnews/mutt.xml
==============================================================================
--- branches/systemd/networking/mailnews/mutt.xml       Sat May 14 05:12:34 
2016        (r17353)
+++ branches/systemd/networking/mailnews/mutt.xml       Sat May 14 13:19:09 
2016        (r17354)
@@ -7,10 +7,10 @@
 <!--  <!ENTITY mutt-download-http 
"&sourceforge-repo;/mutt/mutt-&mutt-version;.tar.gz">-->
   <!ENTITY mutt-download-http " ">
   <!ENTITY mutt-download-ftp  
"ftp://ftp.mutt.org/pub/mutt/mutt-&mutt-version;.tar.gz";>
-  <!ENTITY mutt-md5sum        "d05bb821d7040c61ba89b22d7c2bd388">
+  <!ENTITY mutt-md5sum        "be4d6e738c75c9287e76db7caec6bace">
   <!ENTITY mutt-size          "3.8 MB">
-  <!ENTITY mutt-buildsize     "37 MB (plus a further 5MB for the PDF manual)">
-  <!ENTITY mutt-time          "0.3 SBU (plus a further 0.2 SBU to build the 
PDF manual)">
+  <!ENTITY mutt-buildsize     "36 MB (plus a further 5MB for the PDF manual)">
+  <!ENTITY mutt-time          "0.3 SBU (plus a further 0.1 SBU to build the 
PDF manual)">
 ]>
 
 <sect1 id="mutt" xreflabel="Mutt-&mutt-version;">

Modified: branches/systemd/networking/netprogs/samba.xml
==============================================================================
--- branches/systemd/networking/netprogs/samba.xml      Sat May 14 05:12:34 
2016        (r17353)
+++ branches/systemd/networking/netprogs/samba.xml      Sat May 14 13:19:09 
2016        (r17354)
@@ -6,9 +6,9 @@
 
   <!ENTITY samba-download-http 
"https://download.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz";>
   <!ENTITY samba-download-ftp  " ">
-  <!ENTITY samba-md5sum        "03a65a3adf08ceb1636ad59d234d7f9d">
+  <!ENTITY samba-md5sum        "83b1af8a9899ab4de99f155fc42c83dd">
   <!ENTITY samba-size          "20 MB">
-  <!ENTITY samba-buildsize     "500 MB (additional 407 MB for the quicktest, 
reputedly up to 500 MB additional for all tests)">
+  <!ENTITY samba-buildsize     "464 MB (add 15 MB for the quicktest, reputedly 
up to 500 MB additional for all tests)">
   <!ENTITY samba-time          "2.2 SBU, using parallelism=4 (additional 23.5 
SBU for the quicktest, reputedly up to 110 SBU to run all tests)">
 ]>
 
@@ -129,10 +129,11 @@
 
 make</userinput></screen>
 
+<!--
     <para>According to <application>Samba</application> developers, the
     limitation to 108 characters of the path length of a unix named pipe socket
     may be the cause of errors, so that over 1/3 of the tests might fail. For
-    this reason, the switch <option>--with-selftest-prefix=/tmp/quick</option>
+    this reason, the switch <option>- -with-selftest-prefix=/tmp/quick</option>
     (or another path with small number of characters) can be used with
     configure. Even so, the
     <quote><replaceable>samba3.raw.eas</replaceable></quote> test may fail,
@@ -141,6 +142,7 @@
     be disabled with the following command:</para>
 
 <screen><userinput>sed -i "/samba3.blackbox.failure.failure/i 
\^samba3.raw.eas" selftest/knownfail</userinput></screen>
+-->
 
     <para>To test the results, as the
     <systemitem class="username">root</systemitem> user, issue:

Modified: branches/systemd/packages.ent
==============================================================================
--- branches/systemd/packages.ent       Sat May 14 05:12:34 2016        (r17353)
+++ branches/systemd/packages.ent       Sat May 14 13:19:09 2016        (r17354)
@@ -12,7 +12,7 @@
 <!ENTITY consolekit-version           "0.4.6">
 <!ENTITY cracklib-version             "2.9.6">
 <!ENTITY cyrus-sasl-version           "2.1.26">
-<!ENTITY gnupg2-version               "2.1.11">
+<!ENTITY gnupg2-version               "2.1.12">
 <!ENTITY gnutls-version               "3.4.11">
 <!ENTITY gpgme-version                "1.6.0">
 <!ENTITY haveged-version              "1.9.1">
@@ -20,7 +20,7 @@
 <!ENTITY libcap-version               "2.25">
 <!ENTITY liboauth-version             "1.0.3">
 <!ENTITY libpwquality-version         "1.3.0">
-<!ENTITY linux-pam-version            "1.2.1">
+<!ENTITY linux-pam-version            "1.3.0">
 <!ENTITY linux-pam-docs-version       "1.2.0">
 <!ENTITY mitkrb-major-version         "1.14">
 <!ENTITY mitkrb-version               "1.14.2">
@@ -33,12 +33,12 @@
 major and minor only -->
 <!ENTITY nss-version                  "3.&nss-minor-version;">
 <!ENTITY openssh-version              "7.2p2">
-<!ENTITY openssl-version              "1.0.2g">
+<!ENTITY openssl-version              "1.0.2h">
 <!ENTITY p11-kit-version              "0.23.2">    <!-- Even minors only -->
 <!ENTITY polkit-version               "0.113">
 <!ENTITY shadow-version               "4.2.1">
 <!ENTITY ssh-askpass-version          "&openssh-version;">
-<!ENTITY stunnel-version              "5.31">
+<!ENTITY stunnel-version              "5.32">
 <!ENTITY sudo-version                 "1.8.16">
 <!ENTITY tripwire-version             "2.4.2.2">
 
@@ -52,7 +52,7 @@
 <!ENTITY gptfdisk-version             "1.0.1">
 <!ENTITY parted-version               "3.2">
 <!ENTITY reiser-version               "3.6.24">
-<!ENTITY smartmontools-version        "6.4">
+<!ENTITY smartmontools-version        "6.5">
 <!ENTITY sshfs-fuse-version           "2.5">
 <!ENTITY xfsprogs-version             "4.5.0">
 
@@ -130,7 +130,7 @@
 <!ENTITY libical-version              "2.0.0">
 <!ENTITY libidn-version               "1.32">
 <!ENTITY libiodbc-version             "3.52.10">
-<!ENTITY libksba-version              "1.3.3">
+<!ENTITY libksba-version              "1.3.4">
 <!ENTITY liblinear-version            "2.1">
 <!ENTITY libmbim-version              "1.12.2">
 <!ENTITY libnfsidmap-version          "0.26">
@@ -161,7 +161,7 @@
 <!ENTITY qca-version                  "2.1.1">
 <!ENTITY qjson-version                "0.8.1">
 <!ENTITY sbc-version                  "1.3">
-<!ENTITY talloc-version               "2.1.6">
+<!ENTITY talloc-version               "2.1.7">
 <!ENTITY wayland-version              "1.10.0">
 <!ENTITY wv-version                   "1.2.9">
 <!ENTITY xapian-version               "1.2.23">
@@ -214,7 +214,7 @@
 <!ENTITY hd2u-version                 "1.0.3">
 <!ENTITY highlight-version            "3.22">
 <!ENTITY ibus-version                 "1.5.11">
-<!ENTITY imagemagick-version          "6.9.3">
+<!ENTITY imagemagick-version          "7.0.1">
 <!ENTITY intltool-version             "0.50.2">
 <!ENTITY lsof-version                 "4.89">
 <!ENTITY pinentry-version             "0.9.7">
@@ -245,7 +245,7 @@
 <!ENTITY hdwids-version               "20141022">
 <!ENTITY lm_sensors-version           "3.4.0">
 <!ENTITY logrotate-version            "3.9.1">
-<!ENTITY mc-version                   "4.8.16">
+<!ENTITY mc-version                   "4.8.17">
 <!ENTITY ModemManager-version         "1.4.10">
 <!ENTITY obex-data-server-version     "0.4.6">
 <!ENTITY p7zip-version                "15.14.1">
@@ -315,7 +315,7 @@
 <!ENTITY apache-ant-version           "1.9.7">
 <!ENTITY junit-version                "4.11">
 <!ENTITY hamcrest-version             "1.3">
-<!ENTITY openjdk-version              "1.8.0.77">
+<!ENTITY openjdk-version              "1.8.0.92">
 
 <!ENTITY python2-majorver             "2.7">
 <!ENTITY python3-majorver             "3.5">
@@ -339,7 +339,7 @@
 <!ENTITY Glib-perl-version            "1.280">
 <!ENTITY HTML-Parser-version          "3.72">
 <!ENTITY IPC-Run3-version             "0.048">
-<!ENTITY List-AllUtils-version        "0.09">
+<!ENTITY List-AllUtils-version        "0.10">
 <!ENTITY List-MoreUtils-version       "0.415">
 <!ENTITY Log-Log4perl-version         "1.47">
 <!ENTITY LWP-version                  "6.15">
@@ -392,7 +392,7 @@
 <!ENTITY ntp-version                  "4.2.8p7">
 <!ENTITY rpcbind-version              "0.2.3">
 <!ENTITY rsync-version                "3.1.2">
-<!ENTITY samba-version                "4.4.2">
+<!ENTITY samba-version                "4.4.3">
 <!ENTITY wget-version                 "1.17.1">
 <!ENTITY wireless-tools-version       "29">
 <!ENTITY wpa_supplicant-version       "2.5">
@@ -438,7 +438,7 @@
 <!ENTITY mailx-version                "12.5">
 <!ENTITY procmail-version             "3.22">
 <!ENTITY fetchmail-version            "6.3.26">
-<!ENTITY mutt-version                 "1.6.0">
+<!ENTITY mutt-version                 "1.6.1">
 <!ENTITY re-alpine-version            "2.03">
 
 <!-- Part V -->
@@ -483,7 +483,7 @@
 <!ENTITY xbitmaps-version             "1.1.1">
 <!ENTITY xcursor-themes-version       "1.0.4">
 <!ENTITY xkeyboard-config-version     "2.17">
-<!ENTITY mesa-version                 "11.2.1">
+<!ENTITY mesa-version                 "11.2.2">
 <!ENTITY xcb-util-version             "0.4.0">
 <!ENTITY xcb-util-image-version       "0.4.0">
 <!ENTITY xcb-util-keysyms-version     "0.4.0">
@@ -513,9 +513,9 @@
 <!ENTITY freeglut-version             "3.0.0">
 <!ENTITY gdk-pixbuf-version           "2.34.0">
 <!ENTITY glu-version                  "9.0.0">
-<!ENTITY goffice010-version           "0.10.28">
+<!ENTITY goffice010-version           "0.10.29">
 <!ENTITY gtk2-version                 "2.24.30">
-<!ENTITY gtk3-version                 "3.20.3">
+<!ENTITY gtk3-version                 "3.20.4">
 <!ENTITY gtk-engines-version          "2.20.2">
 <!ENTITY gtkmm2-version               "2.24.4">
 <!ENTITY gtkmm3-version               "3.20.1">
@@ -666,7 +666,7 @@
 <!-- Part X -->
 <!-- Chapter 43 -->
 <!ENTITY AbiWord-version              "3.0.1">
-<!ENTITY gnumeric-version             "1.12.28">
+<!ENTITY gnumeric-version             "1.12.29">
 <!ENTITY gnucash-version              "2.4.11">
 
 <!ENTITY libreoffice-version          "5.1.2">
@@ -846,7 +846,7 @@
  page, as well as to reference the directory in texlive, also
  in asymptote, biber and xindy -->
 <!ENTITY texlive-year                 "2015">
-<!ENTITY asymptote-version            "2.36">
+<!ENTITY asymptote-version            "2.38">
 <!ENTITY biber-version                "2.4">
 <!ENTITY biblatex-version             "3.3">
 <!ENTITY xindy-version                "2.5.1">

Modified: branches/systemd/postlfs/filesystems/smartmontools.xml
==============================================================================
--- branches/systemd/postlfs/filesystems/smartmontools.xml      Sat May 14 
05:12:34 2016        (r17353)
+++ branches/systemd/postlfs/filesystems/smartmontools.xml      Sat May 14 
13:19:09 2016        (r17354)
@@ -7,10 +7,10 @@
   <!ENTITY smartmontools-download-http
     
"&sourceforge-repo2;/projects/smartmontools/files/smartmontools/&smartmontools-version;/smartmontools-&smartmontools-version;.tar.gz">
   <!ENTITY smartmontools-download-ftp  " ">
-  <!ENTITY smartmontools-md5sum        "56812c8312fd123ed40ef65afde1049e">
-  <!ENTITY smartmontools-size          "804 KB">
-  <!ENTITY smartmontools-buildsize     "18 MB">
-  <!ENTITY smartmontools-time          "0.1 SBU">
+  <!ENTITY smartmontools-md5sum        "093aeec3f8f39fa9a37593c4012d3156">
+  <!ENTITY smartmontools-size          "836 KB">
+  <!ENTITY smartmontools-buildsize     "21 MB">
+  <!ENTITY smartmontools-time          "0.2 SBU">
 ]>
 
 <sect1 id="smartmontools" xreflabel="smartmontools-&smartmontools-version;">

Modified: branches/systemd/postlfs/security/gnupg2.xml
==============================================================================
--- branches/systemd/postlfs/security/gnupg2.xml        Sat May 14 05:12:34 
2016        (r17353)
+++ branches/systemd/postlfs/security/gnupg2.xml        Sat May 14 13:19:09 
2016        (r17354)
@@ -6,10 +6,10 @@
 
   <!ENTITY gnupg2-download-http 
"https://gnupg.org/ftp/gcrypt/gnupg/gnupg-&gnupg2-version;.tar.bz2";>
   <!ENTITY gnupg2-download-ftp  
"ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-&gnupg2-version;.tar.bz2";>
-  <!ENTITY gnupg2-md5sum        "f0a7cb09fe119f8b82eba7efecd27dc0">
-  <!ENTITY gnupg2-size          "5.0 MB">
-  <!ENTITY gnupg2-buildsize     "112 MB (with tests and documentation 
included. Add an additional 8 MB for more formats.">
-  <!ENTITY gnupg2-time          "0.9 SBU (with tests and documentation)">
+  <!ENTITY gnupg2-md5sum        "573bc2cd83934eed12f0d0db443f5bde">
+  <!ENTITY gnupg2-size          "5.3 MB">
+  <!ENTITY gnupg2-buildsize     "96 MB (with tests and docs)">
+  <!ENTITY gnupg2-time          "1.0 SBU (with tests and docs)">
 ]>
 
 <sect1 id="gnupg2" xreflabel="GnuPG-&gnupg2-version;">

Modified: branches/systemd/postlfs/security/linux-pam.xml
==============================================================================
--- branches/systemd/postlfs/security/linux-pam.xml     Sat May 14 05:12:34 
2016        (r17353)
+++ branches/systemd/postlfs/security/linux-pam.xml     Sat May 14 13:19:09 
2016        (r17354)
@@ -6,10 +6,10 @@
 
   <!ENTITY linux-pam-download-http 
"http://linux-pam.org/library/Linux-PAM-&linux-pam-version;.tar.bz2";>
   <!ENTITY linux-pam-download-ftp  " ">
-  <!ENTITY linux-pam-md5sum        "9dc53067556d2dd567808fd509519dd6">
+  <!ENTITY linux-pam-md5sum        "da4b2289b7cfb19583d54e9eaaef1c3a">
   <!ENTITY linux-pam-size          "1.3 MB">
-  <!ENTITY linux-pam-buildsize     "33 MB (with tests)">
-  <!ENTITY linux-pam-time          "0.3 SBU (with tests)">
+  <!ENTITY linux-pam-buildsize     "28 MB (with tests)">
+  <!ENTITY linux-pam-time          "0.5 SBU (with tests)">
 
   <!ENTITY linux-pam-docs-download 
"http://linux-pam.org/documentation/Linux-PAM-&linux-pam-docs-version;-docs.tar.bz2";>
   <!ENTITY linux-pam-docs-md5sum   "558378b8be9b8b5c987326f4529f2130">

Modified: branches/systemd/postlfs/security/openssl.xml
==============================================================================
--- branches/systemd/postlfs/security/openssl.xml       Sat May 14 05:12:34 
2016        (r17353)
+++ branches/systemd/postlfs/security/openssl.xml       Sat May 14 13:19:09 
2016        (r17354)
@@ -8,10 +8,10 @@
            "https://openssl.org/source/openssl-&openssl-version;.tar.gz";>
   <!ENTITY openssl-download-ftp
            "ftp://openssl.org/source/openssl-&openssl-version;.tar.gz";>
-  <!ENTITY openssl-md5sum        "f3c710c045cdee5fd114feb69feba7aa">
-  <!ENTITY openssl-size          "5.1 MB">
-  <!ENTITY openssl-buildsize     "63 MB (with tests)">
-  <!ENTITY openssl-time          "1.5 SBU (with tests)">
+  <!ENTITY openssl-md5sum        "9392e65072ce4b614c1392eefc1f23d0">
+  <!ENTITY openssl-size          "5.0 MB">
+  <!ENTITY openssl-buildsize     "51 MB (with tests)">
+  <!ENTITY openssl-time          "1.6 SBU (with tests)">
 ]>
 
 <sect1 id="openssl" xreflabel="OpenSSL-&openssl-version;">

Modified: branches/systemd/postlfs/security/stunnel.xml
==============================================================================
--- branches/systemd/postlfs/security/stunnel.xml       Sat May 14 05:12:34 
2016        (r17353)
+++ branches/systemd/postlfs/security/stunnel.xml       Sat May 14 13:19:09 
2016        (r17354)
@@ -9,9 +9,9 @@
   <!ENTITY stunnel-download-ftp  
"ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-&stunnel-version;.tar.gz";>
   <!-- Following ftp only has later release -->
 <!--  "ftp://ftp.stunnel.org/stunnel/stunnel-&stunnel-version;.tar.gz"; -->
-  <!ENTITY stunnel-md5sum        "a39b89624984cefc6d229a54f34b33ec">
+  <!ENTITY stunnel-md5sum        "60462f97b62e745288541089e8c0877c">
   <!ENTITY stunnel-size          "628 KB">
-  <!ENTITY stunnel-buildsize     "6.9 MB">
+  <!ENTITY stunnel-buildsize     "7.3 MB">
   <!ENTITY stunnel-time          "0.1 SBU">
 ]>
 

Modified: branches/systemd/pst/printing/cups-filters.xml
==============================================================================
--- branches/systemd/pst/printing/cups-filters.xml      Sat May 14 05:12:34 
2016        (r17353)
+++ branches/systemd/pst/printing/cups-filters.xml      Sat May 14 13:19:09 
2016        (r17354)
@@ -144,6 +144,7 @@
         --localstatedir=/var            \
         --without-rcdir                 \
         --disable-static                \
+        --disable-avahi                 \
         --with-gs-path=/usr/bin/gs      \
         --with-pdftops-path=/usr/bin/gs \
         --docdir=/usr/share/doc/cups-filters-&cups-filters-version; &amp;&amp;
@@ -173,6 +174,13 @@
     <title>Command Explanations</title>
 
     <para>
+      <parameter>--disable-avahi</parameter>: This switch is needed
+      if the optional <xref linkend="avahi"/> is not installed. Remove
+      it if avahi is installed and you need network printer discovery
+      capabilities.
+    </para>
+
+    <para>
       <parameter>--without-rcdir</parameter>: This switch disables
       installation of the bundled bootscript which is not compatible
       with BLFS.

Modified: branches/systemd/pst/typesetting/asymptote.xml
==============================================================================
--- branches/systemd/pst/typesetting/asymptote.xml      Sat May 14 05:12:34 
2016        (r17353)
+++ branches/systemd/pst/typesetting/asymptote.xml      Sat May 14 13:19:09 
2016        (r17354)
@@ -6,10 +6,10 @@
 
   <!ENTITY asymptote-download-http 
"&sourceforge-repo;/sourceforge/asymptote/asymptote-&asymptote-version;.src.tgz">
   <!ENTITY asymptote-download-ftp  " ">
-  <!ENTITY asymptote-md5sum        "e4079e7f35b12fab3f7af18bc5206824">
-  <!ENTITY asymptote-size          "3.3 MB">
+  <!ENTITY asymptote-md5sum        "aca55728252777d58ad6eeb2ee550b10">
+  <!ENTITY asymptote-size          "3.4 MB">
   <!ENTITY asymptote-buildsize     "164 MB">
-  <!ENTITY asymptote-time          "1.9 SBU">
+  <!ENTITY asymptote-time          "1.7 SBU">
 ]>
 
 <sect1 id="asymptote" xreflabel="asymptote-&asymptote-version;">

Modified: branches/systemd/x/installing/mesa.xml
==============================================================================
--- branches/systemd/x/installing/mesa.xml      Sat May 14 05:12:34 2016        
(r17353)
+++ branches/systemd/x/installing/mesa.xml      Sat May 14 13:19:09 2016        
(r17354)
@@ -6,7 +6,7 @@
 
   <!ENTITY mesa-download-http " ">
   <!ENTITY mesa-download-ftp  
"ftp://ftp.freedesktop.org/pub/mesa/&mesa-version;/mesa-&mesa-version;.tar.xz";>
-  <!ENTITY mesa-md5sum        "f97d8e2f4b9a346f35c9585b2f3bf8bb">
+  <!ENTITY mesa-md5sum        "e0ec73f7273662a74366f0d76dd19ac3">
   <!ENTITY mesa-size          "7.3 MB">
   <!ENTITY mesa-buildsize     "317 MB (with tests and documentation)">
   <!ENTITY mesa-time          "2.8 SBU (with the test suite and documentation 
at -j4)">

Modified: branches/systemd/x/installing/x7proto.xml
==============================================================================
--- branches/systemd/x/installing/x7proto.xml   Sat May 14 05:12:34 2016        
(r17353)
+++ branches/systemd/x/installing/x7proto.xml   Sat May 14 13:19:09 2016        
(r17354)
@@ -85,8 +85,8 @@
   <!ENTITY xineramaproto-version           "1.2.1">
   <!ENTITY xineramaproto-md5sum            "9959fe0bfb22a0e7260433b8d199590a">
 
-  <!ENTITY xproto-version                  "7.0.28">
-  <!ENTITY xproto-md5sum                   "3ce2f230c5d8fa929f326ad1f0fa40a8">
+  <!ENTITY xproto-version                  "7.0.29">
+  <!ENTITY xproto-md5sum                   "eeeae1f47d43a33ef0d5c56727410326">
 
 ]>
 

Modified: branches/systemd/x/installing/xcb-util-cursor.xml
==============================================================================
--- branches/systemd/x/installing/xcb-util-cursor.xml   Sat May 14 05:12:34 
2016        (r17353)
+++ branches/systemd/x/installing/xcb-util-cursor.xml   Sat May 14 13:19:09 
2016        (r17354)
@@ -6,9 +6,9 @@
 
   <!ENTITY xcb-util-cursor-download-http 
"http://xcb.freedesktop.org/dist/xcb-util-cursor-&xcb-util-cursor-version;.tar.bz2";>
   <!ENTITY xcb-util-cursor-download-ftp  " ">
-  <!ENTITY xcb-util-cursor-md5sum        "88e70d92ff5616d406ce5b1b62e0c58b">
-  <!ENTITY xcb-util-cursor-size          "283 KB">
-  <!ENTITY xcb-util-cursor-buildsize     "2.4 MB">
+  <!ENTITY xcb-util-cursor-md5sum        "6ac3b17cba51aaaa36ba035a53527214">
+  <!ENTITY xcb-util-cursor-size          "292 KB">
+  <!ENTITY xcb-util-cursor-buildsize     "2.5 MB">
   <!ENTITY xcb-util-cursor-time          "less than 0.1 SBU">
 ]>
 

Modified: branches/systemd/x/lib/goffice010.xml
==============================================================================
--- branches/systemd/x/lib/goffice010.xml       Sat May 14 05:12:34 2016        
(r17353)
+++ branches/systemd/x/lib/goffice010.xml       Sat May 14 13:19:09 2016        
(r17354)
@@ -8,9 +8,9 @@
            
"&gnome-download-http;/goffice/0.10/goffice-&goffice010-version;.tar.xz">
   <!ENTITY goffice010-download-ftp
             
"&gnome-download-ftp;/goffice/0.10/goffice-&goffice010-version;.tar.xz">
-  <!ENTITY goffice010-md5sum        "7c4de58dd3e4230a6817d172b865ab84">
+  <!ENTITY goffice010-md5sum        "0b1ff43a34672fc047b3f7314d4b1018">
   <!ENTITY goffice010-size          "2.3 MB">
-  <!ENTITY goffice010-buildsize     "82 MB (with tests)">
+  <!ENTITY goffice010-buildsize     "85 MB (with tests)">
   <!ENTITY goffice010-time          "1.0 SBU (with tests)">
 ]>
 

Modified: branches/systemd/x/lib/gtk3.xml
==============================================================================
--- branches/systemd/x/lib/gtk3.xml     Sat May 14 05:12:34 2016        (r17353)
+++ branches/systemd/x/lib/gtk3.xml     Sat May 14 13:19:09 2016        (r17354)
@@ -6,9 +6,9 @@
 
   <!ENTITY gtk3-download-http 
"&gnome-download-http;/gtk+/3.20/gtk+-&gtk3-version;.tar.xz">
   <!ENTITY gtk3-download-ftp  
"&gnome-download-ftp;/gtk+/3.20/gtk+-&gtk3-version;.tar.xz">
-  <!ENTITY gtk3-md5sum        "c4e4799cbf3aaea3fce5eb2fae77ad2c">
+  <!ENTITY gtk3-md5sum        "0cceee599f2910c25bf4b9dde4ab2fb6">
   <!ENTITY gtk3-size          "16.4 MB">
-  <!ENTITY gtk3-buildsize     "406 MB (plus 8 MB for tests)">
+  <!ENTITY gtk3-buildsize     "422 MB (plus 9 MB for tests)">
   <!ENTITY gtk3-time          "6.3 SBU (plus 0.5 SBU for tests)">
 ]>
 

Modified: branches/systemd/xsoft/graphweb/firefox.xml
==============================================================================
--- branches/systemd/xsoft/graphweb/firefox.xml Sat May 14 05:12:34 2016        
(r17353)
+++ branches/systemd/xsoft/graphweb/firefox.xml Sat May 14 13:19:09 2016        
(r17354)
@@ -294,17 +294,6 @@
       get initial configuration and setup parameters.
     </para>
 
-     <para>
-      <command>make -C firefox-build-dir install</command>: This runs
-      <command>make install</command> in firefox-build-dir.
-    </para>
-
-    <para>
-      <command>ln -sfv ... /usr/bin/firefox</command>: This puts a symbolic 
link
-      to the <command>firefox</command> executable in your <envar>PATH</envar>
-      variable.
-    </para>
-
     <para>
       <command>mkdir -p /usr/lib/mozilla/plugins</command>: This checks
       that <filename class="directory">/usr/lib/mozilla/plugins</filename>

Modified: branches/systemd/xsoft/office/gnumeric.xml
==============================================================================
--- branches/systemd/xsoft/office/gnumeric.xml  Sat May 14 05:12:34 2016        
(r17353)
+++ branches/systemd/xsoft/office/gnumeric.xml  Sat May 14 13:19:09 2016        
(r17354)
@@ -6,9 +6,9 @@
 
   <!ENTITY gnumeric-download-http 
"&gnome-download-http;/gnumeric/1.12/gnumeric-&gnumeric-version;.tar.xz">
   <!ENTITY gnumeric-download-ftp  
"&gnome-download-ftp;/gnumeric/1.12/gnumeric-&gnumeric-version;.tar.xz">
-  <!ENTITY gnumeric-md5sum        "147ddb28b9ec7106d36f4ff82f66f840">
+  <!ENTITY gnumeric-md5sum        "c52924e0afa83e2ab9de623dc8cddd6d">
   <!ENTITY gnumeric-size          "18 MB">
-  <!ENTITY gnumeric-buildsize     "313 MB (with tests)">
+  <!ENTITY gnumeric-buildsize     "276 MB (add 3 MB for tests)">
   <!ENTITY gnumeric-time          "1.6 SBU (additional 8.6 SBU for tests)">
 ]>
 
@@ -142,11 +142,10 @@
     <para>
       If you wish to test the results, first disable one test which fails:
 
-<screen><userinput>sed \
-  -e '/\tt1013-crlibm.*/d' \
-  -i test/Makefile</userinput></screen>
+<screen><userinput>sed -e '/\tt1013-crlibm.*/d' \
+    -i test/Makefile</userinput></screen>
 
-      then issue <command>make check</command>. Tests must be run from an 
active
+      then issue <command>make check</command>. Tests should be run from an 
active
       X session, and <xref linkend="dconf"/> should be installed to prevent 
some
       failures.
     </para>

Modified: branches/systemd/xsoft/other/inkscape.xml
==============================================================================
--- branches/systemd/xsoft/other/inkscape.xml   Sat May 14 05:12:34 2016        
(r17353)
+++ branches/systemd/xsoft/other/inkscape.xml   Sat May 14 13:19:09 2016        
(r17354)
@@ -156,6 +156,9 @@
 
 <screen><userinput>patch -Np1 -i 
../inkscape-&inkscape-version;-testfiles-1.patch &amp;&amp;
 
+sed -e 's/ScopedPtr&lt;char&gt;/make_unique_ptr_gfree/' \
+    -i src/ui/clipboard.cpp &amp;&amp;
+
 CXXFLAGS="-g -O2 -std=c++11" ./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -177,6 +180,11 @@
     <title>Command Explanations</title>
 
     <para>
+      <command>sed ...</command>: This <command>sed</command> fixes a
+      build problem identified upstream.
+    </para>
+
+    <para>
       <command>CXXFLAGS="-g -O2 -std=c++11" ./configure...</command>: Inkscape
       has not yet been ported to the 2011 ISO C++ standard, one of its
       dependencies is compiled with this standard.
@@ -185,12 +193,6 @@
       <envar>CXXFLAGS</envar> together with the default options.
     </para>
 
-    <para>
-      <command>sed -ri ... configure</command>:
-      This <command>sed</command> fixes building problems starting
-      with gc-7.4.2.
-    </para>
-
   </sect2>
 
   <sect2 role="content">
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to