20170807.1 global branch merge.current-20170807.1

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

54 files changed, 632 insertions, 81 deletions

diff --git a/system/brasero/brasero.SlackBuild b/system/brasero/brasero.SlackBuild
index 0fe5a549ac..3f7d21fb06 100644
--- a/system/brasero/brasero.SlackBuild
+++ b/system/brasero/brasero.SlackBuild
@@ -75,7 +75,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=format-nonliteral -Wno-error=format-y2k" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/system/bulk_extractor/bulk_extractor.SlackBuild b/system/bulk_extractor/bulk_extractor.SlackBuild
index 2a7e955d4f..627aed32d5 100644
--- a/system/bulk_extractor/bulk_extractor.SlackBuild
+++ b/system/bulk_extractor/bulk_extractor.SlackBuild
@@ -25,7 +25,7 @@
 # edited for v 1.5.5 November 2014 - added LightGrep option.
 
 PRGNAM=bulk_extractor
-VERSION=${VERSION:-1.5.5}
+VERSION=${VERSION:-20170403_779dbe1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,9 +62,9 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/bulk_extractor/bulk_extractor.info b/system/bulk_extractor/bulk_extractor.info
index 09b76412bb..d4a31c3dd4 100644
--- a/system/bulk_extractor/bulk_extractor.info
+++ b/system/bulk_extractor/bulk_extractor.info
@@ -1,8 +1,8 @@
 PRGNAM="bulk_extractor"
-VERSION="1.5.5"
+VERSION="20170403_779dbe1"
 HOMEPAGE="https://github.com/simsong/bulk_extractor/wiki"
-DOWNLOAD="http://digitalcorpora.org/downloads/bulk_extractor/bulk_extractor-1.5.5.tar.gz"
-MD5SUM="7155ce6938876be91416def15e44d585"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/bulk_extractor-20170403_779dbe1.tar.xz"
+MD5SUM="96f0c04052c51e6746ba83dae9de145e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/caprice32/caprice32.SlackBuild b/system/caprice32/caprice32.SlackBuild
index ac27dd4df4..5eb64c1059 100644
--- a/system/caprice32/caprice32.SlackBuild
+++ b/system/caprice32/caprice32.SlackBuild
@@ -70,6 +70,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+sed -i "s|-O2|$SLKCFLAGS -Wno-narrowing|" makefile.unix
+
 make -f makefile.unix RELEASE=TRUE
 
 mkdir -p $PKG/usr/share/$PRGNAM $PKG/usr/bin
diff --git a/system/clamav/clamav-0.99.2-gcc-6.patch b/system/clamav/clamav-0.99.2-gcc-6.patch
new file mode 100644
index 0000000000..2031edbd38
--- /dev/null
+++ b/system/clamav/clamav-0.99.2-gcc-6.patch
@@ -0,0 +1,84 @@
+diff --git a/libclamav/c++/llvm/include/llvm/ADT/StringMap.h b/libclamav/c++/llvm/include/llvm/ADT/StringMap.h
+index 59ff6aa..1325394 100644
+--- a/libclamav/c++/llvm/include/llvm/ADT/StringMap.h
++++ b/libclamav/c++/llvm/include/llvm/ADT/StringMap.h
+@@ -169,3 +169,3 @@ public:
+       KeyLength+1;
+-    unsigned Alignment = alignof<StringMapEntry>();
++    unsigned Alignment = alignOf<StringMapEntry>();
+ 
+diff --git a/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h b/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h
+index 88044c7..86b0f40 100644
+--- a/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h
++++ b/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h
+@@ -417,3 +417,3 @@ namespace llvm {
+           ileAllocator.Allocate(sizeof(IndexListEntry),
+-          alignof<IndexListEntry>()));
++          alignOf<IndexListEntry>()));
+ 
+diff --git a/libclamav/c++/llvm/include/llvm/Support/AlignOf.h b/libclamav/c++/llvm/include/llvm/Support/AlignOf.h
+index 6a7a1a6..979e597 100644
+--- a/libclamav/c++/llvm/include/llvm/Support/AlignOf.h
++++ b/libclamav/c++/llvm/include/llvm/Support/AlignOf.h
+@@ -51,8 +51,8 @@ struct AlignOf {
+ 
+-/// alignof - A templated function that returns the mininum alignment of
++/// alignOf - A templated function that returns the mininum alignment of
+ ///  of a type.  This provides no extra functionality beyond the AlignOf
+ ///  class besides some cosmetic cleanliness.  Example usage:
+-///  alignof<int>() returns the alignment of an int.
++///  alignOf<int>() returns the alignment of an int.
+ template <typename T>
+-static inline unsigned alignof() { return AlignOf<T>::Alignment; }
++static inline unsigned alignOf() { return AlignOf<T>::Alignment; }
+ 
+diff --git a/libclamav/c++/llvm/include/llvm/Support/Allocator.h b/libclamav/c++/llvm/include/llvm/Support/Allocator.h
+index 4a7251f..17caf5e 100644
+--- a/libclamav/c++/llvm/include/llvm/Support/Allocator.h
++++ b/libclamav/c++/llvm/include/llvm/Support/Allocator.h
+@@ -203,3 +203,3 @@ public:
+       for (char *Ptr = (char*)(Slab+1); Ptr < End; Ptr += sizeof(T)) {
+-        Ptr = Allocator.AlignPtr(Ptr, alignof<T>());
++        Ptr = Allocator.AlignPtr(Ptr, alignOf<T>());
+         if (Ptr + sizeof(T) <= End)
+diff --git a/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp b/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp
+index b892d85..dc72346 100644
+--- a/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp
++++ b/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp
+@@ -495,3 +495,3 @@ void SCEVUnknown::print(raw_ostream &OS) const {
+   if (isAlignOf(AllocTy)) {
+-    OS << "alignof(" << *AllocTy << ")";
++    OS << "alignOf(" << *AllocTy << ")";
+     return;
+diff --git a/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp b/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp
+index 824021c..757ca50 100644
+--- a/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp
++++ b/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp
+@@ -569,3 +569,3 @@ void Emitter<CodeEmitter>::emitMemModRMByte(const MachineInstr &MI,
+   // Calculate what the SS field value should be...
+-  static const unsigned SSTable[] = { ~0, 0, 1, ~0, 2, ~0, ~0, ~0, 3 };
++  static const unsigned SSTable[] = { ~0u, 0u, 1u, ~0u, 2u, ~0u, ~0u, ~0u, 3u };
+   unsigned SS = SSTable[Scale.getImm()];
+diff --git a/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp b/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp
+index 9564fe0..b2b7986 100644
+--- a/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp
++++ b/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp
+@@ -332,3 +332,3 @@ void X86MCCodeEmitter::EmitMemModRMByte(const MCInst &MI, unsigned Op,
+   // Calculate what the SS field value should be...
+-  static const unsigned SSTable[] = { ~0, 0, 1, ~0, 2, ~0, ~0, ~0, 3 };
++  static const unsigned SSTable[] = { ~0u, 0u, 1u, ~0u, 2u, ~0u, ~0u, ~0u, 3u };
+   unsigned SS = SSTable[Scale.getImm()];
+diff --git a/libclamav/mpool.c b/libclamav/mpool.c
+index cd38e15..b5e537d 100644
+--- a/libclamav/mpool.c
++++ b/libclamav/mpool.c
+@@ -417,3 +417,3 @@ static size_t from_bits(unsigned int bits) {
+ 
+-static inline unsigned int alignof(size_t size)
++static inline unsigned int alignOf(size_t size)
+ {
+@@ -609,3 +609,3 @@ static void* allocate_aligned(struct MPMAP *mpm, size_t size, unsigned align, co
+ void *mpool_malloc(struct MP *mp, size_t size) {
+-  size_t align = alignof(size);
++  size_t align = alignOf(size);
+   size_t i, needed = align_increase(size+FRAG_OVERHEAD, align);
diff --git a/system/clamav/clamav.SlackBuild b/system/clamav/clamav.SlackBuild
index b783811bf2..e6e23864e8 100644
--- a/system/clamav/clamav.SlackBuild
+++ b/system/clamav/clamav.SlackBuild
@@ -115,6 +115,9 @@ find -L . \
 # Patch from upstream
 patch -p1 < $CWD/bb111711-fix-zlib-version-check.patch
 
+# Thanks Archlinux for this patch
+patch -p1 < $CWD/clamav-0.99.2-gcc-6.patch
+
 # Specify the desired mirror in the update config file
 # http://www.iana.org/cctld/cctld-whois.htm
 sed -i "s/^\#DatabaseMirror.*/DatabaseMirror db.${COUNTRY}.clamav.net/" \
diff --git a/system/collectd/collectd.SlackBuild b/system/collectd/collectd.SlackBuild
index bb766599fb..6cd6455363 100644
--- a/system/collectd/collectd.SlackBuild
+++ b/system/collectd/collectd.SlackBuild
@@ -11,7 +11,7 @@
 # Modified by the SlackBuilds.org project
 
 PRGNAM=collectd
-VERSION=${VERSION:-5.5.0}
+VERSION=${VERSION:-5.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,9 +58,9 @@ find -L . \
  -exec chmod 644 {} \;
 
 # Fix for gcc-4.8.x
-sed -i "s|\ -Werror||" src/Makefile.in
+sed -i "s|\ -Werror||" src/Makefile.in || exit 1
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=format-truncation=" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -96,7 +96,7 @@ rm -fr $PKG/var/run $PKG/var/log
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS ChangeLog COPYING INSTALL README \
+  AUTHORS ChangeLog COPYING README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/collectd/collectd.info b/system/collectd/collectd.info
index e80a9d6584..2e2bb1c73e 100644
--- a/system/collectd/collectd.info
+++ b/system/collectd/collectd.info
@@ -1,8 +1,8 @@
 PRGNAM="collectd"
-VERSION="5.5.0"
+VERSION="5.7.1"
 HOMEPAGE="http://collectd.org"
-DOWNLOAD="http://collectd.org/files/collectd-5.5.0.tar.bz2"
-MD5SUM="c39305ef5514b44238b0d31f77e29e6a"
+DOWNLOAD="http://collectd.org/files/collectd-5.7.1.tar.bz2"
+MD5SUM="dc36141ed3058c4919bbd54b87c07873"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/colord/colord.SlackBuild b/system/colord/colord.SlackBuild
index ba98ed5883..fe8f40267e 100644
--- a/system/colord/colord.SlackBuild
+++ b/system/colord/colord.SlackBuild
@@ -103,6 +103,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Since polkit in current apply upstream git
+# we have to reduce the polkit version used to test
+# https://github.com/hughsie/colord/issues/36
+sed -i "s|114|113|g" configure
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/system/conky/conky-1.10.6-gcc7.patch b/system/conky/conky-1.10.6-gcc7.patch
new file mode 100644
index 0000000000..dcbc3bc8a5
--- /dev/null
+++ b/system/conky/conky-1.10.6-gcc7.patch
@@ -0,0 +1,11 @@
+diff -Naur conky-1.10.6.orig/src/luamm.hh conky-1.10.6/src/luamm.hh
+--- conky-1.10.6.orig/src/luamm.hh	2016-12-04 16:13:57.000000000 +0100
++++ conky-1.10.6/src/luamm.hh	2017-05-05 12:44:37.525676651 +0200
+@@ -27,6 +27,7 @@
+ #include <mutex>
+ #include <exception>
+ #include <stdexcept>
++#include <functional>
+ #include <string>
+ 
+ #include <lua.hpp>
diff --git a/system/conky/conky.SlackBuild b/system/conky/conky.SlackBuild
index f0ecaf36c5..35bf46ff26 100644
--- a/system/conky/conky.SlackBuild
+++ b/system/conky/conky.SlackBuild
@@ -87,6 +87,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Fix for the newer gcc
+patch -p1 < $CWD/conky-1.10.6-gcc7.patch
+
 # fix MANDIR
 sed -i 's,share/man/man1,man/man1,g' CMakeLists.txt
 
diff --git a/system/dymo-cups-drivers/cups-ppd-header.patch b/system/dymo-cups-drivers/cups-ppd-header.patch
new file mode 100644
index 0000000000..46b366915d
--- /dev/null
+++ b/system/dymo-cups-drivers/cups-ppd-header.patch
@@ -0,0 +1,40 @@
+diff -ur dymo-cups-drivers-1.4.0.5/src/common/CupsFilter.h dymo-cups-drivers-1.4.0.5-patch/src/common/CupsFilter.h
+--- dymo-cups-drivers-1.4.0.5/src/common/CupsFilter.h	2012-02-07 08:22:37.000000000 -0500
++++ dymo-cups-drivers-1.4.0.5-patch/src/common/CupsFilter.h	2016-10-27 20:13:46.267013540 -0400
+@@ -23,6 +23,7 @@
+ 
+ #include <cups/cups.h>
+ #include <cups/raster.h>
++#include <cups/ppd.h>
+ #include <memory>
+ #include <string>
+ #include "CupsPrintEnvironment.h"
+diff -ur dymo-cups-drivers-1.4.0.5/src/lm/CupsFilterLabelManager.h dymo-cups-drivers-1.4.0.5-patch/src/lm/CupsFilterLabelManager.h
+--- dymo-cups-drivers-1.4.0.5/src/lm/CupsFilterLabelManager.h	2012-02-07 08:22:38.000000000 -0500
++++ dymo-cups-drivers-1.4.0.5-patch/src/lm/CupsFilterLabelManager.h	2016-10-27 20:14:00.407310094 -0400
+@@ -23,6 +23,7 @@
+ 
+ #include <cups/cups.h>
+ #include <cups/raster.h>
++#include <cups/ppd.h>
+ #include "LabelManagerDriver.h"
+ #include "LabelManagerLanguageMonitor.h"
+ #include "DummyLanguageMonitor.h"
+@@ -50,4 +51,4 @@
+ 
+ /*
+  * End of "$Id: CupsFilterLabelManager.h 14880 2011-03-31 16:29:05Z aleksandr $".
+- */
+\ No newline at end of file
++ */
+diff -ur dymo-cups-drivers-1.4.0.5/src/lw/CupsFilterLabelWriter.h dymo-cups-drivers-1.4.0.5-patch/src/lw/CupsFilterLabelWriter.h
+--- dymo-cups-drivers-1.4.0.5/src/lw/CupsFilterLabelWriter.h	2012-02-07 08:22:37.000000000 -0500
++++ dymo-cups-drivers-1.4.0.5-patch/src/lw/CupsFilterLabelWriter.h	2016-10-27 20:14:23.717798963 -0400
+@@ -23,6 +23,7 @@
+ 
+ #include <cups/cups.h>
+ #include <cups/raster.h>
++#include <cups/ppd.h>
+ #include "LabelWriterDriver.h"
+ #include "LabelWriterLanguageMonitor.h"
+ #include "DummyLanguageMonitor.h"
diff --git a/system/dymo-cups-drivers/dymo-cups-drivers.SlackBuild b/system/dymo-cups-drivers/dymo-cups-drivers.SlackBuild
index d75cb09fca..e647c5209e 100644
--- a/system/dymo-cups-drivers/dymo-cups-drivers.SlackBuild
+++ b/system/dymo-cups-drivers/dymo-cups-drivers.SlackBuild
@@ -69,6 +69,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Patch for the newer cups - thanks archlinux!
+patch -p1 < $CWD/cups-ppd-header.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/system/dynamips/dynamips.SlackBuild b/system/dynamips/dynamips.SlackBuild
index a9edf005e9..76345e6758 100644
--- a/system/dynamips/dynamips.SlackBuild
+++ b/system/dynamips/dynamips.SlackBuild
@@ -75,6 +75,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 
 sed -i 's/^\(\.PHONY: all dynamips\)/# \1/' Makefile
+sed -i "s/-L\/usr\/lib\ -L\.\ -ldl/-L\/usr\/lib${LIBDIRSUFFIX} -L. -ldl -lz/" stable/Makefile
 
 if [ $ARCH == "x86_64" ]
 then
diff --git a/system/evilvte/evilvte.info b/system/evilvte/evilvte.info
index e4cd913dd5..76d6079d62 100644
--- a/system/evilvte/evilvte.info
+++ b/system/evilvte/evilvte.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/caleb-/evilvte/archive/8dfa41e26bc640dd8d8c7317ff7d
 MD5SUM="e09c34ac7d5afaf6ca785b7984df70ed"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="vte2"
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
diff --git a/system/facter/facter.SlackBuild b/system/facter/facter.SlackBuild
index 7788f94801..03f1919ac8 100644
--- a/system/facter/facter.SlackBuild
+++ b/system/facter/facter.SlackBuild
@@ -77,7 +77,7 @@ mkdir -p build
 cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=misleading-indentation" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DCMAKE_BUILD_TYPE=Release ..
diff --git a/system/fakeroot/fakeroot.SlackBuild b/system/fakeroot/fakeroot.SlackBuild
index ed0dbfb4b7..b3ba5e0918 100644
--- a/system/fakeroot/fakeroot.SlackBuild
+++ b/system/fakeroot/fakeroot.SlackBuild
@@ -70,6 +70,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Patches for glibc-2.2.5 from Debian
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=830912
+patch -p1 < $CWD/glibc-xattr-types.patch
+patch -p1 < $CWD/hide-dlsym-error.patch
+
 ./bootstrap
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/system/fakeroot/glibc-xattr-types.patch b/system/fakeroot/glibc-xattr-types.patch
new file mode 100644
index 0000000000..01962e2c38
--- /dev/null
+++ b/system/fakeroot/glibc-xattr-types.patch
@@ -0,0 +1,108 @@
+Fix the type of xattr functions to match the glibc headers.
+
+--- a/libfakeroot.c
++++ b/libfakeroot.c
+@@ -1570,7 +1570,7 @@
+ #endif /* HAVE_CAPSET */
+ 
+ #if defined(HAVE_SETXATTR) || defined(HAVE_LSETXATTR) || defined(HAVE_FSETXATTR)
+-static size_t common_setxattr(INT_STRUCT_STAT *st, const char *name, void * value, size_t size, int flags)
++static int common_setxattr(INT_STRUCT_STAT *st, const char *name, const void * value, size_t size, int flags)
+ {
+   xattr_args xattr;
+   xattr.name = name;
+@@ -1625,7 +1625,7 @@
+ #endif /* defined(HAVE_LISTXATTR) || defined(HAVE_LLISTXATTR) || defined(HAVE_FLISTXATTR) */
+ 
+ #if defined(HAVE_REMOVEXATTR) || defined(HAVE_LREMOVEXATTR) || defined(HAVE_FREMOVEXATTR)
+-static size_t common_removexattr(INT_STRUCT_STAT *st, const char *name)
++static int common_removexattr(INT_STRUCT_STAT *st, const char *name)
+ {
+   xattr_args xattr;
+   xattr.name = name;
+@@ -1643,7 +1643,7 @@
+ #endif /* defined(HAVE_REMOVEXATTR) || defined(HAVE_LREMOVEXATTR) || defined(HAVE_FREMOVEXATTR) */
+ 
+ #ifdef HAVE_SETXATTR
+-ssize_t setxattr(const char *path, const char *name, void *value, size_t size, int flags)
++int setxattr(const char *path, const char *name, const void *value, size_t size, int flags)
+ {
+   INT_STRUCT_STAT st;
+   int r;
+@@ -1664,7 +1664,7 @@
+ #endif /* HAVE_SETXATTR */
+ 
+ #ifdef HAVE_LSETXATTR
+-ssize_t lsetxattr(const char *path, const char *name, void *value, size_t size, int flags)
++int lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags)
+ {
+   INT_STRUCT_STAT st;
+   int r;
+@@ -1685,7 +1685,7 @@
+ #endif /* HAVE_LSETXATTR */
+ 
+ #ifdef HAVE_FSETXATTR
+-ssize_t fsetxattr(int fd, const char *name, void *value, size_t size, int flags)
++int fsetxattr(int fd, const char *name, const void *value, size_t size, int flags)
+ {
+   INT_STRUCT_STAT st;
+   int r;
+@@ -1832,7 +1832,7 @@
+ #endif /* HAVE_FLISTXATTR */
+ 
+ #ifdef HAVE_REMOVEXATTR
+-ssize_t removexattr(const char *path, const char *name)
++int removexattr(const char *path, const char *name)
+ {
+   INT_STRUCT_STAT st;
+   int r;
+@@ -1853,7 +1853,7 @@
+ #endif /* HAVE_REMOVEXATTR */
+ 
+ #ifdef HAVE_LREMOVEXATTR
+-ssize_t lremovexattr(const char *path, const char *name)
++int lremovexattr(const char *path, const char *name)
+ {
+   INT_STRUCT_STAT st;
+   int r;
+@@ -1874,7 +1874,7 @@
+ #endif /* HAVE_LREMOVEXATTR */
+ 
+ #ifdef HAVE_FREMOVEXATTR
+-ssize_t fremovexattr(int fd, const char *name)
++int fremovexattr(int fd, const char *name)
+ {
+   INT_STRUCT_STAT st;
+   int r;
+--- a/wrapfunc.inp
++++ b/wrapfunc.inp
+@@ -168,22 +168,22 @@
+ fgetxattr;ssize_t;(int fd, const char *name, void *value, size_t size);(fd, name, value, size)
+ #endif /* HAVE_FGETXATTR */
+ #ifdef HAVE_SETXATTR
+-setxattr;ssize_t;(const char *path, const char *name, void *value, size_t size, int flags);(path, name, value, size, flags)
++setxattr;int;(const char *path, const char *name, const void *value, size_t size, int flags);(path, name, value, size, flags)
+ #endif /* HAVE_SETXATTR */
+ #ifdef HAVE_LSETXATTR
+-lsetxattr;ssize_t;(const char *path, const char *name, void *value, size_t size, int flags);(path, name, value, size, flags)
++lsetxattr;int;(const char *path, const char *name, const void *value, size_t size, int flags);(path, name, value, size, flags)
+ #endif /* HAVE_LSETXATTR */
+ #ifdef HAVE_FSETXATTR
+-fsetxattr;ssize_t;(int fd, const char *name, void *value, size_t size, int flags);(fd, name, value, size, flags)
++fsetxattr;int;(int fd, const char *name, const void *value, size_t size, int flags);(fd, name, value, size, flags)
+ #endif /* HAVE_FSETXATTR */
+ #ifdef HAVE_REMOVEXATTR
+-removexattr;ssize_t;(const char *path, const char *name);(path, name)
++removexattr;int;(const char *path, const char *name);(path, name)
+ #endif /* HAVE_REMOVEXATTR */
+ #ifdef HAVE_LREMOVEXATTR
+-lremovexattr;ssize_t;(const char *path, const char *name);(path, name)
++lremovexattr;int;(const char *path, const char *name);(path, name)
+ #endif /* HAVE_LREMOVEXATTR */
+ #ifdef HAVE_FREMOVEXATTR
+-fremovexattr;ssize_t;(int fd, const char *name);(fd, name)
++fremovexattr;int;(int fd, const char *name);(fd, name)
+ #endif /* HAVE_FREMOVEXATTR */
+ 
+ #ifdef HAVE_FSTATAT
+
diff --git a/system/fakeroot/hide-dlsym-error.patch b/system/fakeroot/hide-dlsym-error.patch
new file mode 100644
index 0000000000..3fd34c8778
--- /dev/null
+++ b/system/fakeroot/hide-dlsym-error.patch
@@ -0,0 +1,32 @@
+Description: Hide error from dlsym()
+ dlsym(), starting in glibc 2.24 actually reports errors. In our case,
+ we try to get ACL functions which are not in the glibc. This causes
+ failures in test suites, so hide those messages for non-debugging
+ purposes for now. It also makes the build logs annoying to read.
+Author: Julian Andres Klode <juliank@ubuntu.com>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/830912
+Forwarded: no
+Last-Update: 2016-08-12
+
+--- a/libfakeroot.c
++++ b/libfakeroot.c
+@@ -256,10 +256,16 @@ void load_library_symbols(void){
+  /* clear dlerror() just in case dlsym() legitimately returns NULL */
+     msg = dlerror();
+     *(next_wrap[i].doit)=dlsym(get_libc(), next_wrap[i].name);
++
+     if ( (msg = dlerror()) != NULL){
+-      fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg);
+-/*    abort ();*/
++#ifdef LIBFAKEROOT_DEBUGGING
++      if (fakeroot_debug) {
++        fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg);
++/*      abort ();*/
++      }
++#endif
+     }
++
+   }
+ }
+ 
diff --git a/system/gnome-terminal/gnome-terminal.info b/system/gnome-terminal/gnome-terminal.info
index e9dce86924..e28f430da0 100644
--- a/system/gnome-terminal/gnome-terminal.info
+++ b/system/gnome-terminal/gnome-terminal.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://ftp.gnome.org/pub/gnome/sources/gnome-terminal/2.32/gnome-term
 MD5SUM="cb7843b97a78a3bbaac9381f78bb8569"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libgnome rarian"
+REQUIRES="libgnome rarian vte2"
 MAINTAINER="Thorn Inurcide"
 EMAIL="thorn-inurcide@hotmail.com"
diff --git a/system/guake/guake.info b/system/guake/guake.info
index 7e9cb5842e..8e6b7295c2 100644
--- a/system/guake/guake.info
+++ b/system/guake/guake.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/Guake/guake/archive/0.8.9/guake-0.8.9.tar.gz"
 MD5SUM="43aababf48f04e0e5d0cadc5b3d13935"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gnome-common gnome-python2-gconf python-keybinder pyxdg"
+REQUIRES="gnome-common gnome-python2-gconf python-keybinder pyxdg vte2"
 MAINTAINER="Donald Cooley"
 EMAIL="chytraeu@sdf.org"
diff --git a/system/guefi/README b/system/guefi/README
new file mode 100644
index 0000000000..63caa688ed
--- /dev/null
+++ b/system/guefi/README
@@ -0,0 +1,3 @@
+GUEFI is a Python/GTK+3 application that acts as a frontend for
+efibootmgr. It provides an easy to use interface for managing
+UEFI boot options.
diff --git a/system/guefi/guefi.SlackBuild b/system/guefi/guefi.SlackBuild
new file mode 100644
index 0000000000..a515d4ceb6
--- /dev/null
+++ b/system/guefi/guefi.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# Slackware build script for guefi
+
+# Copyright 2017 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=guefi
+VERSION=${VERSION:-0.1.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+DOCS="AUTHORS COPYING README.md"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+make prefix=/usr
+
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/guefi/guefi.info b/system/guefi/guefi.info
new file mode 100644
index 0000000000..b91af7b998
--- /dev/null
+++ b/system/guefi/guefi.info
@@ -0,0 +1,10 @@
+PRGNAM="guefi"
+VERSION="0.1.3"
+HOMEPAGE="https://github.com/gapan/guefi"
+DOWNLOAD="https://github.com/gapan/guefi/archive/0.1.3.tar.gz"
+MD5SUM="08355512dd019d93f8809c66fb00132b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/system/guefi/slack-desc b/system/guefi/slack-desc
new file mode 100644
index 0000000000..e0df51a295
--- /dev/null
+++ b/system/guefi/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+guefi: guefi (GTK+3 frontend for efibootmgr)
+guefi:
+guefi: GUEFI is a Python/GTK+3 application that acts as a frontend for
+guefi: efibootmgr. It provides an easy to use interface for managing
+guefi: UEFI boot options.
+guefi:
+guefi: homepage: https://github.com/gapan/guefi
+guefi:
+guefi:
+guefi:
+guefi:
diff --git a/system/kyotocabinet/kyotocabinet-1.2.76-gcc6.patch b/system/kyotocabinet/kyotocabinet-1.2.76-gcc6.patch
new file mode 100644
index 0000000000..d565cff0f3
--- /dev/null
+++ b/system/kyotocabinet/kyotocabinet-1.2.76-gcc6.patch
@@ -0,0 +1,45 @@
+Patch from Andreas Stührk <andy@hammerhartes.de> to work around build
+failures with GCC >= 6 like:
+
+In file included from kcdbext.cc:16:0:
+kcdbext.h: In member function 'char* kyotocabinet::IndexDB::get(const char*, size_t, size_t*)':
+kcdbext.h:1281:14: error: cannot convert 'bool' to 'char*' in return
+       return false;
+              ^~~~~
+In file included from kclangc.cc:17:0:
+kcdbext.h: In member function 'char* kyotocabinet::IndexDB::get(const char*, size_t, size_t*)':
+kcdbext.h:1281:14: error: cannot convert 'bool' to 'char*' in return
+       return false;
+              ^~~~~
+
+Note that using '\0' rather nullptr (like the patch from openSUSE is
+doing) just leads to new build failures with GCC >= 7 like:
+
+In file included from kcdbext.cc:16:0:
+kcdbext.h: In member function 'char* kyotocabinet::IndexDB::get(const char*, size_t, size_t*)':
+kcdbext.h:1281:14: error: invalid conversion from 'char' to 'char*' [-fpermissive]
+       return '\0';
+              ^~~~
+In file included from kclangc.cc:17:0:
+kcdbext.h: In member function 'char* kyotocabinet::IndexDB::get(const char*, size_t, size_t*)':
+kcdbext.h:1281:14: error: invalid conversion from 'char' to 'char*' [-fpermissive]
+       return '\0';
+              ^~~~
+
+See also:
+
+ - https://bugzilla.redhat.com/show_bug.cgi?id=1307706
+ - https://build.opensuse.org/package/view_file/devel:libraries:c_c++/kyotocabinet/gcc6-fix-errors.patch?expand=1
+ - https://bugs.debian.org/811627
+
+--- kyotocabinet-1.2.76/kcdbext.h	2016-05-25 11:32:53.591866016 +0200
++++ kyotocabinet-1.2.76/kcdbext.h	2012-05-24 18:27:59.000000000 +0200
+@@ -1278,7 +1278,7 @@
+     if (omode_ == 0) {
+       set_error(_KCCODELINE_, BasicDB::Error::INVALID, "not opened");
+       *sp = 0;
+-      return false;
++      return nullptr;
+     }
+     if (!cache_) return db_.get(kbuf, ksiz, sp);
+     size_t dvsiz = 0;
diff --git a/system/kyotocabinet/kyotocabinet.SlackBuild b/system/kyotocabinet/kyotocabinet.SlackBuild
index 6cb8823a5a..5efbfdb944 100644
--- a/system/kyotocabinet/kyotocabinet.SlackBuild
+++ b/system/kyotocabinet/kyotocabinet.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for kyotocabinet
-# Copyright 2013 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2017 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -69,6 +69,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Patch for gcc >= 6.x - thanks to opensuse
+patch -p1 < $CWD/kyotocabinet-1.2.76-gcc6.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/system/lilyterm/lilyterm.SlackBuild b/system/lilyterm/lilyterm.SlackBuild
index 6d4a4a5835..b5bc2dfe1e 100644
--- a/system/lilyterm/lilyterm.SlackBuild
+++ b/system/lilyterm/lilyterm.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lilyterm
-VERSION=${VERSION:-0.9.9.2}
+VERSION=${VERSION:-0.9.9.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/lilyterm/lilyterm.info b/system/lilyterm/lilyterm.info
index 05fb18a37a..d99cce7266 100644
--- a/system/lilyterm/lilyterm.info
+++ b/system/lilyterm/lilyterm.info
@@ -1,10 +1,10 @@
 PRGNAM="lilyterm"
-VERSION="0.9.9.2"
+VERSION="0.9.9.4"
 HOMEPAGE="http://lilyterm.luna.com.tw/index.html"
-DOWNLOAD="http://lilyterm.luna.com.tw/file/lilyterm-0.9.9.2.tar.gz"
-MD5SUM="d68dd29ce4894f765adba1efd470f90e"
+DOWNLOAD="http://lilyterm.luna.com.tw/file/lilyterm-0.9.9.4.tar.gz"
+MD5SUM="3bbfd4037d45a16b1b45846ce51d100a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="vte2"
 MAINTAINER="Emil Torofiev"
 EMAIL="etorofiev@gmail.com"
diff --git a/system/lxterminal/lxterminal.info b/system/lxterminal/lxterminal.info
index 05df07ceb8..29e8a83f51 100644
--- a/system/lxterminal/lxterminal.info
+++ b/system/lxterminal/lxterminal.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxterminal-20170514_0f2ca0
 MD5SUM="a39e193d3f392c4e0e7300d3b6a57ce7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="vte2"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/system/lzop/lzop-1.03-gcc6.patch b/system/lzop/lzop-1.03-gcc6.patch
new file mode 100644
index 0000000000..9bd8a6bf9c
--- /dev/null
+++ b/system/lzop/lzop-1.03-gcc6.patch
@@ -0,0 +1,26 @@
+--- src/miniacc.h.orig	2016-02-10 16:09:23.247315866 +0100
++++ src/miniacc.h	2016-02-10 16:12:14.973297054 +0100
+@@ -4469,12 +4469,12 @@
+ #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150)
+ #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
+ #else
+-    ACCCHK_ASSERT((1   << (8*SIZEOF_INT-1)) < 0)
++    ACCCHK_ASSERT((int)(1u   << (8*SIZEOF_INT-1)) < 0)
+ #endif
+     ACCCHK_ASSERT((1u  << (8*SIZEOF_INT-1)) > 0)
+ #if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
+ #else
+-    ACCCHK_ASSERT((1l  << (8*SIZEOF_LONG-1)) < 0)
++    ACCCHK_ASSERT((long)(1ul  << (8*SIZEOF_LONG-1)) < 0)
+ #endif
+     ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0)
+ #if defined(acc_int16e_t)
+@@ -4703,7 +4703,7 @@
+ #elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC)
+ #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
+ #elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1)
+-    ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0)
++    ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0)
+ #endif
+ #if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560))
+ #  pragma option pop
diff --git a/system/lzop/lzop.SlackBuild b/system/lzop/lzop.SlackBuild
index fd0279df72..299a04577f 100644
--- a/system/lzop/lzop.SlackBuild
+++ b/system/lzop/lzop.SlackBuild
@@ -72,6 +72,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Thanks to opensuse for this patch
+patch -p0 < $CWD/lzop-1.03-gcc6.patch
+
 CFLAGS="$SLKCFLAGS" \
   ./configure \
   --prefix=/usr \
diff --git a/system/nvidia-legacy340-kernel/4.9.patch b/system/nvidia-legacy340-kernel/4.9.patch
new file mode 100644
index 0000000000..6a47f79374
--- /dev/null
+++ b/system/nvidia-legacy340-kernel/4.9.patch
@@ -0,0 +1,15 @@
+diff -Naur a/kernel/nv-drm.c b/kernel/nv-drm.c
+--- a/kernel/nv-drm.c	2016-12-15 12:41:26.000000000 +0100
++++ b/kernel/nv-drm.c	2016-12-15 12:58:48.000000000 +0100
+@@ -115,7 +115,11 @@
+ };
+ 
+ static struct drm_driver nv_drm_driver = {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++    .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_LEGACY,
++#else
+     .driver_features = DRIVER_GEM | DRIVER_PRIME,
++#endif
+     .load = nv_drm_load,
+     .unload = nv_drm_unload,
+     .fops = &nv_drm_fops,
diff --git a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild
index 2a2ba90016..cbf13d01fc 100644
--- a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild
+++ b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild
@@ -77,6 +77,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Apply a patch for kernel 4.9.x
+patch -p1 < $CWD/4.9.patch
+
 (cd kernel || exit 1
   make SYSSRC=$KERNELPATH module || exit 1
   cd uvm
diff --git a/system/opensc/opensc.SlackBuild b/system/opensc/opensc.SlackBuild
index e7dc5c71e3..2cfddd439d 100644
--- a/system/opensc/opensc.SlackBuild
+++ b/system/opensc/opensc.SlackBuild
@@ -23,13 +23,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=opensc
-VERSION=${VERSION:-0.15.0}
+VERSION=${VERSION:-0.16.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCFILES="README COPYING NEWS ChangeLog"
-XSL_STYLESHEETS_VER=1.78.1
+DOCFILES="README COPYING NEWS"
+XSL_STYLESHEETS_VER=1.79.1
 
 # opensc now supports only one reader subsystem (pcsc-lite or openct)
 OPENCT=${OPENCT:-0}	# pcsc-lite is the default, openct disabled
@@ -51,8 +51,8 @@ case "$OPENCT" in
   *)	RDRSUBSYS_flags="--disable-pcsc --enable-openct" ;;
 esac
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/system/opensc/opensc.info b/system/opensc/opensc.info
index 91496b60e0..d536fa91ad 100644
--- a/system/opensc/opensc.info
+++ b/system/opensc/opensc.info
@@ -1,8 +1,8 @@
 PRGNAM="opensc"
-VERSION="0.15.0"
+VERSION="0.16.0"
 HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki/"
-DOWNLOAD="http://downloads.sourceforge.net/opensc/OpenSC/opensc-0.15.0.tar.gz"
-MD5SUM="34c55315b7f381bd047b6435933baab4"
+DOWNLOAD="https://sourceforge.net/projects/opensc/files/OpenSC/opensc-0.16.0/opensc-0.16.0.tar.gz"
+MD5SUM="724d128f23cd7a74b28d04300ce7bcbd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pcsc-lite"
diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild
index b0d9c0f940..b629e3bec0 100644
--- a/system/qemu/qemu.SlackBuild
+++ b/system/qemu/qemu.SlackBuild
@@ -52,10 +52,11 @@
 # 4.2   05-JUN-2017	version update to 2.9 release
 
 PRGNAM=qemu
-VERSION=${VERSION:-2.9.0}
+VERSION=${VERSION:-2.10.0_rc1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCVER=$(echo $VERSION | tr _ - )
 KVMGROUP=${KVMGROUP:-users}
 TARGETS=${TARGETS:-some}
 VNC_ENABLE=${VNC_ENABLE:-yes}
@@ -100,9 +101,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.xz
+cd $PRGNAM-$SRCVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info
index fe4190cc0c..4fa10f1090 100644
--- a/system/qemu/qemu.info
+++ b/system/qemu/qemu.info
@@ -1,8 +1,8 @@
 PRGNAM="qemu"
-VERSION="2.9.0"
+VERSION="2.10.0_rc1"
 HOMEPAGE="http://www.qemu-project.org"
-DOWNLOAD="http://download.qemu-project.org/qemu-2.9.0.tar.xz"
-MD5SUM="86c95eb3b24ffea3a84a4e3a856b4e26"
+DOWNLOAD="http://download.qemu-project.org/qemu-2.10.0-rc1.tar.xz"
+MD5SUM="e66826ab255bf922a763410146f9a249"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/qtfm/gcc6.patch b/system/qtfm/gcc6.patch
new file mode 100644
index 0000000000..166ef0a79e
--- /dev/null
+++ b/system/qtfm/gcc6.patch
@@ -0,0 +1,12 @@
+diff -Naur qtfm.orig/src/mymodel.cpp qtfm/src/mymodel.cpp
+--- qtfm.orig/src/mymodel.cpp	2013-05-25 19:25:38.000000000 +0200
++++ qtfm/src/mymodel.cpp	2017-05-31 17:12:54.877169485 +0200
+@@ -220,7 +220,7 @@
+ 

+     if(item) return item->absoluteFilePath();

+ 

+-    return false;

++    return "";

+ }

+ 

+ //---------------------------------------------------------------------------------------

diff --git a/system/qtfm/qtfm.SlackBuild b/system/qtfm/qtfm.SlackBuild
index 59cb3c3203..d7a2e4eb1d 100644
--- a/system/qtfm/qtfm.SlackBuild
+++ b/system/qtfm/qtfm.SlackBuild
@@ -23,7 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qtfm
-VERSION=${VERSION:-5.5}
+VERSION=${VERSION:-5.9}
+SRCVER=${SRCVER:-158787}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,9 +60,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM
+unzip $CWD/$SRCVER-$PRGNAM.zip
+cd $PRGNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -69,6 +70,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+patch -p1 < $CWD/gcc6.patch
+
 # Set doc path to /usr/doc/$PRGNAM-$VERSION in qtfm.pro
 sed -i "s,usr/share/doc/$PRGNAM,usr/doc/$PRGNAM-$VERSION," qtfm.pro
 
diff --git a/system/qtfm/qtfm.info b/system/qtfm/qtfm.info
index f47835683e..e209d2cb6c 100644
--- a/system/qtfm/qtfm.info
+++ b/system/qtfm/qtfm.info
@@ -1,8 +1,8 @@
 PRGNAM="qtfm"
-VERSION="5.5"
-HOMEPAGE="http://www.qtfm.org/"
-DOWNLOAD="http://www.qtfm.org/qtfm-5.5.tar.gz"
-MD5SUM="cc1d930503bf0dedc824d6f2abdda719"
+VERSION="5.9"
+HOMEPAGE="http://www.qtfm.org"
+DOWNLOAD="https://dl.opendesktop.org/api/files/download/id/1466643163/158787-qtfm.zip"
+MD5SUM="1a94bd7fbe99e87f530dc9bc1d7a8c45"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/rhash/rhash.SlackBuild b/system/rhash/rhash.SlackBuild
index eeeb01b5d0..e891df327f 100644
--- a/system/rhash/rhash.SlackBuild
+++ b/system/rhash/rhash.SlackBuild
@@ -30,8 +30,8 @@
 #      П.П. Честит ден на Освобождението, българи!
 
 PRGNAM=rhash
-VERSION=${VERSION:-1.3.3}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.3.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 # Shall we compile with OpenSSL support?
@@ -93,7 +93,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # -DUSE_GETTEXT = internationalization support
-make ADDCFLAGS="${SLKCFLAGS} -DUSE_GETTEXT ${OPTCFLAGS}" \
+make -j1 ADDCFLAGS="${SLKCFLAGS} -DUSE_GETTEXT ${OPTCFLAGS}" \
     ADDLDFLAGS="${OPTLDFLAGS}" \
     PREFIX=/usr \
     MANDIR=/usr/man \
diff --git a/system/rhash/rhash.info b/system/rhash/rhash.info
index 0673a04919..8b25f74a9b 100644
--- a/system/rhash/rhash.info
+++ b/system/rhash/rhash.info
@@ -1,8 +1,8 @@
 PRGNAM="rhash"
-VERSION="1.3.3"
+VERSION="1.3.4"
 HOMEPAGE="http://rhash.anz.ru/?l=en"
-DOWNLOAD="http://downloads.sourceforge.net/rhash/rhash-1.3.3-src.tar.gz"
-MD5SUM="0e3c758b5e4b25e29e0094a33a9d2764"
+DOWNLOAD="http://downloads.sourceforge.net/rhash/rhash-1.3.4-src.tar.gz"
+MD5SUM="0b51010604659e9e99f6307b053ba13b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/roxterm/roxterm.info b/system/roxterm/roxterm.info
index 7a9c1bb1a2..84ba1a539e 100644
--- a/system/roxterm/roxterm.info
+++ b/system/roxterm/roxterm.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/roxterm/roxterm-2.9.7.tar.bz2"
 MD5SUM="496b5ddc078cede502f168dadef46cb6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="vte2"
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
diff --git a/system/tp_smapi/tp_smapi.SlackBuild b/system/tp_smapi/tp_smapi.SlackBuild
index b4d5573efd..b95a7238d6 100644
--- a/system/tp_smapi/tp_smapi.SlackBuild
+++ b/system/tp_smapi/tp_smapi.SlackBuild
@@ -22,7 +22,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tp_smapi
-VERSION=${VERSION:-0.41}
+VERSION=${VERSION:-0.42}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,9 +60,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $PRGNAM-tp-smapi-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+cd $PRGNAM-tp-smapi-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/system/tp_smapi/tp_smapi.info b/system/tp_smapi/tp_smapi.info
index 498d83db04..2c682a859c 100644
--- a/system/tp_smapi/tp_smapi.info
+++ b/system/tp_smapi/tp_smapi.info
@@ -1,8 +1,8 @@
 PRGNAM="tp_smapi"
-VERSION="0.41"
+VERSION="0.42"
 HOMEPAGE="https://github.com/evgeni/tp_smapi"
-DOWNLOAD="https://github.com/downloads/evgeni/tp_smapi/tp_smapi-0.41.tar.gz"
-MD5SUM="63c683415c764568f6bf17c7eabe4752"
+DOWNLOAD="https://github.com/evgeni/tp_smapi/archive/tp-smapi/0.42/tp_smapi-0.42.tar.gz"
+MD5SUM="6a51d3aa459ad7a6ebfbb8c29527b3ee"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ttyrec/ttyrec.SlackBuild b/system/ttyrec/ttyrec.SlackBuild
index caecc00574..4b4f00653b 100644
--- a/system/ttyrec/ttyrec.SlackBuild
+++ b/system/ttyrec/ttyrec.SlackBuild
@@ -72,7 +72,7 @@ find -L . \
 # Fixed: "Out of pty's Terminated"
 patch -p1 < $CWD/ttyrec-1.0.8.RHEL5.patch
 
-make
+make CFLAGS+="$SLKCFLAGS -DSVR4 -DHAVE_inotify -D_XOPEN_SOURCE=500"
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/system/uhd/uhd.SlackBuild b/system/uhd/uhd.SlackBuild
index 1171a01c0a..d7100d6204 100644
--- a/system/uhd/uhd.SlackBuild
+++ b/system/uhd/uhd.SlackBuild
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=uhd
-VERSION=${VERSION:-003_005_002}
+VERSION=${VERSION:-003_009_007}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -59,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf UHD-Mirror-release_$VERSION
-tar xvf $CWD/release_$VERSION.tar.gz || tar xvf $CWD/UHD-Mirror-release_$VERSION.tar.gz
-cd UHD-Mirror-release_$VERSION/host
+rm -rf $PRGNAM-release_$VERSION
+tar xvf $CWD/release_$VERSION.tar.gz
+cd $PRGNAM-release_$VERSION/host
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/system/uhd/uhd.info b/system/uhd/uhd.info
index 15d3fc0305..87365de4d6 100644
--- a/system/uhd/uhd.info
+++ b/system/uhd/uhd.info
@@ -1,10 +1,10 @@
 PRGNAM="uhd"
-VERSION="003_005_002"
+VERSION="003_009_007"
 HOMEPAGE="https://www.ettus.com/"
-DOWNLOAD="https://github.com/EttusResearch/UHD-Mirror/archive/release_003_005_002.tar.gz"
-MD5SUM="14f914b68bb9f58b1d08ae97000c03f4"
+DOWNLOAD="https://github.com/EttusResearch/uhd/archive/release_003_009_007.tar.gz"
+MD5SUM="3f024ac4d536a8aaf1ad66617deda941"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python-cheetah"
+REQUIRES="Mako python-cheetah python-requests"
 MAINTAINER="Georgi Kolev"
 EMAIL="shadowx@escom.bg"
diff --git a/system/upx/upx.SlackBuild b/system/upx/upx.SlackBuild
index 2f139e743f..61c2d5a537 100644
--- a/system/upx/upx.SlackBuild
+++ b/system/upx/upx.SlackBuild
@@ -55,6 +55,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+sed -i "s|^CXXFLAGS_WERROR.*|CXXFLAGS_WERROR =|" src/Makefile
+
 # Extract LZMA SDK to a proper place for use at build-time
 mkdir -p $TMP/lzma465
 tar xvf $CWD/lzma465.tar.bz2 -C $TMP/lzma465
diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild
index 5ad4476b66..1b06e4d4bf 100644
--- a/system/vice/vice.SlackBuild
+++ b/system/vice/vice.SlackBuild
@@ -24,7 +24,7 @@
 
 # Initialize variables
 PRGNAM=vice
-VERSION=${VERSION:-3.0}
+VERSION=${VERSION:-3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -79,8 +79,7 @@ find -L . \
  -exec chmod 644 {} \;
 
 # Set proper paths in documentation.
-sed -i "s/\/usr\/local\/lib\//\/usr\/lib${LIBDIRSUFFIX}\//g" \
-  man/vice.1 src/geninfocontrib_h.sh src/arch/win32/utils/geninfocontrib.c
+sed -i "s/\/usr\/local\/lib\//\/usr\/lib${LIBDIRSUFFIX}\//g" man/vice.1
 sed -i 's/"\/vice_toc\.html"/"\/html\/vice_toc\.html"/g' \
   src/arch/unix/gui/uicommands.c
 sed -i "s/\/usr\/local/\/usr/g" doc/vice.* doc/html/*html
@@ -113,7 +112,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-quicktime \
   --enable-ethernet \
   --enable-parsid \
-  --enable-memmap \
   --enable-gnomeui \
   --build=$ARCH-slackware-linux
 
diff --git a/system/vice/vice.info b/system/vice/vice.info
index 094b1ebd7e..b42b7a439d 100644
--- a/system/vice/vice.info
+++ b/system/vice/vice.info
@@ -1,8 +1,8 @@
 PRGNAM="vice"
-VERSION="3.0"
+VERSION="3.1"
 HOMEPAGE="http://vice-emu.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/vice-emu/vice-3.0.tar.gz"
-MD5SUM="c732d76a70ac1232a43456dae540b43a"
+DOWNLOAD="http://downloads.sourceforge.net/vice-emu/vice-3.1.tar.gz"
+MD5SUM="f9018ca464b863da0bb1a82c56374432"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/xnp2/gcc6.patch b/system/xnp2/gcc6.patch
new file mode 100644
index 0000000000..6265959666
--- /dev/null
+++ b/system/xnp2/gcc6.patch
@@ -0,0 +1,17 @@
+--- xnp2-0.86/x11/compiler.h.old        2016-03-08 18:25:50.000000000 +0100
++++ xnp2-0.86/x11/compiler.h    2016-07-05 23:48:04.507937827 +0200
+@@ -117,12 +117,14 @@
+ #define	MAX_PATH	MAXPATHLEN
+ #endif
+
++#ifndef __cplusplus
+ #ifndef	max
+ #define	max(a,b)	(((a) > (b)) ? (a) : (b))
+ #endif
+ #ifndef	min
+ #define	min(a,b)	(((a) < (b)) ? (a) : (b))
+ #endif
++#endif /* __cplusplus */
+
+ #ifndef        ZeroMemory
+ #define        ZeroMemory(d,n)         memset((d), 0, (n))
diff --git a/system/xnp2/xnp2.SlackBuild b/system/xnp2/xnp2.SlackBuild
index bbd8e9d826..b8a467720c 100644
--- a/system/xnp2/xnp2.SlackBuild
+++ b/system/xnp2/xnp2.SlackBuild
@@ -69,6 +69,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Thanks to the archlinux folks!
+patch -p2 < $CWD/gcc6.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \