20201107.1 global branch merge.current-20201107.1

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
author: Matteo Bernardini 2020-11-07 10:39:25 +0100
committer: Matteo Bernardini 2020-11-07 10:39:25 +0100
commit: 69c0dd02dd77d45035c7458bbb3507bfd659bc47 (patch)
tree: 67e0545ccec095bdced5501bd94b7a7c8c6ac70a /system
parent: 47e77153bd7179d5081b4608265a62a12059e36f (diff)
download: slackbuilds-69c0dd02dd77d45035c7458bbb3507bfd659bc47.tar.gz
241 files changed, 9838 insertions, 4580 deletions
diff --git a/system/acpi_call/acpi_call.SlackBuild b/system/acpi_call/acpi_call.SlackBuild
index cbba19ee17..61e7be7220 100644
--- a/system/acpi_call/acpi_call.SlackBuild
+++ b/system/acpi_call/acpi_call.SlackBuild
@@ -67,6 +67,9 @@ find -L . \
 patch -p0 < $CWD/fix-acpi-include.patch
 patch -p0 < $CWD/fix-5.x-kernel.patch
 
+# Fix build with Linux >= 4.12
+sed -i 's|asm/uaccess.h|linux/uaccess.h|' acpi_call.c
+
 make KDIR=$KERNELPATH
 
 mkdir -p $PKG/lib/modules/$KERNEL/misc
diff --git a/system/audit/audit.SlackBuild b/system/audit/audit.SlackBuild
index c18f98a8b8..b215fc7bd1 100644
--- a/system/audit/audit.SlackBuild
+++ b/system/audit/audit.SlackBuild
@@ -23,7 +23,7 @@
 #   SUCH DAMAGE.
 
 PRGNAM=audit
-VERSION=${VERSION:-2.3.6}
+VERSION=${VERSION:-2.8.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -103,7 +103,7 @@ for i in $(find $PKG/etc -type f -name "*.rules" -o -name "*.conf") ; do mv $i $
 mkdir -p $PKG/var/log/audit $PKG/var/lock/subsys
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO contrib \
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README contrib \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
diff --git a/system/audit/audit.info b/system/audit/audit.info
index 809f0561eb..3d9cee63cc 100644
--- a/system/audit/audit.info
+++ b/system/audit/audit.info
@@ -1,8 +1,8 @@
 PRGNAM="audit"
-VERSION="2.3.6"
+VERSION="2.8.5"
 HOMEPAGE="http://people.redhat.com/sgrubb/audit/"
-DOWNLOAD="http://people.redhat.com/sgrubb/audit/audit-2.3.6.tar.gz"
-MD5SUM="ffe178196717f8d3fc5337559543f58a"
+DOWNLOAD="http://people.redhat.com/sgrubb/audit/audit-2.8.5.tar.gz"
+MD5SUM="9455e5773670afdbccaeb92681b2e97d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/brasero/brasero.SlackBuild b/system/brasero/brasero.SlackBuild
index cd1f003c30..32abd17b58 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/colord/colord.SlackBuild b/system/colord/colord.SlackBuild
index 2ac2cabcf3..5112df3e32 100644
--- a/system/colord/colord.SlackBuild
+++ b/system/colord/colord.SlackBuild
@@ -95,6 +95,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 c3f4948c36..395bcdce69 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/cups-bjnp/cups-bjnp.SlackBuild b/system/cups-bjnp/cups-bjnp.SlackBuild
index 1829168b60..0cb88341f5 100644
--- a/system/cups-bjnp/cups-bjnp.SlackBuild
+++ b/system/cups-bjnp/cups-bjnp.SlackBuild
@@ -69,7 +69,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=stringop-truncation" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/system/dahdi-complete/dahdi-complete.SlackBuild b/system/dahdi-complete/dahdi-complete.SlackBuild
index c6984aae30..bbfbde084c 100644
--- a/system/dahdi-complete/dahdi-complete.SlackBuild
+++ b/system/dahdi-complete/dahdi-complete.SlackBuild
@@ -10,7 +10,7 @@
 # All rights reserved.
 
 PRGNAM=dahdi-complete
-VERSION=${VERSION:-2.10.2}
+VERSION=${VERSION:-3.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,16 +61,19 @@ 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 -e 's/ -Werror//' tools/acinclude.m4 tools/xpp/Makefile
-sed -i -e 's/-Werror //' tools/Makefile
+sed -i -e 's/ -Werror//' tools/acinclude.m4 tools/xpp/Makefile.am
+sed -i -e 's/-Werror //' tools/Makefile.am
 
 # Fix Perl install location (otherwise it installs to /usr/local/share/perl5)
-sed -i -e 's/sitelib/vendorlib/' linux/build_tools/live_dahdi tools/xpp/Makefile
+sed -i -e 's/sitelib/vendorlib/' linux/build_tools/live_dahdi tools/xpp/Makefile.am
 
 cd linux
 make all
 
 cd ../tools
+./bootstrap.sh
+autoreconf -fi
+CPPFLAGS="-I$(pwd)/../linux/include" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -88,6 +91,10 @@ make install DESTDIR=$PKG
 cd ..
 make config DESTDIR=$PKG
 
+mkdir -p $PKG/usr/share/perl5/vendor_perl
+mv $PKG/usr/local/share/perl5/* $PKG/usr/share/perl5/vendor_perl/
+rm -fR $PKG/usr/local
+
 # move config files to .new
 cd $PKG/etc
 for file in $(find . -type f); do
@@ -103,7 +110,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 # Clean up zero-length firmware files
-find $PKG/lib/firmware -size 0 -delete
+find $PKG/lib/firmware -size 0 -delete || true
 # Remove unused directory
 rm -rf $PKG/usr/lib
 
diff --git a/system/dahdi-complete/dahdi-complete.info b/system/dahdi-complete/dahdi-complete.info
index 545f353e9a..1c53349c2a 100644
--- a/system/dahdi-complete/dahdi-complete.info
+++ b/system/dahdi-complete/dahdi-complete.info
@@ -1,8 +1,8 @@
 PRGNAM="dahdi-complete"
-VERSION="2.10.2"
+VERSION="3.0.0"
 HOMEPAGE="http://www.asterisk.org/downloads/dahdi"
-DOWNLOAD="http://downloads.asterisk.org/pub/telephony/dahdi-linux-complete/releases/dahdi-linux-complete-2.10.2+2.10.2.tar.gz"
-MD5SUM="9b5ae61dc6202b45284d71481ec758c0"
+DOWNLOAD="http://downloads.asterisk.org/pub/telephony/dahdi-linux-complete/releases/dahdi-linux-complete-3.0.0+3.0.0.tar.gz"
+MD5SUM="0e0a7f18bda5f97dcd22369645234231"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/dash/README b/system/dash/README
deleted file mode 100644
index 4f1ca583a5..0000000000
--- a/system/dash/README
+++ /dev/null
@@ -1,4 +0,0 @@
-DASH is a POSIX-compliant implementation of /bin/sh that aims to be as
-small as possible. It does this without sacrificing speed where
-possible. In fact, it is significantly faster than bash (the GNU
-Bourne-Again SHell) for most tasks.
diff --git a/system/dash/dash.SlackBuild b/system/dash/dash.SlackBuild
deleted file mode 100644
index e0d4ada3e3..0000000000
--- a/system/dash/dash.SlackBuild
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for dash
-
-# Written by Vincent Batts, http://hashbangbash.com/
-# Copyright 2017-2020 Donald Cooley South Haven, Indiana USA
-
-PRGNAM=dash
-VERSION=${VERSION:-0.5.11.2}
-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
-
-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
-
-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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/ \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux \
-  --with-libedit
-
-make
-make install DESTDIR=$PKG
-
-mkdir -p $PKG/usr/bin
-( cd $PKG/usr/bin ; ln -s /bin/dash dash )
-
-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
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  COPYING ChangeLog \
-  $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/dash/dash.info b/system/dash/dash.info
deleted file mode 100644
index 8404d7fbad..0000000000
--- a/system/dash/dash.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="dash"
-VERSION="0.5.11.2"
-HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
-DOWNLOAD="http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.11.2.tar.gz"
-MD5SUM="b9b71c72e40fdc4db9b4ffb81fc3bebc"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libedit"
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
diff --git a/system/dash/slack-desc b/system/dash/slack-desc
deleted file mode 100644
index 83489625d6..0000000000
--- a/system/dash/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-dash: dash (POSIX compliant shell)
-dash:
-dash: DASH is a POSIX-compliant implementation of /bin/sh that aims
-dash: to be as small as possible. It does this without sacrificing
-dash: speed where possible. In fact, it is significantly faster than
-dash: bash (the GNU Bourne-Again SHell) for most tasks.
-dash:
-dash:
-dash:
-dash:
-dash:
diff --git a/system/ddcutil/ddcutil.SlackBuild b/system/ddcutil/ddcutil.SlackBuild
index 9a88356804..f19dc83435 100644
--- a/system/ddcutil/ddcutil.SlackBuild
+++ b/system/ddcutil/ddcutil.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ddcutil
-VERSION=${VERSION:-0.8.6}
+VERSION=${VERSION:-0.9.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,10 +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 {} \;
 
-./autogen.sh
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure \
+./autogen.sh \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
diff --git a/system/ddcutil/ddcutil.info b/system/ddcutil/ddcutil.info
index acd1af4c28..21906ddac4 100644
--- a/system/ddcutil/ddcutil.info
+++ b/system/ddcutil/ddcutil.info
@@ -1,8 +1,8 @@
 PRGNAM="ddcutil"
-VERSION="0.8.6"
+VERSION="0.9.7"
 HOMEPAGE="http://ddcutil.com/"
-DOWNLOAD="https://github.com/rockowitz/ddcutil/archive/v0.8.6/ddcutil-0.8.6.tar.gz"
-MD5SUM="4cb18bb13505e1713736c35f5e8f6237"
+DOWNLOAD="https://github.com/rockowitz/ddcutil/archive/v0.9.7/ddcutil-0.9.7.tar.gz"
+MD5SUM="427c956956ac8c9afdc8e18c76a8e3b0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
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/ecryptfs-utils/ecryptfs-utils.SlackBuild b/system/ecryptfs-utils/ecryptfs-utils.SlackBuild
index 27ba7c2bbb..8a32014071 100644
--- a/system/ecryptfs-utils/ecryptfs-utils.SlackBuild
+++ b/system/ecryptfs-utils/ecryptfs-utils.SlackBuild
@@ -72,6 +72,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 {} \;
 
+patch -p0 < $CWD/openssl.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -84,7 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-pam \
   --enable-gpg \
-  --enable-tests \
+  --disable-tests \
   --build=$ARCH-slackware-linux
 make -j1 all check
 
diff --git a/system/ecryptfs-utils/openssl.patch b/system/ecryptfs-utils/openssl.patch
new file mode 100644
index 0000000000..5c3e419a91
--- /dev/null
+++ b/system/ecryptfs-utils/openssl.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/system/efitools/efitools.SlackBuild b/system/efitools/efitools.SlackBuild
index b2f041bed3..825ec0279e 100644
--- a/system/efitools/efitools.SlackBuild
+++ b/system/efitools/efitools.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=efitools
-VERSION=${VERSION:-1.5.3}
+VERSION=${VERSION:-1.9.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -32,7 +32,7 @@ USE_KEYS=${USE_KEYS:-no}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -44,8 +44,8 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # It's not safe to specify build flags since some EFI programs are built.
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
   EFI_ARCH=ia32
 elif [ "$ARCH" = "i686" ]; then
@@ -93,6 +93,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 {} \;
 
+# https://github.com/vathpela/gnu-efi/commit/d34132e62f666904158c7ec2f1eef5a9d5281c36
+sed -i "s|EFI_WARN_UNKOWN_GLYPH|EFI_WARN_UNKNOWN_GLYPH|" lib/console.c
+
 make \
   CRTPATH=/usr/lib${LIBDIRSUFFIX}/gnuefi \
   MYGUID=${MYGUID} \
diff --git a/system/efitools/efitools.info b/system/efitools/efitools.info
index 8946a7cacf..ff0b1df6bc 100644
--- a/system/efitools/efitools.info
+++ b/system/efitools/efitools.info
@@ -1,8 +1,8 @@
 PRGNAM="efitools"
-VERSION="1.5.3"
+VERSION="1.9.2"
 HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/efitools-1.5.3.tar.gz"
-MD5SUM="19ed4d83cfbb10987b84fca5a744715a"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/efitools-1.9.2.tar.gz"
+MD5SUM="a3a3f04ed6aa5486c97dd206edeebe0a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-File-Slurp sbsigntools"
diff --git a/system/evilvte/evilvte.info b/system/evilvte/evilvte.info
index 9ec5d1d50e..cb96363355 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="orphaned - no maintainer"
 EMAIL="nobody@nowhere"
diff --git a/system/extundelete/extundelete-e2fsprogs-1.44.1.patch b/system/extundelete/extundelete-e2fsprogs-1.44.1.patch
new file mode 100644
index 0000000000..61c078bfb8
--- /dev/null
+++ b/system/extundelete/extundelete-e2fsprogs-1.44.1.patch
@@ -0,0 +1,12 @@
+diff -ru extundelete-0.2.4.orig/src/insertionops.cc extundelete-0.2.4/src/insertionops.cc
+--- extundelete-0.2.4.orig/src/insertionops.cc	2018-06-04 22:19:22.460051515 +0000
++++ extundelete-0.2.4/src/insertionops.cc	2018-06-04 22:19:49.256717673 +0000
+@@ -33,7 +33,7 @@
+   os << "File flags: " << inode.i_flags << std::endl;
+   os << "File version (for NFS): " << inode.i_generation << std::endl;
+   os << "File ACL: " << inode.i_file_acl << std::endl;
+-  os << "Directory ACL: " << inode.i_dir_acl << std::endl;
++  os << "Directory ACL: " << inode.i_size_high << std::endl;
+   os << "Fragment address: " << inode.i_faddr << std::endl;
+   os << "Direct blocks: ";
+   for (int n = 0; n < EXT2_NDIR_BLOCKS; n++)
diff --git a/system/extundelete/extundelete.SlackBuild b/system/extundelete/extundelete.SlackBuild
index 5707b90896..ad08fe39e7 100644
--- a/system/extundelete/extundelete.SlackBuild
+++ b/system/extundelete/extundelete.SlackBuild
@@ -72,6 +72,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 {} \;
 
+patch -p1 < $CWD/extundelete-e2fsprogs-1.44.1.patch
+
 mkdir -p $PKG/usr/bin $PKG/usr/doc
 
 DFLAGS=$LDFLAGS \
diff --git a/system/f2fs_tools/README b/system/f2fs_tools/README
deleted file mode 100644
index 9b03454053..0000000000
--- a/system/f2fs_tools/README
+++ /dev/null
@@ -1 +0,0 @@
-Userland tools for the f2fs filesystem.
diff --git a/system/f2fs_tools/f2fs_tools.SlackBuild b/system/f2fs_tools/f2fs_tools.SlackBuild
deleted file mode 100644
index 198eb74854..0000000000
--- a/system/f2fs_tools/f2fs_tools.SlackBuild
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-# Slackware build script for <f2fs_tools>
-#
-# Michales (clavisound) Michaloudes korgie@gmail.com <2014>
-
-PRGNAM=f2fs_tools
-SRCNAM=f2fs-tools
-VERSION=${VERSION:-1.6.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -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
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-v$VERSION
-tar xvf $CWD/$SRCNAM-v$VERSION.tar.gz
-cd $SRCNAM-v$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" 
-
-autoreconf --install
-
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-static \
-  --build=$ARCH-slackware-linux
-
-make
-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
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog README VERSION \
-  $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/f2fs_tools/f2fs_tools.info b/system/f2fs_tools/f2fs_tools.info
deleted file mode 100644
index cda93b1788..0000000000
--- a/system/f2fs_tools/f2fs_tools.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="f2fs_tools"
-VERSION="1.6.1"
-HOMEPAGE="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git"
-DOWNLOAD="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-v1.6.1.tar.gz"
-MD5SUM="3fc6caa14569e059fc41807e42641a11"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Michales Michaloudes"
-EMAIL="korgie@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/file-roller/file-roller.SlackBuild b/system/file-roller/file-roller.SlackBuild
index 1894ba77d6..9ab5ef132c 100644
--- a/system/file-roller/file-roller.SlackBuild
+++ b/system/file-roller/file-roller.SlackBuild
@@ -26,7 +26,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=file-roller
-VERSION=${VERSION:-3.24.1}
+VERSION=${VERSION:-3.36.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,21 +72,21 @@ 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" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --localedir=/usr/share/locale \
-  --disable-static \
-  --build=$ARCH-slackware-linux
-
-make V=1
-make install DESTDIR=$PKG
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc
+  ninja
+  DESTDIR=$PKG ninja install
+cd ..
 
 #won't work with thunar archive-plugin without renaming desktop file:
 mv $PKG/usr/share/applications/org.gnome.FileRoller.desktop $PKG/usr/share/applications/file-roller.desktop
@@ -95,7 +95,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog HACKING INSTALL MAINTAINERS NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING HACKING MAINTAINERS NEWS README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/file-roller/file-roller.info b/system/file-roller/file-roller.info
index f2ac306e47..87df0fc1d7 100644
--- a/system/file-roller/file-roller.info
+++ b/system/file-roller/file-roller.info
@@ -1,8 +1,8 @@
 PRGNAM="file-roller"
-VERSION="3.24.1"
+VERSION="3.36.2"
 HOMEPAGE="http://ftp.gnome.org/pub/gnome/sources/file-roller"
-DOWNLOAD="http://ftp.acc.umu.se/pub/gnome/sources/file-roller/3.24/file-roller-3.24.1.tar.xz"
-MD5SUM="1e6be71792c7a8e4950297e9fdcf33e7"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/file-roller/3.36/file-roller-3.36.2.tar.xz"
+MD5SUM="caa0103ab34d237a9760fbf5e1c72bc1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/foremost/foremost.SlackBuild b/system/foremost/foremost.SlackBuild
index 7f34e6338c..890df080a0 100644
--- a/system/foremost/foremost.SlackBuild
+++ b/system/foremost/foremost.SlackBuild
@@ -46,6 +46,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/gcc10.patch
+
 # Set the $ARCH variable for the Makefile.
 sed -i "s|-O2|$SLKCFLAGS|" Makefile
 # Set location of configuration file.
diff --git a/system/foremost/gcc10.patch b/system/foremost/gcc10.patch
new file mode 100644
index 0000000000..8506f59cf9
--- /dev/null
+++ b/system/foremost/gcc10.patch
@@ -0,0 +1,99 @@
+diff -up foremost-1.5.7/api.c.me foremost-1.5.7/api.c
+--- foremost-1.5.7/api.c.me	2020-02-06 14:15:48.218200745 +0100
++++ foremost-1.5.7/api.c	2020-02-06 14:16:42.624853860 +0100
+@@ -20,6 +20,7 @@ int				currFATblk;
+ int				highblk = 0;
+ int				block_list[OUR_BLK_SIZE / sizeof(int)];
+ extern int		errno;
++struct DIRECTORY *dirlist, *dl;
+ 
+ /*Inititialize those globals used by extract_ole*/
+ void init_ole()
+diff -up foremost-1.5.7/extract.c.me foremost-1.5.7/extract.c
+--- foremost-1.5.7/extract.c.me	2020-02-06 14:10:30.446386101 +0100
++++ foremost-1.5.7/extract.c	2020-02-06 14:15:14.736798823 +0100
+@@ -25,6 +25,7 @@ extern char *extract_name;
+ extern int	extract;
+ extern int	FATblk;
+ extern int	highblk;
++extern struct DIRECTORY *dirlist, *dl;
+ 
+ /********************************************************************************
+  *Function: extract_zip
+diff -up foremost-1.5.7/main.h.me foremost-1.5.7/main.h
+--- foremost-1.5.7/main.h.me	2020-02-06 13:48:46.923922983 +0100
++++ foremost-1.5.7/main.h	2020-02-06 13:50:08.001849830 +0100
+@@ -292,7 +292,7 @@ char *__progname;
+ /* -----------------------------------------------------------------
+    State Variable and Global Variables
+    ----------------------------------------------------------------- */
+-char wildcard;
++extern char wildcard;
+ typedef struct f_state 
+ {
+   off_t mode;
+@@ -344,7 +344,7 @@ typedef struct s_spec
+     int written; /*used for -a mode*/
+ }s_spec;
+ 
+-s_spec search_spec[50];  /*ARRAY OF BUILTIN SEARCH TYPES*/
++extern s_spec search_spec[50];  /*ARRAY OF BUILTIN SEARCH TYPES*/
+ 
+ typedef struct f_info {
+   char *file_name;
+@@ -367,7 +367,7 @@ typedef struct f_info {
+ } f_info;
+ 
+ /* Set if the user hits ctrl-c */
+-int signal_caught;
++extern int signal_caught;
+ 
+ /* -----------------------------------------------------------------
+    Function definitions
+@@ -433,7 +433,7 @@ off_t find_file_size(FILE *f);
+ char *human_readable(off_t size, char *buffer);
+ char *units(unsigned int c);
+ unsigned int chop(char *buf);
+-void print_search_specs(f_state *s);
++extern void print_search_specs(f_state *s);
+ int memwildcardcmp(const void *s1, const void *s2,size_t n,int caseSensitive);
+ int charactersMatch(char a, char b, int caseSensitive);
+ void printx(unsigned char* buf,int start, int end);
+diff -up foremost-1.5.7/ole.h.me foremost-1.5.7/ole.h
+--- foremost-1.5.7/ole.h.me	2020-02-06 14:08:16.524783353 +0100
++++ foremost-1.5.7/ole.h	2020-02-06 14:10:02.954056080 +0100
+@@ -84,8 +84,8 @@ struct DIRECTORY
+ 	int		s2;
+ 	int		d1;
+ 	int		d2;
+-}
+-*dirlist, *dl;
++};
++
+ 
+ int				get_dir_block(unsigned char *fd, int blknum, int buffersize);
+ int				get_dir_info(unsigned char *src);
+diff -up foremost-1.5.7/state.c.me foremost-1.5.7/state.c
+--- foremost-1.5.7/state.c.me	2020-02-06 14:06:44.514684887 +0100
++++ foremost-1.5.7/state.c	2020-02-06 14:08:03.329625827 +0100
+@@ -2,6 +2,9 @@
+ 
+ #include "main.h"
+ 
++s_spec search_spec[50];
++char wildcard;
++
+ int initialize_state (f_state * s, int argc, char **argv)
+ 	{
+ 	char	**argv_copy = argv;
+diff -up foremost-1.5.7/main.c.me foremost-1.5.7/main.c
+--- foremost-1.5.7/main.c.me	2020-02-06 14:20:09.918342282 +0100
++++ foremost-1.5.7/main.c	2020-02-06 14:20:42.531733786 +0100
+@@ -15,6 +15,7 @@
+  *
+  */
+ #include "main.h"
++int signal_caught;
+ 
+ #ifdef __WIN32
+ 
diff --git a/system/fuse3/README b/system/fuse3/README
deleted file mode 100644
index 533ab44440..0000000000
--- a/system/fuse3/README
+++ /dev/null
@@ -1,10 +0,0 @@
-fuse3 - Filesystem in Userspace, version 3
-
-FUSE (Filesystem in Userspace) is an interface for userspace programs to
-export a filesystem to the Linux kernel. The FUSE project consists of two
-components: the fuse kernel module (maintained in the regular kernel
-repositories) and the libfuse userspace library (maintained in this
-repository). libfuse provides the reference implementation for communicating
-with the FUSE kernel module.
-
-This ought not collide with the "fuse" package in stock slackware install.
diff --git a/system/fuse3/fuse3.info b/system/fuse3/fuse3.info
deleted file mode 100644
index de334d4735..0000000000
--- a/system/fuse3/fuse3.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="fuse3"
-VERSION="3.9.0"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-DOWNLOAD="https://github.com/libfuse/libfuse/releases/download/fuse-3.9.0/fuse-3.9.0.tar.xz"
-MD5SUM="5dc2be21c0d06c7eace340996e8a37e2"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="meson"
-MAINTAINER="Vincent Batts"
-EMAIL="vbatts@hashbanghbash.com"
diff --git a/system/fwupdate/fwupdate.SlackBuild b/system/fwupdate/fwupdate.SlackBuild
index 682bce6a05..5487906bf4 100644
--- a/system/fwupdate/fwupdate.SlackBuild
+++ b/system/fwupdate/fwupdate.SlackBuild
@@ -70,6 +70,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 {} \;
 
+sed -i "s|-Og|-Og -Wno-error=address-of-packed-member -Wno-error=pointer-sign|" \
+  {efi,linux}/Makefile
+
 # randomly fails with more than one thread
 make -j1 \
   EFIDIR=Slackware \
diff --git a/system/geoclue/geoclue.SlackBuild b/system/geoclue/geoclue.SlackBuild
index ce119daa39..5276a0cd02 100644
--- a/system/geoclue/geoclue.SlackBuild
+++ b/system/geoclue/geoclue.SlackBuild
@@ -82,7 +82,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-static=no \
   --enable-gtk=yes \
-  --enable-networkmanager=yes \
   --enable-skyhook=yes \
   --enable-gpsd=no \
   --build=$ARCH-slackware-linux
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/gnome-vfs/gnome-vfs.SlackBuild b/system/gnome-vfs/gnome-vfs.SlackBuild
index 2a2e087339..3b7809d74c 100644
--- a/system/gnome-vfs/gnome-vfs.SlackBuild
+++ b/system/gnome-vfs/gnome-vfs.SlackBuild
@@ -69,6 +69,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+patch -p0 < $CWD/openssl-1.1.patch
+
 # Fix for the newer glib
 sed -i "/-DG_DISABLE_DEPRECATED/d" */Makefile.*
 
diff --git a/system/gnome-vfs/openssl-1.1.patch b/system/gnome-vfs/openssl-1.1.patch
new file mode 100644
index 0000000000..14207f28d1
--- /dev/null
+++ b/system/gnome-vfs/openssl-1.1.patch
@@ -0,0 +1,26 @@
+$NetBSD: patch-libgnomevfs_gnome-vfs-ssl.c,v 1.1 2018/02/16 13:18:26 wiz Exp $
+
+struct SSL is opaque in openssl-1.1; and the SSL_free() man page
+says that one should not free members of it manually (in both
+the openssl-1.0 and openssl-1.1 man pages).
+
+--- libgnomevfs/gnome-vfs-ssl.c.orig	2010-02-09 12:16:14.000000000 +0000
++++ libgnomevfs/gnome-vfs-ssl.c
+@@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
+ 			}
+ 		}
+ 
+-                if (ssl->private->ssl->ctx)
+-                        SSL_CTX_free (ssl->private->ssl->ctx);
+-
+                 SSL_free (ssl->private->ssl);
+ 		g_free (ssl->private);
+ 		g_free (ssl);
+@@ -705,7 +702,6 @@ gnome_vfs_ssl_destroy (GnomeVFSSSL *ssl,
+ 		}
+ 	}
+ 	
+-	SSL_CTX_free (ssl->private->ssl->ctx);
+ 	SSL_free (ssl->private->ssl);
+ 	close (ssl->private->sockfd);
+ 	if (ssl->private->timeout)
diff --git a/system/gnomint/doinst.sh b/system/gnomint/doinst.sh
index bae04666ba..6d1bccdc33 100644
--- a/system/gnomint/doinst.sh
+++ b/system/gnomint/doinst.sh
@@ -6,9 +6,8 @@ if [ -x /usr/bin/update-mime-database ]; then
   /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
 
-if [ -x usr/bin/gconftool-2 ]; then
-  ( cd $PKG/etc/gconf/schemas
-  GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
-  usr/bin/gconftool-2 --makefile-install-rule \
-  etc/gconf/schemas/gnomint.schemas >/dev/null 2>&1 )
+if [ -e usr/share/glib-2.0/schemas ]; then
+  if [ -x /usr/bin/glib-compile-schemas ]; then
+    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+  fi
 fi
diff --git a/system/gnomint/gnomint.SlackBuild b/system/gnomint/gnomint.SlackBuild
index 9f043f0c90..7a4f44ca82 100644
--- a/system/gnomint/gnomint.SlackBuild
+++ b/system/gnomint/gnomint.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for gnomint
 
-# Copyright 2012-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2012-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=gnomint
 VERSION=${VERSION:-1.3.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -71,9 +71,10 @@ 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 {} \;
 
-cp Makefile.in m4/
+# Apply debian patches
+for i in $CWD/patches/* ; do patch -p1 -i $i ; done
 
-sed -i 's|CFLAGS="-Wall -Werror "|CFLAGS="${CFLAGS:--Wall -Werror}"|' configure.ac configure
+autoreconf -fi
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/system/gnomint/patches/01-ldd.patch b/system/gnomint/patches/01-ldd.patch
deleted file mode 100644
index 0f92419fb0..0000000000
--- a/system/gnomint/patches/01-ldd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Daniel Baumann <daniel@debian.org>
-Description: Explicitly linking against libgcrypt.
-
-diff -Naurp gnomint.orig/src/Makefile.in gnomint/src/Makefile.in
---- gnomint.orig/src/Makefile.in	2011-05-17 19:57:50.013883380 +0200
-+++ gnomint/src/Makefile.in	2011-05-17 19:57:37.209981808 +0200
-@@ -347,6 +347,7 @@ gnomint_cli_SOURCES = \
- 
- gnomint_cli_LDADD = \
- 	$(GNOMINTCLI_LIBS) \
-+	$(LIBGCRYPT_LIBS) \
- 	$(LIBGNUTLS_LIBS) \
- 	$(SQLITE_LIBS) \
- 	$(READLINE_LIBS) \
diff --git a/system/gnomint/patches/01_cflags.patch b/system/gnomint/patches/01_cflags.patch
new file mode 100644
index 0000000000..abf31b6357
--- /dev/null
+++ b/system/gnomint/patches/01_cflags.patch
@@ -0,0 +1,15 @@
+Author: Daniel Baumann <daniel@debian.org>
+Description:
+ Don't hardcode CFLAGS and respect the environment (Closes: #634395).
+
+--- gnomint-1.3.0.orig/configure.ac
++++ gnomint-1.3.0/configure.ac
+@@ -182,7 +182,7 @@
+ 
+ dnl
+ if test "x$GCC" = "xyes"; then
+-	CFLAGS="-Wall -Werror "
++	CFLAGS="${CFLAGS:--Wall}"
+ 	if test "x$use_debug" = "xYes"; then
+    	   CFLAGS="$CFLAGS -g -O0"
+ 	fi
diff --git a/system/gnomint/patches/02-cflags.patch b/system/gnomint/patches/02-cflags.patch
deleted file mode 100644
index 59e4f71943..0000000000
--- a/system/gnomint/patches/02-cflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: Daniel Baumann <daniel@debian.org>
-Description:
- Don't hardcode CFLAGS and respect the environemnt (Closes: #634395).
-
-diff -Naurp gnomint.orig/configure gnomint/configure
---- gnomint.orig/configure	2011-09-08 07:58:09.324752523 +0000
-+++ gnomint/configure	2011-09-08 07:59:20.113103539 +0000
-@@ -14338,7 +14338,7 @@ fi
- 
- 
- if test "x$GCC" = "xyes"; then
--	CFLAGS="-Wall -Werror"
-+	CFLAGS="${CFLAGS:--Wall -Werror}"
- 	if test "x$use_debug" = "xYes"; then
-    	   CFLAGS="$CFLAGS -g -O0"
- 	fi
-diff -Naurp gnomint.orig/configure.in gnomint/configure.in
---- gnomint.orig/configure.in	2011-09-08 07:58:09.328752536 +0000
-+++ gnomint/configure.in	2011-09-08 07:59:20.113103539 +0000
-@@ -181,7 +181,7 @@ dnl
- 
- dnl
- if test "x$GCC" = "xyes"; then
--	CFLAGS="-Wall -Werror"
-+	CFLAGS="${CFLAGS:--Wall -Werror}"
- 	if test "x$use_debug" = "xYes"; then
-    	   CFLAGS="$CFLAGS -g -O0"
- 	fi
diff --git a/system/gnomint/patches/02_682432.patch b/system/gnomint/patches/02_682432.patch
new file mode 100644
index 0000000000..96905965a9
--- /dev/null
+++ b/system/gnomint/patches/02_682432.patch
@@ -0,0 +1,16 @@
+Description: Fix double free in tls_creation_data_free.
+Author: Sebastian Ramacher <s.ramacher@gmx.at>
+Bug-Debian: http://bugs.debian.org/682432
+Last-Update: 2012-08-04
+
+--- gnomint-1.3.0.orig/src/tls.c
++++ gnomint-1.3.0/src/tls.c
+@@ -1665,8 +1665,6 @@
+ 		g_free (cd->emailAddress);
+ 	if (cd->password)
+ 		g_free (cd->password);
+-        if (cd->crl_distribution_point)
+-                g_free (cd->crl_distribution_point);
+         if (cd->parent_ca_id_str)
+                 g_free (cd->parent_ca_id_str);
+ 	if (cd->crl_distribution_point)
diff --git a/system/gnomint/patches/03_fix-autoreconf.patch b/system/gnomint/patches/03_fix-autoreconf.patch
new file mode 100644
index 0000000000..ee3a247889
--- /dev/null
+++ b/system/gnomint/patches/03_fix-autoreconf.patch
@@ -0,0 +1,16 @@
+Description: Fix autoreconf failure.
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2018-09-01
+---
+
+--- gnomint-1.3.0.orig/configure.ac
++++ gnomint-1.3.0/configure.ac
+@@ -198,7 +198,6 @@
+ AC_OUTPUT([
+ Makefile
+ src/Makefile
+-m4/Makefile
+ gui/Makefile
+ po/Makefile.in
+ mime/Makefile
diff --git a/system/gnomint/patches/04_gsettings-port.patch b/system/gnomint/patches/04_gsettings-port.patch
new file mode 100644
index 0000000000..5594012cd5
--- /dev/null
+++ b/system/gnomint/patches/04_gsettings-port.patch
@@ -0,0 +1,383 @@
+Description: Port to GSettings.
+Bug-Debian: https://bugs.debian.org/885817
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2019-10-15
+---
+
+--- gnomint-1.3.0.orig/configure.ac
++++ gnomint-1.3.0/configure.ac
+@@ -61,7 +61,6 @@
+ GNUTLS_ADVANCED_FEATURES_MINIMUM_VERSION=2.7.4
+ SQLITE_REQUIRED=3.0
+ GLIB_REQUIRED=2.6.0
+-GCONF_REQUIRED=2.0
+ GTK_REQUIRED=2.12.0
+ ISO_CODES_REQUIRED=0.35
+ 
+@@ -84,7 +83,6 @@
+ PKG_CHECK_MODULES(GNOMINT, 
+ 	glib-2.0 >= $GLIB_REQUIRED \
+ 	gthread-2.0 >= $GLIB_REQUIRED \
+-	gconf-2.0 >= $GCONF_REQUIRED \
+ 	gtk+-2.0 >= $GTK_REQUIRED \
+ 	gdk-pixbuf-2.0 \
+ 	gnutls >= $GNUTLS_REQUIRED \
+@@ -111,8 +109,7 @@
+ AC_SUBST(READLINE_LIBS)
+ 
+ PKG_CHECK_MODULES(GNOMINTCLI, 
+-	glib-2.0 >= $GLIB_REQUIRED \
+-	gconf-2.0 >= $GCONF_REQUIRED \
++	gio-2.0 >= $GLIB_REQUIRED \
+ 	gnutls >= $GNUTLS_REQUIRED \
+ )
+ AC_SUBST(GNOMINTCLI_CFLAGS)
+@@ -150,17 +147,7 @@
+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+ AC_SUBST(GLIB_GENMARSHAL)
+ 
+-dnl The following conditional is set in AM_GCONF_SOURCE_2.
+-dnl Because we may skip its execution, we have to set a default here.
+-m4_pattern_allow([^AM_GCONF_SOURCE_2$])
+-AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
+-GCONFTOOL=""
+-AC_CHECK_PROG(GCONFTOOL, gconftool-2, gconftool-2)
+-if test x"$GCONFTOOL" = x; then
+-	AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+-fi
+-AM_GCONF_SOURCE_2
+-
++GLIB_GSETTINGS
+ 
+ dnl
+ dnl Check if src should be build with the debug mode
+--- gnomint-1.3.0.orig/gconf/Makefile.am
++++ gnomint-1.3.0/gconf/Makefile.am
+@@ -1,21 +1,5 @@
+-schemasdir = @GCONF_SCHEMA_FILE_DIR@
+-schemas_in_files = gnomint.schemas.in
+-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
++gsettings_SCHEMAS = net.sf.gnomint.gschema.xml
+ 
+-@INTLTOOL_SCHEMAS_RULE@
++@GSETTINGS_RULES@
+ 
+-EXTRA_DIST = $(schemas_in_files)
+-
+-CLEANFILES = $(schemas_DATA)
+-
+-if GCONF_SCHEMAS_INSTALL
+-# don't do this if we are building in eg. rpm
+-install-data-local: $(schemas_DATA)
+-	if test -z "$(DESTDIR)" ; then \
+-		for p in $(schemas_DATA) ; do \
+-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \
+-		done \
+-	fi
+-else
+-install-data-local:
+-endif
++EXTRA_DIST = $(gsettings_SCHEMAS)
+--- gnomint-1.3.0.orig/src/preferences-gui.h
++++ gnomint-1.3.0/src/preferences-gui.h
+@@ -20,6 +20,8 @@
+ #ifndef _PREFERENCES_H_
+ #define _PREFERENCES_H_
+ 
++#include <gio/gio.h>
++
+ typedef void (* PreferencesGuiChangeCallback) (gboolean, gboolean);
+ 
+ void preferences_gui_set_csr_visible_callback (PreferencesGuiChangeCallback callback);
+@@ -43,10 +45,8 @@
+ void preferences_deinit (void);
+ 
+ 
+-#include <gconf/gconf-client.h>
+-void preferences_changed_callback(GConfClient* client,
+-                                  guint cnxn_id,
+-                                  GConfEntry *entry,
++void preferences_changed_callback(GSettings* settings,
++                                  gchar *key,
+                                   gpointer user_data);
+ 
+ 
+--- gnomint-1.3.0.orig/src/preferences-gui.c
++++ gnomint-1.3.0/src/preferences-gui.c
+@@ -18,7 +18,6 @@
+ //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+ #include <string.h>
+-#include <gconf/gconf-client.h>
+ 
+ 
+ #include "preferences-gui.h"
+@@ -26,7 +25,7 @@
+ #include <glib/gi18n.h>
+ 
+ 
+-static GConfClient * preferences_client;
++static GSettings * preferences;
+ 
+ PreferencesGuiChangeCallback csr_visible_callback = NULL;
+ PreferencesGuiChangeCallback revoked_visible_callback = NULL;
+@@ -42,18 +41,19 @@
+ }
+ 
+ 
+-void preferences_changed_callback(GConfClient* client,
+-                                  guint cnxn_id,
+-                                  GConfEntry *entry,
++void preferences_changed_callback(GSettings* settings,
++                                  gchar *key,
+                                   gpointer user_data)
+ {
+ 
+-        gboolean value = gconf_value_get_bool (gconf_entry_get_value(entry));
+-        if (! strcmp (gconf_entry_get_key(entry), "/apps/gnomint/crq_visible") && csr_visible_callback)
+-                csr_visible_callback (value, TRUE);
+-
+-        if (! strcmp (gconf_entry_get_key(entry), "/apps/gnomint/revoked_visible") && revoked_visible_callback)
+-                revoked_visible_callback (value, TRUE);
++        if (! strcmp (key, "crq-visible") && csr_visible_callback)
++                csr_visible_callback (g_settings_get_boolean (settings, key),
++                                      TRUE);
++
++        if (! strcmp (key, "revoked-visible") && revoked_visible_callback)
++                revoked_visible_callback (g_settings_get_boolean
++                                          (settings, key),
++                                          TRUE);
+ 
+ }
+ 
+@@ -61,72 +61,62 @@
+ 
+ void preferences_init (int argc, char ** argv)
+ {
+-        gconf_init(argc, argv, NULL);
+-        
+-        preferences_client = gconf_client_get_default();
+-
+-        gconf_client_add_dir(preferences_client,
+-                             "/apps/gnomint",
+-                             GCONF_CLIENT_PRELOAD_NONE,
+-                             NULL);
+-
+-        gconf_client_notify_add (preferences_client, "/apps/gnomint/revoked_visible",
+-                                 preferences_changed_callback,
+-                                 NULL, NULL, NULL);
+-
+-        gconf_client_notify_add (preferences_client, "/apps/gnomint/crq_visible",
+-                                 preferences_changed_callback,
+-                                 NULL, NULL, NULL);
+-
++        preferences = g_settings_new ("net.sf.gnomint");
+ 
++        g_signal_connect (preferences, "changed",
++                          G_CALLBACK (preferences_changed_callback), NULL);
+ }
+ 
+ 
+ gchar * preferences_get_size ()
+ {
+-        return gconf_client_get_string (preferences_client, "/apps/gnomint/size", NULL);
++        return g_settings_get_string (preferences, "size");
+ }
+ 
+ void preferences_set_size (const gchar *new_value)
+ {
+-        gconf_client_set_string (preferences_client, "/apps/gnomint/size", new_value, NULL);
++        g_settings_set_string (preferences, "size", new_value);
++        /* Make sure the backend manages to write the setting,
++           otherwise the program exits too quickly and a garbage value
++           gets written, leading to a crash on next startup.  */
++        g_settings_sync ();
+ }
+ 
+ 
+ gboolean preferences_get_revoked_visible ()
+ {
+-        return gconf_client_get_bool (preferences_client, "/apps/gnomint/revoked_visible", NULL);
++        return g_settings_get_boolean (preferences, "revoked-visible");
+ }
+ 
+ void preferences_set_revoked_visible (gboolean new_value)
+ {
+-        gconf_client_set_bool (preferences_client, "/apps/gnomint/revoked_visible", new_value, NULL);
++        g_settings_set_boolean (preferences, "revoked-visible", new_value);
+ }
+ 
+ gboolean preferences_get_crq_visible ()
+ {
+-        return gconf_client_get_bool (preferences_client, "/apps/gnomint/crq_visible", NULL);
++        return g_settings_get_boolean (preferences, "crq-visible");
+ }
+ 
+ void preferences_set_crq_visible (gboolean new_value)
+ {
+-        gconf_client_set_bool (preferences_client, "/apps/gnomint/crq_visible", new_value, NULL);
++        g_settings_set_boolean (preferences, "crq-visible", new_value);
+ }
+ 
+ gboolean preferences_get_gnome_keyring_export ()
+ {
+-        return gconf_client_get_bool (preferences_client, "/apps/gnomint/gnome_keyring_export", NULL);
++        return g_settings_get_boolean (preferences, "gnome-keyring-export");
+ }
+ 
+ void preferences_set_gnome_keyring_export (gboolean new_value)
+ {
+-        gconf_client_set_bool (preferences_client, "/apps/gnomint/gnome_keyring_export", new_value, NULL);
++        g_settings_set_boolean (preferences, "gnome-keyring-export", new_value);
+ }
+ 
+ 
+ void preferences_deinit ()
+ {
+-        g_object_unref (preferences_client);
+-        preferences_client = NULL;
++        g_object_unref (preferences);
++        preferences = NULL;
+ }
+ 
+--- gnomint-1.3.0.orig/src/preferences.c
++++ gnomint-1.3.0/src/preferences.c
+@@ -18,36 +18,35 @@
+ //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+ #include <libintl.h>
+-#include <gconf/gconf-client.h>
++#include <gio/gio.h>
+ 
+ #include <glib/gi18n.h>
+ 
+ #include "preferences.h"
+ 
+ 
+-static GConfEngine * preferences_engine;
++static GSettings * preferences;
+ 
+ void preferences_init (int argc, char **argv)
+ {
+-        gconf_init (argc, argv, NULL);
+-        preferences_engine = gconf_engine_get_default ();
++        preferences = g_settings_new ("net.sf.gnomint");
+ }
+ 
+ 
+ gboolean preferences_get_gnome_keyring_export ()
+ {
+-        return gconf_engine_get_bool (preferences_engine, "/apps/gnomint/gnome_keyring_export", NULL);
++        return g_settings_get_boolean (preferences, "gnome-keyring-export");
+ }
+ 
+ void preferences_set_gnome_keyring_export (gboolean new_value)
+ {
+-        gconf_engine_set_bool (preferences_engine, "/apps/gnomint/gnome_keyring_export", new_value, NULL);
++        g_settings_set_boolean (preferences, "gnome-keyring-export", new_value);
+ }
+ 
+ 
+ void preferences_deinit ()
+ {
+-        gconf_engine_unref (preferences_engine);
+-        preferences_engine = NULL;
++        g_object_unref (preferences);
++        preferences = NULL;
+ }
+ 
+--- gnomint-1.3.0.orig/gconf/gnomint.schemas.in
++++ /dev/null
+@@ -1,58 +0,0 @@
+-<gconfschemafile>
+-  <schemalist>
+-    <schema>
+-      <key>/schemas/apps/gnomint/size</key>
+-      <applyto>/apps/gnomint/size</applyto>
+-      <owner>gnomint</owner>
+-      <type>string</type>
+-      <default>(500,400)</default>
+-      <locale name="C">
+-        <short>Window size</short> <long>The (width,length) size
+-        gnoMint should take when started. This cannot be smaller than
+-        (320,200).
+-        </long>
+-      </locale>
+-    </schema>
+- 
+-    <schema>
+-      <key>/schemas/apps/gnomint/revoked_visible</key>
+-      <applyto>/apps/gnomint/revoked_visible</applyto>
+-      <owner>gnomint</owner>
+-      <type>bool</type>
+-      <default>0</default>
+-      <locale name="C">
+-        <short>Revoked certificates visibility</short>
+-        <long>Whether the revoked certificates should be visible.
+-        </long>
+-      </locale>
+-    </schema>
+-
+-    <schema>
+-      <key>/schemas/apps/gnomint/crq_visible</key>
+-      <applyto>/apps/gnomint/crq_visible</applyto>
+-      <owner>gnomint</owner>
+-      <type>bool</type>
+-      <default>1</default>
+-      <locale name="C">
+-        <short>Certificate requests visibility</short>
+-        <long>Whether the certificate requests should be visible.
+-        </long>
+-      </locale>
+-    </schema>
+-
+-    <schema>
+-      <key>/schemas/apps/gnomint/gnome_keyring_export</key>
+-      <applyto>/apps/gnomint/gnome_keyring_export</applyto>
+-      <owner>gnomint</owner>
+-      <type>bool</type>
+-      <default>1</default>
+-      <locale name="C">
+-        <short>Automatic exporting of certificates for gnome-keyring</short>
+-        <long>Whether the created or imported certificates are
+-        automatically exported to gnome-keyring certificate-store.
+-        </long>
+-      </locale>
+-    </schema>
+-
+-  </schemalist>
+-</gconfschemafile>
+--- /dev/null
++++ gnomint-1.3.0/gconf/net.sf.gnomint.gschema.xml
+@@ -0,0 +1,30 @@
++<schemalist gettext-domain="gnomint">
++  <schema id="net.sf.gnomint" path="/net/sf/gnomint/">
++    <key name="size" type="s">
++      <default>'(500,400)'</default>
++      <summary>Window size</summary>
++      <description>The (width,length) size gnoMint should take when
++      started. This cannot be smaller than (320,200).</description>
++    </key>
++    <key name="revoked-visible" type="b">
++      <default>false</default>
++      <summary>Revoked certificates visibility</summary>
++      <description>Whether the revoked certificates should be
++      visible.</description>
++    </key>
++    <key name="crq-visible" type="b">
++      <default>true</default>
++      <summary>Certificate requests visibility</summary>
++      <description>Whether the certificate requests should be
++      visible.</description>
++    </key>
++    <key name="gnome-keyring-export" type="b">
++      <default>true</default>
++      <summary>Automatic exporting of certificates for
++      gnome-keyring</summary>
++      <description>Whether the created or imported certificates are
++      automatically exported to gnome-keyring
++      certificate-store.</description>
++    </key>
++  </schema>
++</schemalist>
diff --git a/system/gnomint/patches/05_export-private-key-crash.patch b/system/gnomint/patches/05_export-private-key-crash.patch
new file mode 100644
index 0000000000..e0a3fd2bcb
--- /dev/null
+++ b/system/gnomint/patches/05_export-private-key-crash.patch
@@ -0,0 +1,83 @@
+Description: Fix crash when exporting the private key.
+ In ca_on_extractprivatekey1_activate, when calling
+ gtk_tree_model_get, GLib attempts to assign a guint64 value to a
+ variable declared gint (CA_MODEL_COLUMN_ID is defined as type
+ G_TYPE_UINT64 in the tree store).  This corrupts the stack and also
+ invalidates the iter.
+ .
+ While investigating this, I noticed that the program happily leaks
+ GtkTreeIter's.  Every time the user selects a certificate from the
+ tree view, the callback ca_treeview_selection_change invokes
+ __ca_selection_type which makes a copy of the iter with
+ gtk_tree_iter_copy.  If the user chooses some action from the popup
+ menu, the toolbar or the main menu, __ca_selection_type is called
+ once again in the widget's callback function, copying another iter.
+ AFAICT these are never freed for the lifetime of the program.
+ .
+ This is not addressed by the patch as it would require some changes,
+ but it could be a source of trouble and something to watch out if
+ bugs like this pop up.  According to the GTK+ API documentation,
+ gtk_tree_iter_copy is not supposed to be used by applications;
+ GtkTreeIter structs should be copied by value.
+Bug-Debian: https://bugs.debian.org/855200
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2018-09-02
+---
+
+--- gnomint-1.3.0.orig/src/ca.c
++++ gnomint-1.3.0/src/ca.c
+@@ -922,7 +922,7 @@
+ 	GObject *widget = NULL;
+ 	gchar * filename = NULL;
+ 	GtkDialog * dialog = NULL;
+-	gint id;
++	guint64 id;
+ 	gchar * strerror = NULL;
+ 
+ 	widget = gtk_builder_get_object (main_window_gtkb, "main_window1");
+@@ -973,7 +973,7 @@
+ 	GObject *widget = NULL;
+ 	gchar * filename = NULL;
+ 	GtkDialog * dialog = NULL;
+-	gint id;
++	guint64 id;
+         gchar * error_msg = NULL;
+ 
+ 	widget = gtk_builder_get_object (main_window_gtkb, "main_window1");
+@@ -1022,7 +1022,7 @@
+ 	GObject *widget = NULL;
+ 	gchar * filename = NULL;
+ 	GtkDialog * dialog = NULL;
+-	gint id;
++	guint64 id;
+ 
+         gchar *error_msg = NULL;
+ 
+@@ -1181,7 +1181,7 @@
+ 	GtkTreeIter *iter;	
+ 	gint type;
+ 	gchar *filename = NULL;
+-	gint id;
++	guint64 id;
+ 
+ 	type = __ca_selection_type (GTK_TREE_VIEW(gtk_builder_get_object (main_window_gtkb, "ca_treeview")), &iter);
+ 
+@@ -1212,7 +1212,7 @@
+ 	GtkTreeIter *iter;	
+ 	gint type = __ca_selection_type (GTK_TREE_VIEW(gtk_builder_get_object (main_window_gtkb, "ca_treeview")), &iter);
+ 	gint response = 0;
+-	gint id = 0;
++	guint64 id = 0;
+ 
+ 	if (type == CA_FILE_ELEMENT_TYPE_CSR)
+ 		return;
+@@ -1267,7 +1267,7 @@
+ 	GtkTreeIter *iter;	
+ 	gint type = __ca_selection_type (GTK_TREE_VIEW(gtk_builder_get_object (main_window_gtkb, "ca_treeview")), &iter);
+ 	gint response = 0;
+-	gint id = 0;
++	guint64 id = 0;
+ 
+ 	if (type != CA_FILE_ELEMENT_TYPE_CSR)
+ 		return;
diff --git a/system/gnomint/patches/06_desktop-file.patch b/system/gnomint/patches/06_desktop-file.patch
new file mode 100644
index 0000000000..a6b73b084a
--- /dev/null
+++ b/system/gnomint/patches/06_desktop-file.patch
@@ -0,0 +1,22 @@
+Description: Add code to Exec key, remove Encoding key, add Keywords key.
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2018-09-01
+---
+
+--- gnomint-1.3.0.orig/gui/gnomint.desktop.in
++++ gnomint-1.3.0/gui/gnomint.desktop.in
+@@ -2,11 +2,11 @@
+ _Name=gnoMint X.509 CA Manager
+ GenericName=gnoMint X.509 CA Manager
+ _Comment=Manage X.509 certificates and CAs, easily and graphically
+-Exec=gnomint
++_Keywords=certificate;x.509;encryption;
++Exec=gnomint %f
+ Terminal=false
+ Type=Application
+ Icon=gnomint
+ Categories=GNOME;Application;System;Security
+ MimeType=application/x-gnomint;
+ StartupNotify=true
+-Encoding=UTF-8
diff --git a/system/gnomint/patches/07_spelling-errors.patch b/system/gnomint/patches/07_spelling-errors.patch
new file mode 100644
index 0000000000..f0045bd61b
--- /dev/null
+++ b/system/gnomint/patches/07_spelling-errors.patch
@@ -0,0 +1,39 @@
+Description: Fix some spelling errors.
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2019-10-12
+---
+
+--- gnomint-1.3.0.orig/src/ca.c
++++ gnomint-1.3.0/src/ca.c
+@@ -978,7 +978,7 @@
+ 
+ 	widget = gtk_builder_get_object (main_window_gtkb, "main_window1");
+ 	
+-	dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export uncrypted private key"),
++	dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export unencrypted private key"),
+ 							  GTK_WINDOW(widget),
+ 							  GTK_FILE_CHOOSER_ACTION_SAVE,
+ 							  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+--- gnomint-1.3.0.orig/src/country_table.c
++++ gnomint-1.3.0/src/country_table.c
+@@ -520,7 +520,7 @@
+ 	country_table[i++].code = "VU";
+ 	country_table[i].name = D_("Venezuela");
+ 	country_table[i++].code = "VE";
+-	country_table[i].name = D_("Viet Nam");
++	country_table[i].name = D_("Vietnam");
+ 	country_table[i++].code = "VN";
+ 	country_table[i].name = D_("Virgin Islands, British");
+ 	country_table[i++].code = "VG";
+--- gnomint-1.3.0.orig/src/import.c
++++ gnomint-1.3.0/src/import.c
+@@ -82,7 +82,7 @@
+ 	printf (_("The whole selected file, or some of its elements, seems to\n"
+ 		  "be cyphered using a password or passphrase. For importing\n"
+ 		  "the file into gnoMint database, you must provide an \n"
+-		  "appropiate password.\n"));
++		  "appropriate password.\n"));
+ 
+ 	prompt = g_strdup_printf (_("Please introduce password for `%s'"), crypted_part_description);
+ 	password = dialog_ask_for_password (prompt);
diff --git a/system/gnomint/patches/08_gtk3-port.patch b/system/gnomint/patches/08_gtk3-port.patch
new file mode 100644
index 0000000000..62638dd1df
--- /dev/null
+++ b/system/gnomint/patches/08_gtk3-port.patch
@@ -0,0 +1,7655 @@
+Description: Port to GTK 3.
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2019-10-15
+---
+
+--- gnomint-1.3.0.orig/configure.ac
++++ gnomint-1.3.0/configure.ac
+@@ -60,8 +60,8 @@
+ GNUTLS_REQUIRED=2.0
+ GNUTLS_ADVANCED_FEATURES_MINIMUM_VERSION=2.7.4
+ SQLITE_REQUIRED=3.0
+-GLIB_REQUIRED=2.6.0
+-GTK_REQUIRED=2.12.0
++GLIB_REQUIRED=2.41.1
++GTK_REQUIRED=3.21.5
+ ISO_CODES_REQUIRED=0.35
+ 
+ 
+@@ -83,7 +83,7 @@
+ PKG_CHECK_MODULES(GNOMINT, 
+ 	glib-2.0 >= $GLIB_REQUIRED \
+ 	gthread-2.0 >= $GLIB_REQUIRED \
+-	gtk+-2.0 >= $GTK_REQUIRED \
++	gtk+-3.0 >= $GTK_REQUIRED \
+ 	gdk-pixbuf-2.0 \
+ 	gnutls >= $GNUTLS_REQUIRED \
+ )
+--- gnomint-1.3.0.orig/src/ca.c
++++ gnomint-1.3.0/src/ca.c
+@@ -821,15 +821,15 @@
+ 		dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export certificate"),
+ 								  GTK_WINDOW(widget),
+ 								  GTK_FILE_CHOOSER_ACTION_SAVE,
+-								  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-								  GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++								  _("_Cancel"), GTK_RESPONSE_CANCEL,
++								  _("_Save"), GTK_RESPONSE_ACCEPT,
+ 								  NULL));
+ 	else
+ 		dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export certificate signing request"),
+ 								  GTK_WINDOW(widget),
+ 								  GTK_FILE_CHOOSER_ACTION_SAVE,
+-								  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-								  GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++								  _("_Cancel"), GTK_RESPONSE_CANCEL,
++								  _("_Save"), GTK_RESPONSE_ACCEPT,
+ 								  NULL));
+ 		
+ 	gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+@@ -930,8 +930,8 @@
+ 	dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export crypted private key"),
+ 							  GTK_WINDOW(widget),
+ 							  GTK_FILE_CHOOSER_ACTION_SAVE,
+-							  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-							  GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++							  _("_Cancel"), GTK_RESPONSE_CANCEL,
++							  _("_Save"), GTK_RESPONSE_ACCEPT,
+ 							  NULL));
+ 		
+ 	gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+@@ -981,8 +981,8 @@
+ 	dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export unencrypted private key"),
+ 							  GTK_WINDOW(widget),
+ 							  GTK_FILE_CHOOSER_ACTION_SAVE,
+-							  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-							  GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++							  _("_Cancel"), GTK_RESPONSE_CANCEL,
++							  _("_Save"), GTK_RESPONSE_ACCEPT,
+ 							  NULL));
+         
+ 	gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+@@ -1032,8 +1032,8 @@
+ 			       (_("Export whole certificate in PKCS#12 package"),
+ 				GTK_WINDOW(widget),
+ 				GTK_FILE_CHOOSER_ACTION_SAVE,
+-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-				GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++				_("_Cancel"), GTK_RESPONSE_CANCEL,
++				_("_Save"), GTK_RESPONSE_ACCEPT,
+ 				NULL));
+ 	
+ 	gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+@@ -1422,8 +1422,8 @@
+ 		widget = gtk_builder_get_object (cert_popup_menu_gtkb, "revoke_menuitem");
+ 		gtk_widget_set_sensitive (GTK_WIDGET(widget), (! is_revoked));
+ 
+-		gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, 
+-				event_button->button, event_button->time);
++		gtk_menu_popup_at_pointer (GTK_MENU(menu),
++		                           (GdkEvent *)event_button);
+ 		return FALSE;
+ 	case CA_FILE_ELEMENT_TYPE_CSR:
+ 		menu = gtk_builder_get_object (csr_popup_menu_gtkb,
+@@ -1436,8 +1436,8 @@
+ 		widget = gtk_builder_get_object (csr_popup_menu_gtkb, "extract_pkey_menuitem3");
+ 		gtk_widget_set_sensitive (GTK_WIDGET(widget), pk_indb);
+ 		
+-		gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, 
+-				event_button->button, event_button->time);
++		gtk_menu_popup_at_pointer (GTK_MENU(menu),
++		                           (GdkEvent *)event_button);
+ 		return FALSE;
+ 	default:
+ 	case -1:
+@@ -1446,13 +1446,6 @@
+ 
+ }
+ 
+-void ca_treeview_popup_timeout_program (GdkEventButton *event)
+-{
+-	g_timeout_add (1, ca_treeview_popup_timeout_program_cb, event); 
+-
+-}
+-					
+-
+ G_MODULE_EXPORT gboolean ca_treeview_popup_handler (GtkTreeView *tree_view,
+ 				    GdkEvent *event, gpointer user_data)
+ {
+@@ -1464,7 +1457,7 @@
+ 
+ 		event_button = (GdkEventButton *) event;
+ 		if (event_button->button == 3) {
+-			ca_treeview_popup_timeout_program (event_button);
++			ca_treeview_popup_timeout_program_cb (event_button);
+ 		}
+ 	}
+ 	
+@@ -1775,8 +1768,8 @@
+ 	dialog2 = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Save Diffie-Hellman parameters"),
+ 							  GTK_WINDOW(widget),
+ 							  GTK_FILE_CHOOSER_ACTION_SAVE,
+-							  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-							  GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++							  _("_Cancel"), GTK_RESPONSE_CANCEL,
++							  _("_Save"), GTK_RESPONSE_ACCEPT,
+ 							  NULL));
+ 	gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog2), TRUE);
+ 	
+@@ -1871,8 +1864,8 @@
+                 dialog = gtk_file_chooser_dialog_new (_("Select PEM file to import"),
+                                                       GTK_WINDOW(main_window_widget),
+                                                       GTK_FILE_CHOOSER_ACTION_OPEN,
+-                                                      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-                                                      GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
++                                                      _("_Cancel"), GTK_RESPONSE_CANCEL,
++                                                      _("_Open"), GTK_RESPONSE_ACCEPT,
+                                                       NULL);
+                 
+                 if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+@@ -1905,8 +1898,8 @@
+                 dialog = gtk_file_chooser_dialog_new (_("Select directory to import"),
+                                                       GTK_WINDOW(main_window_widget),
+                                                       GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+-                                                      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-                                                      GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
++                                                      _("_Cancel"), GTK_RESPONSE_CANCEL,
++                                                      _("_Open"), GTK_RESPONSE_ACCEPT,
+                                                       NULL);
+                 
+                 if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+--- gnomint-1.3.0.orig/src/certificate_properties.c
++++ gnomint-1.3.0/src/certificate_properties.c
+@@ -242,7 +242,7 @@
+ 		for (i = g_list_length(cert->uses) - 1; i >= 0; i--) {
+ 			GtkLabel *label = NULL;
+ 			label = GTK_LABEL(gtk_label_new ((gchar *) g_list_nth_data (cert->uses, i)));
+-			gtk_misc_set_alignment (GTK_MISC(label), 0.0, 0.5);
++			gtk_label_set_xalign (label, 0.0);
+ 			gtk_box_pack_end (GTK_BOX(widget), GTK_WIDGET(label), 0, 0, 0);
+ 		}
+ 		gtk_widget_show_all (GTK_WIDGET(widget));
+--- gnomint-1.3.0.orig/src/creation_process_window.c
++++ gnomint-1.3.0/src/creation_process_window.c
+@@ -66,7 +66,7 @@
+ 	GtkWidget *dialog = NULL;
+ 	
+ 	g_thread_join (creation_process_window_thread);
+-	gtk_timeout_remove (timer);	       
++	g_source_remove (timer);
+ 	timer = 0;
+ 	
+ 	widget = gtk_builder_get_object (creation_process_window_gtkb, "creation_process_window");
+@@ -116,7 +116,7 @@
+ 		creation_process_window_ca_finish ();
+ 	} else if (status < 0) {
+ 		error_message = (gchar *) g_thread_join (creation_process_window_thread);
+-		gtk_timeout_remove (timer);	       
++		g_source_remove (timer);
+ 		timer = 0;
+ 		if (error_message) {
+ 			creation_process_window_error_dialog (error_message);
+@@ -165,7 +165,7 @@
+ 	GtkWidget *dialog, *widget;
+ 
+ 	if (timer) {
+-		gtk_timeout_remove (timer);	       
++		g_source_remove (timer);
+ 		timer = 0;
+ 	}
+    
+@@ -196,7 +196,7 @@
+ 	GtkWidget *widget = NULL, *dialog = NULL;
+ 	
+ 	g_thread_join (creation_process_window_thread);
+-	gtk_timeout_remove (timer);	       
++	g_source_remove (timer);
+ 	timer = 0;
+ 	
+ 	widget = GTK_WIDGET(gtk_builder_get_object (creation_process_window_gtkb, "creation_process_window"));
+@@ -242,7 +242,7 @@
+ 		creation_process_window_csr_finish ();
+ 	} else if (status < 0) {
+ 		error_message = (gchar *) g_thread_join (creation_process_window_thread);
+-		gtk_timeout_remove (timer);	       
++		g_source_remove (timer);
+ 		timer = 0;
+ 		if (error_message) {
+ 			creation_process_window_error_dialog (error_message);
+--- gnomint-1.3.0.orig/src/crl.c
++++ gnomint-1.3.0/src/crl.c
+@@ -213,7 +213,7 @@
+ G_MODULE_EXPORT void crl_cancel_clicked_cb (GtkButton *button, gpointer userdata)
+ {
+ 	GtkWidget * window = GTK_WIDGET(gtk_builder_get_object (crl_window_gtkb, "new_crl_dialog"));
+-        gtk_object_destroy(GTK_OBJECT(window));	
++        gtk_widget_destroy(window);
+ 
+ }
+ 
+@@ -241,8 +241,8 @@
+ 	dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export Certificate Revocation List"),
+ 							  GTK_WINDOW(widget),
+ 							  GTK_FILE_CHOOSER_ACTION_SAVE,
+-							  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-							  GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++							  _("_Cancel"), GTK_RESPONSE_CANCEL,
++							  _("_Save"), GTK_RESPONSE_ACCEPT,
+ 							  NULL));
+ 		
+ 	gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+@@ -274,7 +274,7 @@
+ 	gtk_widget_destroy (GTK_WIDGET(dialog));
+ 
+         dialog = GTK_DIALOG(gtk_builder_get_object (crl_window_gtkb, "new_crl_dialog"));
+-        gtk_object_destroy(GTK_OBJECT(dialog));	
++        gtk_widget_destroy(GTK_WIDGET(dialog));
+ 			
+ }
+ 
+--- gnomint-1.3.0.orig/src/main.c
++++ gnomint-1.3.0/src/main.c
+@@ -291,8 +291,8 @@
+ 	dialog = gtk_file_chooser_dialog_new (_("Create new CA database"),
+ 					      GTK_WINDOW(widget),
+ 					      GTK_FILE_CHOOSER_ACTION_SAVE,
+-					      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-					      GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
++					      _("_Cancel"), GTK_RESPONSE_CANCEL,
++					      _("_Open"), GTK_RESPONSE_ACCEPT,
+ 					      NULL);
+ 	gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+ 
+@@ -363,8 +363,8 @@
+ 	dialog = gtk_file_chooser_dialog_new (_("Open CA database"),
+ 					      GTK_WINDOW(widget),
+ 					      GTK_FILE_CHOOSER_ACTION_OPEN,
+-					      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-					      GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
++					      _("_Cancel"), GTK_RESPONSE_CANCEL,
++					      _("_Open"), GTK_RESPONSE_ACCEPT,
+ 					      NULL);
+ 	
+ 	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+@@ -451,8 +451,8 @@
+ 	dialog = gtk_file_chooser_dialog_new (_("Save CA database as..."),
+ 					      GTK_WINDOW(widget),
+ 					      GTK_FILE_CHOOSER_ACTION_SAVE,
+-					      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-					      GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
++					      _("_Cancel"), GTK_RESPONSE_CANCEL,
++					      _("_Open"), GTK_RESPONSE_ACCEPT,
+ 					      NULL);
+ 	gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+ 	
+@@ -490,14 +490,19 @@
+ {
+ 	
+ 	GtkWidget *widget;
+-	gchar *authors[2];
++	GdkPixbuf *logo;
++	gchar **authors;
++	gchar *file;
+ 	
+ 	widget = GTK_WIDGET(gtk_builder_get_object (main_window_gtkb, "main_window"));
+ 
+-	authors[0] = PACKAGE_AUTHORS;
+-	authors[1] = NULL;
++	authors = g_strsplit (PACKAGE_AUTHORS, "\n", -1);
++	file = g_build_filename (PACKAGE_DATA_DIR, "gnomint",
++	                         "gnomint.png", NULL);
++	logo = gdk_pixbuf_new_from_file (file, NULL);
+ 	
+ 	gtk_show_about_dialog (GTK_WINDOW(widget), 
++			       "logo", logo,
+ 			       "version", PACKAGE_VERSION, 
+ 			       "copyright", PACKAGE_COPYRIGHT,
+ 			       "comments", _("gnoMint is a program for creating and managing Certification Authorities, and their certificates"),
+@@ -507,4 +512,7 @@
+ 			       "authors", authors, 
+ 			       "translator_credits", _("translator-credits"),
+ 			       NULL); 
++	g_object_unref (logo);
++	g_strfreev (authors);
++	g_free (file);
+ }
+--- gnomint-1.3.0.orig/src/new_ca_window.c
++++ gnomint-1.3.0/src/new_ca_window.c
+@@ -129,7 +129,7 @@
+ 	
+ 	GtkWindow *window = GTK_WINDOW(gtk_builder_get_object (new_ca_window_gtkb, "new_ca_window"));
+ 
+-	gtk_object_destroy(GTK_OBJECT(window));
++	gtk_widget_destroy(GTK_WIDGET(window));
+ 	
+ }
+ 
+@@ -299,7 +299,7 @@
+         }
+ 
+ 	window = GTK_WINDOW(gtk_builder_get_object (new_ca_window_gtkb, "new_ca_window"));
+-	gtk_object_destroy(GTK_OBJECT(window));
++	gtk_widget_destroy(GTK_WIDGET(window));
+ 
+ 	creation_process_window_ca_display (ca_creation_data);
+ 	
+--- gnomint-1.3.0.orig/src/new_cert.c
++++ gnomint-1.3.0/src/new_cert.c
+@@ -456,7 +456,7 @@
+ 			       gpointer user_data) 
+ {
+ 	GtkWidget * window = GTK_WIDGET(gtk_builder_get_object (new_cert_window_gtkb, "new_cert_window"));
+-        gtk_object_destroy(GTK_OBJECT(window));	
++        gtk_widget_destroy(window);
+ 	
+ }
+ 
+@@ -743,7 +743,7 @@
+ 	}
+ 
+ 	widget = G_OBJECT(gtk_builder_get_object (new_cert_window_gtkb, "new_cert_window"));
+-        gtk_object_destroy(GTK_OBJECT(widget));	
++        gtk_widget_destroy(GTK_WIDGET(widget));
+ 
+ 	dialog_refresh_list();
+ 
+--- gnomint-1.3.0.orig/src/new_req_window.c
++++ gnomint-1.3.0/src/new_req_window.c
+@@ -410,7 +410,7 @@
+ 	
+ 	GtkWindow *window = GTK_WINDOW(gtk_builder_get_object (new_req_window_gtkb, "new_req_window"));
+ 
+-	gtk_object_destroy(GTK_OBJECT(window));
++	gtk_widget_destroy(GTK_WIDGET(window));
+ 	
+ }
+ 
+@@ -498,7 +498,7 @@
+         }
+ 
+ 	window = GTK_WINDOW(gtk_builder_get_object (new_req_window_gtkb, "new_req_window"));
+-	gtk_object_destroy(GTK_OBJECT(window));
++	gtk_widget_destroy(GTK_WIDGET(window));
+ 
+ 	creation_process_window_csr_display (csr_creation_data);	
+ 
+--- gnomint-1.3.0.orig/gui/certificate_popup_menu.ui
++++ gnomint-1.3.0/gui/certificate_popup_menu.ui
+@@ -1,45 +1,50 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkMenu" id="certificate_popup_menu">
+     <property name="visible">True</property>
++    <property name="can_focus">False</property>
+     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+     <child>
+       <object class="GtkImageMenuItem" id="cert_properties_menuitem">
+         <property name="label">gtk-properties</property>
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+         <property name="has_tooltip">True</property>
+         <property name="tooltip_markup">Shows the certificate properties window</property>
+         <property name="tooltip_text" translatable="yes">Shows the certificate properties window</property>
+         <property name="use_underline">True</property>
+         <property name="use_stock">True</property>
+-        <signal name="activate" handler="on_properties1_activate"/>
++        <signal name="activate" handler="on_properties1_activate" swapped="no"/>
+       </object>
+     </child>
+     <child>
+       <object class="GtkSeparatorMenuItem" id="sep_menuitem5">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+       </object>
+     </child>
+     <child>
+       <object class="GtkImageMenuItem" id="cert_export_menuitem">
+         <property name="label" translatable="yes">E_xport</property>
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+         <property name="has_tooltip">True</property>
+         <property name="tooltip_markup">Exports the certificate so it can be imported by any other application</property>
+         <property name="tooltip_text" translatable="yes">Exports the certificate so it can be imported by any other application</property>
+         <property name="use_underline">True</property>
+         <property name="use_stock">False</property>
+-        <signal name="activate" handler="ca_on_export1_activate"/>
++        <signal name="activate" handler="ca_on_export1_activate" swapped="no"/>
+       </object>
+     </child>
+     <child>
+       <object class="GtkImageMenuItem" id="extract_pkey_menuitem">
+         <property name="label" translatable="yes">Extrac_t private key</property>
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+         <property name="has_tooltip">True</property>
+         <property name="tooltip_markup">Extracts the private key of the selected 
+@@ -52,25 +57,27 @@
+ each time the certificate will be used</property>
+         <property name="use_underline">True</property>
+         <property name="use_stock">False</property>
+-        <signal name="activate" handler="ca_on_extractprivatekey1_activate"/>
++        <signal name="activate" handler="ca_on_extractprivatekey1_activate" swapped="no"/>
+       </object>
+     </child>
+     <child>
+       <object class="GtkSeparatorMenuItem" id="sep_menuitem6">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+       </object>
+     </child>
+     <child>
+       <object class="GtkImageMenuItem" id="revoke_menuitem">
+         <property name="label" translatable="yes">Revo_ke</property>
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+         <property name="has_tooltip">True</property>
+         <property name="tooltip_markup">Revokes the selected certificate</property>
+         <property name="tooltip_text" translatable="yes">Revokes the selected certificate</property>
+         <property name="use_underline">True</property>
+         <property name="use_stock">False</property>
+-        <signal name="activate" handler="ca_on_revoke_activate"/>
++        <signal name="activate" handler="ca_on_revoke_activate" swapped="no"/>
+       </object>
+     </child>
+   </object>
+--- gnomint-1.3.0.orig/gui/certificate_properties_dialog.ui
++++ gnomint-1.3.0/gui/certificate_properties_dialog.ui
+@@ -1,547 +1,549 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
+-  <object class="GtkAdjustment" id="AdjustmentHoursBetweenCRLUpdates">
+-    <property name="value">24</property>
+-    <property name="lower">1</property>
+-    <property name="upper">8760</property>
+-    <property name="step_increment">24</property>
+-    <property name="page_increment">168</property>
+-  </object>
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkAdjustment" id="AdjustmentCertMonthsBeforeExpiration">
+-    <property name="value">60</property>
+     <property name="lower">1</property>
+     <property name="upper">600</property>
++    <property name="value">60</property>
+     <property name="step_increment">1</property>
+     <property name="page_increment">12</property>
+   </object>
++  <object class="GtkAdjustment" id="AdjustmentHoursBetweenCRLUpdates">
++    <property name="lower">1</property>
++    <property name="upper">8760</property>
++    <property name="value">24</property>
++    <property name="step_increment">24</property>
++    <property name="page_increment">168</property>
++  </object>
+   <object class="GtkWindow" id="certificate_properties_dialog">
++    <property name="can_focus">False</property>
+     <property name="title" translatable="yes">Certificate properties - gnoMint</property>
+     <property name="modal">True</property>
+     <property name="window_position">center</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+     <child>
+-      <object class="GtkVBox" id="vbox4">
++      <placeholder/>
++    </child>
++    <child>
++      <object class="GtkBox" id="vbox4">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
++        <property name="orientation">vertical</property>
+         <child>
+           <object class="GtkNotebook" id="notebook2">
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+             <property name="border_width">5</property>
+             <child>
+-              <object class="GtkVBox" id="vbox6">
++              <object class="GtkBox" id="vbox6">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="border_width">5</property>
++                <property name="orientation">vertical</property>
+                 <child>
+-                  <object class="GtkVBox" id="vboxCertCapabilities">
++                  <object class="GtkBox" id="vboxCertCapabilities">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="border_width">5</property>
++                    <property name="orientation">vertical</property>
+                     <property name="spacing">5</property>
+                     <child>
+                       <object class="GtkLabel" id="label1">
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">&lt;b&gt;This certificate has been verified for the following uses:&lt;/b&gt;</property>
+                         <property name="use_markup">True</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">0</property>
+                       </object>
+                       <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">True</property>
+                         <property name="position">0</property>
+                       </packing>
+                     </child>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">0</property>
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkHSeparator" id="certPropSeparator"/>
++                  <object class="GtkSeparator" id="certPropSeparator">
++                    <property name="can_focus">False</property>
++                  </object>
+                   <packing>
+                     <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">1</property>
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkTable" id="table6">
++                  <object class="GtkGrid" id="table6">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="border_width">5</property>
+-                    <property name="n_rows">17</property>
+-                    <property name="n_columns">2</property>
+                     <property name="column_spacing">10</property>
+                     <child>
+                       <object class="GtkLabel" id="md5Label">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">MD5FINGERPRINT</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">MD5FINGERPRINT</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">14</property>
+-                        <property name="bottom_attach">15</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="sha1Label">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">SHA1FINGERPRINT</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">SHA1FINGERPRINT</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">13</property>
+-                        <property name="bottom_attach">14</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label22">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes"> </property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes"> </property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">12</property>
+-                        <property name="bottom_attach">13</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="certExpirationDateLabel">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">CertExpirationDate</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">CertExpirationDate</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">11</property>
+-                        <property name="bottom_attach">12</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="certActivationDateLabel">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">CertActivationDate</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">CertActivationDate</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">10</property>
+-                        <property name="bottom_attach">11</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label29">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes"> </property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes"> </property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">9</property>
+-                        <property name="bottom_attach">10</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="certIssuerOULabel">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">CAOU</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">CAOU</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">8</property>
+-                        <property name="bottom_attach">9</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="certIssuerOLabel">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">CAO</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">CAO</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">7</property>
+-                        <property name="bottom_attach">8</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="certIssuerCNLabel">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">CACN</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">CACN</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">6</property>
+-                        <property name="bottom_attach">7</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label33">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes"> </property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes"> </property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">5</property>
+-                        <property name="bottom_attach">6</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="certSNLabel">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">CertSN</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">CertSN</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">4</property>
+-                        <property name="bottom_attach">5</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="certSubjectOULabel">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">SubjectOU</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">SubjectOU</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">3</property>
+-                        <property name="bottom_attach">4</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="certSubjectOLabel">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">SubjectO</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">SubjectO</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">2</property>
+-                        <property name="bottom_attach">3</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="certSubjectCNLabel">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">SubjectCN</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">SubjectCN</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">1</property>
+-                        <property name="bottom_attach">2</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label38">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes"> </property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes"> </property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
++                        <property name="top_attach">0</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label39">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">MD5 fingerprint</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">MD5 fingerprint</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">14</property>
+-                        <property name="bottom_attach">15</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label40">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">SHA1 fingerprint</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">SHA1 fingerprint</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">13</property>
+-                        <property name="bottom_attach">14</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label41">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">1</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Fingerprints&lt;/b&gt;</property>
+                         <property name="use_markup">True</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">1</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">12</property>
+-                        <property name="bottom_attach">13</property>
+-                        <property name="x_options">GTK_FILL</property>
+-                        <property name="y_padding">7</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label42">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Expires on</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Expires on</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">11</property>
+-                        <property name="bottom_attach">12</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label43">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Activated on</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Activated on</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">10</property>
+-                        <property name="bottom_attach">11</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label44">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">1</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Validity&lt;/b&gt;</property>
+                         <property name="use_markup">True</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">1</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">9</property>
+-                        <property name="bottom_attach">10</property>
+-                        <property name="x_options">GTK_FILL</property>
+-                        <property name="y_padding">7</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label45">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Organizational Unit (OU)</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Organizational Unit (OU)</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">8</property>
+-                        <property name="bottom_attach">9</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label73">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Organization (O)</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Organization (O)</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">7</property>
+-                        <property name="bottom_attach">8</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label74">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Common Name (CN)</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Common Name (CN)</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">6</property>
+-                        <property name="bottom_attach">7</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label75">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">1</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Emmited by&lt;/b&gt;</property>
+                         <property name="use_markup">True</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">1</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">5</property>
+-                        <property name="bottom_attach">6</property>
+-                        <property name="x_options">GTK_FILL</property>
+-                        <property name="y_padding">7</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label76">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Serial number</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Serial number</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">4</property>
+-                        <property name="bottom_attach">5</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label77">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Organizational Unit (OU)</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Organizational Unit (OU)</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">3</property>
+-                        <property name="bottom_attach">4</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label78">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Organization (O)</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Organization (O)</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">2</property>
+-                        <property name="bottom_attach">3</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label79">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Common Name (CN)</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Common Name (CN)</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">1</property>
+-                        <property name="bottom_attach">2</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label80">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">1</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Certificate subject&lt;/b&gt;</property>
+                         <property name="use_markup">True</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">1</property>
+                       </object>
+                       <packing>
+-                        <property name="x_options">GTK_FILL</property>
+-                        <property name="y_padding">7</property>
++                        <property name="left_attach">0</property>
++                        <property name="top_attach">0</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="sha256Label">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">SHA256FINGERPRINT</property>
+                         <property name="wrap">True</property>
+                         <property name="wrap_mode">char</property>
+                         <property name="width_chars">60</property>
++                        <property name="max_width_chars">60</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">0</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">15</property>
+-                        <property name="bottom_attach">16</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label4">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">SHA256 fingerprint</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">SHA256 fingerprint</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">15</property>
+-                        <property name="bottom_attach">16</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="sha512Label">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">SHA512FINGERPRINT</property>
+                         <property name="wrap">True</property>
+                         <property name="wrap_mode">char</property>
+                         <property name="width_chars">60</property>
++                        <property name="max_width_chars">60</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">0</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">16</property>
+-                        <property name="bottom_attach">17</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label5">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">SHA512 fingerprint</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">SHA512 fingerprint</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">16</property>
+-                        <property name="bottom_attach">17</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+-		    
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">2</property>
+                   </packing>
+                 </child>
+@@ -550,59 +552,68 @@
+             <child type="tab">
+               <object class="GtkLabel" id="label81">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">General</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0</property>
+-                <property name="label" translatable="yes">General</property>
+               </object>
+               <packing>
+                 <property name="tab_fill">False</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkVBox" id="vbox13">
++              <object class="GtkBox" id="vbox13">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="border_width">10</property>
++                <property name="orientation">vertical</property>
+                 <property name="spacing">5</property>
+                 <child>
+                   <object class="GtkLabel" id="label82">
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">&lt;b&gt;Certificate hierarchy&lt;/b&gt;</property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkScrolledWindow" id="scrolledwindow1">
+                     <property name="can_focus">True</property>
+-                    <property name="hscrollbar_policy">automatic</property>
+-                    <property name="vscrollbar_policy">automatic</property>
+                     <property name="shadow_type">in</property>
+                     <child>
+                       <object class="GtkTreeView" id="treeview3">
+                         <property name="can_focus">True</property>
+                         <property name="headers_visible">False</property>
++                        <child internal-child="selection">
++                          <object class="GtkTreeSelection"/>
++                        </child>
+                       </object>
+                     </child>
+                   </object>
+                   <packing>
+-                    <property name="expand">False</property>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
+                     <property name="position">1</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label83">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">&lt;b&gt;Certificate fields&lt;/b&gt;</property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">2</property>
+                   </packing>
+                 </child>
+@@ -610,18 +621,21 @@
+                   <object class="GtkScrolledWindow" id="scrolledwindow4">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="hscrollbar_policy">automatic</property>
+-                    <property name="vscrollbar_policy">automatic</property>
+                     <property name="shadow_type">in</property>
+                     <child>
+                       <object class="GtkTreeView" id="certTreeView">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="headers_visible">False</property>
++                        <child internal-child="selection">
++                          <object class="GtkTreeSelection"/>
++                        </child>
+                       </object>
+                     </child>
+                   </object>
+                   <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
+                     <property name="position">3</property>
+                   </packing>
+                 </child>
+@@ -633,9 +647,10 @@
+             <child type="tab">
+               <object class="GtkLabel" id="label85">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">Details</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0</property>
+-                <property name="label" translatable="yes">Details</property>
+               </object>
+               <packing>
+                 <property name="position">1</property>
+@@ -643,22 +658,30 @@
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkVBox" id="vbox19">
++              <object class="GtkBox" id="vbox19">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="orientation">vertical</property>
+                 <child>
+                   <object class="GtkLabel" id="label35">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
+-                    <property name="xpad">5</property>
++                    <property name="can_focus">False</property>
++                    <property name="margin_start">5</property>
++                    <property name="margin_end">5</property>
+                     <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;
+-It is recommended that all the certificates generated by a CA share the same properties.
+-If you want to generate certificates with different properties, you should create a hierarchy of CAs, each one with its own policy for certificate generation.&lt;/i&gt;
++It is recommended that all the certificates generated by a CA
++share the same properties.
++If you want to generate certificates with different properties, you
++should create a hierarchy of CAs, each one with its own policy for
++certificate generation.&lt;/i&gt;
+ &lt;/small&gt;
+-Please, define the maximum set of properties for the certificates that this CA will be able to generate:
++Please, define the maximum set of properties for the
++certificates that this CA will be able to generate:
+ </property>
+                     <property name="use_markup">True</property>
+                     <property name="wrap">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -667,18 +690,23 @@
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkHBox" id="hbox6">
++                  <object class="GtkBox" id="hbox6">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="border_width">8</property>
+                     <child>
+                       <object class="GtkLabel" id="label36">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Maximum number of months before
++expiration of the new generated certificates:</property>
++                        <property name="wrap">True</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Maximum number of months before expiration of the new generated certificates:</property>
+-                        <property name="wrap">True</property>
+                       </object>
+                       <packing>
++                        <property name="expand">True</property>
++                        <property name="fill">True</property>
+                         <property name="position">0</property>
+                       </packing>
+                     </child>
+@@ -686,13 +714,15 @@
+                       <object class="GtkSpinButton" id="months_before_expiration_spinbutton2">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+-                        <property name="invisible_char">&#x2022;</property>
++                        <property name="invisible_char">•</property>
+                         <property name="adjustment">AdjustmentCertMonthsBeforeExpiration</property>
+                         <property name="climb_rate">1</property>
+                         <property name="numeric">True</property>
+-                        <signal name="value_changed" handler="ca_policy_expiration_spin_button_change"/>
++                        <signal name="value-changed" handler="ca_policy_expiration_spin_button_change" swapped="no"/>
+                       </object>
+                       <packing>
++                        <property name="expand">True</property>
++                        <property name="fill">True</property>
+                         <property name="position">1</property>
+                       </packing>
+                     </child>
+@@ -709,20 +739,26 @@
+                     <property name="can_focus">True</property>
+                     <property name="border_width">4</property>
+                     <child>
+-                      <object class="GtkVBox" id="vbox1">
++                      <object class="GtkBox" id="vbox1">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="orientation">vertical</property>
+                         <child>
+-                          <object class="GtkHBox" id="hbox7">
++                          <object class="GtkBox" id="hbox7">
+                             <property name="visible">True</property>
++                            <property name="can_focus">False</property>
+                             <property name="border_width">8</property>
+                             <child>
+                               <object class="GtkLabel" id="label24">
+                                 <property name="visible">True</property>
+-                                <property name="xalign">0</property>
++                                <property name="can_focus">False</property>
+                                 <property name="label" translatable="yes">Hours between CRL updates:</property>
+                                 <property name="wrap">True</property>
++                                <property name="xalign">0</property>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">0</property>
+                               </packing>
+                             </child>
+@@ -730,32 +766,41 @@
+                               <object class="GtkSpinButton" id="hours_between_crl_updates_spinbutton">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">True</property>
+-                                <property name="invisible_char">&#x2022;</property>
++                                <property name="invisible_char">•</property>
+                                 <property name="adjustment">AdjustmentHoursBetweenCRLUpdates</property>
+                                 <property name="climb_rate">1</property>
+                                 <property name="numeric">True</property>
+-                                <signal name="value_changed" handler="ca_policy_crl_update_spin_button_change"/>
++                                <signal name="value-changed" handler="ca_policy_crl_update_spin_button_change" swapped="no"/>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">1</property>
+                               </packing>
+                             </child>
+                           </object>
+                           <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">True</property>
+                             <property name="position">0</property>
+                           </packing>
+                         </child>
+                         <child>
+-                          <object class="GtkVBox" id="vbox2">
++                          <object class="GtkBox" id="vbox2">
+                             <property name="visible">True</property>
++                            <property name="can_focus">False</property>
+                             <property name="border_width">9</property>
++                            <property name="orientation">vertical</property>
+                             <child>
+                               <object class="GtkLabel" id="label3">
+                                 <property name="visible">True</property>
+-                                <property name="xalign">0</property>
++                                <property name="can_focus">False</property>
+                                 <property name="label" translatable="yes">CRL distribution URL:</property>
++                                <property name="xalign">0</property>
+                               </object>
+                               <packing>
++                                <property name="expand">True</property>
++                                <property name="fill">True</property>
+                                 <property name="position">0</property>
+                               </packing>
+                             </child>
+@@ -763,8 +808,8 @@
+                               <object class="GtkEntry" id="crl_distribution_point_entry">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">True</property>
+-                                <property name="invisible_char">&#x2022;</property>
+-                                <signal name="changed" handler="ca_policy_crl_distribution_point_change"/>
++                                <property name="invisible_char">•</property>
++                                <signal name="changed" handler="ca_policy_crl_distribution_point_change" swapped="no"/>
+                               </object>
+                               <packing>
+                                 <property name="expand">False</property>
+@@ -774,6 +819,8 @@
+                             </child>
+                           </object>
+                           <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">True</property>
+                             <property name="position">1</property>
+                           </packing>
+                         </child>
+@@ -782,6 +829,7 @@
+                     <child type="label">
+                       <object class="GtkLabel" id="label2">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">&lt;b&gt;CRL Properties&lt;/b&gt;</property>
+                         <property name="use_markup">True</property>
+                       </object>
+@@ -799,11 +847,10 @@
+                     <property name="can_focus">True</property>
+                     <property name="border_width">4</property>
+                     <child>
+-                      <object class="GtkTable" id="table7">
++                      <object class="GtkGrid" id="table7">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="border_width">10</property>
+-                        <property name="n_rows">5</property>
+-                        <property name="n_columns">2</property>
+                         <child>
+                           <object class="GtkCheckButton" id="country_inherited_check">
+                             <property name="label" translatable="yes">Country</property>
+@@ -812,8 +859,12 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
++                          <packing>
++                            <property name="left_attach">0</property>
++                            <property name="top_attach">0</property>
++                          </packing>
+                         </child>
+                         <child>
+                           <object class="GtkCheckButton" id="state_inherited_check">
+@@ -823,16 +874,17 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
++                            <property name="left_attach">0</property>
+                             <property name="top_attach">1</property>
+-                            <property name="bottom_attach">2</property>
+                           </packing>
+                         </child>
+                         <child>
+-                          <object class="GtkHBox" id="hbox4">
++                          <object class="GtkBox" id="hbox4">
+                             <property name="visible">True</property>
++                            <property name="can_focus">False</property>
+                             <child>
+                               <object class="GtkRadioButton" id="country_same_radiobutton">
+                                 <property name="label" translatable="yes">must be the same</property>
+@@ -842,9 +894,11 @@
+                                 <property name="receives_default">False</property>
+                                 <property name="draw_indicator">True</property>
+                                 <property name="group">country_differ_radiobutton</property>
+-                                <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                                <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">0</property>
+                               </packing>
+                             </child>
+@@ -859,18 +913,21 @@
+                                 <property name="draw_indicator">True</property>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">1</property>
+                               </packing>
+                             </child>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
++                            <property name="top_attach">0</property>
+                           </packing>
+                         </child>
+                         <child>
+-                          <object class="GtkHBox" id="hbox8">
++                          <object class="GtkBox" id="hbox8">
+                             <property name="visible">True</property>
++                            <property name="can_focus">False</property>
+                             <child>
+                               <object class="GtkRadioButton" id="state_same_radiobutton">
+                                 <property name="label" translatable="yes">must be the same</property>
+@@ -880,9 +937,11 @@
+                                 <property name="receives_default">False</property>
+                                 <property name="draw_indicator">True</property>
+                                 <property name="group">state_differ_radiobutton</property>
+-                                <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                                <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">0</property>
+                               </packing>
+                             </child>
+@@ -897,15 +956,15 @@
+                                 <property name="draw_indicator">True</property>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">1</property>
+                               </packing>
+                             </child>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
+                             <property name="top_attach">1</property>
+-                            <property name="bottom_attach">2</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -916,11 +975,11 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
++                            <property name="left_attach">0</property>
+                             <property name="top_attach">2</property>
+-                            <property name="bottom_attach">3</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -931,11 +990,11 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
++                            <property name="left_attach">0</property>
+                             <property name="top_attach">3</property>
+-                            <property name="bottom_attach">4</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -946,16 +1005,17 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
++                            <property name="left_attach">0</property>
+                             <property name="top_attach">4</property>
+-                            <property name="bottom_attach">5</property>
+                           </packing>
+                         </child>
+                         <child>
+-                          <object class="GtkHBox" id="hbox24">
++                          <object class="GtkBox" id="hbox24">
+                             <property name="visible">True</property>
++                            <property name="can_focus">False</property>
+                             <child>
+                               <object class="GtkRadioButton" id="city_same_radiobutton">
+                                 <property name="label" translatable="yes">must be the same</property>
+@@ -965,9 +1025,11 @@
+                                 <property name="receives_default">False</property>
+                                 <property name="draw_indicator">True</property>
+                                 <property name="group">city_differ_radiobutton</property>
+-                                <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                                <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">0</property>
+                               </packing>
+                             </child>
+@@ -982,20 +1044,21 @@
+                                 <property name="draw_indicator">True</property>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">1</property>
+                               </packing>
+                             </child>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
+                             <property name="top_attach">2</property>
+-                            <property name="bottom_attach">3</property>
+                           </packing>
+                         </child>
+                         <child>
+-                          <object class="GtkHBox" id="hbox25">
++                          <object class="GtkBox" id="hbox25">
+                             <property name="visible">True</property>
++                            <property name="can_focus">False</property>
+                             <child>
+                               <object class="GtkRadioButton" id="organization_same_radiobutton">
+                                 <property name="label" translatable="yes">must be the same</property>
+@@ -1005,9 +1068,11 @@
+                                 <property name="receives_default">False</property>
+                                 <property name="draw_indicator">True</property>
+                                 <property name="group">organization_differ_radiobutton</property>
+-                                <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                                <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">0</property>
+                               </packing>
+                             </child>
+@@ -1022,20 +1087,21 @@
+                                 <property name="draw_indicator">True</property>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">1</property>
+                               </packing>
+                             </child>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
+                             <property name="top_attach">3</property>
+-                            <property name="bottom_attach">4</property>
+                           </packing>
+                         </child>
+                         <child>
+-                          <object class="GtkHBox" id="hbox27">
++                          <object class="GtkBox" id="hbox27">
+                             <property name="visible">True</property>
++                            <property name="can_focus">False</property>
+                             <child>
+                               <object class="GtkRadioButton" id="ou_same_radiobutton">
+                                 <property name="label" translatable="yes">must be the same</property>
+@@ -1045,9 +1111,11 @@
+                                 <property name="receives_default">False</property>
+                                 <property name="draw_indicator">True</property>
+                                 <property name="group">ou_differ_radiobutton</property>
+-                                <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                                <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">0</property>
+                               </packing>
+                             </child>
+@@ -1062,15 +1130,15 @@
+                                 <property name="draw_indicator">True</property>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">1</property>
+                               </packing>
+                             </child>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
+                             <property name="top_attach">4</property>
+-                            <property name="bottom_attach">5</property>
+                           </packing>
+                         </child>
+                       </object>
+@@ -1078,10 +1146,11 @@
+                     <child type="label">
+                       <object class="GtkLabel" id="label30">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Inherited fields from CA subject&lt;/b&gt;</property>
+                         <property name="use_markup">True</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">0</property>
+                       </object>
+                     </child>
+                   </object>
+@@ -1097,11 +1166,10 @@
+                     <property name="can_focus">True</property>
+                     <property name="border_width">4</property>
+                     <child>
+-                      <object class="GtkTable" id="table12">
++                      <object class="GtkGrid" id="table12">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="border_width">10</property>
+-                        <property name="n_rows">4</property>
+-                        <property name="n_columns">2</property>
+                         <child>
+                           <object class="GtkCheckButton" id="ca_check2">
+                             <property name="label" translatable="yes">Certification Authority</property>
+@@ -1110,8 +1178,12 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
++                          <packing>
++                            <property name="left_attach">0</property>
++                            <property name="top_attach">0</property>
++                          </packing>
+                         </child>
+                         <child>
+                           <object class="GtkCheckButton" id="non_repudiation_check2">
+@@ -1121,11 +1193,11 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
++                            <property name="top_attach">0</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -1137,13 +1209,11 @@
+                             <property name="use_underline">True</property>
+                             <property name="active">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
+                             <property name="top_attach">1</property>
+-                            <property name="bottom_attach">2</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -1155,13 +1225,11 @@
+                             <property name="use_underline">True</property>
+                             <property name="active">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
+                             <property name="top_attach">2</property>
+-                            <property name="bottom_attach">3</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -1173,11 +1241,11 @@
+                             <property name="use_underline">True</property>
+                             <property name="active">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
++                            <property name="left_attach">0</property>
+                             <property name="top_attach">3</property>
+-                            <property name="bottom_attach">4</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -1189,11 +1257,11 @@
+                             <property name="use_underline">True</property>
+                             <property name="active">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
++                            <property name="left_attach">0</property>
+                             <property name="top_attach">2</property>
+-                            <property name="bottom_attach">3</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -1204,22 +1272,21 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
++                            <property name="left_attach">0</property>
+                             <property name="top_attach">1</property>
+-                            <property name="bottom_attach">2</property>
+                           </packing>
+                         </child>
+                         <child>
+                           <object class="GtkLabel" id="label111">
+                             <property name="visible">True</property>
++                            <property name="can_focus">False</property>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
+                             <property name="top_attach">3</property>
+-                            <property name="bottom_attach">4</property>
+                           </packing>
+                         </child>
+                       </object>
+@@ -1227,10 +1294,11 @@
+                     <child type="label">
+                       <object class="GtkLabel" id="label86">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Uses of new generated certificates&lt;/b&gt;</property>
+                         <property name="use_markup">True</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">0</property>
+                       </object>
+                     </child>
+                   </object>
+@@ -1246,11 +1314,10 @@
+                     <property name="can_focus">True</property>
+                     <property name="border_width">4</property>
+                     <child>
+-                      <object class="GtkTable" id="table15">
++                      <object class="GtkGrid" id="table15">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="border_width">10</property>
+-                        <property name="n_rows">4</property>
+-                        <property name="n_columns">2</property>
+                         <child>
+                           <object class="GtkCheckButton" id="email_protection_check2">
+                             <property name="label" translatable="yes">Email protection</property>
+@@ -1260,13 +1327,11 @@
+                             <property name="use_underline">True</property>
+                             <property name="active">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
+                             <property name="top_attach">1</property>
+-                            <property name="bottom_attach">2</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -1277,11 +1342,11 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
++                            <property name="top_attach">0</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -1293,11 +1358,11 @@
+                             <property name="use_underline">True</property>
+                             <property name="active">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
++                            <property name="left_attach">0</property>
+                             <property name="top_attach">1</property>
+-                            <property name="bottom_attach">2</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -1309,8 +1374,12 @@
+                             <property name="use_underline">True</property>
+                             <property name="active">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
++                          <packing>
++                            <property name="left_attach">0</property>
++                            <property name="top_attach">0</property>
++                          </packing>
+                         </child>
+                         <child>
+                           <object class="GtkCheckButton" id="time_stamping_check2">
+@@ -1320,11 +1389,11 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
++                            <property name="left_attach">0</property>
+                             <property name="top_attach">2</property>
+-                            <property name="bottom_attach">3</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -1335,11 +1404,11 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
++                            <property name="left_attach">0</property>
+                             <property name="top_attach">3</property>
+-                            <property name="bottom_attach">4</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -1350,26 +1419,23 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
+                             <property name="top_attach">2</property>
+-                            <property name="bottom_attach">3</property>
+                           </packing>
+                         </child>
+                         <child>
+                           <object class="GtkLabel" id="label100">
+                             <property name="visible">True</property>
++                            <property name="can_focus">False</property>
+                             <property name="xalign">0</property>
+                             <property name="yalign">0</property>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
+                             <property name="top_attach">3</property>
+-                            <property name="bottom_attach">4</property>
+                           </packing>
+                         </child>
+                       </object>
+@@ -1377,14 +1443,17 @@
+                     <child type="label">
+                       <object class="GtkLabel" id="label102">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Purposes of new generated certificates&lt;/b&gt;</property>
+                         <property name="use_markup">True</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">0</property>
+                       </object>
+                     </child>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">5</property>
+                   </packing>
+                 </child>
+@@ -1396,9 +1465,10 @@
+             <child type="tab">
+               <object class="GtkLabel" id="label23">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">CA Policy</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0</property>
+-                <property name="label" translatable="yes">CA Policy</property>
+               </object>
+               <packing>
+                 <property name="position">2</property>
+@@ -1407,12 +1477,15 @@
+             </child>
+           </object>
+           <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
+             <property name="position">0</property>
+           </packing>
+         </child>
+         <child>
+-          <object class="GtkHButtonBox" id="hbuttonbox2">
++          <object class="GtkButtonBox" id="hbuttonbox2">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="border_width">10</property>
+             <property name="layout_style">end</property>
+             <child>
+@@ -1422,7 +1495,7 @@
+                 <property name="can_focus">True</property>
+                 <property name="receives_default">True</property>
+                 <property name="use_stock">True</property>
+-                <signal name="clicked" handler="certificate_properties_close_clicked"/>
++                <signal name="clicked" handler="certificate_properties_close_clicked" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -1433,6 +1506,7 @@
+           </object>
+           <packing>
+             <property name="expand">False</property>
++            <property name="fill">True</property>
+             <property name="pack_type">end</property>
+             <property name="position">1</property>
+           </packing>
+--- gnomint-1.3.0.orig/gui/change_password_dialog.ui
++++ gnomint-1.3.0/gui/change_password_dialog.ui
+@@ -1,32 +1,81 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkDialog" id="change_password_dialog">
++    <property name="can_focus">False</property>
+     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">Database password protection - gnoMint</property>
+     <property name="window_position">center-on-parent</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
++    <child>
++      <placeholder/>
++    </child>
+     <child internal-child="vbox">
+-      <object class="GtkVBox" id="dialog-vbox14">
++      <object class="GtkBox" id="dialog-vbox14">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+         <property name="orientation">vertical</property>
+         <property name="spacing">2</property>
++        <child internal-child="action_area">
++          <object class="GtkButtonBox" id="dialog-action_area14">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="ca_changepwd_cancel_button">
++                <property name="label">gtk-cancel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="ca_changepwd_commit_button">
++                <property name="label">gtk-ok</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
+         <child>
+-          <object class="GtkTable" id="table20">
++          <object class="GtkGrid" id="table20">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="border_width">20</property>
+-            <property name="n_rows">4</property>
+-            <property name="n_columns">2</property>
+-            <property name="column_spacing">10</property>
+             <property name="row_spacing">10</property>
++            <property name="column_spacing">10</property>
++            <property name="column_homogeneous">True</property>
+             <child>
+-              <object class="GtkHBox" id="hbox26">
++              <object class="GtkBox" id="hbox26">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="homogeneous">True</property>
+                 <child>
+                   <object class="GtkRadioButton" id="ca_changepwd_pwd_protect_yes_radiobutton">
+@@ -37,7 +86,7 @@
+                     <property name="use_underline">True</property>
+                     <property name="active">True</property>
+                     <property name="draw_indicator">True</property>
+-                    <signal name="toggled" handler="ca_changepwd_pwd_protect_radiobutton_toggled"/>
++                    <signal name="toggled" handler="ca_changepwd_pwd_protect_radiobutton_toggled" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -64,39 +113,22 @@
+               </object>
+               <packing>
+                 <property name="left_attach">1</property>
+-                <property name="right_attach">2</property>
+-                <property name="x_options">GTK_FILL</property>
+-                <property name="y_options"></property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkLabel" id="label109">
+-                <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
+-                <property name="label" translatable="yes">Protect CA database private 
+-keys with password:</property>
+-                <property name="wrap">True</property>
+-              </object>
+-              <packing>
+-                <property name="x_options">GTK_FILL</property>
+-                <property name="y_options"></property>
++                <property name="top_attach">0</property>
+               </packing>
+             </child>
+             <child>
+               <object class="GtkLabel" id="ca_changepwd_label3">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">Enter new password again 
+ for confirmation:</property>
+                 <property name="wrap">True</property>
+                 <property name="wrap_mode">word-char</property>
++                <property name="xalign">0</property>
+               </object>
+               <packing>
++                <property name="left_attach">0</property>
+                 <property name="top_attach">3</property>
+-                <property name="bottom_attach">4</property>
+-                <property name="x_options">GTK_FILL</property>
+-                <property name="y_options"></property>
+               </packing>
+             </child>
+             <child>
+@@ -105,14 +137,12 @@
+                 <property name="can_focus">True</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                 <property name="visibility">False</property>
+-                <property name="invisible_char">&#x2022;</property>
+-                <signal name="changed" handler="ca_changepwd_newpwd_entry_changed"/>
++                <property name="invisible_char">•</property>
++                <signal name="changed" handler="ca_changepwd_newpwd_entry_changed" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="left_attach">1</property>
+-                <property name="right_attach">2</property>
+                 <property name="top_attach">3</property>
+-                <property name="bottom_attach">4</property>
+               </packing>
+             </child>
+             <child>
+@@ -121,46 +151,41 @@
+                 <property name="can_focus">True</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                 <property name="visibility">False</property>
+-                <property name="invisible_char">&#x2022;</property>
+-                <signal name="changed" handler="ca_changepwd_newpwd_entry_changed"/>
++                <property name="invisible_char">•</property>
++                <signal name="changed" handler="ca_changepwd_newpwd_entry_changed" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="left_attach">1</property>
+-                <property name="right_attach">2</property>
+                 <property name="top_attach">2</property>
+-                <property name="bottom_attach">3</property>
+               </packing>
+             </child>
+             <child>
+               <object class="GtkLabel" id="ca_changepwd_label2">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">Please, enter new 
+ password:</property>
+                 <property name="wrap">True</property>
++                <property name="xalign">0</property>
+               </object>
+               <packing>
++                <property name="left_attach">0</property>
+                 <property name="top_attach">2</property>
+-                <property name="bottom_attach">3</property>
+-                <property name="x_options">GTK_FILL</property>
+-                <property name="y_options"></property>
+               </packing>
+             </child>
+             <child>
+               <object class="GtkLabel" id="ca_changepwd_label1">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">Please, enter current
+ password:</property>
+                 <property name="wrap">True</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
++                <property name="left_attach">0</property>
+                 <property name="top_attach">1</property>
+-                <property name="bottom_attach">2</property>
+-                <property name="x_options">GTK_FILL</property>
+-                <property name="y_options"></property>
+-                <property name="y_padding">15</property>
+               </packing>
+             </child>
+             <child>
+@@ -169,61 +194,34 @@
+                 <property name="can_focus">True</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                 <property name="visibility">False</property>
+-                <property name="invisible_char">&#x2022;</property>
+-                <signal name="changed" handler="ca_changepwd_newpwd_entry_changed"/>
++                <property name="invisible_char">•</property>
++                <signal name="changed" handler="ca_changepwd_newpwd_entry_changed" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="left_attach">1</property>
+-                <property name="right_attach">2</property>
+                 <property name="top_attach">1</property>
+-                <property name="bottom_attach">2</property>
+               </packing>
+             </child>
+-          </object>
+-          <packing>
+-            <property name="position">1</property>
+-          </packing>
+-        </child>
+-        <child internal-child="action_area">
+-          <object class="GtkHButtonBox" id="dialog-action_area14">
+-            <property name="visible">True</property>
+-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-            <property name="layout_style">end</property>
+             <child>
+-              <object class="GtkButton" id="ca_changepwd_cancel_button">
+-                <property name="label" translatable="yes">gtk-cancel</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="ca_changepwd_commit_button">
+-                <property name="label" translatable="yes">gtk-ok</property>
++              <object class="GtkLabel" id="label109">
+                 <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-                <property name="use_stock">True</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">Protect CA database private
++keys with password:</property>
++                <property name="wrap">True</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">1</property>
++                <property name="left_attach">0</property>
++                <property name="top_attach">0</property>
+               </packing>
+             </child>
+           </object>
+           <packing>
+             <property name="expand">False</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
++            <property name="fill">True</property>
++            <property name="position">1</property>
+           </packing>
+         </child>
+       </object>
+--- gnomint-1.3.0.orig/gui/creation_process_window.ui
++++ gnomint-1.3.0/gui/creation_process_window.ui
+@@ -1,40 +1,50 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkWindow" id="creation_process_window">
+     <property name="visible">True</property>
++    <property name="can_focus">False</property>
+     <property name="title" translatable="yes">Creating new CA - gnoMint</property>
+     <property name="modal">True</property>
+     <property name="window_position">center</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+     <child>
+-      <object class="GtkHBox" id="hbox5">
++      <placeholder/>
++    </child>
++    <child>
++      <object class="GtkBox" id="hbox5">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <child>
+           <object class="GtkLabel" id="label25">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="label" translatable="yes"> </property>
+             <property name="xalign">0</property>
+             <property name="yalign">0</property>
+-            <property name="label" translatable="yes"> </property>
+           </object>
+           <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
+             <property name="position">0</property>
+           </packing>
+         </child>
+         <child>
+-          <object class="GtkVBox" id="vbox5">
++          <object class="GtkBox" id="vbox5">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="border_width">9</property>
+             <property name="orientation">vertical</property>
+             <property name="homogeneous">True</property>
+             <child>
+               <object class="GtkLabel" id="titleLabel">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">Creating CA Root Certificate</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0</property>
+-                <property name="label" translatable="yes">Creating CA Root Certificate</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -45,6 +55,7 @@
+             <child>
+               <object class="GtkLabel" id="status_message_label">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0</property>
+               </object>
+@@ -57,7 +68,7 @@
+             <child>
+               <object class="GtkProgressBar" id="creation_process_window_progressbar">
+                 <property name="visible">True</property>
+-                <property name="activity_mode">True</property>
++                <property name="can_focus">False</property>
+                 <property name="pulse_step">0</property>
+               </object>
+               <packing>
+@@ -73,7 +84,7 @@
+                 <property name="can_focus">True</property>
+                 <property name="receives_default">True</property>
+                 <property name="use_stock">True</property>
+-                <signal name="clicked" handler="on_cancel_creation_process_clicked"/>
++                <signal name="clicked" handler="on_cancel_creation_process_clicked" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -84,17 +95,21 @@
+           </object>
+           <packing>
+             <property name="expand">False</property>
++            <property name="fill">True</property>
+             <property name="position">1</property>
+           </packing>
+         </child>
+         <child>
+           <object class="GtkLabel" id="label26">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="label" translatable="yes"> </property>
+             <property name="xalign">0</property>
+             <property name="yalign">0</property>
+-            <property name="label" translatable="yes"> </property>
+           </object>
+           <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
+             <property name="position">2</property>
+           </packing>
+         </child>
+--- gnomint-1.3.0.orig/gui/csr_popup_menu.ui
++++ gnomint-1.3.0/gui/csr_popup_menu.ui
+@@ -1,45 +1,50 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkMenu" id="csr_popup_menu">
+     <property name="visible">True</property>
++    <property name="can_focus">False</property>
+     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+     <child>
+       <object class="GtkImageMenuItem" id="csr_properties_menuitem">
+         <property name="label">gtk-properties</property>
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+         <property name="has_tooltip">True</property>
+         <property name="tooltip_markup">Shows the CSR properties window</property>
+         <property name="tooltip_text" translatable="yes">Shows the CSR properties window</property>
+         <property name="use_underline">True</property>
+         <property name="use_stock">True</property>
+-        <signal name="activate" handler="on_properties1_activate"/>
++        <signal name="activate" handler="on_properties1_activate" swapped="no"/>
+       </object>
+     </child>
+     <child>
+       <object class="GtkSeparatorMenuItem" id="sep_menuitem7">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+       </object>
+     </child>
+     <child>
+       <object class="GtkImageMenuItem" id="csr_export_menuitem">
+         <property name="label" translatable="yes">E_xport</property>
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+         <property name="has_tooltip">True</property>
+         <property name="tooltip_markup">Exports the CSR so it can be imported by any other application</property>
+         <property name="tooltip_text" translatable="yes">Exports the CSR so it can be imported by any other application</property>
+         <property name="use_underline">True</property>
+         <property name="use_stock">False</property>
+-        <signal name="activate" handler="ca_on_export1_activate"/>
++        <signal name="activate" handler="ca_on_export1_activate" swapped="no"/>
+       </object>
+     </child>
+     <child>
+       <object class="GtkImageMenuItem" id="extract_pkey_menuitem3">
+         <property name="label" translatable="yes">Extrac_t private key</property>
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+         <property name="has_tooltip">True</property>
+         <property name="tooltip_markup">Extracts the private key of the selected 
+@@ -52,32 +57,35 @@
+ each time the CSR will be used</property>
+         <property name="use_underline">True</property>
+         <property name="use_stock">False</property>
+-        <signal name="activate" handler="ca_on_extractprivatekey1_activate"/>
++        <signal name="activate" handler="ca_on_extractprivatekey1_activate" swapped="no"/>
+       </object>
+     </child>
+     <child>
+       <object class="GtkSeparatorMenuItem" id="sep_menuitem8">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+       </object>
+     </child>
+     <child>
+       <object class="GtkImageMenuItem" id="sign_csr_menuitem">
+         <property name="label" translatable="yes">_Sign</property>
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+         <property name="use_underline">True</property>
+         <property name="use_stock">False</property>
+-        <signal name="activate" handler="ca_on_sign1_activate"/>
++        <signal name="activate" handler="ca_on_sign1_activate" swapped="no"/>
+       </object>
+     </child>
+     <child>
+       <object class="GtkImageMenuItem" id="csr_delete_menuitem">
+         <property name="label">gtk-delete</property>
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+         <property name="use_underline">True</property>
+         <property name="use_stock">True</property>
+-        <signal name="activate" handler="ca_on_delete2_activate"/>
++        <signal name="activate" handler="ca_on_delete2_activate" swapped="no"/>
+       </object>
+     </child>
+   </object>
+--- gnomint-1.3.0.orig/gui/csr_properties_dialog.ui
++++ gnomint-1.3.0/gui/csr_properties_dialog.ui
+@@ -1,8 +1,9 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkWindow" id="csr_properties_dialog">
++    <property name="can_focus">False</property>
+     <property name="title" translatable="yes">CSR properties - gnoMint</property>
+     <property name="modal">True</property>
+     <property name="window_position">center</property>
+@@ -10,170 +11,183 @@
+     <property name="type_hint">dialog</property>
+     <property name="urgency_hint">True</property>
+     <child>
+-      <object class="GtkVBox" id="vbox21">
++      <placeholder/>
++    </child>
++    <child>
++      <object class="GtkBox" id="vbox21">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
+         <child>
+           <object class="GtkNotebook" id="notebook4">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="border_width">5</property>
+             <property name="show_tabs">False</property>
+             <property name="show_border">False</property>
+             <child>
+-              <object class="GtkVBox" id="vbox22">
++              <object class="GtkBox" id="vbox22">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="border_width">5</property>
+                 <property name="orientation">vertical</property>
+                 <child>
+-                  <object class="GtkVBox" id="vboxCertCapabilities2">
++                  <object class="GtkBox" id="vboxCertCapabilities2">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="border_width">5</property>
+                     <property name="orientation">vertical</property>
+                     <property name="spacing">5</property>
+                     <child>
+                       <object class="GtkLabel" id="privatekey_in_db_label">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">&lt;b&gt;This Certificate Signing Request has its corresponding private key saved in the internal database.&lt;/b&gt;</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">&lt;b&gt;This Certificate Signing Request has its
++corresponding private key saved in the internal database.&lt;/b&gt;</property>
+                         <property name="use_markup">True</property>
+                         <property name="wrap">True</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">0</property>
+                       </object>
+                       <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">True</property>
+                         <property name="position">0</property>
+                       </packing>
+                     </child>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">0</property>
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkHSeparator" id="certPropSeparator2">
++                  <object class="GtkSeparator" id="certPropSeparator2">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">1</property>
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkTable" id="table8">
++                  <object class="GtkGrid" id="table8">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="border_width">5</property>
+-                    <property name="n_rows">4</property>
+-                    <property name="n_columns">2</property>
+                     <property name="column_spacing">10</property>
+                     <child>
+                       <object class="GtkLabel" id="certSubjectOULabel1">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">SubjectOU</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">SubjectOU</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">3</property>
+-                        <property name="bottom_attach">4</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="certSubjectOLabel1">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">SubjectO</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">SubjectO</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">2</property>
+-                        <property name="bottom_attach">3</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="certSubjectCNLabel1">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">SubjectCN</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">SubjectCN</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">1</property>
+-                        <property name="bottom_attach">2</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label131">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes"> </property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes"> </property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
++                        <property name="top_attach">0</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label119">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Organizational Unit (OU)</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Organizational Unit (OU)</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">3</property>
+-                        <property name="bottom_attach">4</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label118">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Organization (O)</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Organization (O)</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">2</property>
+-                        <property name="bottom_attach">3</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label117">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Common Name (CN)</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Common Name (CN)</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">1</property>
+-                        <property name="bottom_attach">2</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label116">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">1</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">&lt;b&gt;CSR subject&lt;/b&gt;</property>
+                         <property name="use_markup">True</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">1</property>
+                       </object>
+                       <packing>
+-                        <property name="x_options">GTK_FILL</property>
+-                        <property name="y_padding">7</property>
++                        <property name="left_attach">0</property>
++                        <property name="top_attach">0</property>
+                       </packing>
+                     </child>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">2</property>
+                   </packing>
+                 </child>
+@@ -185,9 +199,10 @@
+             <child type="tab">
+               <object class="GtkLabel" id="label135">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">General</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0</property>
+-                <property name="label" translatable="yes">General</property>
+               </object>
+               <packing>
+                 <property name="tab_fill">False</property>
+@@ -199,9 +214,10 @@
+             <child type="tab">
+               <object class="GtkLabel" id="label139">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">Details</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0</property>
+-                <property name="label" translatable="yes">Details</property>
+               </object>
+               <packing>
+                 <property name="position">1</property>
+@@ -210,12 +226,15 @@
+             </child>
+           </object>
+           <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
+             <property name="position">0</property>
+           </packing>
+         </child>
+         <child>
+-          <object class="GtkHButtonBox" id="hbuttonbox5">
++          <object class="GtkButtonBox" id="hbuttonbox5">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="border_width">10</property>
+             <property name="layout_style">end</property>
+             <child>
+@@ -225,7 +244,7 @@
+                 <property name="can_focus">True</property>
+                 <property name="receives_default">True</property>
+                 <property name="use_stock">True</property>
+-                <signal name="clicked" handler="csr_properties_close_clicked"/>
++                <signal name="clicked" handler="csr_properties_close_clicked" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -235,6 +254,8 @@
+             </child>
+           </object>
+           <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
+             <property name="pack_type">end</property>
+             <property name="position">1</property>
+           </packing>
+--- gnomint-1.3.0.orig/gui/dh_parameters_dialog.ui
++++ gnomint-1.3.0/gui/dh_parameters_dialog.ui
+@@ -1,68 +1,124 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkAdjustment" id="AdjustmentDHPrimeSizeSpinButton">
+     <property name="lower">1024</property>
+     <property name="upper">10240</property>
+-    <property name="step-increment">1024</property>
+-    <property name="page-increment">1024</property>
+-    <property name="page-size">0</property>
+     <property name="value">1024</property>
++    <property name="step_increment">1024</property>
++    <property name="page_increment">1024</property>
+   </object>
+   <object class="GtkDialog" id="dh_parameters_dialog">
++    <property name="can_focus">False</property>
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">New Diffie-Hellman parameters - gnoMint</property>
+     <property name="window_position">center-on-parent</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
++    <child>
++      <placeholder/>
++    </child>
+     <child internal-child="vbox">
+-      <object class="GtkVBox" id="dialog-vbox18">
++      <object class="GtkBox" id="dialog-vbox18">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
+         <property name="spacing">2</property>
++        <child internal-child="action_area">
++          <object class="GtkButtonBox" id="dialog-action_area18">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="button19">
++                <property name="label">gtk-cancel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="button18">
++                <property name="label">gtk-ok</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
+         <child>
+-          <object class="GtkVBox" id="vbox9">
++          <object class="GtkBox" id="vbox9">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="orientation">vertical</property>
+             <property name="spacing">12</property>
+             <child>
+               <object class="GtkLabel" id="label47">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="label" translatable="yes">You are about to create and export a set of Diffie&#xB7;Hellman parameters into a PKCS#3 structure file.</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">You are about to create and export a set of
++Diffie·Hellman parameters into a PKCS#3 structure file.</property>
+                 <property name="use_markup">True</property>
+                 <property name="wrap">True</property>
++                <property name="xalign">0</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">0</property>
+               </packing>
+             </child>
+             <child>
+               <object class="GtkLabel" id="label48">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="xpad">8</property>
+-                <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;PKCS#3 files containing Diffie&#xB7;Hellman parameters are used by some cryptographic 
++                <property name="can_focus">False</property>
++                <property name="margin_start">8</property>
++                <property name="margin_end">8</property>
++                <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;PKCS#3 files containing Diffie·Hellman parameters are used by some cryptographic
+ applications for a secure interchange of their keys over insecure channels.&lt;/i&gt;&lt;/small&gt;</property>
+                 <property name="use_markup">True</property>
+                 <property name="wrap">True</property>
+                 <property name="max_width_chars">80</property>
++                <property name="xalign">0</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+             <child>
+               <object class="GtkLabel" id="label49">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">Please, enter the prime size, in bits:</property>
+                 <property name="use_markup">True</property>
+                 <property name="wrap">True</property>
++                <property name="xalign">0</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">2</property>
+               </packing>
+             </child>
+@@ -70,58 +126,23 @@
+               <object class="GtkSpinButton" id="dh_prime_size_spinbutton">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+-                <property name="invisible_char">&#x2022;</property>
++                <property name="invisible_char">•</property>
+                 <property name="adjustment">AdjustmentDHPrimeSizeSpinButton</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">3</property>
+               </packing>
+             </child>
+           </object>
+           <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
+             <property name="padding">10</property>
+             <property name="position">1</property>
+           </packing>
+         </child>
+-        <child internal-child="action_area">
+-          <object class="GtkHButtonBox" id="dialog-action_area18">
+-            <property name="visible">True</property>
+-            <property name="layout_style">end</property>
+-            <child>
+-              <object class="GtkButton" id="button19">
+-                <property name="label" translatable="yes">gtk-cancel</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="button18">
+-                <property name="label" translatable="yes">gtk-ok</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">1</property>
+-              </packing>
+-            </child>
+-          </object>
+-          <packing>
+-            <property name="expand">False</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
+-          </packing>
+-        </child>
+       </object>
+     </child>
+     <action-widgets>
+--- gnomint-1.3.0.orig/gui/get_db_password_dialog.ui
++++ gnomint-1.3.0/gui/get_db_password_dialog.ui
+@@ -1,28 +1,73 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkDialog" id="get_db_password_dialog">
++    <property name="can_focus">False</property>
+     <property name="title" translatable="yes">Enter password - gnoMint</property>
+     <property name="modal">True</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
++    <child>
++      <placeholder/>
++    </child>
+     <child internal-child="vbox">
+-      <object class="GtkVBox" id="dialog-vbox13">
++      <object class="GtkBox" id="dialog-vbox13">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
++        <child internal-child="action_area">
++          <object class="GtkButtonBox" id="dialog-action_area13">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="button11">
++                <property name="label">gtk-cancel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="cadb_password_dialog_ok_button">
++                <property name="label">gtk-ok</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
+         <child>
+-          <object class="GtkVBox" id="vbox24">
++          <object class="GtkBox" id="vbox24">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+             <property name="border_width">20</property>
+             <property name="orientation">vertical</property>
+             <child>
+               <object class="GtkLabel" id="get_passwd_msg_label">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">This action requires using one or more private keys saved in the CA database.
+ 
+ Please insert the database password.</property>
+@@ -30,6 +75,8 @@
+                 <property name="justify">fill</property>
+                 <property name="wrap">True</property>
+                 <property name="width_chars">40</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -38,28 +85,35 @@
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHBox" id="pwd_hbox">
++              <object class="GtkBox" id="pwd_hbox">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                 <child>
+                   <object class="GtkImage" id="image16">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                     <property name="icon_name">dialog-password</property>
+-                    <property name="icon-size">6</property>
++                    <property name="icon_size">6</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="password_message2">
+                     <property name="visible">True</property>
+-                    <property name="xalign">1</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">Password:</property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">1</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">1</property>
+                   </packing>
+                 </child>
+@@ -69,15 +123,19 @@
+                     <property name="can_focus">True</property>
+                     <property name="can_default">True</property>
+                     <property name="visibility">False</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                     <property name="activates_default">True</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">2</property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+@@ -86,10 +144,9 @@
+                 <property name="label" translatable="yes">Remember this password during this gnoMint session</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
++                <property name="focus_on_click">False</property>
+                 <property name="receives_default">False</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-                <property name="focus_on_click">False</property>
+-                <property name="xalign">0</property>
+                 <property name="draw_indicator">True</property>
+               </object>
+               <packing>
+@@ -100,46 +157,9 @@
+             </child>
+           </object>
+           <packing>
+-            <property name="position">1</property>
+-          </packing>
+-        </child>
+-        <child internal-child="action_area">
+-          <object class="GtkHButtonBox" id="dialog-action_area13">
+-            <property name="visible">True</property>
+-            <property name="layout_style">end</property>
+-            <child>
+-              <object class="GtkButton" id="button11">
+-                <property name="label">gtk-cancel</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="cadb_password_dialog_ok_button">
+-                <property name="label">gtk-ok</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">1</property>
+-              </packing>
+-            </child>
+-          </object>
+-          <packing>
+             <property name="expand">False</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
++            <property name="fill">True</property>
++            <property name="position">1</property>
+           </packing>
+         </child>
+       </object>
+--- gnomint-1.3.0.orig/gui/get_password_dialog.ui
++++ gnomint-1.3.0/gui/get_password_dialog.ui
+@@ -1,53 +1,100 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkDialog" id="get_password_dialog">
++    <property name="can_focus">False</property>
+     <property name="title" translatable="yes">Enter password - gnoMint</property>
+     <property name="modal">True</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
++    <child>
++      <placeholder/>
++    </child>
+     <child internal-child="vbox">
+-      <object class="GtkVBox" id="dialog-vbox12">
++      <object class="GtkBox" id="dialog-vbox12">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
++        <child internal-child="action_area">
++          <object class="GtkButtonBox" id="dialog-action_area12">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="button10">
++                <property name="label">gtk-cancel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="password_dialog_ok_button">
++                <property name="label">gtk-ok</property>
++                <property name="visible">True</property>
++                <property name="sensitive">False</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
+         <child>
+-          <object class="GtkVBox" id="vbox17">
++          <object class="GtkBox" id="vbox17">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="border_width">11</property>
+             <property name="orientation">vertical</property>
+             <child>
+               <object class="GtkLabel" id="info_message">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">Please, enter password</property>
+                 <property name="use_markup">True</property>
+                 <property name="wrap">True</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">0</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkTable" id="table3">
++              <object class="GtkGrid" id="table3">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="border_width">30</property>
+-                <property name="n_rows">2</property>
+-                <property name="n_columns">2</property>
+                 <child>
+                   <object class="GtkEntry" id="confirm_entry">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="visibility">False</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+                   </packing>
+                 </child>
+                 <child>
+@@ -55,85 +102,55 @@
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="visibility">False</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                     <property name="activates_default">True</property>
+-                    <signal name="changed" handler="dialog_password_entry_changed_cb"/>
++                    <signal name="changed" handler="dialog_password_entry_changed_cb" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
++                    <property name="top_attach">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="confirm_message">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">Password (confirm):</property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="password_message">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">Password:</property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
++                  <packing>
++                    <property name="left_attach">0</property>
++                    <property name="top_attach">0</property>
++                  </packing>
+                 </child>
+               </object>
+               <packing>
+-                <property name="position">1</property>
+-              </packing>
+-            </child>
+-          </object>
+-          <packing>
+-            <property name="position">1</property>
+-          </packing>
+-        </child>
+-        <child internal-child="action_area">
+-          <object class="GtkHButtonBox" id="dialog-action_area12">
+-            <property name="visible">True</property>
+-            <property name="layout_style">end</property>
+-            <child>
+-              <object class="GtkButton" id="button10">
+-                <property name="label">gtk-cancel</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+                 <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="password_dialog_ok_button">
+-                <property name="label">gtk-ok</property>
+-                <property name="visible">True</property>
+-                <property name="sensitive">False</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+           </object>
+           <packing>
+             <property name="expand">False</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
++            <property name="fill">True</property>
++            <property name="position">1</property>
+           </packing>
+         </child>
+       </object>
+--- gnomint-1.3.0.orig/gui/get_pkey_dialog.ui
++++ gnomint-1.3.0/gui/get_pkey_dialog.ui
+@@ -1,8 +1,9 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkDialog" id="get_pkey_dialog">
++    <property name="can_focus">False</property>
+     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">Choose private key file. gnoMint</property>
+@@ -10,32 +11,84 @@
+     <property name="window_position">center-on-parent</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
++    <child>
++      <placeholder/>
++    </child>
+     <child internal-child="vbox">
+-      <object class="GtkVBox" id="dialog-vbox20">
++      <object class="GtkBox" id="dialog-vbox20">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+         <property name="orientation">vertical</property>
+         <property name="spacing">2</property>
++        <child internal-child="action_area">
++          <object class="GtkButtonBox" id="dialog-action_area20">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="button15">
++                <property name="label">gtk-cancel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="button7">
++                <property name="label">gtk-ok</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="padding">4</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
+         <child>
+-          <object class="GtkVBox" id="vbox18">
++          <object class="GtkBox" id="vbox18">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+             <property name="orientation">vertical</property>
+             <property name="spacing">20</property>
+             <child>
+               <object class="GtkLabel" id="label28">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
+                 <property name="label" translatable="yes">&lt;big&gt;Choose private key file&lt;/big&gt;
+ 
+-For doing the selected operation, you must provide the file where resides the private key corresponding to the certificate:</property>
++For doing the selected operation, you must provide the
++file where resides the private key corresponding to the
++certificate:</property>
+                 <property name="use_markup">True</property>
+                 <property name="wrap">True</property>
+                 <property name="wrap_mode">word-char</property>
+                 <property name="width_chars">40</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -46,24 +99,28 @@
+             <child>
+               <object class="GtkLabel" id="cert_dn_label">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                 <property name="label" translatable="yes">Certificate DN</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+             <child>
+               <object class="GtkLabel" id="label31">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
+                 <property name="label" translatable="yes">Please, choose the file:</property>
+                 <property name="use_markup">True</property>
+                 <property name="wrap">True</property>
+                 <property name="wrap_mode">word-char</property>
+                 <property name="width_chars">40</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -74,8 +131,9 @@
+             <child>
+               <object class="GtkFileChooserButton" id="pkey_filechooser">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-                <signal name="selection_changed" handler="pkey_manage_filechooser_file_set_cb"/>
++                <signal name="selection-changed" handler="pkey_manage_filechooser_file_set_cb" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -101,53 +159,12 @@
+             </child>
+           </object>
+           <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
+             <property name="padding">10</property>
+             <property name="position">1</property>
+           </packing>
+         </child>
+-        <child internal-child="action_area">
+-          <object class="GtkHButtonBox" id="dialog-action_area20">
+-            <property name="visible">True</property>
+-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-            <property name="layout_style">end</property>
+-            <child>
+-              <object class="GtkButton" id="button15">
+-                <property name="label" translatable="yes">gtk-cancel</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="button7">
+-                <property name="label" translatable="yes">gtk-ok</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">1</property>
+-              </packing>
+-            </child>
+-          </object>
+-          <packing>
+-            <property name="expand">False</property>
+-            <property name="padding">4</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
+-          </packing>
+-        </child>
+       </object>
+     </child>
+     <action-widgets>
+--- gnomint-1.3.0.orig/gui/import_file_or_directory_dialog.ui
++++ gnomint-1.3.0/gui/import_file_or_directory_dialog.ui
+@@ -1,40 +1,91 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkDialog" id="import_file_or_directory_dialog">
++    <property name="can_focus">False</property>
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">Import selection - gnoMint</property>
+     <property name="window_position">center-on-parent</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
++    <child>
++      <placeholder/>
++    </child>
+     <child internal-child="vbox">
+-      <object class="GtkVBox" id="dialog-vbox15">
++      <object class="GtkBox" id="dialog-vbox15">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
+         <property name="spacing">2</property>
++        <child internal-child="action_area">
++          <object class="GtkButtonBox" id="dialog-action_area15">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="button24">
++                <property name="label">gtk-cancel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="button23">
++                <property name="label">gtk-ok</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
+         <child>
+-          <object class="GtkVBox" id="vbox10">
++          <object class="GtkBox" id="vbox10">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="border_width">8</property>
+             <property name="orientation">vertical</property>
+             <property name="spacing">8</property>
+             <child>
+               <object class="GtkLabel" id="label53">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">Please, choose the more suitable option for
++what you want to import:</property>
++                <property name="wrap">True</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0</property>
+-                <property name="label" translatable="yes">Please, choose the more suitable option for what you want to import:</property>
+-                <property name="wrap">True</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">0</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkVBox" id="vbox11">
++              <object class="GtkBox" id="vbox11">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="orientation">vertical</property>
+                 <child>
+                   <object class="GtkRadioButton" id="importfile_radiobutton">
+@@ -47,21 +98,31 @@
+                     <property name="draw_indicator">True</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label54">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
+-                    <property name="xpad">24</property>
+-                    <property name="ypad">9</property>
+-                    <property name="label" translatable="yes">&lt;i&gt;Import a single file, encoded in DER or PEM format, containing certificates, private keys (encrypted or plain), signing requests (CSRs), revocation lists (CRLs) or PKCS#12 packages.&lt;/i&gt;</property>
++                    <property name="can_focus">False</property>
++                    <property name="margin_start">24</property>
++                    <property name="margin_end">24</property>
++                    <property name="margin_top">9</property>
++                    <property name="margin_bottom">9</property>
++                    <property name="label" translatable="yes">&lt;i&gt;Import a single file, encoded in DER or PEM format, containing
++certificates, private keys (encrypted or plain), signing
++requests (CSRs), revocation lists (CRLs) or PKCS#12
++packages.&lt;/i&gt;</property>
+                     <property name="use_markup">True</property>
+                     <property name="wrap">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">1</property>
+                   </packing>
+                 </child>
+@@ -76,73 +137,45 @@
+                     <property name="group">importfile_radiobutton</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">2</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label55">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
+-                    <property name="xpad">24</property>
+-                    <property name="ypad">9</property>
++                    <property name="can_focus">False</property>
++                    <property name="margin_start">24</property>
++                    <property name="margin_end">24</property>
++                    <property name="margin_top">9</property>
++                    <property name="margin_bottom">9</property>
+                     <property name="label" translatable="yes">&lt;i&gt;Import a directory containing the structure of
+ a whole CA made with OpenSSL .&lt;/i&gt;</property>
+                     <property name="use_markup">True</property>
+                     <property name="justify">fill</property>
+                     <property name="wrap">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">3</property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
+-                <property name="position">1</property>
+-              </packing>
+-            </child>
+-          </object>
+-          <packing>
+-            <property name="position">1</property>
+-          </packing>
+-        </child>
+-        <child internal-child="action_area">
+-          <object class="GtkHButtonBox" id="dialog-action_area15">
+-            <property name="visible">True</property>
+-            <property name="layout_style">end</property>
+-            <child>
+-              <object class="GtkButton" id="button24">
+-                <property name="label" translatable="yes">gtk-cancel</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="button23">
+-                <property name="label" translatable="yes">gtk-ok</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+                 <property name="expand">False</property>
+-                <property name="fill">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+           </object>
+           <packing>
+             <property name="expand">False</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
++            <property name="fill">True</property>
++            <property name="position">1</property>
+           </packing>
+         </child>
+       </object>
+--- gnomint-1.3.0.orig/gui/import_password_dialog.ui
++++ gnomint-1.3.0/gui/import_password_dialog.ui
+@@ -1,35 +1,84 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkDialog" id="import_password_dialog">
++    <property name="can_focus">False</property>
+     <property name="title" translatable="yes">Enter password - gnoMint</property>
+     <property name="modal">True</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
++    <child>
++      <placeholder/>
++    </child>
+     <child internal-child="vbox">
+-      <object class="GtkVBox" id="dialog-vbox16">
++      <object class="GtkBox" id="dialog-vbox16">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
++        <child internal-child="action_area">
++          <object class="GtkButtonBox" id="dialog-action_area16">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="button21">
++                <property name="label">gtk-cancel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="import_password_dialog_ok_button1">
++                <property name="label">gtk-ok</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
+         <child>
+-          <object class="GtkVBox" id="vbox8">
++          <object class="GtkBox" id="vbox8">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+             <property name="border_width">20</property>
+             <property name="orientation">vertical</property>
+             <child>
+               <object class="GtkLabel" id="get_passwd_msg_label1">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
+-                <property name="label" translatable="yes">The whole selected file, or some of its elements, seems to be cyphered using a password or passphrase.
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">The whole selected file, or some of its elements, seems to
++be cyphered using a password or passphrase.
+ 
+-For importing the file into gnoMint database, you must provide an appropiate password.</property>
++For importing the file into gnoMint database, you must
++provide an appropiate password.</property>
+                 <property name="use_markup">True</property>
+                 <property name="justify">fill</property>
+                 <property name="wrap">True</property>
+                 <property name="width_chars">40</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -40,54 +89,69 @@
+             <child>
+               <object class="GtkLabel" id="label52">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="ypad">8</property>
++                <property name="can_focus">False</property>
++                <property name="margin_top">8</property>
++                <property name="margin_bottom">8</property>
+                 <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;The part that is being imported has the description:&lt;/i&gt;&lt;/small&gt;</property>
+                 <property name="use_markup">True</property>
+                 <property name="use_underline">True</property>
+                 <property name="justify">right</property>
++                <property name="xalign">0</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+             <child>
+               <object class="GtkLabel" id="import_crypted_part_description">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="xpad">15</property>
++                <property name="can_focus">False</property>
++                <property name="margin_left">15</property>
++                <property name="margin_right">15</property>
+                 <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;#Description#&lt;/i&gt;&lt;/small&gt;</property>
+                 <property name="use_markup">True</property>
+                 <property name="use_underline">True</property>
+                 <property name="justify">right</property>
++                <property name="xalign">0</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">2</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHBox" id="pwd_hbox1">
++              <object class="GtkBox" id="pwd_hbox1">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                 <child>
+                   <object class="GtkImage" id="image17">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                     <property name="icon_name">dialog-password</property>
+-                    <property name="icon-size">6</property>
++                    <property name="icon_size">6</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="password_message1">
+                     <property name="visible">True</property>
+-                    <property name="xalign">1</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">Password:</property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">1</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">1</property>
+                   </packing>
+                 </child>
+@@ -97,60 +161,27 @@
+                     <property name="can_focus">True</property>
+                     <property name="can_default">True</property>
+                     <property name="visibility">False</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                     <property name="activates_default">True</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">2</property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
+-                <property name="position">3</property>
+-              </packing>
+-            </child>
+-          </object>
+-          <packing>
+-            <property name="position">1</property>
+-          </packing>
+-        </child>
+-        <child internal-child="action_area">
+-          <object class="GtkHButtonBox" id="dialog-action_area16">
+-            <property name="visible">True</property>
+-            <property name="layout_style">end</property>
+-            <child>
+-              <object class="GtkButton" id="button21">
+-                <property name="label">gtk-cancel</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="import_password_dialog_ok_button1">
+-                <property name="label">gtk-ok</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+                 <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">1</property>
++                <property name="fill">True</property>
++                <property name="position">3</property>
+               </packing>
+             </child>
+           </object>
+           <packing>
+             <property name="expand">False</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
++            <property name="fill">True</property>
++            <property name="position">1</property>
+           </packing>
+         </child>
+       </object>
+--- gnomint-1.3.0.orig/gui/main_window.ui
++++ gnomint-1.3.0/gui/main_window.ui
+@@ -1,51 +1,82 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
++  <object class="GtkImage" id="addcaimg">
++    <property name="visible">True</property>
++    <property name="can_focus">False</property>
++    <property name="pixbuf">addca.png</property>
++  </object>
++  <object class="GtkImage" id="addcsrimg">
++    <property name="visible">True</property>
++    <property name="can_focus">False</property>
++    <property name="pixbuf">addcsr.png</property>
++  </object>
++  <object class="GtkImage" id="extractpkeyimg">
++    <property name="visible">True</property>
++    <property name="can_focus">False</property>
++    <property name="pixbuf">extractpkey.png</property>
++  </object>
++  <object class="GtkImage" id="signimg">
++    <property name="visible">True</property>
++    <property name="can_focus">False</property>
++    <property name="pixbuf">sign.png</property>
++  </object>
+   <object class="GtkWindow" id="main_window1">
+     <property name="visible">True</property>
++    <property name="can_focus">False</property>
+     <property name="title" translatable="yes">gnoMint</property>
+     <property name="role">gnoMint_main</property>
+     <property name="window_position">center</property>
+     <property name="default_width">400</property>
+     <property name="default_height">300</property>
+     <property name="icon">gnomint.png</property>
+-    <signal name="delete_event" handler="on_main_window1_delete"/>
++    <signal name="delete-event" handler="on_main_window1_delete" swapped="no"/>
++    <child>
++      <placeholder/>
++    </child>
+     <child>
+-      <object class="GtkVBox" id="vbox1">
++      <object class="GtkBox" id="vbox1">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
+         <child>
+           <object class="GtkMenuBar" id="menubar1">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <child>
+               <object class="GtkMenuItem" id="file1">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">_Certificates</property>
+                 <property name="use_underline">True</property>
+                 <child type="submenu">
+                   <object class="GtkMenu" id="file1_menu1">
++                    <property name="can_focus">False</property>
+                     <child>
+                       <object class="GtkImageMenuItem" id="new1">
+                         <property name="label" translatable="yes">_New certificate database</property>
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">False</property>
+-                        <signal name="activate" handler="on_new1_activate"/>
++                        <signal name="activate" handler="on_new1_activate" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkImageMenuItem" id="open1">
+                         <property name="label" translatable="yes">_Open certificate database</property>
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">False</property>
+-                        <signal name="activate" handler="on_open1_activate"/>
++                        <signal name="activate" handler="on_open1_activate" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkMenuItem" id="openrecentsmenuitem">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">Open _recents</property>
+                         <property name="use_underline">True</property>
+                       </object>
+@@ -54,41 +85,47 @@
+                       <object class="GtkImageMenuItem" id="save_as1">
+                         <property name="label" translatable="yes">_Save certificate database as...</property>
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">False</property>
+-                        <signal name="activate" handler="on_save_as1_activate"/>
++                        <signal name="activate" handler="on_save_as1_activate" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkSeparatorMenuItem" id="separator1">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkImageMenuItem" id="gtk-add">
+                         <property name="label">gtk-add</property>
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">True</property>
+                         <child type="submenu">
+                           <object class="GtkMenu" id="menu3">
+                             <property name="visible">True</property>
++                            <property name="can_focus">False</property>
+                             <child>
+                               <object class="GtkImageMenuItem" id="new2">
+                                 <property name="label" translatable="yes">_Add self-signed CA</property>
+                                 <property name="visible">True</property>
++                                <property name="can_focus">False</property>
+                                 <property name="use_underline">True</property>
+                                 <property name="use_stock">False</property>
+-                                <signal name="activate" handler="on_add_self_signed_ca_activate"/>
++                                <signal name="activate" handler="on_add_self_signed_ca_activate" swapped="no"/>
+                               </object>
+                             </child>
+                             <child>
+                               <object class="GtkImageMenuItem" id="new_certificate1">
+                                 <property name="label" translatable="yes">Add _Certificate Request</property>
+                                 <property name="visible">True</property>
++                                <property name="can_focus">False</property>
+                                 <property name="use_underline">True</property>
+                                 <property name="use_stock">False</property>
+-                                <signal name="activate" handler="on_add_csr_activate"/>
++                                <signal name="activate" handler="on_add_csr_activate" swapped="no"/>
+                               </object>
+                             </child>
+                           </object>
+@@ -100,12 +137,13 @@
+                         <property name="label" translatable="yes">Extrac_t private key</property>
+                         <property name="visible">True</property>
+                         <property name="sensitive">False</property>
++                        <property name="can_focus">False</property>
+                         <property name="has_tooltip">True</property>
+                         <property name="tooltip_markup">Extract the saved private key to an external file or device</property>
+                         <property name="tooltip_text" translatable="yes">Extract the saved private key to an external file or device</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">False</property>
+-                        <signal name="activate" handler="ca_on_extractprivatekey1_activate"/>
++                        <signal name="activate" handler="ca_on_extractprivatekey1_activate" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+@@ -113,9 +151,10 @@
+                         <property name="label" translatable="yes">Revo_ke</property>
+                         <property name="visible">True</property>
+                         <property name="sensitive">False</property>
++                        <property name="can_focus">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">False</property>
+-                        <signal name="activate" handler="ca_on_revoke_activate"/>
++                        <signal name="activate" handler="ca_on_revoke_activate" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+@@ -123,9 +162,10 @@
+                         <property name="label" translatable="yes">_Sign</property>
+                         <property name="visible">True</property>
+                         <property name="sensitive">False</property>
++                        <property name="can_focus">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">False</property>
+-                        <signal name="activate" handler="ca_on_sign1_activate"/>
++                        <signal name="activate" handler="ca_on_sign1_activate" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+@@ -133,91 +173,103 @@
+                         <property name="label">gtk-delete</property>
+                         <property name="visible">True</property>
+                         <property name="sensitive">False</property>
++                        <property name="can_focus">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">True</property>
+-                        <signal name="activate" handler="ca_on_delete2_activate"/>
++                        <signal name="activate" handler="ca_on_delete2_activate" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkSeparatorMenuItem" id="separatormenuitem4">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkMenuItem" id="generate_crl_menuitem">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                         <property name="has_tooltip">True</property>
+                         <property name="tooltip_markup">Generate the current Certificate Revocation List</property>
+                         <property name="tooltip_text" translatable="yes">Generate the current Certificate Revocation List</property>
+                         <property name="label" translatable="yes">Generate _CRL</property>
+                         <property name="use_underline">True</property>
+-                        <signal name="activate" handler="ca_generate_crl"/>
++                        <signal name="activate" handler="ca_generate_crl" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkSeparatorMenuItem" id="separator3">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkMenuItem" id="generate_dh_menuitem">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">Generate D_H parameters...</property>
+                         <property name="use_underline">True</property>
+-                        <signal name="activate" handler="ca_generate_dh_param_show"/>
++                        <signal name="activate" handler="ca_generate_dh_param_show" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkSeparatorMenuItem" id="separator4">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkMenuItem" id="change_pwd_menuitem">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                         <property name="label" translatable="yes">Change database pass_word</property>
+                         <property name="use_underline">True</property>
+-                        <signal name="activate" handler="ca_on_change_pwd_menuitem_activate"/>
++                        <signal name="activate" handler="ca_on_change_pwd_menuitem_activate" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkSeparatorMenuItem" id="separator5">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkImageMenuItem" id="import1">
+                         <property name="label" translatable="yes">_Import</property>
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">False</property>
+-                        <signal name="activate" handler="on_import1_activate"/>
++                        <signal name="activate" handler="on_import1_activate" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkMenuItem" id="export1">
+                         <property name="visible">True</property>
+                         <property name="sensitive">False</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">E_xport</property>
+                         <property name="use_underline">True</property>
+-                        <signal name="activate" handler="ca_on_export1_activate"/>
++                        <signal name="activate" handler="ca_on_export1_activate" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkSeparatorMenuItem" id="separatormenuitem2">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkImageMenuItem" id="quit1">
+                         <property name="label">gtk-quit</property>
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">True</property>
+-                        <signal name="activate" handler="on_quit1_activate"/>
++                        <signal name="activate" handler="on_quit1_activate" swapped="no"/>
+                       </object>
+                     </child>
+                   </object>
+@@ -227,31 +279,36 @@
+             <child>
+               <object class="GtkMenuItem" id="edit1">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">_Edit</property>
+                 <property name="use_underline">True</property>
+                 <child type="submenu">
+                   <object class="GtkMenu" id="edit1_menu1">
++                    <property name="can_focus">False</property>
+                     <child>
+                       <object class="GtkImageMenuItem" id="properties1">
+                         <property name="label">gtk-properties</property>
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">True</property>
+-                        <signal name="activate" handler="on_properties1_activate"/>
++                        <signal name="activate" handler="on_properties1_activate" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkSeparatorMenuItem" id="separator2">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkImageMenuItem" id="preferences1">
+                         <property name="label">gtk-preferences</property>
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">True</property>
+-                        <signal name="activate" handler="on_preferences1_activate"/>
++                        <signal name="activate" handler="on_preferences1_activate" swapped="no"/>
+                       </object>
+                     </child>
+                   </object>
+@@ -261,31 +318,35 @@
+             <child>
+               <object class="GtkMenuItem" id="menuitem1">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                 <property name="label" translatable="yes">_View</property>
+                 <property name="use_underline">True</property>
+                 <child type="submenu">
+                   <object class="GtkMenu" id="menu1">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                     <child>
+                       <object class="GtkCheckMenuItem" id="csr_view_menuitem">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                         <property name="label" translatable="yes">Certificate _Signing Requests</property>
+                         <property name="use_underline">True</property>
+                         <property name="active">True</property>
+-                        <signal name="toggled" handler="ca_csr_view_toggled"/>
++                        <signal name="toggled" handler="ca_csr_view_toggled" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkCheckMenuItem" id="revoked_view_menuitem">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                         <property name="label" translatable="yes">_Revoked Certificates</property>
+                         <property name="use_underline">True</property>
+                         <property name="active">True</property>
+-                        <signal name="toggled" handler="ca_rcrt_view_toggled"/>
++                        <signal name="toggled" handler="ca_rcrt_view_toggled" swapped="no"/>
+                       </object>
+                     </child>
+                   </object>
+@@ -295,17 +356,20 @@
+             <child>
+               <object class="GtkMenuItem" id="help1">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">_Help</property>
+                 <property name="use_underline">True</property>
+                 <child type="submenu">
+                   <object class="GtkMenu" id="help1_menu1">
++                    <property name="can_focus">False</property>
+                     <child>
+                       <object class="GtkImageMenuItem" id="about1">
+                         <property name="label">gtk-about</property>
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">True</property>
+-                        <signal name="activate" handler="on_about1_activate"/>
++                        <signal name="activate" handler="on_about1_activate" swapped="no"/>
+                       </object>
+                     </child>
+                   </object>
+@@ -322,14 +386,16 @@
+         <child>
+           <object class="GtkToolbar" id="toolbar1">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <child>
+               <object class="GtkToolButton" id="toolbutton1">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="has_tooltip">True</property>
+                 <property name="tooltip_markup">Create a new database</property>
+                 <property name="tooltip_text" translatable="yes">Create a new database</property>
+                 <property name="stock_id">gtk-new</property>
+-                <signal name="clicked" handler="on_new1_activate"/>
++                <signal name="clicked" handler="on_new1_activate" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -339,11 +405,12 @@
+             <child>
+               <object class="GtkToolButton" id="toolbutton2">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="has_tooltip">True</property>
+                 <property name="tooltip_markup">Open an existing database</property>
+                 <property name="tooltip_text" translatable="yes">Open an existing database</property>
+                 <property name="stock_id">gtk-open</property>
+-                <signal name="clicked" handler="on_open1_activate"/>
++                <signal name="clicked" handler="on_open1_activate" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -353,6 +420,7 @@
+             <child>
+               <object class="GtkSeparatorToolItem" id="toolbutton4">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -362,12 +430,13 @@
+             <child>
+               <object class="GtkToolButton" id="addca_toolbutton">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="has_tooltip">True</property>
+                 <property name="tooltip_markup">Add an autosigned CA</property>
+                 <property name="tooltip_text" translatable="yes">Add an autosigned CA</property>
+                 <property name="label" translatable="yes">Add autosigned CA certificate</property>
+                 <property name="icon_widget">addcaimg</property>
+-                <signal name="clicked" handler="on_add_self_signed_ca_activate"/>
++                <signal name="clicked" handler="on_add_self_signed_ca_activate" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -377,12 +446,13 @@
+             <child>
+               <object class="GtkToolButton" id="addcsr_toolbutton">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="has_tooltip">True</property>
+                 <property name="tooltip_markup">Add a new Certificate Signing Request</property>
+                 <property name="tooltip_text" translatable="yes">Add a new Certificate Signing Request</property>
+                 <property name="label" translatable="yes">Add CSR</property>
+                 <property name="icon_widget">addcsrimg</property>
+-                <signal name="clicked" handler="on_add_csr_activate"/>
++                <signal name="clicked" handler="on_add_csr_activate" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -392,6 +462,7 @@
+             <child>
+               <object class="GtkSeparatorToolItem" id="toolbutton6">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -402,12 +473,13 @@
+               <object class="GtkToolButton" id="extractpkey_toolbutton">
+                 <property name="visible">True</property>
+                 <property name="sensitive">False</property>
++                <property name="can_focus">False</property>
+                 <property name="has_tooltip">True</property>
+                 <property name="tooltip_markup">Extract the private key of the selected item into a external file</property>
+                 <property name="tooltip_text" translatable="yes">Extract the private key of the selected item into a external file</property>
+                 <property name="label" translatable="yes">Extract Private Key</property>
+                 <property name="icon_widget">extractpkeyimg</property>
+-                <signal name="clicked" handler="ca_on_extractprivatekey1_activate"/>
++                <signal name="clicked" handler="ca_on_extractprivatekey1_activate" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -418,12 +490,13 @@
+               <object class="GtkToolButton" id="revoke_toolbutton">
+                 <property name="visible">True</property>
+                 <property name="sensitive">False</property>
++                <property name="can_focus">False</property>
+                 <property name="has_tooltip">True</property>
+                 <property name="tooltip_markup">Revoke the selected certificate</property>
+                 <property name="tooltip_text" translatable="yes">Revoke the selected certificate</property>
+                 <property name="label" translatable="yes">Revoke</property>
+                 <property name="stock_id">gtk-cancel</property>
+-                <signal name="clicked" handler="ca_on_revoke_activate"/>
++                <signal name="clicked" handler="ca_on_revoke_activate" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -434,12 +507,13 @@
+               <object class="GtkToolButton" id="sign_toolbutton">
+                 <property name="visible">True</property>
+                 <property name="sensitive">False</property>
++                <property name="can_focus">False</property>
+                 <property name="has_tooltip">True</property>
+                 <property name="tooltip_markup">Sign the selected Certificate Signing Request</property>
+                 <property name="tooltip_text" translatable="yes">Sign the selected Certificate Signing Request</property>
+                 <property name="label" translatable="yes">Sign</property>
+                 <property name="icon_widget">signimg</property>
+-                <signal name="clicked" handler="ca_on_sign1_activate"/>
++                <signal name="clicked" handler="ca_on_sign1_activate" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -450,11 +524,12 @@
+               <object class="GtkToolButton" id="delete_toolbutton">
+                 <property name="visible">True</property>
+                 <property name="sensitive">False</property>
++                <property name="can_focus">False</property>
+                 <property name="has_tooltip">True</property>
+                 <property name="tooltip_markup">Delete the selected Certificate Signing Request</property>
+                 <property name="tooltip_text" translatable="yes">Delete the selected Certificate Signing Request</property>
+                 <property name="stock_id">gtk-delete</property>
+-                <signal name="clicked" handler="ca_on_delete2_activate"/>
++                <signal name="clicked" handler="ca_on_delete2_activate" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -472,41 +547,28 @@
+           <object class="GtkScrolledWindow" id="scrolledwindow6">
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+-            <property name="hscrollbar_policy">automatic</property>
+-            <property name="vscrollbar_policy">automatic</property>
+             <property name="shadow_type">in</property>
+             <child>
+               <object class="GtkTreeView" id="ca_treeview">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="rules_hint">True</property>
+-                <signal name="button_press_event" handler="ca_treeview_popup_handler"/>
+-                <signal name="cursor_changed" handler="ca_treeview_selection_change"/>
+-                <signal name="row_activated" handler="ca_treeview_row_activated"/>
++                <signal name="button-press-event" handler="ca_treeview_popup_handler" swapped="no"/>
++                <signal name="cursor-changed" handler="ca_treeview_selection_change" swapped="no"/>
++                <signal name="row-activated" handler="ca_treeview_row_activated" swapped="no"/>
++                <child internal-child="selection">
++                  <object class="GtkTreeSelection"/>
++                </child>
+               </object>
+             </child>
+           </object>
+           <packing>
++            <property name="expand">True</property>
++            <property name="fill">True</property>
+             <property name="position">2</property>
+           </packing>
+         </child>
+       </object>
+     </child>
+   </object>
+-  <object class="GtkImage" id="addcaimg">
+-    <property name="visible">True</property>
+-    <property name="pixbuf">addca.png</property>
+-  </object>
+-  <object class="GtkImage" id="addcsrimg">
+-    <property name="visible">True</property>
+-    <property name="pixbuf">addcsr.png</property>
+-  </object>
+-  <object class="GtkImage" id="signimg">
+-    <property name="visible">True</property>
+-    <property name="pixbuf">sign.png</property>
+-  </object>
+-  <object class="GtkImage" id="extractpkeyimg">
+-    <property name="visible">True</property>
+-    <property name="pixbuf">extractpkey.png</property>
+-  </object>
+ </interface>
+--- gnomint-1.3.0.orig/gui/new_ca_window.ui
++++ gnomint-1.3.0/gui/new_ca_window.ui
+@@ -1,49 +1,58 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <!-- interface-requires gtk+ 2.12 -->
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkAdjustment" id="adjustmentCAKeyLength">
+-    <property name="value">2048</property>
+     <property name="lower">1024</property>
+     <property name="upper">5120</property>
++    <property name="value">2048</property>
+     <property name="step_increment">1024</property>
+     <property name="page_increment">1024</property>
+   </object>
+   <object class="GtkAdjustment" id="adjustmentMonthsBeforeExpiration">
+-    <property name="value">240</property>
+     <property name="lower">1</property>
+     <property name="upper">600</property>
++    <property name="value">240</property>
+     <property name="step_increment">1</property>
+     <property name="page_increment">12</property>
+   </object>
+   <object class="GtkWindow" id="new_ca_window">
+     <property name="visible">True</property>
++    <property name="can_focus">False</property>
+     <property name="title" translatable="yes">New CA - gnoMint</property>
+     <property name="modal">True</property>
+     <property name="window_position">center</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+     <child>
++      <placeholder/>
++    </child>
++    <child>
+       <object class="GtkNotebook" id="new_ca_notebook">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="border_width">8</property>
+         <property name="show_tabs">False</property>
+         <property name="show_border">False</property>
+         <child>
+-          <object class="GtkVBox" id="vbox2">
++          <object class="GtkBox" id="vbox2">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="orientation">vertical</property>
+             <property name="spacing">6</property>
+             <child>
+-              <object class="GtkHBox" id="hbox1">
++              <object class="GtkBox" id="hbox1">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <child>
+                   <object class="GtkLabel" id="label11">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">&lt;big&gt;CA Subject Properties&lt;/big&gt;
+ </property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -54,9 +63,10 @@
+                 <child>
+                   <object class="GtkLabel" id="label12">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes"> </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes"> </property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -72,186 +82,168 @@
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkTable" id="table1">
++              <object class="GtkGrid" id="table1">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="border_width">6</property>
+-                <property name="n_rows">6</property>
+-                <property name="n_columns">2</property>
+                 <property name="row_spacing">6</property>
+                 <child>
+                   <object class="GtkLabel" id="label9">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Organization:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Organization:</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">3</property>
+-                    <property name="bottom_attach">4</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label10">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Organization Unit:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Organization Unit:</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">4</property>
+-                    <property name="bottom_attach">5</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label6">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">Country:</property>
+                     <property name="max_width_chars">0</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
++                    <property name="left_attach">0</property>
++                    <property name="top_attach">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label7">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">State or Province name: </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">State or Province name: </property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label8">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">City: </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">City: </property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">2</property>
+-                    <property name="bottom_attach">3</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkEntry" id="st_entry">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkEntry" id="city_entry">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">2</property>
+-                    <property name="bottom_attach">3</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkEntry" id="o_entry">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">3</property>
+-                    <property name="bottom_attach">4</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkEntry" id="ou_entry">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">4</property>
+-                    <property name="bottom_attach">5</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label20">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">CA Root Certificate 
+ Common Name (CN):</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">5</property>
+-                    <property name="bottom_attach">6</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkEntry" id="cn_entry">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
+-                    <signal name="changed" handler="on_cn_entry_changed"/>
++                    <property name="invisible_char">•</property>
++                    <signal name="changed" handler="on_cn_entry_changed" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">5</property>
+-                    <property name="bottom_attach">6</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkComboBox" id="country_combobox">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
++                    <property name="top_attach">0</property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHButtonBox" id="hbuttonbox1">
++              <object class="GtkButtonBox" id="hbuttonbox1">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="spacing">12</property>
+                 <property name="layout_style">end</property>
+                 <child>
+@@ -277,7 +269,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_ca_cancel_clicked"/>
++                    <signal name="clicked" handler="on_new_ca_cancel_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -294,7 +286,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_ca_next1_clicked"/>
++                    <signal name="clicked" handler="on_new_ca_next1_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -317,28 +309,33 @@
+         <child type="tab">
+           <object class="GtkLabel" id="label3">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="label" translatable="yes">CA properties</property>
+             <property name="xalign">0</property>
+             <property name="yalign">0</property>
+-            <property name="label" translatable="yes">CA properties</property>
+           </object>
+           <packing>
+             <property name="tab_fill">False</property>
+           </packing>
+         </child>
+         <child>
+-          <object class="GtkVBox" id="vbox20">
++          <object class="GtkBox" id="vbox20">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="orientation">vertical</property>
+             <child>
+-              <object class="GtkHBox" id="hbox21">
++              <object class="GtkBox" id="hbox21">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <child>
+                   <object class="GtkLabel" id="label37">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">&lt;big&gt;CA Root certificate properties&lt;/big&gt;
+ </property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -349,9 +346,10 @@
+                 <child>
+                   <object class="GtkLabel" id="label103">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes"> </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes"> </property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -362,16 +360,16 @@
+               </object>
+               <packing>
+                 <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">0</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkTable" id="table2">
++              <object class="GtkGrid" id="table2">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="border_width">6</property>
+-                <property name="n_rows">3</property>
+-                <property name="n_columns">2</property>
+-                <property name="homogeneous">True</property>
++                <property name="column_homogeneous">True</property>
+                 <child>
+                   <object class="GtkSpinButton" id="months_before_expiration_spinbutton">
+                     <property name="visible">True</property>
+@@ -384,24 +382,20 @@
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">2</property>
+-                    <property name="bottom_attach">3</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label27">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Months before root certificate expiration:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Months before root certificate expiration:</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">2</property>
+-                    <property name="bottom_attach">3</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+@@ -416,15 +410,13 @@
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkHBox" id="hbox3">
++                  <object class="GtkBox" id="hbox3">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="homogeneous">True</property>
+                     <child>
+                       <object class="GtkRadioButton" id="rsa_radiobutton">
+@@ -435,7 +427,7 @@
+                         <property name="use_underline">True</property>
+                         <property name="active">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_ca_privkey_type_toggle"/>
++                        <signal name="toggled" handler="on_new_ca_privkey_type_toggle" swapped="no"/>
+                       </object>
+                       <packing>
+                         <property name="expand">False</property>
+@@ -462,45 +454,46 @@
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
++                    <property name="top_attach">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label21">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Private key bit length:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Private key bit length:</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label17">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Private key type:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Private key type:</property>
+                   </object>
+                   <packing>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
++                    <property name="left_attach">0</property>
++                    <property name="top_attach">0</property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHButtonBox" id="hbuttonbox12">
++              <object class="GtkButtonBox" id="hbuttonbox12">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="spacing">12</property>
+                 <property name="layout_style">end</property>
+                 <child>
+@@ -526,7 +519,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_ca_cancel_clicked"/>
++                    <signal name="clicked" handler="on_new_ca_cancel_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -542,7 +535,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_ca_previous2_clicked"/>
++                    <signal name="clicked" handler="on_new_ca_previous2_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -558,7 +551,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_ca_next2_clicked"/>
++                    <signal name="clicked" handler="on_new_ca_next2_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -569,20 +562,23 @@
+               </object>
+               <packing>
+                 <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">2</property>
+               </packing>
+             </child>
+           </object>
+           <packing>
+             <property name="position">1</property>
++            <property name="tab_fill">False</property>
+           </packing>
+         </child>
+         <child type="tab">
+           <object class="GtkLabel" id="label4">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="label" translatable="yes">Root certificate prop</property>
+             <property name="xalign">0</property>
+             <property name="yalign">0</property>
+-            <property name="label" translatable="yes">Root certificate prop</property>
+           </object>
+           <packing>
+             <property name="position">1</property>
+@@ -590,19 +586,23 @@
+           </packing>
+         </child>
+         <child>
+-          <object class="GtkVBox" id="vbox3">
++          <object class="GtkBox" id="vbox3">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="orientation">vertical</property>
+             <child>
+-              <object class="GtkHBox" id="hbox2">
++              <object class="GtkBox" id="hbox2">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <child>
+                   <object class="GtkLabel" id="label13">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">&lt;big&gt;CA properties&lt;/big&gt;
+ </property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -613,9 +613,10 @@
+                 <child>
+                   <object class="GtkLabel" id="label14">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes"> </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes"> </property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -626,17 +627,21 @@
+               </object>
+               <packing>
+                 <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">0</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkVBox" id="vbox1">
++              <object class="GtkBox" id="vbox1">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="orientation">vertical</property>
+                 <child>
+                   <object class="GtkLabel" id="label1">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">CRL Distribution Point:</property>
++                    <property name="xalign">0</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -647,8 +652,7 @@
+                 <child>
+                   <object class="GtkLabel" id="label2">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">&lt;small&gt;Please, in this field enter an URL where the CRL for this CA will be available. 
+ You can leave it blank. In this case, no CRL Distribution Point will be set in the CA 
+ Certificate, and you will be able to set it as a new CA property. 
+@@ -657,6 +661,8 @@
+                     <property name="use_markup">True</property>
+                     <property name="wrap">True</property>
+                     <property name="max_width_chars">60</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -668,7 +674,7 @@
+                   <object class="GtkEntry" id="crl_distribution_point_entry">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -678,12 +684,15 @@
+                 </child>
+               </object>
+               <packing>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHButtonBox" id="hbuttonbox4">
++              <object class="GtkButtonBox" id="hbuttonbox4">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="spacing">12</property>
+                 <property name="layout_style">end</property>
+                 <child>
+@@ -709,7 +718,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_ca_cancel_clicked"/>
++                    <signal name="clicked" handler="on_new_ca_cancel_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -725,7 +734,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_ca_previous3_clicked"/>
++                    <signal name="clicked" handler="on_new_ca_previous3_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -741,7 +750,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_ca_commit_clicked"/>
++                    <signal name="clicked" handler="on_new_ca_commit_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -752,17 +761,20 @@
+               </object>
+               <packing>
+                 <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">2</property>
+               </packing>
+             </child>
+           </object>
+           <packing>
+             <property name="position">2</property>
++            <property name="tab_fill">False</property>
+           </packing>
+         </child>
+         <child type="tab">
+           <object class="GtkLabel" id="label18">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+             <property name="label" translatable="yes">Password protect</property>
+           </object>
+--- gnomint-1.3.0.orig/gui/new_cert_window.ui
++++ gnomint-1.3.0/gui/new_cert_window.ui
+@@ -1,41 +1,47 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkAdjustment" id="AdjustmentMonthsBeforeExpirationSpinButton1">
+     <property name="lower">1</property>
+     <property name="upper">600</property>
+-    <property name="step-increment">1</property>
+-    <property name="page-increment">12</property>
+-    <property name="page-size">0</property>
+     <property name="value">1</property>
++    <property name="step_increment">1</property>
++    <property name="page_increment">12</property>
+   </object>
+   <object class="GtkWindow" id="new_cert_window">
+     <property name="visible">True</property>
++    <property name="can_focus">False</property>
+     <property name="title" translatable="yes">New Certificate - gnoMint</property>
+     <property name="modal">True</property>
+     <property name="window_position">center</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+     <child>
++      <placeholder/>
++    </child>
++    <child>
+       <object class="GtkNotebook" id="new_cert_notebook">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="border_width">8</property>
+         <property name="show_tabs">False</property>
+         <property name="show_border">False</property>
+         <child>
+-          <object class="GtkVBox" id="vbox25">
++          <object class="GtkBox" id="vbox25">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="orientation">vertical</property>
+             <property name="spacing">6</property>
+             <child>
+               <object class="GtkLabel" id="label136">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">&lt;big&gt;New Certificate Properties&lt;/big&gt;
+ </property>
+                 <property name="use_markup">True</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -46,197 +52,196 @@
+             <child>
+               <object class="GtkLabel" id="label137">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
+-                <property name="label" translatable="yes">You are about to sign a Certificate Signing Request, and this way, creating a new certificate. Please check the certificate properties.</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">You are about to sign a Certificate Signing Request,
++and this way, creating a new certificate. Please
++check the certificate properties.</property>
+                 <property name="justify">fill</property>
+                 <property name="wrap">True</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkTable" id="table13">
++              <object class="GtkGrid" id="table13">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="border_width">16</property>
+-                <property name="n_rows">6</property>
+-                <property name="n_columns">2</property>
+-                <property name="column_spacing">10</property>
+                 <property name="row_spacing">6</property>
++                <property name="column_spacing">10</property>
+                 <child>
+                   <object class="GtkLabel" id="cn_label">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">label</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">label</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">5</property>
+-                    <property name="bottom_attach">6</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="ou_label">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">label</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">label</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">4</property>
+-                    <property name="bottom_attach">5</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="o_label">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">label</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">label</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">3</property>
+-                    <property name="bottom_attach">4</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="l_label">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">label</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">label</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">2</property>
+-                    <property name="bottom_attach">3</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="st_label">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">label</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">label</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="c_label">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">label</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">label</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
++                    <property name="top_attach">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label144">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Organization:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Organization:</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">3</property>
+-                    <property name="bottom_attach">4</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label143">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Organization Unit:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Organization Unit:</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">4</property>
+-                    <property name="bottom_attach">5</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label142">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Country:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Country:</property>
+                   </object>
+                   <packing>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
++                    <property name="left_attach">0</property>
++                    <property name="top_attach">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label141">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">State or Province name: </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">State or Province name: </property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label140">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">City: </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">City: </property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">2</property>
+-                    <property name="bottom_attach">3</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label138">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">New certificate 
+ Common Name (CN):</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">5</property>
+-                    <property name="bottom_attach">6</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">2</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHButtonBox" id="hbuttonbox14">
++              <object class="GtkButtonBox" id="hbuttonbox14">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="spacing">12</property>
+                 <property name="layout_style">end</property>
+                 <child>
+@@ -262,7 +267,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_cert_cancel_clicked"/>
++                    <signal name="clicked" handler="on_new_cert_cancel_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -278,7 +283,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_cert_next1_clicked"/>
++                    <signal name="clicked" handler="on_new_cert_next1_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -301,27 +306,30 @@
+         <child type="tab">
+           <object class="GtkLabel" id="label145">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="label" translatable="yes">CA properties</property>
+             <property name="xalign">0</property>
+             <property name="yalign">0</property>
+-            <property name="label" translatable="yes">CA properties</property>
+           </object>
+           <packing>
+             <property name="tab_fill">False</property>
+           </packing>
+         </child>
+         <child>
+-          <object class="GtkVBox" id="vbox23">
++          <object class="GtkBox" id="vbox23">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="orientation">vertical</property>
+             <property name="spacing">6</property>
+             <child>
+               <object class="GtkLabel" id="label34">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">&lt;big&gt;New Certificate Properties&lt;/big&gt;
+ </property>
+                 <property name="use_markup">True</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -332,13 +340,18 @@
+             <child>
+               <object class="GtkLabel" id="label84">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
+-                <property name="label" translatable="yes">You are about to sign a Certificate Signing Request. Please, choose the Certification Authority you are going to use for signing it.</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">You are about to sign a Certificate Signing Request.
++Please, choose the Certification Authority you are
++going to use for signing it.</property>
+                 <property name="justify">fill</property>
+                 <property name="wrap">True</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+@@ -346,25 +359,29 @@
+               <object class="GtkScrolledWindow" id="scrolledwindow5">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+-                <property name="hscrollbar_policy">automatic</property>
+-                <property name="vscrollbar_policy">automatic</property>
+                 <property name="shadow_type">in</property>
+                 <child>
+                   <object class="GtkTreeView" id="signing_ca_treeview">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="headers_visible">False</property>
+-                    <signal name="cursor_changed" handler="new_cert_signing_ca_treeview_cursor_changed"/>
++                    <signal name="cursor-changed" handler="new_cert_signing_ca_treeview_cursor_changed" swapped="no"/>
++                    <child internal-child="selection">
++                      <object class="GtkTreeSelection"/>
++                    </child>
+                   </object>
+                 </child>
+               </object>
+               <packing>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
+                 <property name="position">2</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHButtonBox" id="hbuttonbox3">
++              <object class="GtkButtonBox" id="hbuttonbox3">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="spacing">12</property>
+                 <property name="layout_style">end</property>
+                 <child>
+@@ -390,7 +407,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_cert_cancel_clicked"/>
++                    <signal name="clicked" handler="on_new_cert_cancel_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -406,7 +423,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_cert_previous2_clicked"/>
++                    <signal name="clicked" handler="on_new_cert_previous2_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -423,7 +440,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_cert_next2_clicked"/>
++                    <signal name="clicked" handler="on_new_cert_next2_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -446,9 +463,10 @@
+         <child type="tab">
+           <object class="GtkLabel" id="label151">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="label" translatable="yes">Choose CA for signing the CSR</property>
+             <property name="xalign">0</property>
+             <property name="yalign">0</property>
+-            <property name="label" translatable="yes">Choose CA for signing the CSR</property>
+           </object>
+           <packing>
+             <property name="position">2</property>
+@@ -456,17 +474,19 @@
+           </packing>
+         </child>
+         <child>
+-          <object class="GtkVBox" id="vbox26">
++          <object class="GtkBox" id="vbox26">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="orientation">vertical</property>
+             <child>
+               <object class="GtkLabel" id="label146">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">&lt;big&gt;New Certificate Properties&lt;/big&gt;
+ </property>
+                 <property name="use_markup">True</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -475,17 +495,21 @@
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHBox" id="hbox20">
++              <object class="GtkBox" id="hbox20">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="border_width">8</property>
+                 <child>
+                   <object class="GtkLabel" id="label147">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Months before certificate expiration:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Months before certificate expiration:</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">0</property>
+                   </packing>
+                 </child>
+@@ -493,19 +517,21 @@
+                   <object class="GtkSpinButton" id="months_before_expiration_spinbutton1">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                     <property name="adjustment">AdjustmentMonthsBeforeExpirationSpinButton1</property>
+                     <property name="climb_rate">1</property>
+                     <property name="numeric">True</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">1</property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+-                <property name="fill">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+@@ -515,11 +541,10 @@
+                 <property name="can_focus">True</property>
+                 <property name="border_width">4</property>
+                 <child>
+-                  <object class="GtkTable" id="table16">
++                  <object class="GtkGrid" id="table16">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="border_width">10</property>
+-                    <property name="n_rows">4</property>
+-                    <property name="n_columns">2</property>
+                     <child>
+                       <object class="GtkCheckButton" id="data_encipherment_check">
+                         <property name="label" translatable="yes">Data encipherment</property>
+@@ -529,13 +554,11 @@
+                         <property name="use_underline">True</property>
+                         <property name="active">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">2</property>
+-                        <property name="bottom_attach">3</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -547,13 +570,11 @@
+                         <property name="use_underline">True</property>
+                         <property name="active">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">1</property>
+-                        <property name="bottom_attach">2</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -565,11 +586,11 @@
+                         <property name="use_underline">True</property>
+                         <property name="active">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
++                        <property name="top_attach">0</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -580,8 +601,12 @@
+                         <property name="receives_default">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
++                      <packing>
++                        <property name="left_attach">0</property>
++                        <property name="top_attach">0</property>
++                      </packing>
+                     </child>
+                     <child>
+                       <object class="GtkCheckButton" id="key_agreement_check">
+@@ -592,11 +617,11 @@
+                         <property name="use_underline">True</property>
+                         <property name="active">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">3</property>
+-                        <property name="bottom_attach">4</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -607,11 +632,11 @@
+                         <property name="receives_default">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">2</property>
+-                        <property name="bottom_attach">3</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -622,22 +647,21 @@
+                         <property name="receives_default">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">1</property>
+-                        <property name="bottom_attach">2</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label110">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">3</property>
+-                        <property name="bottom_attach">4</property>
+                       </packing>
+                     </child>
+                   </object>
+@@ -645,16 +669,17 @@
+                 <child type="label">
+                   <object class="GtkLabel" id="label150">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">&lt;b&gt;Certificate uses&lt;/b&gt;</property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                 </child>
+               </object>
+               <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
+                 <property name="position">2</property>
+               </packing>
+             </child>
+@@ -664,22 +689,20 @@
+                 <property name="can_focus">True</property>
+                 <property name="border_width">4</property>
+                 <child>
+-                  <object class="GtkTable" id="table14">
++                  <object class="GtkGrid" id="table14">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="border_width">10</property>
+-                    <property name="n_rows">4</property>
+-                    <property name="n_columns">2</property>
+                     <child>
+                       <object class="GtkLabel" id="label161">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">3</property>
+-                        <property name="bottom_attach">4</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -690,13 +713,11 @@
+                         <property name="receives_default">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">2</property>
+-                        <property name="bottom_attach">3</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -707,11 +728,11 @@
+                         <property name="receives_default">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">3</property>
+-                        <property name="bottom_attach">4</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -722,11 +743,11 @@
+                         <property name="receives_default">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">2</property>
+-                        <property name="bottom_attach">3</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -738,8 +759,12 @@
+                         <property name="use_underline">True</property>
+                         <property name="active">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
++                      <packing>
++                        <property name="left_attach">0</property>
++                        <property name="top_attach">0</property>
++                      </packing>
+                     </child>
+                     <child>
+                       <object class="GtkCheckButton" id="webclient_check">
+@@ -750,11 +775,11 @@
+                         <property name="use_underline">True</property>
+                         <property name="active">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">1</property>
+-                        <property name="bottom_attach">2</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -765,11 +790,11 @@
+                         <property name="receives_default">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
++                        <property name="top_attach">0</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -781,13 +806,11 @@
+                         <property name="use_underline">True</property>
+                         <property name="active">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">1</property>
+-                        <property name="bottom_attach">2</property>
+                       </packing>
+                     </child>
+                   </object>
+@@ -795,30 +818,36 @@
+                 <child type="label">
+                   <object class="GtkLabel" id="label148">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">&lt;b&gt;Certificate purposes&lt;/b&gt;</property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                 </child>
+               </object>
+               <packing>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
+                 <property name="position">3</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHSeparator" id="hseparator1">
++              <object class="GtkSeparator" id="hseparator1">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="padding">10</property>
+                 <property name="position">4</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHButtonBox" id="hbuttonbox15">
++              <object class="GtkButtonBox" id="hbuttonbox15">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="spacing">12</property>
+                 <property name="layout_style">end</property>
+                 <child>
+@@ -844,7 +873,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_cert_cancel_clicked"/>
++                    <signal name="clicked" handler="on_new_cert_cancel_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -860,7 +889,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_cert_previous3_clicked"/>
++                    <signal name="clicked" handler="on_new_cert_previous3_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -876,7 +905,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_cert_commit_clicked"/>
++                    <signal name="clicked" handler="on_new_cert_commit_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -887,6 +916,7 @@
+               </object>
+               <packing>
+                 <property name="expand">False</property>
++                <property name="fill">False</property>
+                 <property name="position">5</property>
+               </packing>
+             </child>
+@@ -898,6 +928,7 @@
+         <child type="tab">
+           <object class="GtkLabel" id="label32">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="label" translatable="yes">Certificate properties</property>
+           </object>
+           <packing>
+--- gnomint-1.3.0.orig/gui/new_crl_dialog.ui
++++ gnomint-1.3.0/gui/new_crl_dialog.ui
+@@ -1,26 +1,75 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkDialog" id="new_crl_dialog">
++    <property name="can_focus">False</property>
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">New CRL - gnoMint</property>
+     <property name="window_position">center-on-parent</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
++    <child>
++      <placeholder/>
++    </child>
+     <child internal-child="vbox">
+-      <object class="GtkVBox" id="dialog-vbox21">
++      <object class="GtkBox" id="dialog-vbox21">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
+         <property name="spacing">11</property>
++        <child internal-child="action_area">
++          <object class="GtkButtonBox" id="dialog-action_area21">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="button22">
++                <property name="label">gtk-cancel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++                <signal name="clicked" handler="crl_cancel_clicked_cb" swapped="no"/>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="crl_ok_button">
++                <property name="label">gtk-ok</property>
++                <property name="visible">True</property>
++                <property name="sensitive">False</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++                <signal name="clicked" handler="crl_ok_clicked_cb" swapped="no"/>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
+         <child>
+           <object class="GtkLabel" id="label50">
+             <property name="visible">True</property>
+-            <property name="xalign">0</property>
+-            <property name="yalign">0</property>
++            <property name="can_focus">False</property>
+             <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;New Certificate Revocation List&lt;/b&gt;&lt;/big&gt;</property>
+             <property name="use_markup">True</property>
++            <property name="xalign">0</property>
++            <property name="yalign">0</property>
+           </object>
+           <packing>
+             <property name="expand">False</property>
+@@ -31,9 +80,10 @@
+         <child>
+           <object class="GtkLabel" id="label51">
+             <property name="visible">True</property>
+-            <property name="xalign">0</property>
++            <property name="can_focus">False</property>
+             <property name="label" translatable="yes">Please, select the CA for which a Certificate 
+ Revocation List is going to be created:</property>
++            <property name="xalign">0</property>
+           </object>
+           <packing>
+             <property name="expand">False</property>
+@@ -45,64 +95,25 @@
+           <object class="GtkScrolledWindow" id="scrolledwindow2">
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+-            <property name="hscrollbar_policy">automatic</property>
+-            <property name="vscrollbar_policy">automatic</property>
+             <property name="shadow_type">in</property>
+             <child>
+               <object class="GtkTreeView" id="crl_ca_treeview">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="headers_visible">False</property>
+-                <signal name="cursor_changed" handler="crl_treeview_cursor_changed_cb"/>
++                <signal name="cursor-changed" handler="crl_treeview_cursor_changed_cb" swapped="no"/>
++                <child internal-child="selection">
++                  <object class="GtkTreeSelection"/>
++                </child>
+               </object>
+             </child>
+           </object>
+           <packing>
++            <property name="expand">True</property>
++            <property name="fill">True</property>
+             <property name="position">3</property>
+           </packing>
+         </child>
+-        <child internal-child="action_area">
+-          <object class="GtkHButtonBox" id="dialog-action_area21">
+-            <property name="visible">True</property>
+-            <property name="layout_style">end</property>
+-            <child>
+-              <object class="GtkButton" id="button22">
+-                <property name="label" translatable="yes">gtk-cancel</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-                <signal name="clicked" handler="crl_cancel_clicked_cb"/>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="crl_ok_button">
+-                <property name="label" translatable="yes">gtk-ok</property>
+-                <property name="visible">True</property>
+-                <property name="sensitive">False</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-                <signal name="clicked" handler="crl_ok_clicked_cb"/>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">1</property>
+-              </packing>
+-            </child>
+-          </object>
+-          <packing>
+-            <property name="expand">False</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
+-          </packing>
+-        </child>
+       </object>
+     </child>
+     <action-widgets>
+--- gnomint-1.3.0.orig/gui/new_req_window.ui
++++ gnomint-1.3.0/gui/new_req_window.ui
+@@ -1,41 +1,50 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkAdjustment" id="AdjustmentKeyLengthSpinButton1">
+-    <property name="value">2048</property>
+     <property name="lower">1024</property>
+     <property name="upper">5120</property>
++    <property name="value">2048</property>
+     <property name="step_increment">1024</property>
+   </object>
+   <object class="GtkWindow" id="new_req_window">
+     <property name="visible">True</property>
++    <property name="can_focus">False</property>
+     <property name="title" translatable="yes">New certificate request - gnoMint</property>
+     <property name="modal">True</property>
+     <property name="window_position">center</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+     <child>
++      <placeholder/>
++    </child>
++    <child>
+       <object class="GtkNotebook" id="new_req_notebook">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="border_width">8</property>
+         <property name="show_tabs">False</property>
+         <property name="show_border">False</property>
+         <child>
+-          <object class="GtkVBox" id="vbox27">
++          <object class="GtkBox" id="vbox27">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="orientation">vertical</property>
+             <property name="spacing">7</property>
+             <child>
+-              <object class="GtkHBox" id="hbox22">
++              <object class="GtkBox" id="hbox22">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <child>
+                   <object class="GtkLabel" id="label105">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">&lt;big&gt;Certificate Request Properties&lt;/big&gt;
+ </property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -46,9 +55,10 @@
+                 <child>
+                   <object class="GtkLabel" id="label106">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes"> </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes"> </property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -59,18 +69,26 @@
+               </object>
+               <packing>
+                 <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">0</property>
+               </packing>
+             </child>
+             <child>
+               <object class="GtkLabel" id="label108">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="label" translatable="yes">&lt;small&gt;The subject of the new certificate request can inherit information from one of the existing Certification Authorities. This is a must if the policy of the CA you are going to use is defined to force some fields of a certificate subject to be the same as the ones in the CA cert subject.&lt;/small&gt;</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">&lt;small&gt;The subject of the new certificate request can inherit information
++from one of the existing Certification Authorities. This is a must if the
++policy of the CA you are going to use is defined to force some fields
++of a certificate subject to be the same as the ones in the CA cert
++subject.&lt;/small&gt;</property>
+                 <property name="use_markup">True</property>
+                 <property name="wrap">True</property>
++                <property name="xalign">0</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+@@ -84,6 +102,8 @@
+                 <property name="draw_indicator">True</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">2</property>
+               </packing>
+             </child>
+@@ -95,9 +115,11 @@
+                 <property name="receives_default">False</property>
+                 <property name="draw_indicator">True</property>
+                 <property name="group">dont_inherit_radiobutton</property>
+-                <signal name="toggled" handler="new_req_inherit_fields_toggled"/>
++                <signal name="toggled" handler="new_req_inherit_fields_toggled" swapped="no"/>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">3</property>
+               </packing>
+             </child>
+@@ -105,8 +127,6 @@
+               <object class="GtkScrolledWindow" id="scrolledwindow7">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+-                <property name="hscrollbar_policy">automatic</property>
+-                <property name="vscrollbar_policy">automatic</property>
+                 <property name="shadow_type">in</property>
+                 <child>
+                   <object class="GtkTreeView" id="new_req_ca_treeview">
+@@ -114,16 +134,22 @@
+                     <property name="can_focus">True</property>
+                     <property name="headers_visible">False</property>
+                     <property name="enable_tree_lines">True</property>
++                    <child internal-child="selection">
++                      <object class="GtkTreeSelection"/>
++                    </child>
+                   </object>
+                 </child>
+               </object>
+               <packing>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
+                 <property name="position">4</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHButtonBox" id="hbuttonbox13">
++              <object class="GtkButtonBox" id="hbuttonbox13">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="spacing">12</property>
+                 <property name="layout_style">end</property>
+                 <child>
+@@ -149,7 +175,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_req_cancel_clicked"/>
++                    <signal name="clicked" handler="on_new_req_cancel_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -165,7 +191,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_req_next1_clicked"/>
++                    <signal name="clicked" handler="on_new_req_next1_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -176,6 +202,7 @@
+               </object>
+               <packing>
+                 <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">5</property>
+               </packing>
+             </child>
+@@ -184,29 +211,34 @@
+         <child type="tab">
+           <object class="GtkLabel" id="label95">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="label" translatable="yes">CA properties</property>
+             <property name="xalign">0</property>
+             <property name="yalign">0</property>
+-            <property name="label" translatable="yes">CA properties</property>
+           </object>
+           <packing>
+             <property name="tab_fill">False</property>
+           </packing>
+         </child>
+         <child>
+-          <object class="GtkVBox" id="vbox15">
++          <object class="GtkBox" id="vbox15">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="orientation">vertical</property>
+             <property name="spacing">6</property>
+             <child>
+-              <object class="GtkHBox" id="hbox17">
++              <object class="GtkBox" id="hbox17">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <child>
+                   <object class="GtkLabel" id="label87">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">&lt;big&gt;Certificate Request Properties&lt;/big&gt;
+ </property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -217,9 +249,10 @@
+                 <child>
+                   <object class="GtkLabel" id="label88">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes"> </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes"> </property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -235,185 +268,167 @@
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkTable" id="table9">
++              <object class="GtkGrid" id="table9">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="border_width">6</property>
+-                <property name="n_rows">6</property>
+-                <property name="n_columns">2</property>
+                 <property name="row_spacing">6</property>
+                 <child>
+                   <object class="GtkComboBox" id="country_combobox1">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
++                    <property name="top_attach">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkEntry" id="cn_entry1">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
+-                    <signal name="changed" handler="on_new_req_cn_entry_changed"/>
++                    <property name="invisible_char">•</property>
++                    <signal name="changed" handler="on_new_req_cn_entry_changed" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">5</property>
+-                    <property name="bottom_attach">6</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label94">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">Certificate 
+ Common Name (CN):</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">5</property>
+-                    <property name="bottom_attach">6</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkEntry" id="ou_entry1">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">4</property>
+-                    <property name="bottom_attach">5</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkEntry" id="o_entry1">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">3</property>
+-                    <property name="bottom_attach">4</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkEntry" id="city_entry1">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">2</property>
+-                    <property name="bottom_attach">3</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkEntry" id="st_entry1">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label93">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">City: </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">City: </property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">2</property>
+-                    <property name="bottom_attach">3</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label92">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">State or Province name: </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">State or Province name: </property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label91">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Country:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Country:</property>
+                   </object>
+                   <packing>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
++                    <property name="left_attach">0</property>
++                    <property name="top_attach">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label90">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Organization Unit:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Organization Unit:</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">4</property>
+-                    <property name="bottom_attach">5</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label89">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Organization:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Organization:</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">3</property>
+-                    <property name="bottom_attach">4</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHButtonBox" id="hbuttonbox10">
++              <object class="GtkButtonBox" id="hbuttonbox10">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="spacing">12</property>
+                 <property name="layout_style">end</property>
+                 <child>
+@@ -439,7 +454,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_req_cancel_clicked"/>
++                    <signal name="clicked" handler="on_new_req_cancel_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -455,7 +470,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_req_previous2_clicked"/>
++                    <signal name="clicked" handler="on_new_req_previous2_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -472,7 +487,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_req_next2_clicked"/>
++                    <signal name="clicked" handler="on_new_req_next2_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -495,9 +510,10 @@
+         <child type="tab">
+           <object class="GtkLabel" id="label101">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="label" translatable="yes">Root certificate prop</property>
+             <property name="xalign">0</property>
+             <property name="yalign">0</property>
+-            <property name="label" translatable="yes">Root certificate prop</property>
+           </object>
+           <packing>
+             <property name="position">1</property>
+@@ -505,19 +521,23 @@
+           </packing>
+         </child>
+         <child>
+-          <object class="GtkVBox" id="vbox16">
++          <object class="GtkBox" id="vbox16">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="orientation">vertical</property>
+             <child>
+-              <object class="GtkHBox" id="hbox18">
++              <object class="GtkBox" id="hbox18">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <child>
+                   <object class="GtkLabel" id="label96">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">&lt;big&gt;Certificate Request Properties&lt;/big&gt;
+ </property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -528,9 +548,10 @@
+                 <child>
+                   <object class="GtkLabel" id="label97">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes"> </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes"> </property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -541,23 +562,23 @@
+               </object>
+               <packing>
+                 <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">0</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkTable" id="table10">
++              <object class="GtkGrid" id="table10">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="border_width">6</property>
+-                <property name="n_rows">2</property>
+-                <property name="n_columns">2</property>
+-                <property name="homogeneous">True</property>
++                <property name="column_homogeneous">True</property>
+                 <child>
+                   <object class="GtkSpinButton" id="keylength_spinbutton1">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="editable">False</property>
+                     <property name="max_length">5</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                     <property name="adjustment">AdjustmentKeyLengthSpinButton1</property>
+                     <property name="climb_rate">1024</property>
+                     <property name="snap_to_ticks">True</property>
+@@ -566,15 +587,13 @@
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkHBox" id="hbox19">
++                  <object class="GtkBox" id="hbox19">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="homogeneous">True</property>
+                     <child>
+                       <object class="GtkRadioButton" id="rsa_radiobutton1">
+@@ -586,7 +605,7 @@
+                         <property name="active">True</property>
+                         <property name="draw_indicator">True</property>
+                         <property name="group">dsa_radiobutton1</property>
+-                        <signal name="toggled" handler="on_new_req_privkey_type_toggle"/>
++                        <signal name="toggled" handler="on_new_req_privkey_type_toggle" swapped="no"/>
+                       </object>
+                       <packing>
+                         <property name="expand">False</property>
+@@ -613,45 +632,46 @@
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
++                    <property name="top_attach">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label99">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Private key bit length:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Private key bit length:</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label98">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Private key type:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Private key type:</property>
+                   </object>
+                   <packing>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
++                    <property name="left_attach">0</property>
++                    <property name="top_attach">0</property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHButtonBox" id="hbuttonbox11">
++              <object class="GtkButtonBox" id="hbuttonbox11">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="spacing">12</property>
+                 <property name="layout_style">end</property>
+                 <child>
+@@ -677,7 +697,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_req_cancel_clicked"/>
++                    <signal name="clicked" handler="on_new_req_cancel_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -693,7 +713,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_req_previous3_clicked"/>
++                    <signal name="clicked" handler="on_new_req_previous3_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -709,7 +729,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_req_commit_clicked"/>
++                    <signal name="clicked" handler="on_new_req_commit_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -720,6 +740,7 @@
+               </object>
+               <packing>
+                 <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">2</property>
+               </packing>
+             </child>
+@@ -731,6 +752,7 @@
+         <child type="tab">
+           <object class="GtkLabel" id="label104">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="label" translatable="yes">page 3</property>
+           </object>
+           <packing>
+--- gnomint-1.3.0.orig/gui/preferences_dialog.ui
++++ gnomint-1.3.0/gui/preferences_dialog.ui
+@@ -1,8 +1,9 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkDialog" id="preferences_dialog">
++    <property name="can_focus">False</property>
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">General Preferences - gnoMint</property>
+     <property name="resizable">False</property>
+@@ -10,19 +11,51 @@
+     <property name="window_position">center-on-parent</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
++    <child>
++      <placeholder/>
++    </child>
+     <child internal-child="vbox">
+-      <object class="GtkVBox" id="dialog-vbox19">
++      <object class="GtkBox" id="dialog-vbox19">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
+         <property name="spacing">2</property>
++        <child internal-child="action_area">
++          <object class="GtkButtonBox" id="dialog-action_area19">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="preferences_ok_button">
++                <property name="label">gtk-ok</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++                <signal name="clicked" handler="preferences_window_ok_button_clicked_cb" swapped="no"/>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
+         <child>
+           <object class="GtkNotebook" id="notebook1">
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+             <child>
+-              <object class="GtkVBox" id="vbox7">
++              <object class="GtkBox" id="vbox7">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="orientation">vertical</property>
+                 <child>
+                   <object class="GtkCheckButton" id="gnomekeyring_export_check">
+@@ -33,9 +66,11 @@
+                     <property name="receives_default">False</property>
+                     <property name="use_underline">True</property>
+                     <property name="draw_indicator">True</property>
+-                    <signal name="toggled" handler="preferences_window_gnomekeyring_export_toggled"/>
++                    <signal name="toggled" handler="preferences_window_gnomekeyring_export_toggled" swapped="no"/>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">0</property>
+                   </packing>
+                 </child>
+@@ -44,6 +79,7 @@
+             <child type="tab">
+               <object class="GtkLabel" id="label46">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">Export options</property>
+               </object>
+               <packing>
+@@ -52,36 +88,12 @@
+             </child>
+           </object>
+           <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
+             <property name="padding">6</property>
+             <property name="position">1</property>
+           </packing>
+         </child>
+-        <child internal-child="action_area">
+-          <object class="GtkHButtonBox" id="dialog-action_area19">
+-            <property name="visible">True</property>
+-            <property name="layout_style">end</property>
+-            <child>
+-              <object class="GtkButton" id="preferences_ok_button">
+-                <property name="label" translatable="yes">gtk-ok</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-                <signal name="clicked" handler="preferences_window_ok_button_clicked_cb"/>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-          </object>
+-          <packing>
+-            <property name="expand">False</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
+-          </packing>
+-        </child>
+       </object>
+     </child>
+     <action-widgets>
+--- gnomint-1.3.0.orig/src/ca.h
++++ gnomint-1.3.0/src/ca.h
+@@ -47,7 +47,6 @@
+ gboolean ca_rcrt_view_toggled (GtkCheckMenuItem *button, gpointer user_data);
+ void ca_generate_crl (GtkCheckMenuItem *button, gpointer user_data);
+ gboolean ca_treeview_popup_timeout_program_cb (gpointer data);
+-void ca_treeview_popup_timeout_program (GdkEventButton *event);
+ gboolean ca_treeview_popup_handler (GtkTreeView *tree_view,
+ 				    GdkEvent *event, gpointer user_data);
+ void ca_on_change_pwd_menuitem_activate (GtkMenuItem *menuitem, gpointer user_data);
+--- gnomint-1.3.0.orig/gui/export_certificate_dialog.ui
++++ gnomint-1.3.0/gui/export_certificate_dialog.ui
+@@ -1,8 +1,9 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkDialog" id="export_certificate_dialog">
++    <property name="can_focus">False</property>
+     <property name="title" translatable="yes">Export certificate - gnoMint</property>
+     <property name="modal">True</property>
+     <property name="window_position">center</property>
+@@ -10,32 +11,82 @@
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+     <property name="urgency_hint">True</property>
+-    <property name="has_separator">False</property>
++    <child>
++      <placeholder/>
++    </child>
+     <child internal-child="vbox">
+-      <object class="GtkVBox" id="dialog-vbox11">
++      <object class="GtkBox" id="dialog-vbox11">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
++        <child internal-child="action_area">
++          <object class="GtkButtonBox" id="dialog-action_area11">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="button1">
++                <property name="label">gtk-cancel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="button4">
++                <property name="label">gtk-ok</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
+         <child>
+-          <object class="GtkVBox" id="vbox12">
++          <object class="GtkBox" id="vbox12">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="border_width">8</property>
+             <property name="orientation">vertical</property>
+             <property name="spacing">8</property>
+             <child>
+               <object class="GtkLabel" id="label2">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">Please, choose which part of the
++saved certificate you want to export:</property>
++                <property name="wrap">True</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0</property>
+-                <property name="label" translatable="yes">Please, choose which part of the saved certificate you want to export:</property>
+-                <property name="wrap">True</property>
+               </object>
+               <packing>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
+                 <property name="position">0</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkVBox" id="vbox14">
++              <object class="GtkBox" id="vbox14">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="orientation">vertical</property>
+                 <child>
+                   <object class="GtkRadioButton" id="publicpart_radiobutton1">
+@@ -48,22 +99,29 @@
+                     <property name="draw_indicator">True</property>
+                   </object>
+                   <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
+                     <property name="position">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label5">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
+-                    <property name="xpad">24</property>
+-                    <property name="ypad">9</property>
++                    <property name="can_focus">False</property>
++                    <property name="margin_left">24</property>
++                    <property name="margin_right">24</property>
++                    <property name="margin_top">9</property>
++                    <property name="margin_bottom">9</property>
+                     <property name="label" translatable="yes">&lt;i&gt;Export only the certificate to a public file, in PEM format.&lt;/i&gt;</property>
+                     <property name="use_markup">True</property>
+                     <property name="justify">fill</property>
+                     <property name="wrap">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
+                     <property name="position">1</property>
+                   </packing>
+                 </child>
+@@ -79,22 +137,31 @@
+                     <property name="group">publicpart_radiobutton1</property>
+                   </object>
+                   <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
+                     <property name="position">2</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label15">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
+-                    <property name="xpad">24</property>
+-                    <property name="ypad">9</property>
+-                    <property name="label" translatable="yes">&lt;i&gt;Export the saved private key to a PKCS#8 password-protected file. This file should only be accessed by the subject of the certificate.&lt;/i&gt;</property>
++                    <property name="can_focus">False</property>
++                    <property name="margin_left">24</property>
++                    <property name="margin_right">24</property>
++                    <property name="margin_top">9</property>
++                    <property name="margin_bottom">9</property>
++                    <property name="label" translatable="yes">&lt;i&gt;Export the saved private key to a PKCS#8 password-
++protected file. This file should only be accessed by the
++subject of the certificate.&lt;/i&gt;</property>
+                     <property name="use_markup">True</property>
+                     <property name="justify">fill</property>
+                     <property name="wrap">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
+                     <property name="position">3</property>
+                   </packing>
+                 </child>
+@@ -109,22 +176,31 @@
+                     <property name="group">publicpart_radiobutton1</property>
+                   </object>
+                   <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
+                     <property name="position">4</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label16">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
+-                    <property name="xpad">24</property>
+-                    <property name="ypad">9</property>
+-                    <property name="label" translatable="yes">&lt;i&gt;Export the saved private key to a PEM file. This option should only be used for exporting certificates that will be used in unattended servers.&lt;/i&gt;</property>
++                    <property name="can_focus">False</property>
++                    <property name="margin_left">24</property>
++                    <property name="margin_right">24</property>
++                    <property name="margin_top">9</property>
++                    <property name="margin_bottom">9</property>
++                    <property name="label" translatable="yes">&lt;i&gt;Export the saved private key to a PEM file. This option
++should only be used for exporting certificates that will be
++used in unattended servers.&lt;/i&gt;</property>
+                     <property name="use_markup">True</property>
+                     <property name="justify">fill</property>
+                     <property name="wrap">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
+                     <property name="position">5</property>
+                   </packing>
+                 </child>
+@@ -139,72 +215,46 @@
+                     <property name="group">publicpart_radiobutton1</property>
+                   </object>
+                   <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
+                     <property name="position">6</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label19">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
+-                    <property name="xpad">24</property>
+-                    <property name="ypad">9</property>
+-                    <property name="label" translatable="yes">&lt;i&gt;Export both (private and public) parts to a password-protected PKCS#12 file. This kind of file can be imported by other common programs, such as web or mail clients.&lt;/i&gt;</property>
++                    <property name="can_focus">False</property>
++                    <property name="margin_left">24</property>
++                    <property name="margin_right">24</property>
++                    <property name="margin_top">9</property>
++                    <property name="margin_bottom">9</property>
++                    <property name="label" translatable="yes">&lt;i&gt;Export both (private and public) parts to a password-
++protected PKCS#12 file. This kind of file can be imported
++by other common programs, such as web or mail clients.&lt;/i&gt;</property>
+                     <property name="use_markup">True</property>
+                     <property name="justify">fill</property>
+                     <property name="wrap">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
+                     <property name="position">7</property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
+-                <property name="position">1</property>
+-              </packing>
+-            </child>
+-          </object>
+-          <packing>
+-            <property name="position">1</property>
+-          </packing>
+-        </child>
+-        <child internal-child="action_area">
+-          <object class="GtkHButtonBox" id="dialog-action_area11">
+-            <property name="visible">True</property>
+-            <property name="layout_style">end</property>
+-            <child>
+-              <object class="GtkButton" id="button1">
+-                <property name="label">gtk-cancel</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="button4">
+-                <property name="label">gtk-ok</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+           </object>
+           <packing>
+             <property name="expand">False</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
++            <property name="fill">True</property>
++            <property name="position">1</property>
+           </packing>
+         </child>
+       </object>
diff --git a/system/gnomint/patches/09_gcc-10.patch b/system/gnomint/patches/09_gcc-10.patch
new file mode 100644
index 0000000000..0e9779335c
--- /dev/null
+++ b/system/gnomint/patches/09_gcc-10.patch
@@ -0,0 +1,33 @@
+Description: Fix FTBFS with GCC 10.
+Author: Yavor Doganov <yavor@gnu.org>
+Bug-Debian: https://bugs.debian.org/957287
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2020-06-23
+---
+
+--- gnomint-1.3.0.orig/src/ca_file.h
++++ gnomint-1.3.0/src/ca_file.h
+@@ -69,6 +69,7 @@
+ 
+ GList * ca_file_get_revoked_certs (guint64 ca_id, gchar **error);
+ 
++typedef
+ enum {CA_FILE_CA_COLUMN_ID=0,
+       CA_FILE_CA_COLUMN_SERIAL=1,
+       CA_FILE_CA_COLUMN_SUBJECT=2,
+@@ -78,6 +79,7 @@
+       CA_FILE_CA_COLUMN_NUMBER=6}
+         CaFileCAColumns;
+ 
++typedef
+ enum {CA_FILE_CERT_COLUMN_ID=0,
+       CA_FILE_CERT_COLUMN_IS_CA=1,
+       CA_FILE_CERT_COLUMN_SERIAL=2,
+@@ -93,6 +95,7 @@
+       CA_FILE_CERT_COLUMN_NUMBER=12}
+         CaFileCertColumns;
+ 
++typedef
+ enum {CA_FILE_CSR_COLUMN_ID=0,
+       CA_FILE_CSR_COLUMN_SUBJECT=1,
+       CA_FILE_CSR_COLUMN_PRIVATE_KEY_IN_DB=2,
diff --git a/system/gnomint/patches/gnutls3.patch b/system/gnomint/patches/gnutls3.patch
deleted file mode 100644
index 8ee3371884..0000000000
--- a/system/gnomint/patches/gnutls3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -aur a/src/import.c b/src/import.c
---- a/src/import.c	2010-05-31 23:01:37.000000000 +0200
-+++ b/src/import.c	2012-06-27 17:50:06.993671796 +0200
-@@ -695,7 +695,7 @@
- 
-                 // After having all the parts unencrypted, we import all certificates first.
-                 for (i=0; i<n_bags; i++) {
--                        gnutls_pkcs12_bag * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
-+                        gnutls_pkcs12_bag_t * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
-                         guint num_elements_in_bag = gnutls_pkcs12_bag_get_count (*pkcs12_bag);
-                         
-                         for (i=0; i < num_elements_in_bag; i++) {
-@@ -722,7 +722,7 @@
-                 
-                 // Then, we import all PKCS8 private keys.
-                 for (i=0; i<n_bags; i++) {
--                        gnutls_pkcs12_bag * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
-+                        gnutls_pkcs12_bag_t * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
-                         guint num_elements_in_bag = gnutls_pkcs12_bag_get_count (*pkcs12_bag);
-                         
-                         for (i=0; i < num_elements_in_bag; i++) {
-@@ -796,7 +796,7 @@
-                 // Then we import the CRLs
- 
-                 for (i=0; i<n_bags; i++) {
--                        gnutls_pkcs12_bag * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
-+                        gnutls_pkcs12_bag_t * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
-                         guint num_elements_in_bag = gnutls_pkcs12_bag_get_count (*pkcs12_bag);
-                         
-                         for (i=0; i < num_elements_in_bag; i++) {
-Nur in b/src: import.c~.
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/jmtpfs/jmtpfs.SlackBuild b/system/guefi/guefi.SlackBuild
index 545efff32e..a515d4ceb6 100644
--- a/system/jmtpfs/jmtpfs.SlackBuild
+++ b/system/guefi/guefi.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for jmtpfs
+# Slackware build script for guefi
 
-# Copyright 2015 Andre Barboza, Belo Horizonte, Minas Gerais, Brazil
+# Copyright 2017 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=jmtpfs
-VERSION=${VERSION:-0.5}
+PRGNAM=guefi
+VERSION=${VERSION:-0.1.3}
 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"
@@ -54,13 +54,15 @@ else
   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/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,19 +71,17 @@ 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 {} \;
 
-CXXFLAGS="$SLKCFLAGS -lpthread" \
-./configure \
-  --prefix=/usr \
-  --build=$ARCH-slackware-linux
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+make prefix=/usr
 
-make
 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 AUTHORS COPYING INSTALL NEWS README $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
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/fuse3/slack-desc b/system/guefi/slack-desc
index 6cd1dacca4..e0df51a295 100644
--- a/system/fuse3/slack-desc
+++ b/system/guefi/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
      |-----handy-ruler------------------------------------------------------|
-fuse3: fuse3 (Filesystem in Userspace)
-fuse3:
-fuse3: FUSE is a simple interface for userspace programs to export a virtual
-fuse3: filesystem to the Linux kernel. FUSE also aims to provide a secure
-fuse3: method for non privileged users to create and mount their own
-fuse3: filesystem implementations.
-fuse3:
-fuse3: Homepage: https://github.com/libfuse/libfuse
-fuse3:
-fuse3:
-fuse3:
+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/hack-font-ttf/README b/system/hack-font-ttf/README
deleted file mode 100644
index a5baafc081..0000000000
--- a/system/hack-font-ttf/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Hack -  A typeface in the Bitstream Vera lineage
-
-Hack has deep roots in the libre, open source typeface community and
-includes the contributions of the Bitstream Vera & DejaVu projects.
-
-The face has been re-designed with an expanded glyph set, modifications
-of the original glyph shapes, and meticulous attention to metrics.
diff --git a/system/hack-font-ttf/doinst.sh b/system/hack-font-ttf/doinst.sh
deleted file mode 100644
index bdb050188d..0000000000
--- a/system/hack-font-ttf/doinst.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# Update the X font indexes:
-if [ -x /usr/bin/mkfontdir -o -x /usr/X11R6/bin/mkfontdir ]; then
-  ( cd /usr/share/fonts/TTF
-    mkfontscale .
-    mkfontdir .
-  )
-fi
-if [ -x /usr/bin/fc-cache ]; then
-  /usr/bin/fc-cache -f
-fi
diff --git a/system/hack-font-ttf/hack-font-ttf.SlackBuild b/system/hack-font-ttf/hack-font-ttf.SlackBuild
deleted file mode 100644
index 807a20902e..0000000000
--- a/system/hack-font-ttf/hack-font-ttf.SlackBuild
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for hack-font-ttf
-
-# Copyright 2018 rfmae <rfmae.git@mailbox.org>
-# 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=hack-font-ttf
-VERSION=${VERSION:-3.003}
-ARCH=noarch
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=Hack-v$VERSION-ttf.tar.xz
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir -p $PRGNAM-$VERSION
-tar xvf $CWD/$SRCNAM -C $PRGNAM-$VERSION
-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 {} \;
-
-mkdir -p $PKG/usr/share/fonts/TTF/
-cp -a *.ttf $PKG/usr/share/fonts/TTF/
-
-mkdir -p $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
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/hack-font-ttf/hack-font-ttf.info b/system/hack-font-ttf/hack-font-ttf.info
deleted file mode 100644
index c377fc0f73..0000000000
--- a/system/hack-font-ttf/hack-font-ttf.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="hack-font-ttf"
-VERSION="3.003"
-HOMEPAGE="https://sourcefoundry.org/hack/"
-DOWNLOAD="https://github.com/source-foundry/Hack/releases/download/v3.003/Hack-v3.003-ttf.tar.xz"
-MD5SUM="cf274d8c32045a350e6d6a116fe463d7"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="rfmae"
-EMAIL="rfmae.git@mailbox.org"
diff --git a/system/hack-font-ttf/slack-desc b/system/hack-font-ttf/slack-desc
deleted file mode 100644
index 416a81c711..0000000000
--- a/system/hack-font-ttf/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-hack-font-ttf: hack-font-ttf (font)
-hack-font-ttf:
-hack-font-ttf: A typeface in the Bitstream Vera lineage
-hack-font-ttf: Hack has deep roots in the libre, open source typeface community and
-hack-font-ttf: includes the contributions of the Bitstream Vera & DejaVu projects.
-hack-font-ttf:
-hack-font-ttf: The face has been re-designed with an expanded glyph set,
-hack-font-ttf: modifications of the original glyph shapes, and meticulous attention
-hack-font-ttf: to metrics.
-hack-font-ttf:
-hack-font-ttf: http://sourcefoundry.org/hack/
diff --git a/system/haveged/README b/system/haveged/README
deleted file mode 100644
index 187b3bdda9..0000000000
--- a/system/haveged/README
+++ /dev/null
@@ -1,27 +0,0 @@
-haveged (a simple entropy-gathering daemon)
-
-The haveged project is an attempt to provide an easy-to-use, unpredictable
-random number generator based upon an adaptation of the HAVEGE algorithm.
-Haveged was created to remedy low-entropy conditions in the Linux random
-device that can occur under some workloads, especially on headless servers.
-
-The HAVEGE algorithm is based upon the indirect effects of unrelated hardware
-events on the instruction timing of a calculation that is sensitive to
-processor features such as branch predictors and instruction/data access
-mechanisms.
-Samples from a high-resolution timer are input into the algorithm to
-produce a stream of random data in a collection buffer. The contents of this
-buffer can be fed into the random device or accessed directly through the
-file system. File system access is a useful alternative to those situations
-where use of the random device is either inappropriate or not available.
-
-Add the following snippet to your /etc/rc.d/rc.M to start up haveged at boot:
-
-# Starting HAVEGED entropy daemon
-if [ -x /etc/rc.d/rc.haveged ]; then
-  /etc/rc.d/rc.haveged start
-fi
-
-You can see how many bits of entropy are available to the system by reading
-the /proc/sys/kernel/random/entropy_avail file, and check the size of your
-entropy pool at /proc/sys/kernel/random/poolsize.
diff --git a/system/haveged/doinst.sh b/system/haveged/doinst.sh
deleted file mode 100644
index b9e90c8608..0000000000
--- a/system/haveged/doinst.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-config() {
-  for infile in $1; do
-    NEW="$infile"
-    OLD="$(dirname $NEW)/$(basename $NEW .new)"
-    # If there's no config file by that name, mv it over:
-    if [ ! -r $OLD ]; then
-      mv $NEW $OLD
-    elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-      # toss the redundant copy
-      rm $NEW
-    fi
-    # Otherwise, we leave the .new copy for the admin to consider...
-  done
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-preserve_perms etc/rc.d/rc.haveged.new
-
diff --git a/system/haveged/haveged.info b/system/haveged/haveged.info
deleted file mode 100644
index ea62f1b72e..0000000000
--- a/system/haveged/haveged.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="haveged"
-VERSION="1.9.2"
-HOMEPAGE="http://www.issihosts.com/haveged/index.html"
-DOWNLOAD="http://www.issihosts.com/haveged/haveged-1.9.2.tar.gz"
-MD5SUM="fb1d8b3dcbb9d06b30eccd8aa500fd31"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Erik Falor"
-EMAIL="ewfalor@gmail.com"
diff --git a/system/haveged/rc.haveged b/system/haveged/rc.haveged
deleted file mode 100644
index 404d9ca800..0000000000
--- a/system/haveged/rc.haveged
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-# Start/stop/restart haveged.
-
-PIDFILE=/var/run/haveged.pid
-HAVEGED_OPTS="-w 1024 -v 1 -p $PIDFILE"
-
-# Start haveged:
-haveged_start() {
-  if [ -f $PIDFILE ]; then
-    echo "HAVEGE daemon is already running as PID $(cat  $PIDFILE) " >&2
-    exit 3
-  elif [ -x /sbin/haveged ]; then
-    echo "Starting HAVEGE daemon:  /sbin/haveged"
-    /sbin/haveged $HAVEGED_OPTS
-  fi
-}
-
-# Stop haveged:
-haveged_stop() {
-  if [ -r /var/run/haveged.pid ]; then
-    kill $(cat /var/run/haveged.pid)
-  else
-    killall haveged
-  fi
-}
-
-# Restart haveged:
-haveged_restart() {
-  haveged_stop
-  sleep 1
-  haveged_start
-}
-
-case "$1" in
-'start')
-  haveged_start
-  ;;
-'stop')
-  haveged_stop
-  ;;
-'restart')
-  haveged_restart
-  ;;
-*)
-  echo "usage $0 start|stop|restart"
-  exit 2
-esac
diff --git a/system/haveged/slack-desc b/system/haveged/slack-desc
deleted file mode 100644
index 55d8f9ed50..0000000000
--- a/system/haveged/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-haveged: haveged (A simple entropy daemon)
-haveged:
-haveged: The haveged project is an attempt to provide an easy-to-use,
-haveged: unpredictable random number generator based upon an adaptation of the
-haveged: HAVEGE algorithm.  Haveged was created to remedy low-entropy
-haveged: conditions in the Linux random device that can occur under some
-haveged: workloads, especially on headless servers.
-haveged:
-haveged:
-haveged:
-haveged:
diff --git a/system/innotop/README b/system/innotop/README
deleted file mode 100644
index 91cdb498ac..0000000000
--- a/system/innotop/README
+++ /dev/null
@@ -1,6 +0,0 @@
-MySQL and InnoDB transaction/status monitor. Like 'top' for MySQL.
-
-Displays queries, InnoDB transactions, lock waits, deadlocks, foreign key
-errors, open tables, replication status, buffer information, row
-operations, logs, I/O operations, load graph, and more.
-You can monitor many servers at once with innotop.
diff --git a/system/innotop/innotop.SlackBuild b/system/innotop/innotop.SlackBuild
deleted file mode 100644
index feebb18fe5..0000000000
--- a/system/innotop/innotop.SlackBuild
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for innotop
-
-# Copyright 2010-2013 Heinz Wiesinger, Amsterdam, The Netherlands
-# 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=innotop
-VERSION=${VERSION:-1.9.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-ARCH="noarch"
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-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
-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 {} \;
-
-perl Makefile.PL INSTALLDIRS=vendor
-make
-make test
-make install DESTDIR=$PKG
-
-#Move man-pages to appropriate place
-mv $PKG/usr/share/man $PKG/usr/
-
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-find $PKG -depth -type d -empty -exec rm -rf {} \;
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changelog COPYING INSTALL MANIFEST \
- $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/innotop/innotop.info b/system/innotop/innotop.info
deleted file mode 100644
index 5db755263b..0000000000
--- a/system/innotop/innotop.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="innotop"
-VERSION="1.9.1"
-HOMEPAGE="https://github.com/innotop/innotop"
-DOWNLOAD="https://distfiles.macports.org/innotop/innotop-1.9.1.tar.gz"
-MD5SUM="7979b7a074e43fe1f0d032034e234bac"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
diff --git a/system/innotop/slack-desc b/system/innotop/slack-desc
deleted file mode 100644
index 889a1b9c46..0000000000
--- a/system/innotop/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-innotop: innotop (MySQL / InnoDB monitor application)
-innotop:
-innotop: MySQL and InnoDB transaction/status monitor. Like 'top' for MySQL.
-innotop: Displays queries, InnoDB transactions, lock waits, deadlocks, foreign
-innotop: key errors, open tables, replication status, buffer information, row
-innotop: operations, logs, I/O operations, load graph, and more.
-innotop: You can monitor many servers at once with innotop.
-innotop:
-innotop: Homepage: https://github.com/innotop/innotop
-innotop:
-innotop:
diff --git a/system/inxi/README b/system/inxi/README
deleted file mode 100644
index acc274640e..0000000000
--- a/system/inxi/README
+++ /dev/null
@@ -1,4 +0,0 @@
-inxi (a command line system information tool)
-
-Its a newer, better system information script for irc, administration,
-and system troubleshooters.
diff --git a/system/inxi/inxi.SlackBuild b/system/inxi/inxi.SlackBuild
deleted file mode 100644
index 5bfc28111a..0000000000
--- a/system/inxi/inxi.SlackBuild
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for inxi
-
-# Copyright 2011-2012 Binh Nguyen <binhvng@gmail.com>
-# Copyright 2014-2019 Aaditya Bagga <aaditya_gnulinux@zoho.com>
-# 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=inxi
-VERSION=${VERSION:-3.0.37}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-_VERSION_SUFFIX=${_VERSION_SUFFIX:-1}
-ARCH=noarch
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -eu
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION-$_VERSION_SUFFIX
-tar xvf $CWD/$PRGNAM-$VERSION-$_VERSION_SUFFIX.tar.gz || tar xvf $CWD/$VERSION-$_VERSION_SUFFIX.tar.gz
-cd $TMP/$PRGNAM-$VERSION-$_VERSION_SUFFIX
-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 {} \;
-
-install -D -m 0755 inxi $PKG/usr/bin/inxi
-install -D -m 0644 inxi.1 $PKG/usr/man/man1/inxi.1
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cp inxi.changelog $PKG/usr/doc/$PRGNAM-$VERSION/
-
-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/inxi/inxi.info b/system/inxi/inxi.info
deleted file mode 100644
index e4a15bf195..0000000000
--- a/system/inxi/inxi.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="inxi"
-VERSION="3.0.37"
-HOMEPAGE="https://github.com/smxi/inxi"
-DOWNLOAD="https://github.com/smxi/inxi/archive/3.0.37-1.tar.gz"
-MD5SUM="672437de389fecd2ce807f9a36793576"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Aaditya Bagga"
-EMAIL="aaditya_gnulinux@zoho.com"
diff --git a/system/inxi/slack-desc b/system/inxi/slack-desc
deleted file mode 100644
index 5c0b9e3895..0000000000
--- a/system/inxi/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-inxi: inxi (a full featured system information script)
-inxi:
-inxi: A newer, better system information script for irc,
-inxi: administration, and system troubleshooters.
-inxi:
-inxi: Homepage: https://github.com/smxi/inxi
-inxi:
-inxi:
-inxi:
-inxi:
-inxi:
diff --git a/system/iscan-data/README b/system/iscan-data/README
new file mode 100644
index 0000000000..e26cac2c62
--- /dev/null
+++ b/system/iscan-data/README
@@ -0,0 +1,2 @@
+This package contains EPSON Image Scan! data files which are
+required for using certain EPSON all-in-one devices.
diff --git a/system/patchelf/patchelf.SlackBuild b/system/iscan-data/iscan-data.SlackBuild
index 7ca4ad1081..0219b2faad 100644
--- a/system/patchelf/patchelf.SlackBuild
+++ b/system/iscan-data/iscan-data.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for patchelf
+# Slackware build script for iscan-data
 
-# Copyright 2014 Zhu Qun-Ying
+# Copyright 2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,9 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=patchelf
-VERSION=${VERSION:-0.10}
+PRGNAM=iscan-data
+VERSION=${VERSION:-1.39.1}
+ADDVER=${ADDVER:-2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -35,8 +36,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-set -e
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -49,18 +48,22 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
+DOCS="COPYING KNOWN-PROBLEMS SUPPORTED-DEVICES"
+
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/${PRGNAM}_${VERSION}-${ADDVER}.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,27 +72,27 @@ 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 {} \;
 
-autoreconf -isf
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib${LIBDIRSUFFIX} \
-    --mandir=/usr/man \
-    --docdir=/usr/doc/$PRGNAM-$VERSION \
-    --build=$ARCH-slackware-linux
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
 
 make
-
 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 README COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-gzip $PKG/usr/man/man1/*
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/system/iscan-data/iscan-data.info b/system/iscan-data/iscan-data.info
new file mode 100644
index 0000000000..a59ad78c7e
--- /dev/null
+++ b/system/iscan-data/iscan-data.info
@@ -0,0 +1,10 @@
+PRGNAM="iscan-data"
+VERSION="1.39.1"
+HOMEPAGE="http://epson.net"
+DOWNLOAD="http://support.epson.net/linux/src/scanner/iscan/iscan-data_1.39.1-2.tar.gz"
+MD5SUM="3a20ada6e5306048ce02e436bcb6afe3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/system/f2fs_tools/slack-desc b/system/iscan-data/slack-desc
index cb5332d95f..d3f025101e 100644
--- a/system/f2fs_tools/slack-desc
+++ b/system/iscan-data/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
           |-----handy-ruler------------------------------------------------------|
-f2fs_tools: f2fs_tools (Userland tools for the f2fs filesystem)
-f2fs_tools:
-f2fs_tools: Project URL:
-f2fs_tools: https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git
-f2fs_tools:
-f2fs_tools:
-f2fs_tools:
-f2fs_tools:
-f2fs_tools:
-f2fs_tools:
-f2fs_tools:
+iscan-data: iscan-data (EPSON Image Scan! data files)
+iscan-data:
+iscan-data: This package contains EPSON Image Scan! data files which are
+iscan-data: required for using certain EPSON all-in-one devices.
+iscan-data:
+iscan-data: homepage: http://epson.net
+iscan-data:
+iscan-data:
+iscan-data:
+iscan-data:
+iscan-data:
diff --git a/system/iscan/README b/system/iscan/README
new file mode 100644
index 0000000000..3ae47041b7
--- /dev/null
+++ b/system/iscan/README
@@ -0,0 +1,4 @@
+EPSON Image Scan! for Linux enables you to print to a networked
+all-in-one EPSON printer.  A SANE 'epkowa' backend is provided
+as well; scanning over the network requires the additional
+iscan-network-nt package which contains a protocol driver.
diff --git a/system/iscan/doinst.sh b/system/iscan/doinst.sh
new file mode 100644
index 0000000000..25f34e1d3a
--- /dev/null
+++ b/system/iscan/doinst.sh
@@ -0,0 +1,29 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/sane.d/epkowa.conf.new
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/system/haveged/haveged.SlackBuild b/system/iscan/iscan.SlackBuild
index 0d5e97f692..33276ad0c0 100644
--- a/system/haveged/haveged.SlackBuild
+++ b/system/iscan/iscan.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for haveged
+# Slackware build script for iscan
 
-# Copyright 2018 Erik Falor, Logan, Utah, USA
+# Copyright 2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by Nikos Giotis 20170903, Athens, GR
-#   Use static building
-#   Changed install target to /sbin, /lib[64]
-#   Added check for existing installation due to problems when rebuilding
-#     produces binary that segfaults if any previous installation is there
+# Shamelessly ripped from Alien Bob's script: thank him for all the hard work!
 
-PRGNAM=haveged
-VERSION=${VERSION:-1.9.2}
+PRGNAM=iscan
+VERSION=${VERSION:-2.30.4}
+ADDVER=${ADDVER:-2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,23 +57,23 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e
-
-# Try to detect any previous installations and bail out if true
-if [ -f "/usr/lib$LIBDIRSUFFIX/libhavege.so" -o \
-     -f "/usr/lib$LIBDIRSUFFIX/libhavege.a" -o \
-     -f "/lib$LIBDIRSUFFIX/libhavege.so" -o \
-     -f "/lib$LIBDIRSUFFIX/libhavege.a" ]; then
-  echo 'Detected libhaveged!' >&2
-  echo 'Please remove libhaveged before building a new one.' >&2
-  exit 1
+# Minor library version of libpng on our system:
+PNGMINOR=$(pkg-config --modversion libpng |cut -d'.' -f2)
+if [ $PNGMINOR -gt 5 ]; then
+  PNG_LDFLAGS="-lpng16"
+elif [ $PNGMINOR -eq 4 ]; then
+  PNG_LDFLAGS="-lpng14"
 fi
 
+DOCS="COPYING INSTALL NEWS README non-free/COPYING*.txt"
+
+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/${PRGNAM}_${VERSION}-${ADDVER}.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -85,32 +82,58 @@ 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 {} \;
 
-# Static build for easier inclusion in initrd
+# Apply ArchLinux patches:
+# Allow linking against libpng15 and newer:
+patch -p0 < $CWD/patches/iscan_png15.patch
+# Patch for ambiguous div in jpegstream.cc:
+patch -p0 < $CWD/patches/jpegstream.cc.patch
+# Fix compilation error 'unknown type name u_char' on 32bit:
+patch -p1 < $CWD/patches/iscan-2.30.3_x86-unknown-types.patch
+# Add fix for CXX ABI different than 1002:
+ln -s libesmod-x86_64.c2.so non-free/libesmod-x86_64.so
+
+LDFLAGS="-ldl $PNG_LDFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="-static" \
 ./configure \
   --prefix=/usr \
-  --sbindir=/sbin \
-  --libdir=/lib${LIBDIRSUFFIX} \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-dependency-reduction \
+  --enable-frontend \
+  --enable-jpeg \
+  --enable-tiff \
+  --enable-png \
+  --enable-gimp \
   --build=$ARCH-slackware-linux
 
 make
-make install-strip DESTDIR=$PKG
+make install DESTDIR=$PKG
+
+# Install the SANE backend configuration:
+mkdir -p $PKG/etc/sane.d/dll.d
+install -m0644 backend/epkowa.conf $PKG/etc/sane.d/epkowa.conf.new
+echo "epkowa" > $PKG/etc/sane.d/dll.d/epkowa.conf
+
+# Create the forgotten desktop menu:
+mkdir -p $PKG/usr/share/applications
+install -m0644 $PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+
+# Make the GIMP aware of the iscan plugin:
+mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/gimp/2.0/plug-ins
+ln -s /usr/bin/$PRGNAM $PKG/usr/lib$LIBDIRSUFFIX/gimp/2.0/plug-ins/
 
-rm -rf $PKG/etc/init.d
-install -D -m0755 -oroot -groot $CWD/rc.haveged $PKG/etc/rc.d/rc.haveged.new
+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
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL README \
-  $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
diff --git a/system/iscan/iscan.info b/system/iscan/iscan.info
new file mode 100644
index 0000000000..a299693821
--- /dev/null
+++ b/system/iscan/iscan.info
@@ -0,0 +1,10 @@
+PRGNAM="iscan"
+VERSION="2.30.4"
+HOMEPAGE="http://epson.net"
+DOWNLOAD="http://support.epson.net/linux/src/scanner/iscan/iscan_2.30.4-2.tar.gz"
+MD5SUM="b79c73341fcd7dd930381d50952b88c8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="iscan-data"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/system/iscan/patches/iscan-2.30.3_x86-unknown-types.patch b/system/iscan/patches/iscan-2.30.3_x86-unknown-types.patch
new file mode 100644
index 0000000000..9bb856ff83
--- /dev/null
+++ b/system/iscan/patches/iscan-2.30.3_x86-unknown-types.patch
@@ -0,0 +1,12 @@
+diff -ru a/sanei/sanei_pio.c b/sanei/sanei_pio.c
+--- a/sanei/sanei_pio.c	2019-03-01 10:44:36.723260142 -0600
++++ b/sanei/sanei_pio.c	2019-03-01 10:48:47.660693036 -0600
+@@ -73,6 +73,7 @@
+ #elif HAVE_SYS_HW_H
+ # include <sys/hw.h>
+ #elif defined(__i386__)  && defined (__GNUC__)
++#include <sys/types.h>
+ 
+ static __inline__ void
+ outb (u_char value, u_long port)
+
diff --git a/system/iscan/patches/iscan_png15.patch b/system/iscan/patches/iscan_png15.patch
new file mode 100644
index 0000000000..8220ac4af3
--- /dev/null
+++ b/system/iscan/patches/iscan_png15.patch
@@ -0,0 +1,52 @@
+#
+# Thanks to Fabio Castelli, ArchLinux:
+# https://projects.archlinux.org/svntogit/community.git/tree/trunk/libpng15.patch?h=packages/iscan
+#
+--- lib/pngstream.cc	2011-12-01 02:30:53.000000000 +0100
++++ lib/pngstream.cc	2012-02-06 03:06:22.000000000 +0100
+@@ -83,7 +83,12 @@
+ #if HAVE_PNG_H
+     set_error_handler (_png, _info);
+ 
++/* when not interlacing (ie, only one pass), number of rows is image height:  _v_sz */
++#if PNG_LIBPNG_VER > 10499
++        if (!_footer && _v_sz == lib->get_current_row_number(_png))
++#else
+     if (_header && !_footer && _png->num_rows == _png->flush_rows)
++#endif
+       {
+         lib->write_end (_png, _info);
+         _footer = true;
+@@ -167,6 +172,9 @@
+     funcsym (write_row);
+     funcsym (write_flush);
+     funcsym (write_end);
++#if PNG_LIBPNG_VER > 10499
++    funcsym (get_current_row_number);
++#endif
+ 
+     if (lib->access_version_number
+         && lib->create_write_struct
+@@ -176,6 +184,9 @@
+         && lib->set_IHDR
+         && lib->set_pHYs
+         && lib->set_invert_mono
++#if PNG_LIBPNG_VER > 10499
++	&& lib->get_current_row_number
++#endif
+         && lib->write_info
+         && lib->write_row
+         && lib->write_flush
+--- lib/pngstream.hh	2011-12-01 02:30:53.000000000 +0100
++++ lib/pngstream.hh	2012-02-06 03:09:09.000000000 +0100
+@@ -108,6 +108,10 @@
+                png_structp);
+       fundecl (void, write_end,
+                png_structp, png_infop);
++#if PNG_LIBPNG_VER > 10499
++      fundecl (png_uint_32, get_current_row_number,
++               png_structp);
++#endif
+ #endif /* HAVE_PNG_H */
+     };
+     static png_lib_handle *lib;
diff --git a/system/iscan/patches/jpegstream.cc.patch b/system/iscan/patches/jpegstream.cc.patch
new file mode 100644
index 0000000000..988a25daea
--- /dev/null
+++ b/system/iscan/patches/jpegstream.cc.patch
@@ -0,0 +1,21 @@
+--- lib/jpegstream.cc.orig	2016-06-20 06:10:38.000000000 +0200
++++ lib/jpegstream.cc	2016-07-10 18:45:40.511301054 +0200
+@@ -33,7 +33,7 @@
+ 
+ #include "jpegstream.hh"
+ 
+-#include <cstdlib>
++// #include <cstdlib>
+ #include <ios>
+ 
+ namespace iscan
+@@ -82,7 +82,8 @@
+         //        only that _bits != 8.
+         for (unsigned int i = 0; i < _h_sz; ++i)
+           {
+-            div_t index = div (i, 8 * sizeof (JSAMPLE));
++            div_t index = div (static_cast<int>(i),
++                               static_cast<int>(8 * sizeof (JSAMPLE)));
+             int offset = 8 * sizeof (JSAMPLE) - 1 - index.rem;
+             _scanline[i] = ((line[index.quot] & (1 << offset))
+                             ? 0 : ~0);
diff --git a/system/iscan/slack-desc b/system/iscan/slack-desc
new file mode 100644
index 0000000000..56fcd9b5c0
--- /dev/null
+++ b/system/iscan/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------------------------------------------------------|
+iscan: iscan (front-end for EPSON all-in-one devices)
+iscan:
+iscan: EPSON Image Scan! for Linux enables you to print to a networked
+iscan: all-in-one EPSON printer.  A SANE 'epkowa' backend is provided
+iscan: as well; scanning over the network requires the additional
+iscan: iscan-network-nt package which contains a protocol driver.
+iscan:
+iscan: homepage: http://epson.net
+iscan:
+iscan:
+iscan:
diff --git a/system/jdupes/jdupes.SlackBuild b/system/jdupes/jdupes.SlackBuild
index 97ced62617..4d4e59ab29 100644
--- a/system/jdupes/jdupes.SlackBuild
+++ b/system/jdupes/jdupes.SlackBuild
@@ -62,6 +62,7 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+rm testdir/recursed_a/symlink_infinite_loop
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/system/jmtpfs/README b/system/jmtpfs/README
deleted file mode 100644
index d43b1a7ac3..0000000000
--- a/system/jmtpfs/README
+++ /dev/null
@@ -1,10 +0,0 @@
-jmtpfs is a FUSE and libmtp based filesystem for accessing MTP 
-(Media Transfer Protocol) devices. It was specifically designed 
-for exchaning files between Linux (and Mac OS X) systems and 
-newer Android devices that support MTP but not USB Mass Storage.
-
-The goal is to create a well behaved filesystem, allowing tools 
-like find and rsync to work as expected. MTP file types are set 
-automatically based on file type detection using libmagic. 
-Setting the file appears to be necessary for some Android apps, 
-like  Gallery, to be able to find and use the files.
diff --git a/system/jmtpfs/jmtpfs.info b/system/jmtpfs/jmtpfs.info
deleted file mode 100644
index 897c93dc9f..0000000000
--- a/system/jmtpfs/jmtpfs.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="jmtpfs"
-VERSION="0.5"
-HOMEPAGE="https://github.com/JasonFerrara/jmtpfs"
-DOWNLOAD="https://github.com/JasonFerrara/jmtpfs/archive/v0.5.tar.gz"
-MD5SUM="501e51530d3c04d63e9ac96d794bf5c5"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Andre Barboza"
-EMAIL="bmg.andre@gmail.com"
diff --git a/system/jmtpfs/slack-desc b/system/jmtpfs/slack-desc
deleted file mode 100644
index 7fab708cd9..0000000000
--- a/system/jmtpfs/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-jmtpfs: jmtpfs (FUSE and libmtp based filesystem for accessing MTP)
-jmtpfs:
-jmtpfs: jmtpfs is a FUSE and libmtp based filesystem for accessing MTP
-jmtpfs: (Media Transfer Protocol) devices. It was specifically designed
-jmtpfs: for exchaning files between Linux (and Mac OS X) systems and
-jmtpfs: newer Android devices that support MTP but not USB Mass
-jmtpfs: Storage.
-jmtpfs:
-jmtpfs:
-jmtpfs:
-jmtpfs: https://github.com/JasonFerrara/jmtpfs
diff --git a/system/lbzip2/README b/system/lbzip2/README
deleted file mode 100644
index 2092f0ebfb..0000000000
--- a/system/lbzip2/README
+++ /dev/null
@@ -1,2 +0,0 @@
-lbzip2 is a multi-threaded bzip2/bunzip2 filter that doesn't depend on the 
-lseek() system call and so isn't restricted to regular files.
diff --git a/system/lbzip2/lbzip2.SlackBuild b/system/lbzip2/lbzip2.SlackBuild
deleted file mode 100644
index 801213a810..0000000000
--- a/system/lbzip2/lbzip2.SlackBuild
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for lbzip2
-#
-# Copyright 2009-2010  Erik W. Hanson, Minneapolis, MN, USA
-# 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.
-
-# Modified by B. Watson <yalhcru@gmail.com>.
-
-# 20170302 bkw: use long-format github URL
-
-# 20150519 bkw:
-# - took over maintenance
-# - bump VERSION to 2.5
-# - add gnulib dependency
-# - make VERSION respect environment
-# - clean up slack-desc
-
-PRGNAM=lbzip2
-VERSION=${VERSION:-2.5}
-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
-
-set -eu
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Upstream says automake-1.14 is required, but our
-# 1.11.5 works fine if we change the version check.
-sed -i '/^AM_INIT_AUTOMAKE/s,1\.14,1.11.5,' configure.ac
-
-sh build-aux/autogen.sh
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-gzip $PKG/usr/man/man1/$PRGNAM.1
-
-# The other man pages just source lbzip2.1. Make them
-# symlinks instead (easier to deal with).
-for i in lbunzip2 lbzcat; do
-  rm -f $PKG/usr/man/man1/$i.1
-  ln -s $PRGNAM.1.gz $PKG/usr/man/man1/$i.1.gz
-done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ALGORITHM AUTHORS COPYING ChangeLog* NEWS README THANKS \
-      $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/lbzip2/lbzip2.info b/system/lbzip2/lbzip2.info
deleted file mode 100644
index c1ccd5d21a..0000000000
--- a/system/lbzip2/lbzip2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="lbzip2"
-VERSION="2.5"
-HOMEPAGE="https://github.com/kjn/lbzip2/"
-DOWNLOAD="https://github.com/kjn/lbzip2/archive/v2.5/lbzip2-2.5.tar.gz"
-MD5SUM="288e404f325d9073bdc80759cae30adc"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="gnulib"
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/system/lbzip2/slack-desc b/system/lbzip2/slack-desc
deleted file mode 100644
index fb3286dd7e..0000000000
--- a/system/lbzip2/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-lbzip2: lbzip2 (a pthreads-based parallel bzip2/bunzip2)
-lbzip2:
-lbzip2: Lbzip2 is a Pthreads-based parallel bzip2/bunzip2 filter passable to
-lbzip2: GNU tar with the --use-compress-program option. It isn't restricted
-lbzip2: to regular files on input, nor output.
-lbzip2:
-lbzip2:
-lbzip2:
-lbzip2:
-lbzip2:
-lbzip2:
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 18760fdefe..c7f00b5797 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="https://lilyterm.luna.com.tw/index.html"
-DOWNLOAD="https://lilyterm.luna.com.tw/file/lilyterm-0.9.9.2.tar.gz"
-MD5SUM="d68dd29ce4894f765adba1efd470f90e"
+DOWNLOAD="https://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/lxtask/fix-no-common.patch b/system/lxtask/fix-no-common.patch
new file mode 100644
index 0000000000..d986741b21
--- /dev/null
+++ b/system/lxtask/fix-no-common.patch
@@ -0,0 +1,73 @@
+diff -Naur a/src/interface.c b/src/interface.c
+--- a/src/interface.c	2016-02-21 01:06:17.000000000 +0100
++++ b/src/interface.c	2016-09-13 19:37:28.038350050 +0200
+@@ -26,6 +26,18 @@
+ #include <glib/gi18n.h>
+ #include "interface.h"
+ 
++GtkTreeStore *list_store;
++GtkTreeSelection *selection;
++GtkWidget *treeview;
++GtkWidget *mainmenu;
++GtkWidget *taskpopup;
++GtkWidget *cpu_usage_progress_bar;
++GtkWidget *mem_usage_progress_bar;
++GtkWidget *cpu_usage_progress_bar_box;
++GtkWidget *mem_usage_progress_bar_box;
++
++GtkTreeViewColumn *column;
++
+ #define GLADE_HOOKUP_OBJECT(component,widget,name) \
+   g_object_set_data_full (G_OBJECT (component), name, \
+     gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref)
+diff -Naur a/src/interface.h b/src/interface.h
+--- a/src/interface.h	2014-09-16 14:27:52.000000000 +0200
++++ b/src/interface.h	2016-09-13 19:32:22.816372893 +0200
+@@ -38,16 +38,15 @@
+ #include "callbacks.h"
+ #include "types.h"
+ 
+-GtkTreeStore *list_store;
+-GtkTreeSelection *selection;
+-GtkWidget *treeview;
+-GtkWidget *mainmenu;
+-GtkWidget *taskpopup;
+-GtkWidget *priopopup;
+-GtkWidget *cpu_usage_progress_bar;
+-GtkWidget *mem_usage_progress_bar;
+-GtkWidget *cpu_usage_progress_bar_box;
+-GtkWidget *mem_usage_progress_bar_box;
++extern GtkTreeStore *list_store;
++extern GtkTreeSelection *selection;
++extern GtkWidget *treeview;
++extern GtkWidget *mainmenu;
++extern GtkWidget *taskpopup;
++extern GtkWidget *cpu_usage_progress_bar;
++extern GtkWidget *mem_usage_progress_bar;
++extern GtkWidget *cpu_usage_progress_bar_box;
++extern GtkWidget *mem_usage_progress_bar_box;
+ 
+ enum {
+     COLUMN_NAME = 0,
+@@ -61,7 +60,7 @@
+     COLUMN_PPID
+ };
+ 
+-GtkTreeViewColumn *column;
++extern GtkTreeViewColumn *column;
+ 
+ void change_list_store_view(void);
+ void create_list_store(void);
+diff -Naur a/src/types.h b/src/types.h
+--- a/src/types.h	2014-09-16 14:27:52.000000000 +0200
++++ b/src/types.h	2016-09-13 19:25:51.014402217 +0200
+@@ -77,9 +77,6 @@
+ extern gint win_width;
+ extern gint win_height;
+ 
+-const gchar *custom_signal_0;
+-const gchar *custom_signal_1;
+-
+ extern int page_size;
+ 
+ #endif
diff --git a/system/lxtask/lxtask.SlackBuild b/system/lxtask/lxtask.SlackBuild
index 773b8f900d..3db22407fb 100644
--- a/system/lxtask/lxtask.SlackBuild
+++ b/system/lxtask/lxtask.SlackBuild
@@ -107,6 +107,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 building wit gcc >= 10.x
+patch -p1 < $CWD/fix-no-common.patch
+
 sh autogen.sh || true
 
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/system/lxterminal/lxterminal.info b/system/lxterminal/lxterminal.info
index 8f5130af46..bd782fb65f 100644
--- a/system/lxterminal/lxterminal.info
+++ b/system/lxterminal/lxterminal.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/lxde/lxterminal-0.3.2.tar.xz"
 MD5SUM="62e57c3aafb831505cc1638b2b737cc9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="vte2"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/system/lz4/README b/system/lz4/README
deleted file mode 100644
index f97be58647..0000000000
--- a/system/lz4/README
+++ /dev/null
@@ -1,9 +0,0 @@
-lz4 (compression algorithm)
-
-LZ4 is lossless compression algorithm, providing compression speed at
-400 MB/s per core (0.16 Bytes/cycle). It also features an extremely fast
-decoder, with speed in multiple GB/s per core (0.71 Bytes/cycle). A high
-compression derivative, called LZ4_HC, is also provided. It trades CPU
-time for compression ratio.
-
-This build includes liblz4 and the command-line lz4 tools.
diff --git a/system/lz4/lz4.SlackBuild b/system/lz4/lz4.SlackBuild
deleted file mode 100644
index f164983623..0000000000
--- a/system/lz4/lz4.SlackBuild
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for lz4
-
-# Written by B. Watson (yalhcru@gmail.com)
-
-# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
-
-# 20191127 bkw: update for 1.9.2
-# 20180911 bkw: update for 1.8.3
-# 20180611 bkw: update for 1.8.2. don't try to use the updated script
-#               to build older versions, the man pages will end up
-#               in the wrong place due to upstream changing how they
-#               interpret MANDIR
-# 20180114 bkw: update for 1.8.1.2. had to add -j1 to the make command.
-# 20170819 bkw: update for 1.8.0
-# 20170302 bkw: use github long-format URL
-# 20170122 bkw: update for 1.7.5
-
-PRGNAM=lz4
-VERSION=${VERSION:-1.9.2}
-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
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz --exclude visual
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-# -j1 was necessary in 1.8.1.2. Not sure it's still needed in 1.8.2, but
-# lz4 is small & builds pretty fast even with -j1, so I'll leave it for now.
-make -j1 \
-  CFLAGS="$SLKCFLAGS" \
-  PREFIX=/usr \
-  LIBDIR=/usr/lib$LIBDIRSUFFIX \
-  MANDIR=/usr/man \
-  DESTDIR=$PKG \
-  BUILD_STATIC=no \
-  default install
-
-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
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION
-mkdir -p $DOCDIR
-cp -a NEWS README* doc/* examples $DOCDIR
-
-# the library is BSD licensed, but the programs are GPL.
-cat programs/COPYING > $DOCDIR/LICENSE.programs.txt
-cat lib/LICENSE > $DOCDIR/LICENSE.lib.txt
-
-cat $CWD/$PRGNAM.SlackBuild > $DOCDIR/$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/lz4/lz4.info b/system/lz4/lz4.info
deleted file mode 100644
index dc19a75be8..0000000000
--- a/system/lz4/lz4.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="lz4"
-VERSION="1.9.2"
-HOMEPAGE="https://lz4.github.io/lz4/"
-DOWNLOAD="https://github.com/lz4/lz4/archive/v1.9.2/lz4-1.9.2.tar.gz"
-MD5SUM="3898c56c82fb3d9455aefd48db48eaad"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/system/lz4/slack-desc b/system/lz4/slack-desc
deleted file mode 100644
index b9c624ad7d..0000000000
--- a/system/lz4/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-lz4: lz4 (compression algorithm)
-lz4:
-lz4: LZ4 is lossless compression algorithm, providing compression
-lz4: speed at 400 MB/s per core (0.16 Bytes/cycle). It also features
-lz4: an extremely fast decoder, with speed in multiple GB/s per core
-lz4: (0.71 Bytes/cycle). A high compression derivative, called LZ4_HC,
-lz4: is also provided. It trades CPU time for compression ratio.
-lz4:
-lz4:
-lz4:
-lz4:
diff --git a/system/man-db/README b/system/man-db/README
deleted file mode 100644
index 8ac7c0c470..0000000000
--- a/system/man-db/README
+++ /dev/null
@@ -1,14 +0,0 @@
-man-db (database-driven manual pager suite)
-
-This package provides the man command and related utilities
-for examining on-line help files (manual pages). It can act as a
-replacement for Slackware's man package. It has several enhancements
-over man, including an indexed database for searches with -k or
-apropos, the ability to easily view man pages in a browser, better
-i18n support, and a much more efficient implementation of the -K (full
-text search) option.
-
-This build includes a complete install of libpipeline.
-
-By default, man-db doesn't conflict with Slackware's man package. See
-README.Slackware for details.
diff --git a/system/man-db/README.Slackware b/system/man-db/README.Slackware
deleted file mode 100644
index 165e9dfa4c..0000000000
--- a/system/man-db/README.Slackware
+++ /dev/null
@@ -1,49 +0,0 @@
-By default, man-db can be installed alongside Slackware's man package
-without conflict, as it installs its binaries and man pages into
-/opt/man-db. After installation, either log out and back in, or source
-/etc/profile.d/man-db.sh in your shell (this adjusts $PATH so the man
-command from /opt/man-db will be found first).
-
-Alternately, man-db can be built as a replacement for Slackware's
-man package.  To do this, set USR=yes in the script's environment,
-and "removepkg man" before installing man-db. No profile scripts are
-installed in this case.
-
-When installing man-db, the doinst.sh script may take several minutes to
-run. This is because it's indexing all the man pages on the system. Also,
-a cron job is installed in /etc/cron.daily, which adds newly-installed
-man pages to the database. The index speeds up searching via "man -k"
-or "apropos". The disadvantage is that newly-installed man pages won't
-be found in these searches until the database has been updated, so any
-time you install new man pages, you'll want to run "mandb" as root, or
-wait for cron to do it for you (if you don't do this, the new pages can
-still be displayed, they just won't be searchable). The indexing runs
-quickly once the initial database has been created, so the cron job or
-manual update shouldn't bring your system to its knees.
-
-The database is located in /var/cache/man, and on a full Slackware install
-will be approximately 5MB in size. During index creation, approximately
-10MB in /var is used. If you decide to removepkg man-db, you'll probably
-also want to get rid of its database with "rm -rf /var/cache/man". If
-the database gets corrupted somehow, it can be regenerated from scratch
-by running "mandb -c" or just reinstalling the man-db package.
-
-Although man-db supports caching formatted pages ("cat" pages), it's
-disabled in this build, to make man-db behave more like Slackware's man
-(which supports caching, but it's disabled). On modern (and even 10+
-year old) systems, the small amount of extra time it takes to format
-a man page every time it's viewed is probably not worth the headaches
-caused by stale cat pages.
-
-Unlike some distro packages of man-db, this build doesn't install man or
-mandb setuid. This prevents caching cat pages from working (see above),
-and prevents man from automatically adding new man pages to the database
-the first time a user views them (they will be indexed by the cron job,
-or by root manually running "mandb", if you're impatient).
-
-A word about i18n support: the whole reason I packaged man-db is because
-Slackware's man can't handle Japanese man pages, and I couldn't come
-up with a way to make them work after several hours of research and
-man.conf editing. With man-db, they Just Work, with LANG=ja_JP.UTF-8
-(now all I have to do is learn to read Japanese). In general, UTF-8
-locales are preferred for man-db, although non-UTF-8 is also supported.
diff --git a/system/man-db/doinst.sh b/system/man-db/doinst.sh
deleted file mode 100644
index cb474322c8..0000000000
--- a/system/man-db/doinst.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/man_db.conf.new
-
-# In English, the if/find below means "only run the database creation if
-# it was last done over an hour ago". This is needed because upgradepkg
-# runs doinst.sh twice, but I don't want the 10+ minute long database
-# creation to happen twice on upgrade (or at all, when I'm repeatedly
-# reinstalling man-db for testing purposes).
-
-if  \
-  [ ! -e /var/cache/man/man-db ] || \
-  [ -n "$( find var/cache/man/ -type d -a -name man-db -a -mmin +60 )" ]
-then
-# Generate the initial man database (or rebuild it if it exists).
-# We want to skip this step if installing somewhere besides / (e.g. with
-# the -root option or ROOT env variable set for installpkg), hence the
-# readlink silliness.
-
-# The -c option means it blows away any existing db. I thought about
-# leaving it off (it will still create the db if it doesn't exist),
-# but decided it's better to build it fresh if the package gets
-# reinstalled (in case the db format has changed, or in case the
-# db is corrupted and the user is trying to fix it by reinstalling
-# this package).
-
-# the 2>/dev/null was added for 2.7.6 because it complains about
-# missing CACHEDIR.TAG files... which don't matter, because we've
-# got NOCACHE in the config file.
-  ( \
-    [ -x /bin/readlink ] && \
-    [ "$( /bin/readlink -f $( pwd ) )" = "/" ] && \
-    ( [ -x /opt/man-db/bin/mandb ] && /opt/man-db/bin/mandb -c -q ) || \
-    ( [ -x /usr/bin/mandb ] && /usr/bin/mandb -c -q ) \
-  ) 2>/dev/null
-fi
diff --git a/system/man-db/dont_write_in_usr.diff b/system/man-db/dont_write_in_usr.diff
deleted file mode 100644
index 8f71585981..0000000000
--- a/system/man-db/dont_write_in_usr.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -Naur man-db-2.7.6.1/configure man-db-2.7.6.1.patched/configure
---- man-db-2.7.6.1/configure	2016-12-12 07:43:48.000000000 -0500
-+++ man-db-2.7.6.1.patched/configure	2017-03-04 16:49:57.389893574 -0500
-@@ -25809,46 +25809,8 @@
- 
- 
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5
--$as_echo_n "checking for long file names... " >&6; }
--if ${ac_cv_sys_long_file_names+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  ac_cv_sys_long_file_names=yes
--# Test for long file names in all the places we know might matter:
--#      .		the current directory, where building will happen
--#      $prefix/lib	where we will be installing things
--#      $exec_prefix/lib	likewise
--#      $TMPDIR		if set, where it might want to write temporary files
--#      /tmp		where it might want to write temporary files
--#      /var/tmp		likewise
--#      /usr/tmp		likewise
--for ac_dir in . "$TMPDIR" /tmp /var/tmp /usr/tmp "$prefix/lib" "$exec_prefix/lib"; do
--  # Skip $TMPDIR if it is empty or bogus, and skip $exec_prefix/lib
--  # in the usual case where exec_prefix is '${prefix}'.
--  case $ac_dir in #(
--    . | /* | ?:[\\/]*) ;; #(
--    *) continue;;
--  esac
--  test -w "$ac_dir/." || continue # It is less confusing to not echo anything here.
--  ac_xdir=$ac_dir/cf$$
--  (umask 077 && mkdir "$ac_xdir" 2>/dev/null) || continue
--  ac_tf1=$ac_xdir/conftest9012345
--  ac_tf2=$ac_xdir/conftest9012346
--  touch "$ac_tf1" 2>/dev/null && test -f "$ac_tf1" && test ! -f "$ac_tf2" ||
--    ac_cv_sys_long_file_names=no
--  rm -f -r "$ac_xdir" 2>/dev/null
--  test $ac_cv_sys_long_file_names = no && break
--done
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_long_file_names" >&5
--$as_echo "$ac_cv_sys_long_file_names" >&6; }
--if test $ac_cv_sys_long_file_names = yes; then
--
- $as_echo "#define HAVE_LONG_FILE_NAMES 1" >>confdefs.h
- 
--fi
--
- 
- 
- 
diff --git a/system/man-db/man-db.SlackBuild b/system/man-db/man-db.SlackBuild
deleted file mode 100644
index 7e8260ddd1..0000000000
--- a/system/man-db/man-db.SlackBuild
+++ /dev/null
@@ -1,224 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for man-db
-
-# Written by B. Watson (yalhcru@gmail.com)
-
-# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
-
-# 20201024 bkw: update for v2.9.3 (matches -current)
-# 20200316 bkw: update for v2.9.1 (resync with -current)
-# 20191201 bkw: update for v2.9.0 (to match -current again).
-# Also got rid of the systemd-specific stuff properly (via configure opts).
-
-# 20180801 bkw: update for v2.8.4.
-# 20180611 bkw: update for v2.8.3, to match what Pat has in -current.
-
-# 20180208 bkw: update for man-db 2.8.0, libpipeline 1.5.0.
-# This may be the last SBo update, since Pat has imported man-db
-# into Slackware-current. Depends on how long it is from now until
-# the next release: I'll maintain this until SBo stops accepting
-# submissions for 14.2.
-
-# 20170305 bkw:
-# - BUILD=2
-# - get rid of systemd-specific /usr/lib/tmpfiles.d from package.
-# - patch configure so it doesn't write to /usr/lib.
-
-# 20170215 bkw:
-# - update for 2.7.6.1 (whoops, last update wasn't for the latest version
-# - only update the cache in doinst.sh if it's over an hour old. this
-#   takes several minutes, and happens twice (uselessly) if the package
-#   is upgraded (since upgradepkg runs doinst.sh twice). waiting an hour
-#   also makes my life easier when I'm testing this script.
-# - fix man-db.cron so it works even if USR=yes (whoops), and stop trying
-#   to chown the cache to the nonexistent 'man' user.
-
-# 20170125 bkw:
-# - update for 2.7.6.
-# - add --disable-cache-owner. TODO: revisit this at some
-#   point. Maybe create a dedicated 'man' user, or use one of the existing
-#   users like 'bin' or 'operator'.
-
-# 20160726 bkw:
-# - update for 2.7.5.
-
-# 20150507 bkw:
-# - update for 2.7.1.
-# - fix homepage in .info file.
-# - had to update libpipeline to 1.4.0.
-
-# 20140924 bkw:
-# - update for 2.7.0.1, which fixes the clash between man-db's zsoelim
-#   and groff's zsoelim.
-# - update README and README.Slackware slightly.
-
-PRGNAM=man-db
-VERSION=${VERSION:-2.9.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
-
-set -e
-
-# By default, install binaries to /opt, so as not to stomp on Slackware's
-# man pkg. We will have to include a /etc/profile.d script to set PATH,
-# MANPATH, etc. Note that only binaries and the man pages for man-db itself
-# go to /opt. Everything else (libpipeline, man-db's shared libs, localized
-# messages, etc) goes to /usr as usual.
-
-# If you want a proper replacement for Slack's man pkg, build with
-# USR="yes", which puts the binaries in the usual places. If your name is
-# Patrick V. and you're finally replacing man with man-db in Slackware,
-# feel free to uncomment the next line:
-#USR="yes"
-
-BINDIR=/opt/$PRGNAM/bin
-[ "${USR:-no}" = "yes" ] && BINDIR=/usr/bin
-MANDIR="${BINDIR/bin/man}"
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-
-# libpipeline is a pretty niche-market library. It used to be bundled
-# in the man-db source, and as far as I can tell, nothing else uses it.
-# Instead of making it a separate build and external dep, we'll just
-# bundle it here.
-LIBNAM=libpipeline
-LIBVER=1.5.3
-
-cd $TMP
-rm -rf $LIBNAM-$LIBVER
-tar xvf $CWD/$LIBNAM-$LIBVER.tar.gz
-cd $LIBNAM-$LIBVER
-chown -R root:root .
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION/$LIBNAM-$LIBVER \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/$LIBNAM-$LIBVER
-cp -a COPYING ChangeLog* NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION/$LIBNAM-$LIBVER
-
-# now build man-db itself, using the libpipeline installed in $PKG
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-# The 'checking for long filenames' test in the configure script writes to
-# /usr/lib, which is bad behaviour for a configure script. Not to mention
-# wrong (it assumes configure is always being run as root). We already
-# know we have long filename support, because we live in the 21st century
-# now, so this patch gets rid of the test and force-enables it.
-patch -p1 < $CWD/dont_write_in_usr.diff
-
-# The circumlocutions below are needed because doing it the sane way:
-# libpipeline_LIBS="-L$PKG/usr/lib$LIBDIRSUFFIX -lpipeline"
-# gets broken by libtool (it *insists* on replacing -lpipeline with
-# /usr/lib64/libpipeline.so, which will fail if it's an older version).
-LD_LIBRARY_PATH="$PKG/usr/lib$LIBDIRSUFFIX" \
-LDFLAGS="$PKG/usr/lib$LIBDIRSUFFIX/libpipeline.so" \
-libpipeline_CFLAGS="-I$PKG/usr/include" \
-libpipeline_LIBS="-L$PKG/usr/lib$LIBDIRSUFFIX $PKG/usr/lib$LIBDIRSUFFIX/libpipeline.so" \
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --with-systemdtmpfilesdir=no \
-  --with-systemdsystemunitdir=no \
-  --disable-setuid \
-  --disable-cache-owner \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=$MANDIR \
-  --bindir=$BINDIR \
-  --sbindir=${BINDIR/bin/sbin} \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-# There will always be man pages here, regardless of USR=yes or no.
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-if [ "${USR:-no}" != "yes" ]; then
-  # separate dir full of man pages and symlinks in /opt
-  find $PKG/$MANDIR -type f -exec gzip -9 {} \;
-  for i in $( find $PKG/$MANDIR -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-  # only need the profile.d stuff if installing to /opt
-  mkdir -p $PKG/etc/profile.d
-  install -m0755 -oroot -groot $CWD/$PRGNAM.sh $CWD/$PRGNAM.csh $PKG/etc/profile.d
-fi
-
-# no special ownership or perms needed here since we --disable-setuid
-mkdir -p $PKG/var/cache/man
-
-# only ship a daily cronjob, don't need a weekly one like Debian has.
-mkdir -p $PKG/etc/cron.daily
-install -m0755 -oroot -groot $CWD/$PRGNAM.cron $PKG/etc/cron.daily/$PRGNAM
-
-# modified default config, customized for Slackware. See the conf file for
-# list of changes.
-zcat $CWD/man_db.conf.new.gz \
-  | sed "s,@LIBDIRSUFFIX@,$LIBDIRSUFFIX,g" \
-  > $PKG/etc/man_db.conf.new
-rm -rf $PKG/etc/man_db.conf
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS Change* FAQ NEWS README docs/* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-sed "s,@BINDIR@,$BINDIR," < $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-# N.B. the -p option is actually needed here (for libpipeline.so).
-cd $PKG
-/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/man-db/man-db.cron b/system/man-db/man-db.cron
deleted file mode 100644
index 93c3a00ff2..0000000000
--- a/system/man-db/man-db.cron
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# man-db daily cronjob, part of the slackbuilds.org man-db package.
-# Author: B. Watson.
-# Adapted from Debian's man-db package, so I guess the license is GPL.
-
-set -e
-
-if ! [ -d /var/cache/man ]; then
-  # Recover from deletion, per FHS.
-  mkdir -p /var/cache/man
-  chown root:root /var/cache/man || true
-  chmod 2755 /var/cache/man
-fi
-
-# expunge old catman pages which have not been read in a week
-# commented out, as we've got cat pages disabled in this build. Left
-# here for reference in case someone really wants to enable cat pages
-# some day.
-#find /var/cache/man -type f -name '*.gz' -atime +6 -print0 | xargs -r0 rm -f &> /dev/null
-
-# regenerate man database. /opt/man-db/bin probably isn't in cron's $PATH,
-# so check for it specially, otherwise use $PATH.
-if [ -x /opt/man-db/bin/mandb ]; then
-  MANDB=/opt/man-db/bin/mandb
-else
-  MANDB=mandb
-fi
-
-$MANDB --no-purge --quiet
diff --git a/system/man-db/man-db.csh b/system/man-db/man-db.csh
deleted file mode 100644
index 6cf39ce0ba..0000000000
--- a/system/man-db/man-db.csh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/csh
-
-# Set up environment for man-db. This file is part of the slackbuilds.org
-# man-db build.
-
-# Author: B. Watson. License: WTFPL
-
-setenv MANPATH /opt/man-db/man:$MANPATH
-set path = ( /opt/man-db/bin $path )
-if ("`id -u`" == "0") then
-   set path = ( /opt/man-db/sbin $path )
-endif
diff --git a/system/man-db/man-db.info b/system/man-db/man-db.info
deleted file mode 100644
index a0c86e1b19..0000000000
--- a/system/man-db/man-db.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="man-db"
-VERSION="2.9.3"
-HOMEPAGE="http://www.nongnu.org/man-db/"
-DOWNLOAD="http://download.savannah.gnu.org/releases/man-db/man-db-2.9.3.tar.xz \
-          http://download.savannah.gnu.org/releases/libpipeline/libpipeline-1.5.3.tar.gz"
-MD5SUM="4c8721faa54a4c950c640e5e5c713fb0 \
-        dad443d0911cf9f0f1bd90a334bc9004"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/system/man-db/man-db.sh b/system/man-db/man-db.sh
deleted file mode 100644
index 54c9b34ae0..0000000000
--- a/system/man-db/man-db.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Set up environment for man-db. This file is part of the slackbuilds.org
-# man-db build.
-
-# Author: B. Watson. License: WTFPL
-
-MANPATH="/opt/man-db/man:$MANPATH"
-PATH="/opt/man-db/bin:$PATH"
-
-if [ "$( id -u )" = "0" ]; then
-  PATH="/opt/man-db/sbin:$PATH"
-fi
-
-export MANPATH
-export PATH
diff --git a/system/man-db/man_db.conf.new.gz b/system/man-db/man_db.conf.new.gz
deleted file mode 100644
index 1d128438c4..0000000000
--- a/system/man-db/man_db.conf.new.gz
+++ /dev/null
diff --git a/system/man-db/slack-desc b/system/man-db/slack-desc
deleted file mode 100644
index 5abdea8fb6..0000000000
--- a/system/man-db/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-man-db: man-db (database-driven manual pager suite)
-man-db:
-man-db: This package provides the man command and related utilities
-man-db: for examining on-line help files (manual pages). It can act as a
-man-db: replacement for Slackware's man package. It has several enhancements
-man-db: over man, including an indexed database for searches with -k or
-man-db: apropos, the ability to easily view man pages in a browser, better
-man-db: i18n support, and a much more efficient implementation of the -K
-man-db: (full text search) option.
-man-db:
-man-db:
diff --git a/system/mlocate/README b/system/mlocate/README
deleted file mode 100644
index f2029ce76a..0000000000
--- a/system/mlocate/README
+++ /dev/null
@@ -1,31 +0,0 @@
-mlocate (locate/updatedb implementation)
-
-mlocate is a locate/updatedb implementation. It keeps a database of all
-existing files and allows you to lookup files by name. The 'm' stands for
-"merging": updatedb reuses the existing database to avoid rereading most
-of the file system, which makes updatedb faster and does not trash the
-system caches as much as traditional locate implementations.
-
-This is the same "locate" that's in Slackware-current (and eventually 15.0).
-
-This conflicts with Slackware 14.2's slocate package! Before installing
-this, add slocate to /etc/slackpkg/blacklist and then:
-
-  # removepkg slocate
-
-It's also recommended to:
-
-  # rm -rf /var/lib/slocate /etc/updatedb.conf
-
-The locate database will be created daily, as a cron job. If you don't
-want to wait, you can create it manually:
-
-  # /etc/cron.daily/mlocate
-
-If you want to revert to Slackware's slocate, remove slocate from
-/etc/slackpkg/blacklist, then:
-
-  # removepkg mlocate
-  # rm -rf /var/lib/mlocate /etc/updatedb.conf
-  # slackpkg update
-  # slackpkg install slocate
diff --git a/system/mlocate/doinst.sh b/system/mlocate/doinst.sh
deleted file mode 100644
index 8afb2a4fff..0000000000
--- a/system/mlocate/doinst.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# doinst.sh copied from Pat's, got rid of the stuff that creates the
-# slocate group.
-
-config() {
-  NEW="$1"
-  OLD="`dirname $NEW`/`basename $NEW .new`"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-config etc/updatedb.conf.new
-
-if [ ! -r var/lib/mlocate/mlocate.db ]; then
-  touch var/lib/mlocate/mlocate.db
-  chown root:slocate var/lib/mlocate/mlocate.db
-  chmod 640 var/lib/mlocate/mlocate.db
-fi
-
diff --git a/system/mlocate/mlocate-run-updatedb b/system/mlocate/mlocate-run-updatedb
deleted file mode 100644
index 7d3f2ac526..0000000000
--- a/system/mlocate/mlocate-run-updatedb
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-nodevs=$(< /proc/filesystems awk '$1 == "nodev" && $2 != "rootfs" && $2 != "zfs" { print $2 }')
-/usr/bin/updatedb -f "$nodevs"
diff --git a/system/mlocate/mlocate.SlackBuild b/system/mlocate/mlocate.SlackBuild
deleted file mode 100644
index 9f213fbb54..0000000000
--- a/system/mlocate/mlocate.SlackBuild
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for mlocate
-
-# Written by B. Watson (yalhcru@gmail.com)
-
-# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
-
-# Notes:
-# - This is intended to be 100% compatible with the mlocate in -current.
-# - mlocate and slocate can't read each others' database formats. Bummer.
-# - DOWNLOAD is upstream's site, but the file is identical to the one
-#   from Pat's source/ dir. I used upstream so the file won't disappear if
-#   Pat upgrades or changes his mind.
-# - mlocate on -current uses the slocate group (there's no mlocate group),
-#   so I do the same here.
-# - mlocate's database is about 40% larger than slocate's, on my build box.
-#   Not a real concern unless you're building a tiny embedded system.
-
-PRGNAM=mlocate
-VERSION=${VERSION:-0.26}
-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
-
-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
-chown -R root:root .
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var/lib \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make groupname=slocate
-make install-strip DESTDIR=$PKG
-
-gzip $PKG/usr/man/man?/*.?
-
-# This stuff comes straight from Pat's mlocate.SlackBuild:
-mkdir -p $PKG/etc
-cp -a $CWD/updatedb.conf.new $PKG/etc/updatedb.conf.new
-chown root:root $PKG/etc/updatedb.conf.new
-chmod 644 $PKG/etc/updatedb.conf.new
-
-mv $PKG/usr/bin/locate $PKG/usr/bin/mlocate
-( cd $PKG/usr/bin ; ln -sf mlocate locate )
-
-( cd $PKG/usr/man/man1
-  ln -sf locate.1 mlocate.1
-)
-
-mkdir -p $PKG/usr/libexec
-cp -a $CWD/mlocate-run-updatedb $PKG/usr/libexec/mlocate-run-updatedb
-chown root:root $PKG/usr/libexec/mlocate-run-updatedb
-chmod 755 $PKG/usr/libexec/mlocate-run-updatedb
-
-mkdir -p $PKG/etc/cron.daily
-cp -a $CWD/mlocate.cron $PKG/etc/cron.daily/mlocate
-chown root:root $PKG/etc/cron.daily/mlocate
-chmod 755 $PKG/etc/cron.daily/mlocate
-
-chown root:slocate $PKG/usr/bin/mlocate
-chmod 2711 $PKG/usr/bin/mlocate
-mkdir -p $PKG/var/lib/mlocate
-chown root:slocate $PKG/var/lib/mlocate
-chmod 750 $PKG/var/lib/mlocate
-# End of Pat's stuff.
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING* ChangeLog NEWS README* \
-  $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
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/mlocate/mlocate.cron b/system/mlocate/mlocate.cron
deleted file mode 100644
index 5464abad35..0000000000
--- a/system/mlocate/mlocate.cron
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-ionice -c3 nice -n 19 /usr/libexec/mlocate-run-updatedb
diff --git a/system/mlocate/mlocate.info b/system/mlocate/mlocate.info
deleted file mode 100644
index b9eb39f232..0000000000
--- a/system/mlocate/mlocate.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="mlocate"
-VERSION="0.26"
-HOMEPAGE="https://pagure.io/mlocate/releases"
-DOWNLOAD="https://releases.pagure.org/mlocate/mlocate-0.26.tar.xz"
-MD5SUM="539e6f86bf387358aa2b14d5f880e49a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="%README%"
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/system/mlocate/slack-desc b/system/mlocate/slack-desc
deleted file mode 100644
index e28d270792..0000000000
--- a/system/mlocate/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-mlocate: mlocate (locate/updatedb implementation)
-mlocate:
-mlocate: mlocate is a locate/updatedb implementation. It keeps a database
-mlocate: of all existing files and allows you to lookup files by name. The
-mlocate: 'm' stands for "merging": updatedb reuses the existing database
-mlocate: to avoid rereading most of the file system, which makes updatedb
-mlocate: faster and does not trash the system caches as much as traditional
-mlocate: locate implementations.
-mlocate:
-mlocate: This conflicts with Slackware 14.2's slocate package. See README
-mlocate: for details.
diff --git a/system/mlocate/updatedb.conf.new b/system/mlocate/updatedb.conf.new
deleted file mode 100644
index 542cd7c679..0000000000
--- a/system/mlocate/updatedb.conf.new
+++ /dev/null
@@ -1,4 +0,0 @@
-PRUNE_BIND_MOUNTS = "yes"
-PRUNEFS = "9p afs anon_inodefs auto autofs bdev binfmt_misc cgroup cifs coda configfs cpuset debugfs devpts ecryptfs exofs fuse fuse.sshfs fusectl gfs gfs2 gpfs hugetlbfs inotifyfs iso9660 jffs2 lustre mqueue ncpfs nfs nfs4 nfsd pipefs proc ramfs rootfs rpc_pipefs securityfs selinuxfs sfs sockfs sysfs tmpfs ubifs udf usbfs ceph fuse.ceph"
-PRUNENAMES = ".git .hg .svn .bzr .arch-ids {arch} CVS"
-PRUNEPATHS = "/afs /dev /media /mnt /net /proc /sys /tmp /usr/tmp /var/cache/ccache /var/lib/ceph /var/spool/cups /var/tmp"
diff --git a/system/mongodb/mongodb.SlackBuild b/system/mongodb/mongodb.SlackBuild
index 99d3331f9e..c305e76cab 100644
--- a/system/mongodb/mongodb.SlackBuild
+++ b/system/mongodb/mongodb.SlackBuild
@@ -24,7 +24,7 @@
 
 
 PRGNAM="mongodb"
-VERSION=${VERSION:-3.4.9}
+VERSION=${VERSION:-3.4.24}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 MAKEJOBS=${MAKEJOBS:-1}
diff --git a/system/mongodb/mongodb.info b/system/mongodb/mongodb.info
index 8c57d99cc5..c563a13750 100644
--- a/system/mongodb/mongodb.info
+++ b/system/mongodb/mongodb.info
@@ -1,10 +1,10 @@
 PRGNAM="mongodb"
-VERSION="3.4.9"
+VERSION="3.4.24"
 HOMEPAGE="https://www.mongodb.org/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://fastdl.mongodb.org/src/mongodb-src-r3.4.9.tar.gz"
-MD5SUM_x86_64="c8c9f521807b1097e04ffa2081e35177"
+DOWNLOAD_x86_64="https://fastdl.mongodb.org/src/mongodb-src-r3.4.24.tar.gz"
+MD5SUM_x86_64="2033a6857e9e71bb2faede3a262c4524"
 REQUIRES=""
 MAINTAINER="Miguel De Anda"
 EMAIL="miguel@thedeanda.com"
diff --git a/system/noto-fonts/66-noto-mono.conf b/system/noto-fonts/66-noto-mono.conf
deleted file mode 100644
index c003973938..0000000000
--- a/system/noto-fonts/66-noto-mono.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <alias>
-    <family>monospace</family>
-    <prefer>
-      <family>Noto Mono</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>Noto Mono</family>
-    <default>
-      <family>monospace</family>
-    </default>
-  </alias>
-</fontconfig>
diff --git a/system/noto-fonts/66-noto-sans.conf b/system/noto-fonts/66-noto-sans.conf
deleted file mode 100644
index 012aebedf8..0000000000
--- a/system/noto-fonts/66-noto-sans.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <alias>
-    <family>sans-serif</family>
-    <prefer>
-      <family>Noto Sans</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>Noto Sans</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-</fontconfig>
diff --git a/system/noto-fonts/66-noto-serif.conf b/system/noto-fonts/66-noto-serif.conf
deleted file mode 100644
index 036baf7764..0000000000
--- a/system/noto-fonts/66-noto-serif.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <alias>
-    <family>serif</family>
-    <prefer>
-      <family>Noto Serif</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>Noto Serif</family>
-    <default>
-      <family>serif</family>
-    </default>
-  </alias>
-</fontconfig>
diff --git a/system/noto-fonts/README b/system/noto-fonts/README
deleted file mode 100644
index 91b48a4d6f..0000000000
--- a/system/noto-fonts/README
+++ /dev/null
@@ -1,14 +0,0 @@
-noto-fonts (Googles Noto fonts)
-
-Noto's goal is to provide a beautiful reading experience for all
-languages.
-
-It is a free, professionally-designed, open-source collection of
-fonts with a harmonious look and feel in multiple weights and styles.
-Noto fonts are published under the SIL Open Font License (OFL) v1.1.
-which allows you to copy, modify, and redistribute them if you need.
-
-Currently, Noto covers all major languages of the world and many
-others, including European, African, Middle Eastern, Indic, South and
-Southeast Asian, Central Asian, American, and East Asian languages.
-Several minority and historical languages are also supported.
diff --git a/system/noto-fonts/doinst.sh b/system/noto-fonts/doinst.sh
deleted file mode 100644
index 8fec9f5340..0000000000
--- a/system/noto-fonts/doinst.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-# Update the X font indexes:
-if [ -x /usr/bin/mkfontdir ]; then
-  ( cd /usr/share/fonts/TTF
-    mkfontscale .
-    mkfontdir .
-  )
-fi
-
-if [ -x /usr/bin/fc-cache ]; then
-  /usr/bin/fc-cache -f
-fi
diff --git a/system/noto-fonts/noto-fonts.SlackBuild b/system/noto-fonts/noto-fonts.SlackBuild
deleted file mode 100644
index b13b7d7f67..0000000000
--- a/system/noto-fonts/noto-fonts.SlackBuild
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for noto-fonts.
-#
-# Copyright 2016-2018  Edinaldo P. Silva, Rio de Janeiro, Brazil.
-# 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=noto-fonts
-VERSION=${VERSION:-20180624}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-ARCH=noarch
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-SRCVER=${SRCVER:-449470a4d83f6eecdb4a537ab66fcbb5ff28917a}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$SRCVER
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz --exclude=hinted/{Arimo*.ttf,Cousine*.ttf,Tinos*.ttf}
-mv $PRGNAM-$SRCVER $PRGNAM-$VERSION
-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 {} \;
-
-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
-
-install -d $PKG/usr/share/fonts/TTF/
-install -m644 alpha/Noto*.tt[fc] $PKG/usr/share/fonts/TTF/
-install -m644 hinted/Noto*.tt[fc] $PKG/usr/share/fonts/TTF/
-install -m644 unhinted/Noto*.tt[fc] $PKG/usr/share/fonts/TTF/
-
-mkdir -p $PKG/etc/fonts/conf.avail
-install -m644 $CWD/*.conf $PKG/etc/fonts/conf.avail/
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp FAQ.md issue_template.md LICENSE NEWS.md README.md $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
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/noto-fonts/noto-fonts.info b/system/noto-fonts/noto-fonts.info
deleted file mode 100644
index b499de501b..0000000000
--- a/system/noto-fonts/noto-fonts.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="noto-fonts"
-VERSION="20180624"
-HOMEPAGE="https://github.com/googlei18n/noto-fonts"
-DOWNLOAD="https://github.com/googlei18n/noto-fonts/archive/449470a4d83f6eecdb4a537ab66fcbb5ff28917a/noto-fonts-449470a4d83f6eecdb4a537ab66fcbb5ff28917a.tar.gz"
-MD5SUM="acd40dfe3dca60cfb545afd3cba944f4"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Edinaldo P. Silva"
-EMAIL="edps.mundognu@gmail.com"
diff --git a/system/noto-fonts/slack-desc b/system/noto-fonts/slack-desc
deleted file mode 100644
index 2c34909d4f..0000000000
--- a/system/noto-fonts/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-noto-fonts: noto-fonts (Googles Noto fonts)
-noto-fonts:
-noto-fonts: Noto's goal is to provide a beautiful reading experience for all
-noto-fonts: languages.
-noto-fonts:
-noto-fonts: It is a free, professionally-designed, open-source collection of
-noto-fonts: fonts with a harmonious look and feel in multiple weights and styles.
-noto-fonts: Noto fonts are published under the SIL Open Font License (OFL) v1.1.
-noto-fonts:
-noto-fonts: Home page: https://github.com/googlei18n/noto-fonts
-noto-fonts:
diff --git a/system/nss-pam-ldapd/README b/system/nss-pam-ldapd/README
deleted file mode 100644
index bb4b25566a..0000000000
--- a/system/nss-pam-ldapd/README
+++ /dev/null
@@ -1,5 +0,0 @@
-nss-pam-ldap is a Name Service Switch (NSS) module and Pluggable
-Authentication Module (PAM) that allows your LDAP server to provide
-user account, group, host name, alias, netgroup, and basically any
-other information that you would normally get from /etc flat files
-or NIS.  It also allows you to do authentication to an LDAP server.
diff --git a/system/nss-pam-ldapd/doinst.sh b/system/nss-pam-ldapd/doinst.sh
deleted file mode 100644
index d483abce26..0000000000
--- a/system/nss-pam-ldapd/doinst.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-config etc/nslcd.conf.new
-preserve_perms etc/rc.d/rc.nss-pam-ldapd.new
diff --git a/system/nss-pam-ldapd/nss-pam-ldapd.SlackBuild b/system/nss-pam-ldapd/nss-pam-ldapd.SlackBuild
deleted file mode 100644
index ac14ec8fbf..0000000000
--- a/system/nss-pam-ldapd/nss-pam-ldapd.SlackBuild
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for nss-pam-ldapd
-
-# Copyright (c) 2009-2013 Christopher Walker <kris240376@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the following disclaimer
-#   in the documentation and/or other materials provided with the
-#   distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "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 COPYRIGHT
-# OWNER OR CONTRIBUTORS 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=nss-pam-ldapd
-VERSION=${VERSION:-0.8.12}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -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
-
-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
-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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-pam \
-  --build=$ARCH-slackware-linux
-
-make
-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
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mv $PKG/etc/nslcd.conf $PKG/etc/nslcd.conf.new
-chmod 0600 $PKG/etc/nslcd.conf.new
-
-mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.nss-pam-ldapd > $PKG/etc/rc.d/rc.nss-pam-ldapd.new
-
-mkdir -p $PKG/var/run/nslcd
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog* HACKING INSTALL NEWS README TODO \
-  $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
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/nss-pam-ldapd/nss-pam-ldapd.info b/system/nss-pam-ldapd/nss-pam-ldapd.info
deleted file mode 100644
index a79bf47ade..0000000000
--- a/system/nss-pam-ldapd/nss-pam-ldapd.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="nss-pam-ldapd"
-VERSION="0.8.12"
-HOMEPAGE="https://arthurdejong.org/nss-pam-ldapd/"
-DOWNLOAD="https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.8.12.tar.gz"
-MD5SUM="83121b0a536e763a9c0e3eec66ab2ef8"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Christopher Walker"
-EMAIL="kris240376@gmail.com"
diff --git a/system/nss-pam-ldapd/rc.nss-pam-ldapd b/system/nss-pam-ldapd/rc.nss-pam-ldapd
deleted file mode 100644
index 0630c0a349..0000000000
--- a/system/nss-pam-ldapd/rc.nss-pam-ldapd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# rc.nss-pam-ldapd:  start/stop/restart nslcd
-#
-# nslcd is a daemon that will do LDAP queries for local processes that want
-# to do user, group, and other naming lookups (NSS), or do user authentication,
-# authorization, or password modification (PAM).  slapd is typically invoked
-# at boot time, usually out of /etc/rc.d/rc.local.
-#
-
-nslcd_start() {
-  if [ -x /usr/sbin/nslcd -a -r /etc/nslcd.conf ]; then
-    echo "Starting nslcd name service daemon:  /usr/sbin/nslcd"
-    /usr/sbin/nslcd
-  fi
-}
-
-nslcd_stop() {
-  echo "Stopping nslcd name service daemon..."
-  killall nslcd
-}
-
-case "$1" in
-'start')
-  nslcd_start
-  ;;
-'stop')
-  nslcd_stop
-  ;;
-'restart')
-  nslcd_stop
-  sleep 2
-  nslcd_start
-  ;;
-*)
-  echo "usage $0 start|stop|restart"
-esac
diff --git a/system/nss-pam-ldapd/slack-desc b/system/nss-pam-ldapd/slack-desc
deleted file mode 100644
index d82845204e..0000000000
--- a/system/nss-pam-ldapd/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-nss-pam-ldapd: nss-pam-ldapd (LDAP NSS/PAM module)
-nss-pam-ldapd:
-nss-pam-ldapd: nss-pam-ldapd is a NSS and PAM module that allows your LDAP server to
-nss-pam-ldapd: provide user account, group, host name, alias, netgroup, and basically
-nss-pam-ldapd: any other information that you would normally get from /etc/ flat
-nss-pam-ldapd: files or NIS.  It also allows you to do authentication to an LDAP
-nss-pam-ldapd: server.
-nss-pam-ldapd:
-nss-pam-ldapd: Homepage: https://arthurdejong.org/nss-pam-ldapd/
-nss-pam-ldapd:
-nss-pam-ldapd:
diff --git a/system/nvidia-legacy304-kernel/4.14_kernel.patch b/system/nvidia-legacy304-kernel/4.14_kernel.patch
new file mode 100644
index 0000000000..6642189009
--- /dev/null
+++ b/system/nvidia-legacy304-kernel/4.14_kernel.patch
@@ -0,0 +1,26 @@
+diff -ur a/kernel/nv-drm.c b/kernel/nv-drm.c
+--- a/kernel/nv-drm.c	2017-09-14 23:51:09.000000003 +0300
++++ b/kernel/nv-drm.c	2017-12-06 18:47:48.279729889 +0200
+@@ -121,7 +121,11 @@
+ {
+     int ret = 0;
+ #if defined(NV_DRM_AVAILABLE)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+     ret = drm_pci_init(&nv_drm_driver, pci_driver);
++#else
++    ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver);
++#endif
+ #endif
+     return ret;
+ }
+@@ -131,6 +135,10 @@
+ )
+ {
+ #if defined(NV_DRM_AVAILABLE)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+     drm_pci_exit(&nv_drm_driver, pci_driver);
++#else
++    drm_legacy_pci_exit(&nv_drm_driver, pci_driver);
++#endif
+ #endif
+ }
diff --git a/system/nvidia-legacy304-kernel/4.15_kernel.patch b/system/nvidia-legacy304-kernel/4.15_kernel.patch
new file mode 100644
index 0000000000..fdac62fb24
--- /dev/null
+++ b/system/nvidia-legacy304-kernel/4.15_kernel.patch
@@ -0,0 +1,48 @@
+diff -ur a/kernel/nv.c b/kernel/nv.c
+--- a/kernel/nv.c	2017-09-14 23:51:09.000000000 +0300
++++ b/kernel/nv.c	2018-02-13 14:56:42.289490885 +0200
+@@ -301,7 +301,11 @@
+ #else
+ irqreturn_t   nv_kern_isr(int, void *);
+ #endif
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ void          nv_kern_rc_timer(unsigned long);
++#else
++void          nv_kern_rc_timer(struct timer_list *t);
++#endif
+ #if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
+ static int    nv_kern_apm_event(struct pm_dev *, pm_request_t, void *);
+ #endif
+@@ -2075,10 +2079,18 @@
+ }
+ 
+ void nv_kern_rc_timer(
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+     unsigned long data
++#else
++    struct timer_list *t
++#endif
+ )
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+     nv_linux_state_t *nvl = (nv_linux_state_t *) data;
++#else
++    nv_linux_state_t *nvl = from_timer(nvl, t, rc_timer);
++#endif
+     nv_state_t *nv = NV_STATE_PTR(nvl);
+ 
+     NV_CHECK_PCI_CONFIG_SPACE(nvl->timer_sp, nv, TRUE, TRUE, FALSE);
+@@ -3029,9 +3041,13 @@
+         return -1;
+ 
+     nv_printf(NV_DBG_INFO, "NVRM: initializing rc timer\n");
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+     init_timer(&nvl->rc_timer);
+     nvl->rc_timer.function = nv_kern_rc_timer;
+     nvl->rc_timer.data = (unsigned long) nv;
++#else
++    timer_setup(&nvl->rc_timer, nv_kern_rc_timer, 0);
++#endif
+     nv->rc_timer_enabled = 1;
+     mod_timer(&nvl->rc_timer, jiffies + HZ); /* set our timeout for 1 second */
+     nv_printf(NV_DBG_INFO, "NVRM: rc timer initialized\n");
diff --git a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild b/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild
index c789ab3a6a..db6edc4a0d 100644
--- a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild
+++ b/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild
@@ -75,6 +75,10 @@ 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 {} \;
 
+# https://pkgs.rpmfusion.org/cgit/nonfree/nvidia-304xx-kmod.git/log/
+patch -p1 < $CWD/4.14_kernel.patch 
+patch -p1 < $CWD/4.15_kernel.patch 
+
 cd kernel || exit 1
 
 make SYSSRC=$KERNELPATH module || exit 1
diff --git a/system/nvidia-legacy390-driver/nvidia-switch b/system/nvidia-legacy390-driver/nvidia-switch
index 2f57366cfd..06f7115a3b 100644
--- a/system/nvidia-legacy390-driver/nvidia-switch
+++ b/system/nvidia-legacy390-driver/nvidia-switch
@@ -67,7 +67,6 @@ save_GL(){
 
       if [ "$GLVND" = "yes" ]; then
         mv libGL.so.$GL_VERSION $SAVELIBS
-        mv libGL.la $SAVELIBS
         mv libEGL.so.1.?.0 $SAVELIBS
         mv libGLESv1_CM.so.1.1.0 $SAVELIBS
         mv libGLESv2.so.2.0.0 $SAVELIBS
diff --git a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild
index fba0d38bd0..00334bf33a 100644
--- a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild
+++ b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild
@@ -80,6 +80,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 (cd kernel || exit 1
+  sed -i "s|error=undef|no-error=undef|" Kbuild
   make SYSSRC=$KERNELPATH module || exit 1
 )
 
diff --git a/system/nvme-cli/README b/system/nvme-cli/README
deleted file mode 100644
index 81b59c533e..0000000000
--- a/system/nvme-cli/README
+++ /dev/null
@@ -1,6 +0,0 @@
-The nvme-cli is a NVMe management command line interface.
-
-NVMe is a fast, scalable, direct attached storage interface, accessing
-solid state drives through PCIe.
-
-The nvme CLI contains core management tools with minimal dependencies.
diff --git a/system/nvme-cli/doinst.sh b/system/nvme-cli/doinst.sh
deleted file mode 100644
index b5a41d1d89..0000000000
--- a/system/nvme-cli/doinst.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/bash_completion.d/nvme.new
diff --git a/system/nvme-cli/nvme-cli.SlackBuild b/system/nvme-cli/nvme-cli.SlackBuild
deleted file mode 100644
index e8980f65af..0000000000
--- a/system/nvme-cli/nvme-cli.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for nvme-cli
-
-# Copyright 2017-2020, Alexander Verbovetsky, Moscow, Russia
-# 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=nvme-cli
-VERSION=${VERSION:-1.13}
-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 -I."
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -I."
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC -I."
-else
-  SLKCFLAGS="-O2 -I."
-fi
-
-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
-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 {} \;
-
-make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" PREFIX=/usr SBINDIR=/usr/sbin
-make install CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" \
-  PREFIX=/usr SBINDIR=/usr/sbin DESTDIR=$PKG
-
-rm -f $PKG/etc/nvme/*
-rm -r $PKG/etc/udev
-rm -r $PKG/usr/lib/{dracut,systemd}
-rmdir --ignore-fail-on-non-empty $PKG/usr/lib
-
-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/etc/bash_completion.d
-mv $PKG/usr/share/bash-completion/completions/nvme $PKG/etc/bash_completion.d/nvme.new
-rmdir $PKG/usr/share/bash-completion/completions/
-rmdir $PKG/usr/share/bash-completion/
-
-mv $PKG/usr/share/man $PKG/usr/man
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/completions
-cp -a CONTRIBUTING* README* LICENSE* scripts $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a completions/{README,_nvme} $PKG/usr/doc/$PRGNAM-$VERSION/completions
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/nvme-cli/nvme-cli.info b/system/nvme-cli/nvme-cli.info
deleted file mode 100644
index b5ecb010b2..0000000000
--- a/system/nvme-cli/nvme-cli.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="nvme-cli"
-VERSION="1.13"
-HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
-DOWNLOAD="https://github.com/linux-nvme/nvme-cli/archive/v1.13/nvme-cli-1.13.tar.gz"
-MD5SUM="a9a326d481fa7bd68cb03bfc5c5e7f44"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Alexander Verbovetsky"
-EMAIL="alik@ejik.org"
diff --git a/system/nvme-cli/slack-desc b/system/nvme-cli/slack-desc
deleted file mode 100644
index 6dfba6a52b..0000000000
--- a/system/nvme-cli/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-nvme-cli: nvme-cli (NVMe management command line interface)
-nvme-cli:
-nvme-cli: Userspace tooling to control NVMe drives
-nvme-cli:
-nvme-cli: NVMe is a fast, scalable, direct attached storage interface,
-nvme-cli: accessing solid state drives through PCIe.
-nvme-cli:
-nvme-cli: The nvme CLI contains core management tools with minimal
-nvme-cli: dependencies.
-nvme-cli:
-nvme-cli: Homepage: https://github.com/linux-nvme/nvme-cli
diff --git a/system/opam/README b/system/opam/README
index 9257895cd0..36b3e185fc 100644
--- a/system/opam/README
+++ b/system/opam/README
@@ -6,15 +6,16 @@ constraints, and a Git-friendly development workflow.
 
 Managing your OCaml installation can be as simple as:
 
-    opam list -a         # List the available packages
-    opam install lwt     # Install LWT
-    opam update          # Update the package list
-    ...
-    opam upgrade         # Upgrade the installed packages to their latest version
+  opam list -a       # List the available packages
+  opam install lwt   # Install LWT
+  opam update        # Update the package list
+  ...
+  opam upgrade       # Upgrade the installed packages to their latest version
 
 
 It has to be initialised. To do it, you can use the following command:
-opam init
+
+  opam init
 
 It is not recommended to run opam as root.
 Apparently it rather installs per-user packages.
diff --git a/system/opam/opam.SlackBuild b/system/opam/opam.SlackBuild
index e7d8270b0d..04464c1032 100644
--- a/system/opam/opam.SlackBuild
+++ b/system/opam/opam.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=opam
-VERSION=${VERSION:-2.0.1}
+VERSION=${VERSION:-2.0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,16 +73,16 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libdir=/usr/lib$LIBDIRSUFFIX \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
-make lib-ext
-make
-make install DESTDIR=$PKG
+make -j1 lib-ext
+make -j1
+make -j1 DESTDIR=$PKG install
 
 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/opam/opam.info b/system/opam/opam.info
index fd986517c7..718cadb372 100644
--- a/system/opam/opam.info
+++ b/system/opam/opam.info
@@ -1,8 +1,8 @@
 PRGNAM="opam"
-VERSION="2.0.1"
+VERSION="2.0.5"
 HOMEPAGE="https://opam.ocaml.org/"
-DOWNLOAD="https://github.com/ocaml/opam/releases/download/2.0.1/opam-full-2.0.1.tar.gz"
-MD5SUM="24faa0ad049d146dfc3fcbe9cbab5eda"
+DOWNLOAD="https://github.com/ocaml/opam/releases/download/2.0.5/opam-full-2.0.5.tar.gz"
+MD5SUM="3a273029a55529831fdd408d9add2db0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ocaml bubblewrap"
diff --git a/system/open-vm-tools/open-vm-tools.SlackBuild b/system/open-vm-tools/open-vm-tools.SlackBuild
index a294741688..7c8753ef11 100644
--- a/system/open-vm-tools/open-vm-tools.SlackBuild
+++ b/system/open-vm-tools/open-vm-tools.SlackBuild
@@ -89,6 +89,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|\ -Werror||" configure.ac
+
 autoreconf -i
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/system/p7zip/p7zip.SlackBuild b/system/p7zip/p7zip.SlackBuild
index ec9cbda5ed..8ea97633e0 100644
--- a/system/p7zip/p7zip.SlackBuild
+++ b/system/p7zip/p7zip.SlackBuild
@@ -73,7 +73,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 make all3 \
-  OPTFLAGS="$SLKCFLAGS" \
+  OPTFLAGS="$SLKCFLAGS -Wno-narrowing" \
   DEST_HOME=/usr \
   DEST_SHARE_DOC=/usr/doc/$PRGNAM-$VERSION \
   DEST_SHARE=/usr/lib$LIBDIRSUFFIX/p7zip \
diff --git a/system/packagekit/doinst.sh b/system/packagekit/doinst.sh
index fa9fe022ef..4e39e9d043 100644
--- a/system/packagekit/doinst.sh
+++ b/system/packagekit/doinst.sh
@@ -14,7 +14,6 @@ config() {
 config etc/PackageKit/PackageKit.conf.new
 config etc/PackageKit/Vendor.conf.new
 config etc/PackageKit/CommandNotFound.conf.new
-config etc/PackageKit/Katja.conf.new
 
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
diff --git a/system/packagekit/packagekit.SlackBuild b/system/packagekit/packagekit.SlackBuild
index 7527471105..33c2dd3f99 100644
--- a/system/packagekit/packagekit.SlackBuild
+++ b/system/packagekit/packagekit.SlackBuild
@@ -26,7 +26,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM="packagekit"
-VERSION=${VERSION:-1.1.4}
+VERSION=${VERSION:-1.1.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -98,7 +98,6 @@ for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i
 mv $PKG/etc/PackageKit/CommandNotFound.conf $PKG/etc/PackageKit/CommandNotFound.conf.new
 mv $PKG/etc/PackageKit/PackageKit.conf $PKG/etc/PackageKit/PackageKit.conf.new
 mv $PKG/etc/PackageKit/Vendor.conf $PKG/etc/PackageKit/Vendor.conf.new
-mv $PKG/etc/PackageKit/Katja.conf $PKG/etc/PackageKit/Katja.conf.new
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
diff --git a/system/packagekit/packagekit.info b/system/packagekit/packagekit.info
index c7f1732d6a..223c61a515 100644
--- a/system/packagekit/packagekit.info
+++ b/system/packagekit/packagekit.info
@@ -1,10 +1,10 @@
 PRGNAM="packagekit"
-VERSION="1.1.4"
+VERSION="1.1.12"
 HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
-DOWNLOAD="https://www.freedesktop.org/software/PackageKit/releases/PackageKit-1.1.4.tar.xz"
-MD5SUM="d1a000a33c7c935522af7a01dea012bf"
+DOWNLOAD="https://www.freedesktop.org/software/PackageKit/releases/PackageKit-1.1.12.tar.xz"
+MD5SUM="da8c9d81c886fae43047b3c006e9b4a8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="autoconf-archive"
 MAINTAINER="Nishant Limbachia"
 EMAIL="nishant@mnspace.net"
diff --git a/system/parallel/README b/system/parallel/README
deleted file mode 100644
index bbee7b2123..0000000000
--- a/system/parallel/README
+++ /dev/null
@@ -1,9 +0,0 @@
-GNU parallel is a shell tool for executing jobs in parallel using one
-or more computers. A job can be a single command or a small script
-that has to be run for each of the lines in the input. The typical
-input is a list of files, a list of hosts, a list of users, a list of
-URLs, or a list of tables. A job can also be a command that reads
-from a pipe. GNU parallel can then split the input and pipe it into
-commands in parallel.
-
-This package conflicts with misc/moreutils.
diff --git a/system/parallel/parallel.SlackBuild b/system/parallel/parallel.SlackBuild
deleted file mode 100644
index 2aed36a5e5..0000000000
--- a/system/parallel/parallel.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for "parallel".
-
-# Copyright 2015-2017 Marcel Saegebarth <marc@mos6581.de>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "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 COPYRIGHT
-# OWNER OR CONTRIBUTORS 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=parallel
-VERSION=${VERSION:-20200522}
-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
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-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" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CITATION COPYING NEWS README $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/parallel/parallel.info b/system/parallel/parallel.info
deleted file mode 100644
index 41cae8fa5f..0000000000
--- a/system/parallel/parallel.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="parallel"
-VERSION="20200522"
-HOMEPAGE="http://www.gnu.org/software/parallel/"
-DOWNLOAD="https://ftp.gnu.org/gnu/parallel/parallel-20200522.tar.bz2"
-MD5SUM="81e23020aecff6535a1a75cbbc5fe506"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Marcel Saegebarth"
-EMAIL="marc@mos6581.de"
diff --git a/system/parallel/slack-desc b/system/parallel/slack-desc
deleted file mode 100644
index 32663235a5..0000000000
--- a/system/parallel/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-parallel: parallel (Executes jobs in parallel)
-parallel:
-parallel: GNU parallel is a shell tool for executing jobs in parallel using one
-parallel: or more computers. A job can be a single command or a small script
-parallel: that has to be run for each of the lines in the input. The typical
-parallel: input is a list of files, a list of hosts, a list of users, a list of
-parallel: URLs, or a list of tables. A job can also be a command that reads
-parallel: from a pipe. GNU parallel can then split the input and pipe it into
-parallel: commands in parallel.
-parallel:
-parallel: Homepage: http://www.gnu.org/software/parallel/
diff --git a/system/patchelf/README b/system/patchelf/README
deleted file mode 100644
index 4286fd37ae..0000000000
--- a/system/patchelf/README
+++ /dev/null
@@ -1,3 +0,0 @@
-PatchELF is a simple utility for modifing existing ELF executables
-and libraries.  It can change the dynamic loader ("ELF interpreter")
-of executables and change the RPATH of executables and libraries.
diff --git a/system/patchelf/patchelf.info b/system/patchelf/patchelf.info
deleted file mode 100644
index 2697431fba..0000000000
--- a/system/patchelf/patchelf.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="patchelf"
-VERSION="0.10"
-HOMEPAGE="https://nixos.org/patchelf.html"
-DOWNLOAD="https://nixos.org/releases/patchelf/patchelf-0.10/patchelf-0.10.tar.bz2"
-MD5SUM="6c3f3a06a95705870d129494a6880106"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Zhu Qun-Ying"
-EMAIL="zhu.qunying@gmail.com"
diff --git a/system/patchelf/slack-desc b/system/patchelf/slack-desc
deleted file mode 100644
index 30e2694647..0000000000
--- a/system/patchelf/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-patchelf: patchelf (A utility for patching ELF binaries)
-patchelf:
-patchelf: PatchELF is a simple utility for modifing existing ELF executables
-patchelf: and libraries.  It can change the dynamic loader ("ELF interpreter")
-patchelf: of executables and change the RPATH of executables and libraries.
-patchelf:
-patchelf:
-patchelf:
-patchelf:
-patchelf: Home page: https://nixos.org/patchelf.html
-patchelf:
diff --git a/system/percona-xtrabackup/README b/system/percona-xtrabackup/README
deleted file mode 100644
index 05cb5de107..0000000000
--- a/system/percona-xtrabackup/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Percona XtraBackup is OpenSource online (non-blockable) backup
-solution for InnoDB and XtraDB engines.
diff --git a/system/percona-xtrabackup/percona-xtrabackup.SlackBuild b/system/percona-xtrabackup/percona-xtrabackup.SlackBuild
deleted file mode 100644
index 3127baaa7c..0000000000
--- a/system/percona-xtrabackup/percona-xtrabackup.SlackBuild
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for percona-xtrabackup
-
-# Copyright 2012-2013 Heinz Wiesinger, Amsterdam, The Netherlands
-# 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=percona-xtrabackup
-VERSION=${VERSION:-2.1.5}
-PERCONA_VERSION=${PERCONA_VERSION:-5.5.31-rel30.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
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-rm -rf Percona-Server-$PERCONA_VERSION
-tar xvf $PRGNAM-$VERSION/Percona-Server-$PERCONA_VERSION.tar.gz
-cd Percona-Server-$PERCONA_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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Apply xtrabackup patch
-patch -p1 -i ../$PRGNAM-$VERSION/patches/xtradb55.patch
-
-LIBS="-lrt" \
-cmake \
-  -DCMAKE_C_FLAGS="$SLKCFLAGS -I$TMP/$PRGNAM-$VERSION/src" \
-  -DCMAKE_CXX_FLAGS="$SLKCFLAGS -I$TMP/$PRGNAM-$VERSION/src" \
-  -DENABLED_LOCAL_INFILE=ON \
-  -DWITH_INNOBASE_STORAGE_ENGINE=ON \
-  -DWITH_PARTITION_STORAGE_ENGINE=ON \
-  -DWITH_ZLIB=bundled \
-  -DWITH_EXTRA_CHARSETS=all \
-  -DENABLE_DTRACE=OFF \
-  .
-
-for i in include zlib strings mysys dbug extra storage/innobase; do
-  make -C $i
-done
-
-cd $TMP/$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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# build internal libarchive
-cd src/libarchive
-  cmake \
-    -DCMAKE_C_FLAGS="$SLKCFLAGS" \
-    -DENABLE_CPIO=OFF \
-    -DENABLE_OPENSSL=OFF \
-    -DENABLE_TAR=OFF \
-    -DENABLE_TEST=OFF \
-    .
-
-  make
-cd -
-
-# build xtrabackup
-cd src
-  LIBS="-lrt" \
-  CFLAGS="$SLKCFLAGS" \
-  make \
-    MYSQL_ROOT_DIR="$TMP/Percona-Server-$PERCONA_VERSION" \
-    clean
-
-  LIBS="-lrt" \
-  CFLAGS="$SLKCFLAGS" \
-  make \
-    MYSQL_ROOT_DIR="$TMP/Percona-Server-$PERCONA_VERSION" \
-    XTRABACKUP_VERSION=$VERSION \
-    xtradb55
-cd -
-
-mkdir -p $PKG/usr/{bin,man/man1}
-install -m 755 src/xtrabackup_55 $PKG/usr/bin/xtrabackup
-install -m 755 src/xbstream $PKG/usr/bin/
-install -m 755 src/xbcrypt $PKG/usr/bin/
-install -m 755 innobackupex $PKG/usr/bin/
-install -m 644 doc/xtrabackup.1 $PKG/usr/man/man1/
-
-# Fix xtrabackup usage in innobackupex
-sed -i "s/xtrabackup_55/xtrabackup/g" $PKG/usr/bin/innobackupex
-
-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
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a BUILD.txt COPYING REVNO VERSION \
-  $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/percona-xtrabackup/percona-xtrabackup.info b/system/percona-xtrabackup/percona-xtrabackup.info
deleted file mode 100644
index e2b8be656b..0000000000
--- a/system/percona-xtrabackup/percona-xtrabackup.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="percona-xtrabackup"
-VERSION="2.1.5"
-HOMEPAGE="http://www.percona.com/software/percona-xtrabackup"
-DOWNLOAD="http://www.percona.com/downloads/XtraBackup/XtraBackup-2.1.5/source/percona-xtrabackup-2.1.5.tar.gz"
-MD5SUM="8782d736ecf7f0a702a8c053c4f9cdb8"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
diff --git a/system/percona-xtrabackup/slack-desc b/system/percona-xtrabackup/slack-desc
deleted file mode 100644
index 4ed2d118e3..0000000000
--- a/system/percona-xtrabackup/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-percona-xtrabackup: percona-xtrabackup (Online backup for MySQL / InnoDB)
-percona-xtrabackup:
-percona-xtrabackup: Percona XtraBackup is OpenSource online (non-blockable) backup
-percona-xtrabackup: solution for InnoDB and XtraDB engines.
-percona-xtrabackup:
-percona-xtrabackup: Homepage: http://www.percona.com/software/percona-xtrabackup
-percona-xtrabackup:
-percona-xtrabackup:
-percona-xtrabackup:
-percona-xtrabackup:
-percona-xtrabackup:
diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild
index c7b9538ff6..7c7780822b 100644
--- a/system/qemu/qemu.SlackBuild
+++ b/system/qemu/qemu.SlackBuild
@@ -58,7 +58,7 @@
 # 6.1   19-AUG-2019	verion update
 
 PRGNAM=qemu
-VERSION=${VERSION:-4.1.0}
+VERSION=${VERSION:-5.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -161,7 +161,7 @@ make V=1
 make install DESTDIR=$PKG
 
 # Remove empty /var
-rm -rf $PKG/var/run
+rm -rf $PKG/var
 
 # install some udev rules for /dev/kvm
 # Note: no udev rules for usb pasthrough when running qemu as non-root on linux hosts. See Section 2.11.2
@@ -190,7 +190,7 @@ fi
 
 # Add docs to the proper location
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changelog COPYING* CODING_STYLE HACKING LICENSE MAINTAINERS README docs/* \
+cp -a Changelog COPYING* CODING_STYLE.rst LICENSE MAINTAINERS README.rst docs/* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info
index d092200f0e..9cd7abd533 100644
--- a/system/qemu/qemu.info
+++ b/system/qemu/qemu.info
@@ -1,8 +1,8 @@
 PRGNAM="qemu"
-VERSION="4.1.0"
+VERSION="5.1.0"
 HOMEPAGE="https://www.qemu.org"
-DOWNLOAD="https://download.qemu.org/qemu-4.1.0.tar.xz"
-MD5SUM="cdf2b5ca52b9abac9bacb5842fa420f8"
+DOWNLOAD="https://download.qemu.org/qemu-5.1.0.tar.xz"
+MD5SUM="f3eb729786591f05a9ac5d8ab03b9269"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2"
diff --git a/system/qterminal/qterminal.SlackBuild b/system/qterminal/qterminal.SlackBuild
index f939c03e7a..a8b950eb42 100644
--- a/system/qterminal/qterminal.SlackBuild
+++ b/system/qterminal/qterminal.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for qterminal
 
-# Copyright 2011-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2011-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qterminal
-VERSION=${VERSION:-0.14.1}
+VERSION=${VERSION:-0.15.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/qterminal/qterminal.info b/system/qterminal/qterminal.info
index cf48e2f5a5..1536072d0e 100644
--- a/system/qterminal/qterminal.info
+++ b/system/qterminal/qterminal.info
@@ -1,8 +1,8 @@
 PRGNAM="qterminal"
-VERSION="0.14.1"
+VERSION="0.15.0"
 HOMEPAGE="https://github.com/lxde/qterminal"
-DOWNLOAD="https://github.com/lxde/qterminal/releases/download/0.14.1/qterminal-0.14.1.tar.xz"
-MD5SUM="8b2e83a5a0daf8cd9a1b770f9e719a7d"
+DOWNLOAD="https://github.com/lxde/qterminal/releases/download/0.15.0/qterminal-0.15.0.tar.xz"
+MD5SUM="c5e834da5e01182d1772a2f2e391e7c6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qtermwidget"
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/rxvt-unicode/README b/system/rxvt-unicode/README
deleted file mode 100644
index 8b1c84db04..0000000000
--- a/system/rxvt-unicode/README
+++ /dev/null
@@ -1,8 +0,0 @@
-rxvt-unicode is an enhanced version of the rxvt terminal emulator.  It has
-full unicode and Xft support, does font antialiasing and italics, and has
-the same transparency capabilities as ATerm.  It can be extended using Perl.
-
-The slackbuild uses environment variable called CONFIG_PERL to control
-whether the embedded perl interpreter will be built. Setting to anything
-other than YES during the build will disable it, which will result in a
-much leaner package.
diff --git a/system/rxvt-unicode/rxvt-unicode.SlackBuild b/system/rxvt-unicode/rxvt-unicode.SlackBuild
deleted file mode 100644
index 5a955c787b..0000000000
--- a/system/rxvt-unicode/rxvt-unicode.SlackBuild
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for rxvt-unicode
-
-# 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.
-
-# Currently maintained by Jason Graham (jgraha8@gmail.com)
-# Updates by Kevin Paulus, aka "goarilla" (goarilla@gmail.com)
-# Previously maintained by LEVAI Daniel, 2010-2014
-# Initial SlackBuild written by Dugan Chen (dugan_c@fastmail.fm)
-
-PRGNAM=rxvt-unicode
-VERSION=${VERSION:-9.22}
-BUILD=${BUILD:-2}
-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
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-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 {} \;
-
-# Option to enable/disable the embedded perl interpreter
-CONFIG_PERL=${CONFIG_PERL:-YES}
-
-if [ "${CONFIG_PERL}" == 'YES' ];then
-	_PERL_OPT='--enable-perl'
-else
-	_PERL_OPT='--disable-perl'
-fi
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --enable-everything \
-  --enable-unicode3 \
-  --enable-combining \
-  --enable-xft \
-  --enable-font-styles \
-  --enable-transparency \
-  --enable-fading \
-  --enable-frills \
-  --enable-pixbuf \
-  --enable-rxvt-scroll \
-  --enable-next-scroll \
-  --enable-xterm-scroll \
-  ${_PERL_OPT} \
-  --enable-xim \
-  --enable-iso14755 \
-  --enable-keepscrolling \
-  --enable-selectionscrolling \
-  --enable-mousewheel \
-  --enable-slipwheeling \
-  --enable-smart-resize \
-  --enable-text-blink \
-  --enable-pointer-blank \
-  --enable-utmp \
-  --enable-wtmp \
-  --enable-lastlog \
-  --enable-256-color \
-  --build=$ARCH-slackware-linux
-
-make
-
-mkdir -p $PKG/usr/share/terminfo
-TERMINFO=$PKG/usr/share/terminfo make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object"  | grep ELF | \
-  cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/share/pixmaps/
-cp $CWD/urxvt.xpm $PKG/usr/share/pixmaps/urxvt.xpm
-
-mkdir -p $PKG/usr/share/applications
-cp $CWD/rxvt-unicode.desktop $PKG/usr/share/applications/rxvt-unicode.desktop
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING Changes INSTALL README.FAQ $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
-
-# Fix usr/bin/urxvt permissions to enable writing to utmp and wtmp files
-#
-version="$(echo "$VERSION" |sed -e 's/[^0-9]//g')"
-if [ "$version" -le 922 ]; then
-  # standalone
-  chgrp utmp usr/bin/urxvt
-  chmod 2755 usr/bin/urxvt
-  # client
-  chgrp utmp usr/bin/urxvtc
-  chmod 2755 usr/bin/urxvtc
-  # server
-  chgrp utmp usr/bin/urxvtd
-  chmod 2755 usr/bin/urxvtd
-fi
-
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/rxvt-unicode/rxvt-unicode.desktop b/system/rxvt-unicode/rxvt-unicode.desktop
deleted file mode 100644
index 7622918703..0000000000
--- a/system/rxvt-unicode/rxvt-unicode.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=urxvt
-Comment=An unicode capable rxvt clone
-Exec=urxvt
-Icon=utilities-terminal
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
diff --git a/system/rxvt-unicode/rxvt-unicode.info b/system/rxvt-unicode/rxvt-unicode.info
deleted file mode 100644
index d02aee8160..0000000000
--- a/system/rxvt-unicode/rxvt-unicode.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="rxvt-unicode"
-VERSION="9.22"
-HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
-DOWNLOAD="http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.22.tar.bz2"
-MD5SUM="93782dec27494eb079467dacf6e48185"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Jason Graham"
-EMAIL="jgraha8@gmail.com"
diff --git a/system/rxvt-unicode/slack-desc b/system/rxvt-unicode/slack-desc
deleted file mode 100644
index 2f428ddfd9..0000000000
--- a/system/rxvt-unicode/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-rxvt-unicode: rxvt-unicode (enhanced version of rxvt)
-rxvt-unicode:
-rxvt-unicode: This project is an enhanced version of the rxvt terminal
-rxvt-unicode: emulator.  It has full unicode and Xft support, does font
-rxvt-unicode: antialiasing and italics, and has the same transparency
-rxvt-unicode: capabilities as ATerm.  It can be extended using Perl.
-rxvt-unicode:
-rxvt-unicode: Visit the rxvt-unicode project online:
-rxvt-unicode: http://software.schmorp.de/pkg/rxvt-unicode/
-rxvt-unicode:
-rxvt-unicode:
diff --git a/system/rxvt-unicode/urxvt.xpm b/system/rxvt-unicode/urxvt.xpm
deleted file mode 100644
index c7b6a2db7e..0000000000
--- a/system/rxvt-unicode/urxvt.xpm
+++ /dev/null
@@ -1,141 +0,0 @@
-/* XPM */
-static char * urxvt_32x32_xpm[] = {
-"32 32 106 2",
-"  	c None",
-". 	c #E7E7E7",
-"+ 	c #E7E3DE",
-"@ 	c #E7DFDE",
-"# 	c #29417B",
-"$ 	c #5A719C",
-"% 	c #294173",
-"& 	c #08246B",
-"* 	c #18387B",
-"= 	c #294D8C",
-"- 	c #395D9C",
-"; 	c #526DAD",
-"> 	c #6382BD",
-", 	c #7392C6",
-"' 	c #84A6DE",
-") 	c #9CBAE7",
-"! 	c #B5CFF7",
-"~ 	c #CEDBEF",
-"{ 	c #ADBECE",
-"] 	c #94B2D6",
-"^ 	c #CEDFEF",
-"/ 	c #ADBED6",
-"( 	c #C6D3DE",
-"_ 	c #52658C",
-": 	c #7371F7",
-"< 	c #394573",
-"[ 	c #B5D3F7",
-"} 	c #D6D3CE",
-"| 	c #A5A6A5",
-"1 	c #A59E9C",
-"2 	c #6B6963",
-"3 	c #B5B2AD",
-"4 	c #8496AD",
-"5 	c #CEC7C6",
-"6 	c #9CA6AD",
-"7 	c #C6C7C6",
-"8 	c #525D6B",
-"9 	c #294584",
-"0 	c #8C96BD",
-"a 	c #8C9EC6",
-"b 	c #425D9C",
-"c 	c #7392CE",
-"d 	c #8CA6DE",
-"e 	c #ADAAA5",
-"f 	c #A5A29C",
-"g 	c #211C18",
-"h 	c #C6BEBD",
-"i 	c #52618C",
-"j 	c #B5B6B5",
-"k 	c #52596B",
-"l 	c #847D7B",
-"m 	c #002063",
-"n 	c #001C52",
-"o 	c #001C5A",
-"p 	c #ADC7EF",
-"q 	c #94A2B5",
-"r 	c #8C9EAD",
-"s 	c #8CAAC6",
-"t 	c #9CAABD",
-"u 	c #8C9EB5",
-"v 	c #F7F7F7",
-"w 	c #DEDBDE",
-"x 	c #848284",
-"y 	c #8C8A8C",
-"z 	c #8C8E8C",
-"A 	c #D6D7D6",
-"B 	c #FFFFFF",
-"C 	c #E7E3E7",
-"D 	c #DEDFDE",
-"E 	c #949294",
-"F 	c #ADAAAD",
-"G 	c #EFEFEF",
-"H 	c #CECFCE",
-"I 	c #BDBEBD",
-"J 	c #4A4D4A",
-"K 	c #B5B2B5",
-"L 	c #9C9E9C",
-"M 	c #7B7D7B",
-"N 	c #393C39",
-"O 	c #9C9A9C",
-"P 	c #848684",
-"Q 	c #313031",
-"R 	c #636563",
-"S 	c #292C29",
-"T 	c #F7F3F7",
-"U 	c #949694",
-"V 	c #5A595A",
-"W 	c #EFEBEF",
-"X 	c #737173",
-"Y 	c #000000",
-"Z 	c #ADAEAD",
-"` 	c #BDBABD",
-" .	c #D6D7FF",
-"..	c #5A59FF",
-"+.	c #CECFFF",
-"@.	c #B5B2FF",
-"#.	c #DEDBFF",
-"$.	c #A5A2A5",
-"%.	c #C6C3C6",
-"&.	c #ADA6AD",
-"*.	c #7371FF",
-"=.	c #6B6DFF",
-"-.	c #5A5D5A",
-";.	c #BDB6BD",
-">.	c #CECBC6",
-",.	c #BDBAB5",
-"                                                                ",
-"                                                                ",
-"                                                                ",
-". + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ",
-"@ # $ $ $ % & * = - ; > , ' ) ! ~ ~ ~ ~ { ~ ~ ~ ~ ] ^ ~ ~ ~ / ( ",
-"@ _ : : : < & * = - ; > , ' ) [ } } } } | 1 2 2 3 4 @ 1 5 1 6 ( ",
-"@ _ 7 7 7 8 9 0 a b ; > c d ) [ } } } } | e } } e 4 @ f g h 6 ( ",
-"@ i j j j k & * = - ; > , ' ) [ } 2 l } | e 1 1 3 4 @ 1 5 1 6 ( ",
-"@ m n n n o & * = - ; > , ' ) p q q q q r q q q q s t q q q u ( ",
-"@ v v v v v v v v v v v v v v v v v v v v v v v v v v w x y z A ",
-"@ B B B B B B B B B B B B B B B B B C B B B B B B B B D E F | + ",
-"@ B D G H H B H B B H G D B B w G I J I I B B B B B B D F K L + ",
-"@ B M J z N B z O H P B Q v B R B O N O O B B B B B B D M y L + ",
-"@ B M I B B B B J S T B L K I z B B R B B B B B B B B D P U F + ",
-"@ B M I B B B C J V H B T V J W B B R B B B B B B B B D P U F + ",
-"@ B M I B B B V G G J G B X M B B B X S N B B B B B B D P U F + ",
-"@ B B B B B B B B B B B B B B B B B B B B B B B B B B D P U F + ",
-"@ B B B B B B B B B B B B B B B . H H H H C B B B B B D P U F + ",
-"@ B B B B B B B B B B B B B B B M Y Y Y Y R B B B B B D P U F + ",
-"@ B B B B B B v B B B B B B B B M Y Y Y Y R B B B B B D P U F + ",
-"@ B B B B B B J L B B B B B B B M Y Y Y Y R B B B B B D O Z ` + ",
-"@  .....+.@.#.B K R $.B B B B B M Y Y Y Y R B B B B B D %.%.&.+ ",
-"@ +.B B *.=.B B L -.H B B B B B M Y Y Y Y R B B B B B D %.K L + ",
-"@ B B B B B B R K B B B B B B B M Y Y Y Y R B B B B B D %.K L + ",
-"@ B B B B B B B B B B B B B B B M Y Y Y Y R B B B B B D ;.O O + ",
-"@ B B B B B B B B B B B B B B B O Q Q Q Q P B B B B B D $.F F + ",
-"@ B B B B B B B B B B B B B B B B B B B B B B B B B B D | K L + ",
-"@ B B B B B B B B B B B B B B B B B B B B B B B B B B D O Z j + ",
-"H >.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.7 >.>.>.,.",
-"                                                                ",
-"                                                                ",
-"                                                                "};
diff --git a/system/sbsigntools/autogen.patch b/system/sbsigntools/autogen.patch
deleted file mode 100644
index e681792c49..0000000000
--- a/system/sbsigntools/autogen.patch
+++ /dev/null
@@ -1,277 +0,0 @@
-From c8c7e1ba97d15433247bcf87e88485cf7c6b7cc3 Mon Sep 17 00:00:00 2001
-From: James Bottomley <JBottomley@Parallels.com>
-Date: Tue, 26 Jun 2012 09:49:05 +0100
-Subject: sbsigntools: fix autogen.sh for build service
-
----
- AUTHORS    |   4 ++
- ChangeLog  | 224 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- autogen.sh |  10 ---
- 3 files changed, 228 insertions(+), 10 deletions(-)
- create mode 100644 AUTHORS
- create mode 100644 ChangeLog
-
-diff --git a/AUTHORS b/AUTHORS
-new file mode 100644
-index 0000000..3eaa355
---- /dev/null
-+++ b/AUTHORS
-@@ -0,0 +1,4 @@
-+	Adam Conrad
-+	Ivan Hu
-+	James Bottomley
-+	Jeremy Kerr
-diff --git a/ChangeLog b/ChangeLog
-new file mode 100644
-index 0000000..d5d5ea6
---- /dev/null
-+++ b/ChangeLog
-@@ -0,0 +1,224 @@
-+2012-06-20 c07dfb9 Ivan Hu <ivan.hu@canonical.com>
-+
-+  * configure: Add check for bfh.h
-+
-+2012-06-19 5e07c4e Ivan Hu <ivan.hu@canonical.com>
-+
-+  * tests: Add a test to check invalid PKCS7 signature attaching
-+
-+2012-06-19 bfb778e Ivan Hu <ivan.hu@canonical.com>
-+
-+  * sbattach: Check that attached signatures are valid PKCS7 data
-+
-+2012-06-14 bf6df84 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbverify: Use a variable for image filename
-+
-+2012-06-13 9b7f7fb Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * image: Unconditionally parse PE/COFF data
-+
-+2012-06-13 128f1c1 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbverify: Check for failed image load
-+
-+2012-06-13 b48e256 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * tests: Add tests for missing image, cert & key files
-+
-+2012-06-13 0af5e01 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * tests: Execute tests in a clean (temporary) directory
-+
-+2012-06-13 8716e88 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * tests: Use COMPILE.S for assembing test object
-+
-+2012-06-13 807f0e6 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Version 0.2
-+
-+2012-06-13 7c2d8bb Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * docs: Add simple manpage for sbattach
-+
-+2012-06-13 deb9211 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * automake: Clean generated man files
-+
-+2012-06-13 3cde1e4 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * tests: Add a few simple tests
-+
-+2012-06-13 cc881c2 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Remove unused test.c file
-+
-+2012-06-12 4c79e3a Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbattach: Add too to manage detached signatures
-+
-+2012-06-12 564f5bc Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * image: Add facility to write unsigned images
-+
-+2012-06-11 a07b8d2 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbsign,sbverify: Update getopt_long optstrings
-+
-+2012-06-11 5836038 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbverify: Add support for detached signatures
-+
-+2012-06-11 b8a7d51 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbverify: Split image signature table reading to separate function
-+
-+2012-06-11 e9f438c Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Fix warnings from added -W flags
-+
-+2012-06-11 f19e8bb Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * automake: Add -Wall -Wextra CFLAGS
-+
-+2012-06-11 af4f088 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbsign: Add --detached option to create detached PKCS7 signatures
-+
-+2012-06-11 0c9fbd2 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbsign: fix flag for verbose operation
-+
-+2012-06-11 3673db1 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * docs: Fix manpage creation
-+
-+2012-05-29 9b2f3a7 Adam Conrad <adconrad@0c3.net>
-+
-+  * autogen.sh: Fix ccan_module assignment
-+
-+2012-05-28 3fb0f00 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * image: use read_write_all from ccan
-+
-+2012-05-28 f1112b4 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * image: Fix format specifier for 32-bit builds
-+
-+2012-05-24 d5e634c Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * autoconfiscate
-+
-+2012-05-23 82f8c30 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * docs: Add initial manpages
-+
-+2012-05-23 c14efcb Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbsign,sbverify: help2man-ize usage output
-+
-+2012-05-23 98a4f10 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Makefile: Add dist targets
-+
-+2012-05-22 1b2b5c6 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * ccan: Add ccan import logic
-+
-+2012-05-15 6ff68e5 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Move ccan submodule
-+
-+2012-05-15 9a08e25 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Remove unused header
-+
-+2012-05-14 bc618c5 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Remove pkcs7-simple test file
-+
-+2012-05-14 9ac930e Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Makefile: add install target
-+
-+2012-05-14 a1b270f Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Makefile: Comment components
-+
-+2012-05-14 c67b82a Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbverify: clean up openssl init
-+
-+2012-05-14 c499763 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbverify: add check for invalid PKCS7 data
-+
-+2012-05-14 74eb766 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbverify: Add certificate chain verification
-+
-+2012-05-12 e111127 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * verify: move idc-related parsing to idc.c
-+
-+2012-05-12 46cf6a6 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbsign: fix incorrect check for certificate load
-+
-+2012-05-12 57d9f0c Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * image: reformat gap warnings
-+
-+2012-05-12 ab05bec Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * image: add cert table to image size
-+
-+2012-05-12 e1fec08 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbverify: Add check for image hash
-+
-+2012-05-12 fefe97c Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbverify: check for presence of signature table
-+
-+2012-05-12 b73f723 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Makefile: add $(tools) var
-+
-+2012-05-12 55b1940 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbsigntool -> sbsign
-+
-+2012-05-12 a183de9 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * image: open output file with O_TRUNC
-+
-+2012-04-24 04b70fc Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbsigntooL: expand usage info
-+
-+2012-04-24 9826a43 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Add GPLv3 text in COPYING
-+
-+2012-04-24 906654e Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * coff: remove unneeded coff includes
-+
-+2012-04-23 9d3c8b5 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Add copyright comments
-+
-+2012-04-23 e019eec Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * image: warn about potential checksum differences
-+
-+2012-04-23 01e33cd Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * idc: allocate using the image context
-+
-+2012-04-23 acd8c0a Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Initial commit
-+
-diff --git a/autogen.sh b/autogen.sh
-index 32ea6f6..117835b 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -16,16 +16,6 @@ then
- 		--build-type=automake lib/ccan $ccan_modules
- fi
- 
--# Create generatable docs from git
--(
--	echo "Authors of sbsigntool:"
--	echo
--	git log --format='%an' | sort -u | sed 's,^,\t,'
--) > AUTHORS
--
--# Generate simple ChangeLog
--git log --date=short --format='%ad %t %an <%ae>%n%n  * %s%n' > ChangeLog
--
- # automagic
- aclocal
- autoheader
--- 
-2.1.2
-
diff --git a/system/sbsigntools/ccan_makefile.patch b/system/sbsigntools/ccan_makefile.patch
deleted file mode 100644
index e77b958ab8..0000000000
--- a/system/sbsigntools/ccan_makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- sbsigntools-0.7/lib/ccan.git/Makefile	2015-02-07 12:56:54.457781357 +0000
-+++ sbsigntools-0.7/lib/ccan.git/Makefile	2015-02-07 13:00:25.482175092 +0000
-@@ -15,7 +15,7 @@
- EXCLUDE=wwviaudio ogg_to_pcm jmap jset nfs
- 
- # Where make scores puts the results
--SCOREDIR=scores/$(shell whoami)/$(shell uname -s)-$(shell uname -m)-$(CC)-$(shell git describe --always --dirty)
-+#SCOREDIR=scores/$(shell whoami)/$(shell uname -s)-$(shell uname -m)-$(CC)-$(shell git describe --always --dirty)
- 
- ALL=$(filter-out $(EXCLUDE), $(REALLY_ALL))
- 
-@@ -77,7 +77,7 @@ distclean: clean
- scores: $(SCOREDIR)/SUMMARY
- 
- $(SCOREDIR)/SUMMARY: $(patsubst ccan/%/_info, $(SCOREDIR)/score-%, $(wildcard ccan/*/_info))
--	git describe --always > $@
-+#	git describe --always > $@
- 	uname -a >> $@
- 	$(CC) -v >> $@
- 	cat $^ | grep 'Total score:' >> $@
diff --git a/system/sbsigntools/fix_efi_arch.patch b/system/sbsigntools/fix_efi_arch.patch
deleted file mode 100644
index fceb96f4bf..0000000000
--- a/system/sbsigntools/fix_efi_arch.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 706bec1a957f2fcce3781e326e6e0b2be41a9b86 Mon Sep 17 00:00:00 2001
-From: James Bottomley <JBottomley@Parallels.com>
-Date: Tue, 6 Jan 2015 08:00:28 -0800
-Subject: [PATCH] OBS add correcting definition of EFI_ARCH
-
-Signed-off-by: James Bottomley <JBottomley@Parallels.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4891151..2e80e09 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -64,7 +64,7 @@ PKG_CHECK_MODULES(uuid, uuid,
-     AC_MSG_ERROR([libuuid (from the uuid package) is required]))
- 
- dnl gnu-efi headers require extra include dirs
--EFI_ARCH=$(uname -m)
-+EFI_ARCH=$(uname -m | sed s/i.86/ia32/)
- EFI_CPPFLAGS="-I/usr/include/efi -I/usr/include/efi/$EFI_ARCH \
-  -DEFI_FUNCTION_WRAPPER"
- CPPFLAGS_save="$CPPFLAGS"
--- 
-2.1.2
-
diff --git a/system/sbsigntools/sbsigntools.SlackBuild b/system/sbsigntools/sbsigntools.SlackBuild
index f9701591ff..5f64805828 100644
--- a/system/sbsigntools/sbsigntools.SlackBuild
+++ b/system/sbsigntools/sbsigntools.SlackBuild
@@ -23,15 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sbsigntools
-VERSION=${VERSION:-0.7}
+VERSION=${VERSION:-0.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-CCAN_VERSION=${CCAN_VERSION:-0.0.2}
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -42,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"
@@ -62,23 +60,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+# The tarball is generated from a clone --recursive of the git repository
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
-tar -xvf $CWD/ccan-$CCAN_VERSION.tar.gz -C lib/ccan.git
-
-# Next 2 patches taken from
-# https://build.opensuse.org/package/show/home:jejb1:UEFI/sbsigntools?rev=16
-# Fixes build on 32-bit.
-patch -p1 -i $CWD/fix_efi_arch.patch
-
-# Creates changelog and stops git from being called.
-patch -p1 -i $CWD/autogen.patch
-
-# Suppress "not git repo messages"- they're evaluated by the makefile but don't
-# actually get run so it's just noise.
-patch -p1 -i $CWD/ccan_makefile.patch
-rm lib/ccan.git/Makefile-web
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -86,7 +70,10 @@ 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 {} \;
 
-./autogen.sh
+sed -i "s|/usr/lib$LIBDIRSUFFIX/efi|/usr/lib$LIBDIRSUFFIX/gnuefi|" configure.ac
+
+NOCONFIGURE=1 ./autogen.sh
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/system/sbsigntools/sbsigntools.info b/system/sbsigntools/sbsigntools.info
index 7a80834512..52bbf91726 100644
--- a/system/sbsigntools/sbsigntools.info
+++ b/system/sbsigntools/sbsigntools.info
@@ -1,10 +1,8 @@
 PRGNAM="sbsigntools"
-VERSION="0.7"
+VERSION="0.9.1"
 HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/sbsigntools.git/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/sbsigntools-0.7.tar.gz \
-          http://ponce.cc/slackware/sources/repo/ccan-0.0.2.tar.gz"
-MD5SUM="5adb5f7caaf435268f833eb816566c8e \
-        6de60482bf935a159ecb647d2e4a57ab"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/sbsigntools-0.9.1.tar.xz"
+MD5SUM="3dbdb509be9310523377dc523d4b5bd7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/spacefm/glibc-2.28.patch b/system/spacefm/glibc-2.28.patch
new file mode 100644
index 0000000000..324bc43b93
--- /dev/null
+++ b/system/spacefm/glibc-2.28.patch
@@ -0,0 +1,12 @@
+diff --git a/src/main.c b/src/main.c                                                                                                                                              
+index 645e2ec..9453a3b 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -23,6 +23,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
++#include <sys/sysmacros.h>
+ 
+ #include <signal.h>
+
diff --git a/system/spacefm/spacefm.SlackBuild b/system/spacefm/spacefm.SlackBuild
index c8a93b7eaa..46cf4735bd 100644
--- a/system/spacefm/spacefm.SlackBuild
+++ b/system/spacefm/spacefm.SlackBuild
@@ -81,6 +81,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 {} \;
 
+# https://github.com/IgnorantGuru/spacefm/issues/727
+patch -p1 < $CWD/glibc-2.28.patch
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/system/t1utils/README b/system/t1utils/README
deleted file mode 100644
index 5ff4feb67b..0000000000
--- a/system/t1utils/README
+++ /dev/null
@@ -1,17 +0,0 @@
-t1utils is a collection of simple Type 1 font manipulation programs.  Together,
-they allow you to convert between PFA (ASCII) and PFB (binary) formats,
-disassemble PFA or PFB files into human-readable form, and reassemble them
-into PFA or PFB format.  Additionally you can extract font resources from
-a Macintosh font file (ATM/Laserwriter), or create a Macintosh Type 1 font
-file from a PFA or PFB font.
-
-* t1ascii:  changes PFB (binary) fonts into PFA (ASCII) format
-* t1binary:  goes the opposite direction
-* t1disasm:  translates PFBs or PFAs into a human-readable and -editable format
-* t1asm:  goes the opposite direction
-* t1unmac:  translates a Macintosh Type 1 font into either PFB or PFA format
-* t1mac:  goes the opposite direction
-
-NOTE: You do not need t1utils if you already have texlive installed as it is
-already included there. However, installing it anyway doesn't do any harm
-either.
diff --git a/system/t1utils/slack-desc b/system/t1utils/slack-desc
deleted file mode 100644
index ecbc9472a2..0000000000
--- a/system/t1utils/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-t1utils: t1utils (Type 1 Font Utilities)
-t1utils:
-t1utils: t1utils is a collection of simple Type 1 font manipulation programs.
-t1utils: Together, they allow you to convert between PFA (ASCII) and PFB
-t1utils: (binary) formats, disassemble PFA or PFB files into human-readable
-t1utils: form, and reassemble them into PFA or PFB format.  Additionally you
-t1utils: can extract font resources from a Macintosh font file
-t1utils: (ATM/Laserwriter), or create a Macintosh Type 1 font file from a
-t1utils: PFA or PFB font.
-t1utils:
-t1utils:
diff --git a/system/t1utils/t1utils.SlackBuild b/system/t1utils/t1utils.SlackBuild
deleted file mode 100644
index ab9ef7ba50..0000000000
--- a/system/t1utils/t1utils.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for t1utils
-
-# Copyright 2013-2017 Kyle Guinn <elyk03@gmail.com>, USA
-# 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=t1utils
-VERSION=${VERSION:-1.41}
-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-$VERSION
-OUTPUT=${OUTPUT:-/tmp}
-
-DOCS="INSTALL LICENSE NEWS.md README.md"
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$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
-
-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
-chown -R root:root .
-chmod -R u+w,go-w,a+rX-st .
-
-# -D_GNU_SOURCE is to fix https://github.com/kohler/t1utils/issues/8
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-dependency-tracking \
-  --build=$ARCH-slackware-linux \
-  CFLAGS="$SLKCFLAGS" \
-  CPPFLAGS="-D_GNU_SOURCE" \
-
-make
-make install-strip DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 {} +
-
-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/t1utils/t1utils.info b/system/t1utils/t1utils.info
deleted file mode 100644
index 99d640b848..0000000000
--- a/system/t1utils/t1utils.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="t1utils"
-VERSION="1.41"
-HOMEPAGE="https://www.lcdf.org/type/#t1utils"
-DOWNLOAD="https://www.lcdf.org/type/t1utils-1.41.tar.gz"
-MD5SUM="5430f82fcc27ccfc44526a59fa64849a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Kyle Guinn"
-EMAIL="elyk03@gmail.com"
diff --git a/system/terminator/terminator.info b/system/terminator/terminator.info
index 217966f2ae..d205f33bf4 100644
--- a/system/terminator/terminator.info
+++ b/system/terminator/terminator.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://launchpad.net/terminator/trunk/1.0/+download/terminator-1.0.ta
 MD5SUM="26b2c80a30bead957b83cef3a2b9101f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="psutil"
+REQUIRES="psutil vte2"
 MAINTAINER="Alan Alberghini"
 EMAIL="414N@slacky.it"
diff --git a/system/tinyterm/tinyterm.info b/system/tinyterm/tinyterm.info
index d27383884f..310a51b8a9 100644
--- a/system/tinyterm/tinyterm.info
+++ b/system/tinyterm/tinyterm.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/ryanpcmcquen/tinyterm/archive/0.6.0/tinyterm-0.6.0.
 MD5SUM="e9adc2bc038576dfaa51cb4390b1100b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="vte2"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/system/ttyrec/ttyrec-1.0.8-flags.patch b/system/ttyrec/ttyrec-1.0.8-flags.patch
new file mode 100644
index 0000000000..34687d9b8b
--- /dev/null
+++ b/system/ttyrec/ttyrec-1.0.8-flags.patch
@@ -0,0 +1,19 @@
+--- a/Makefile	2017-08-26 11:47:02.981266309 +0200
++++ b/Makefile	2017-08-26 14:33:47.161600445 +0200
+@@ -10,13 +10,13 @@
+ all: $(TARGET)
+ 
+ ttyrec: ttyrec.o io.o
+-	$(CC) $(CFLAGS) -o ttyrec ttyrec.o io.o
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ttyrec ttyrec.o io.o
+ 
+ ttyplay: ttyplay.o io.o
+-	$(CC) $(CFLAGS) -o ttyplay ttyplay.o io.o
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ttyplay ttyplay.o io.o
+ 
+ ttytime: ttytime.o io.o
+-	$(CC) $(CFLAGS) -o ttytime ttytime.o io.o
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ttytime ttytime.o io.o
+ 
+ clean:
+ 	rm -f *.o $(TARGET) ttyrecord *~
diff --git a/system/ttyrec/ttyrec-1.0.8-glibc-2.30.patch b/system/ttyrec/ttyrec-1.0.8-glibc-2.30.patch
new file mode 100644
index 0000000000..174fc7786e
--- /dev/null
+++ b/system/ttyrec/ttyrec-1.0.8-glibc-2.30.patch
@@ -0,0 +1,30 @@
+diff --git a/ttyrec.c b/ttyrec.c
+index 3392f70..86a59ee 100644
+--- a/ttyrec.c
++++ b/ttyrec.c
+@@ -57,7 +57,9 @@
+ 
+ #if defined(SVR4)
+ #include <fcntl.h>
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__linux__))
+ #include <stropts.h>
++#endif
+ #endif /* SVR4 */
+ 
+ #include <sys/time.h>
+@@ -449,6 +451,7 @@ getslave()
+ 		perror("open(fd, O_RDWR)");
+ 		fail();
+ 	}
++#ifndef __linux__
+ 	if (isastream(slave)) {
+ 		if (ioctl(slave, I_PUSH, "ptem") < 0) {
+ 			perror("ioctl(fd, I_PUSH, ptem)");
+@@ -466,6 +469,7 @@ getslave()
+ #endif
+ 		(void) ioctl(0, TIOCGWINSZ, (char *)&win);
+ 	}
++#endif
+ #else /* !SVR4 */
+ #ifndef HAVE_openpty
+ 	line[strlen("/dev/")] = 't';
diff --git a/system/ttyrec/ttyrec-1.0.8.RHEL5.patch b/system/ttyrec/ttyrec-1.0.8.RHEL5.patch
deleted file mode 100644
index 900b017cb9..0000000000
--- a/system/ttyrec/ttyrec-1.0.8.RHEL5.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -rupN original/Makefile new/Makefile
---- original/Makefile	2006-06-11 10:52:50.000000000 -0500
-+++ new/Makefile	2012-04-23 18:34:05.000000000 -0500
-@@ -1,5 +1,5 @@
- CC = gcc
--CFLAGS = -O2
-+CFLAGS = -O2 -DHAVE_openpty
- VERSION = 1.0.8
- 
- TARGET = ttyrec ttyplay ttytime
-@@ -10,7 +10,7 @@ DIST =	ttyrec.c ttyplay.c ttyrec.h io.c 
- all: $(TARGET)
- 
- ttyrec: ttyrec.o io.o
--	$(CC) $(CFLAGS) -o ttyrec ttyrec.o io.o
-+	$(CC) $(CFLAGS) -o ttyrec ttyrec.o io.o -lutil
- 
- ttyplay: ttyplay.o io.o
- 	$(CC) $(CFLAGS) -o ttyplay ttyplay.o io.o
-diff -rupN original/ttyrec.c new/ttyrec.c
---- original/ttyrec.c	2006-06-11 10:52:50.000000000 -0500
-+++ new/ttyrec.c	2012-04-23 18:26:41.000000000 -0500
-@@ -71,7 +71,9 @@
- #define _(FOO) FOO
- 
- #ifdef HAVE_openpty
--#include <libutil.h>
-+/* #include <libutil.h> */
-+#include <pty.h>  /* for openpty and forkpty */
-+#include <utmp.h> /* for login_tty */
- #endif
- 
- #if defined(SVR4) && !defined(CDEL)
diff --git a/system/ttyrec/ttyrec.SlackBuild b/system/ttyrec/ttyrec.SlackBuild
index caecc00574..a54cdb9126 100644
--- a/system/ttyrec/ttyrec.SlackBuild
+++ b/system/ttyrec/ttyrec.SlackBuild
@@ -69,10 +69,10 @@ 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 {} \;
 
-# Fixed: "Out of pty's Terminated"
-patch -p1 < $CWD/ttyrec-1.0.8.RHEL5.patch
+patch -p1 < $CWD/ttyrec-1.0.8-flags.patch
+patch -p1 < $CWD/ttyrec-1.0.8-glibc-2.30.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/unison/unison.SlackBuild b/system/unison/unison.SlackBuild
index 6d43f2fab0..4bb216b12f 100644
--- a/system/unison/unison.SlackBuild
+++ b/system/unison/unison.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=unison
-VERSION=${VERSION:-2.51.2}
+VERSION=${VERSION:-20191211_26a29f7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,7 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/system/unison/unison.info b/system/unison/unison.info
index f10eaf5a3d..15c5be3a22 100644
--- a/system/unison/unison.info
+++ b/system/unison/unison.info
@@ -1,8 +1,8 @@
 PRGNAM="unison"
-VERSION="2.51.2"
+VERSION="20191211_26a29f7"
 HOMEPAGE="https://www.cis.upenn.edu/~bcpierce/unison/"
-DOWNLOAD="https://github.com/bcpierce00/unison/archive/v2.51.2/unison-2.51.2.tar.gz"
-MD5SUM="11991eddcf6fdd8b50041eefe44bad61"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/unison-20191211_26a29f7.tar.xz"
+MD5SUM="7c702475d21c2368f0af044847eb6c53"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lablgtk"
diff --git a/system/vhba-module/vhba-module.SlackBuild b/system/vhba-module/vhba-module.SlackBuild
index 64d9365316..37e455cce6 100644
--- a/system/vhba-module/vhba-module.SlackBuild
+++ b/system/vhba-module/vhba-module.SlackBuild
@@ -60,6 +60,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|\ -Werror||" Makefile
+
 make KERNELRELEASE=$KERNEL
 
 mkdir -p $PKG/lib/modules/$KERNEL/extra
diff --git a/system/virt-manager/Add-Slackware-to-OS-choices.patch b/system/virt-manager/Add-Slackware-to-OS-choices.patch
index 18aadb62cf..0a5260206f 100644
--- a/system/virt-manager/Add-Slackware-to-OS-choices.patch
+++ b/system/virt-manager/Add-Slackware-to-OS-choices.patch
@@ -1,37 +1,21 @@
-diff -Nur virt-manager-1.5.0.orig/virtinst/osdict.py virt-manager-1.5.0/virtinst/osdict.py
---- virt-manager-1.5.0.orig/virtinst/osdict.py	2018-01-27 14:57:20.000000000 -0600
-+++ virt-manager-1.5.0/virtinst/osdict.py	2018-02-19 00:52:00.750416744 -0600
-@@ -159,6 +159,7 @@
-         "rhel5": "rhel5.0",
-         "rhel6": "rhel6.0",
-         "rhel7": "rhel7.0",
-+        "slackware": "slackware14.2",
-         "ubuntuhardy": "ubuntu8.04",
-         "ubuntuintrepid": "ubuntu8.10",
-         "ubuntujaunty": "ubuntu9.04",
-@@ -373,7 +374,7 @@
-         # EOL date. So assume None == EOL, add some manual work arounds.
-         # We should fix this in a new libosinfo version, and then drop
-         # this hack
--        if self._is_related_to(["fedora24", "rhel7.0", "debian6",
-+        if self._is_related_to(["slackware14.2", "fedora24", "rhel7.0", "debian6",
-             "ubuntu13.04", "win8", "win2k12", "mageia5", "centos7.0"],
-             check_clones=False, check_derives=False):
-             return True
-diff -Nur virt-manager-1.5.0.orig/virtinst/urlfetcher.py virt-manager-1.5.0/virtinst/urlfetcher.py
---- virt-manager-1.5.0.orig/virtinst/urlfetcher.py	2018-01-27 14:57:20.000000000 -0600
-+++ virt-manager-1.5.0/virtinst/urlfetcher.py	2018-02-19 00:52:00.751416752 -0600
-@@ -1379,6 +1379,43 @@
-         return False
+diff -Nur virt-manager-2.2.0.orig/virtinst/install/urldetect.py virt-manager-2.2.0/virtinst/install/urldetect.py
+--- virt-manager-2.2.0.orig/virtinst/install/urldetect.py	2019-06-17 00:20:11.000000000 -0500
++++ virt-manager-2.2.0/virtinst/install/urldetect.py	2019-07-03 02:14:35.978571412 -0500
+@@ -466,6 +466,47 @@
+         return cache.treeinfo_family_regex(famregex)
  
  
-+class SlackwareDistro(Distro):
++class SlackwareDistro(_DistroTree):
 +    # slackware doesn't have installable URLs, so this is just for a
 +    # mounted ISO
 +    name = "Slackware"
 +    urldistro = "slackware"
 +    os_variant = "linux"
 +
++    PRETTY_NAME = "Slackware"
++    matching_distros = ["slackware"]
++    _variant_prefix = "slackware"
++
 +    _boot_iso_paths = []
 +    _xen_kernel_paths = []
 +
@@ -62,6 +46,17 @@ diff -Nur virt-manager-1.5.0.orig/virtinst/urlfetcher.py virt-manager-1.5.0/virt
 +        return False
 +
 +
- # Build list of all *Distro classes
- def _build_distro_list():
-     allstores = []
+ class _SuseDistro(_RHELDistro):
+     PRETTY_NAME = None
+     _suse_regex = []
+diff -Nur virt-manager-2.2.0.orig/virtinst/osdict.py virt-manager-2.2.0/virtinst/osdict.py
+--- virt-manager-2.2.0.orig/virtinst/osdict.py	2019-06-17 00:20:11.000000000 -0500
++++ virt-manager-2.2.0/virtinst/osdict.py	2019-07-03 02:11:59.208399622 -0500
+@@ -146,6 +146,7 @@
+         "rhel5": "rhel5.0",
+         "rhel6": "rhel6.0",
+         "rhel7": "rhel7.0",
++        "slackware": "slackware14.2",
+         "ubuntuhardy": "ubuntu8.04",
+         "ubuntuintrepid": "ubuntu8.10",
+         "ubuntujaunty": "ubuntu9.04",
diff --git a/system/virt-manager/virt-manager.SlackBuild b/system/virt-manager/virt-manager.SlackBuild
index 3a8402bd75..1b2326ed09 100644
--- a/system/virt-manager/virt-manager.SlackBuild
+++ b/system/virt-manager/virt-manager.SlackBuild
@@ -4,10 +4,10 @@
 
 # Written by Ash Wiren  ash@spooksoftware.com # Released to public domain.
 # Modified by Zoran Stojakovic
-# Lots of mods by rworkman for 1.x
+# Lots of mods by rworkman for 1.x and (later) 2.x
 
 PRGNAM=virt-manager
-VERSION=${VERSION:-1.5.1}
+VERSION=${VERSION:-2.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,8 +56,8 @@ find -L . \
 # Add Slackware support
 patch -p1 < $CWD/Add-Slackware-to-OS-choices.patch
 
-python setup.py configure
-python setup.py install --root=$PKG
+python3 setup.py configure
+python3 setup.py install --root=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -68,7 +68,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-    COPYING HACKING.md INSTALL.md NEWS.md README.md \
+    CONTRIBUTING.md COPYING INSTALL.md NEWS.md README.md \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/virt-manager/virt-manager.info b/system/virt-manager/virt-manager.info
index 6bdff3b232..c21bad0447 100644
--- a/system/virt-manager/virt-manager.info
+++ b/system/virt-manager/virt-manager.info
@@ -1,10 +1,10 @@
 PRGNAM="virt-manager"
-VERSION="1.5.1"
+VERSION="2.2.1"
 HOMEPAGE="http://virt-manager.org/"
-DOWNLOAD="http://virt-manager.org/download/sources/virt-manager/virt-manager-1.5.1.tar.gz"
-MD5SUM="32a929fd91fca9767730abaefb94661d"
+DOWNLOAD="https://virt-manager.org/download/sources/virt-manager/virt-manager-2.2.1.tar.gz"
+MD5SUM="adb4fa436d60b62a8e18a7b3a1667d97"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libosinfo libvirt-glib libvirt-python gnome-python2-gconf tunctl ipaddr-py python-requests gtk-vnc spice-gtk vte3"
+REQUIRES="gtksourceview3 libosinfo libvirt-glib libvirt-python gtk-vnc spice-gtk"
 MAINTAINER="Robby Workman"
 EMAIL="rworkman@slackbuilds.org"
diff --git a/system/virtualbox-addons/rc.vboxadd.diff b/system/virtualbox-addons/rc.vboxadd.diff
index f0b3acddd0..bb5fdde0fe 100644
--- a/system/virtualbox-addons/rc.vboxadd.diff
+++ b/system/virtualbox-addons/rc.vboxadd.diff
@@ -1,6 +1,7 @@
---- vboxadd.sh.orig	2016-11-23 16:24:46.000000000 +0100
-+++ vboxadd.sh	2016-12-27 16:06:46.413895799 +0100
-@@ -154,42 +154,9 @@
+diff -ur VirtualBox-5.2.4.orig/src/VBox/Additions/linux/installer/vboxadd.sh VirtualBox-5.2.4/src/VBox/Additions/linux/installer/vboxadd.sh
+--- VirtualBox-5.2.4.orig/src/VBox/Additions/linux/installer/vboxadd.sh	2017-12-19 10:22:03.000000000 +0100
++++ VirtualBox-5.2.4/src/VBox/Additions/linux/installer/vboxadd.sh	2018-01-07 17:23:23.225998245 +0100
+@@ -130,18 +130,9 @@
  
  dev=/dev/vboxguest
  userdev=/dev/vboxuser
@@ -8,165 +9,127 @@
  owner=vboxadd
  group=1
  
--test_for_gcc_and_make()
--{
--    which make > /dev/null 2>&1 || printf "\nThe make utility was not found. If the following module compilation fails then\nthis could be the reason and you should try installing it.\n"
--    which gcc > /dev/null 2>&1 || printf "\nThe gcc utility was not found. If the following module compilation fails then\nthis could be the reason and you should try installing it.\n"
--}
--
--test_sane_kernel_dir()
--{
--    KERN_VER=`uname -r`
--    KERN_DIR="/lib/modules/$KERN_VER/build"
--    if [ -d "$KERN_DIR" ]; then
--        KERN_REL=`make -sC $KERN_DIR --no-print-directory kernelrelease 2>/dev/null || true`
--        if [ -z "$KERN_REL" -o "x$KERN_REL" = "x$KERN_VER" ]; then
--            return 0
--        fi
--    fi
--    printf "\nThe headers for the current running kernel were not found. If the following\nmodule compilation fails then this could be the reason.\n"
--    if [ "$system" = "redhat" ]; then
--        if echo "$KERN_VER" | grep -q "uek"; then
--            printf "The missing package can be probably installed with\nyum install kernel-uek-devel-$KERN_VER\n"
--        else
--            printf "The missing package can be probably installed with\nyum install kernel-devel-$KERN_VER\n"
--        fi
--    elif [ "$system" = "suse" ]; then
--        KERN_VER_SUSE=`echo "$KERN_VER" | sed 's/.*-\([^-]*\)/\1/g'`
--        KERN_VER_BASE=`echo "$KERN_VER" | sed 's/\(.*\)-[^-]*/\1/g'`
--        printf "The missing package can be probably installed with\nzypper install kernel-$KERN_VER_SUSE-devel-$KERN_VER_BASE\n"
--    elif [ "$system" = "debian" ]; then
--        printf "The missing package can be probably installed with\napt-get install linux-headers-$KERN_VER\n"
--    fi
--}
+-if test -r $config; then
+-  . $config
+-else
+-  fail "Configuration file $config not found"
+-fi
+-test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
+-  fail "Configuration file $config not complete"
 -
  running_vboxguest()
  {
      lsmod | grep -q "vboxguest[^_-]"
-@@ -261,13 +228,6 @@
- start()
- {
-     begin "Starting the VirtualBox Guest Additions ";
--    if test -r $config; then
--      . $config
--    else
--      fail "Configuration file $config not found"
+@@ -252,28 +243,6 @@
+         }
+     fi  # INSTALL_NO_MODULE_BUILDS
+ 
+-    # Put the X.Org driver in place.  This is harmless if it is not needed.
+-    "${INSTALL_DIR}/init/vboxadd-x11" setup 2>> "${LOG}"
+-    # Install the guest OpenGL drivers.  For now we don't support
+-    # multi-architecture installations
+-    rm -f /etc/ld.so.conf.d/00vboxvideo.conf
+-    rm -Rf /var/lib/VBoxGuestAdditions/lib
+-    if /usr/bin/VBoxClient --check3d 2>/dev/null; then
+-        mkdir -p /var/lib/VBoxGuestAdditions/lib
+-        ln -sf "${INSTALL_DIR}/lib/VBoxOGL.so" /var/lib/VBoxGuestAdditions/lib/libGL.so.1
+-        # SELinux for the OpenGL libraries, so that gdm can load them during the
+-        # acceleration support check.  This prevents an "Oh no, something has gone
+-        # wrong!" error when starting EL7 guests.
+-        if test -e /etc/selinux/config; then
+-            if command -v semanage > /dev/null; then
+-                semanage fcontext -a -t lib_t "/var/lib/VBoxGuestAdditions/lib/libGL.so.1"
+-            fi
+-            chcon -h  -t lib_t "/var/lib/VBoxGuestAdditions/lib/libGL.so.1"
+-        fi
+-        echo "/var/lib/VBoxGuestAdditions/lib" > /etc/ld.so.conf.d/00vboxvideo.conf
 -    fi
--    test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
--      fail "Configuration file $config not complete"
-     uname -r | grep -q -E '^2\.6|^3|^4' 2>/dev/null &&
-         ps -A -o comm | grep -q '/*udevd$' 2>/dev/null ||
-         no_udev=1
-@@ -378,218 +338,16 @@
+-    ldconfig
+-
+     # Mount all shared folders from /etc/fstab. Normally this is done by some
+     # other startup script but this requires the vboxdrv kernel module loaded.
+     # This isn't necessary anymore as the vboxsf module is autoloaded.
+@@ -303,195 +272,16 @@
      return 0
  }
  
--## Update the initramfs.  Debian and Ubuntu put the graphics driver in, and
--# need the touch(1) command below.  Everyone else that I checked just need
--# the right module alias file from depmod(1) and only use the initramfs to
--# load the root filesystem, not the boot splash.  update-initramfs works
--# for the first two and dracut for every one else I checked.  We are only
--# interested in distributions recent enough to use the KMS vboxvideo driver.
--## @param $1  kernel version to update for.
--update_module_dependencies()
--{
--    depmod "${1}"
--    rm -f "/lib/modules/${1}/initrd/vboxvideo"
--    test -d "/lib/modules/${1}/initrd" &&
--        test -f "/lib/modules/${1}/misc/vboxvideo.ko" &&
--        touch "/lib/modules/${1}/initrd/vboxvideo"
--    test -n "${QUICKSETUP}" && return
--    if type dracut >/dev/null 2>&1; then
--        dracut -f "/boot/initramfs-${1}.img" "${1}"
--    elif type update-initramfs >/dev/null 2>&1; then
--        update-initramfs -u -k "${1}"
--    fi
--}
--
 -# Remove any existing VirtualBox guest kernel modules from the disk, but not
 -# from the kernel as they may still be in use
 -cleanup_modules()
 -{
--    if [ -n "$(which dkms 2>/dev/null)" ]; then
--        begin "Removing existing VirtualBox DKMS kernel modules"
--        $DODKMS uninstall $OLDMODULES > $LOG
--        succ_msg
--    fi
--    begin "Removing existing VirtualBox non-DKMS kernel modules"
--    for i in $OLDMODULES; do
--        find /lib/modules -name $i\* | xargs rm 2>/dev/null
+-    log "Removing existing VirtualBox kernel modules."
+-    for i in ${OLDMODULES}; do
+-        # We no longer support DKMS, remove any leftovers.
+-        rm -rf "/var/lib/dkms/${i}"*
+-        # And remove old modules.
+-        rm -f /lib/modules/*/misc/"${i}"*
 -    done
--    succ_msg
+-    # Remove leftover module folders.
+-    for i in /lib/modules/*/misc; do
+-        test -d "${i}" && rmdir -p "${i}" 2>/dev/null
+-    done
+-    rm -f /etc/depmod.d/vboxvideo-upstream.conf
 -}
 -
 -# Build and install the VirtualBox guest kernel modules
 -setup_modules()
 -{
 -    # don't stop the old modules here -- they might be in use
--    cleanup_modules
--    begin "Building the VirtualBox Guest Additions kernel modules"
--
--    # Short cut out if a dkms build succeeds
--    if [ -n "$(which dkms 2>/dev/null)" ] &&
--       $DODKMS install vboxguest $INSTALL_VER >> $LOG 2>&1; then
--        succ_msg
--        return 0
--    fi
--
--    test_for_gcc_and_make
--    test_sane_kernel_dir
+-    test -z "${QUICKSETUP}" && cleanup_modules
+-    # This does not work for 2.4 series kernels.  How sad.
+-    test -n "${QUICKSETUP}" && test -f "${MODULE_DIR}/vboxguest.ko" && return 0
+-    info "Building the VirtualBox Guest Additions kernel modules."
 -
--    echo
--    begin "Building the main Guest Additions module"
+-    # We are allowed to do ">> $LOG" after we have called "log()" once.
+-    log "Building the main Guest Additions module."
 -    if ! $BUILDINTMP \
 -        --save-module-symvers /tmp/vboxguest-Module.symvers \
 -        --module-source $MODULE_SRC/vboxguest \
 -        --no-print-directory install >> $LOG 2>&1; then
--        show_error "Look at $LOG to find out what went wrong"
--        return 1
+-        # If check_module_dependencies.sh fails it prints a message itself.
+-        "${INSTALL_DIR}"/other/check_module_dependencies.sh 2>&1 &&
+-            info "Look at $LOG to find out what went wrong"
+-        return 0
 -    fi
--    succ_msg
--    begin "Building the shared folder support module"
+-    log "Building the shared folder support module"
 -    if ! $BUILDINTMP \
 -        --use-module-symvers /tmp/vboxguest-Module.symvers \
 -        --module-source $MODULE_SRC/vboxsf \
 -        --no-print-directory install >> $LOG 2>&1; then
--        show_error  "Look at $LOG to find out what went wrong"
--        return 1
+-        info  "Look at $LOG to find out what went wrong"
+-        return 0
 -    fi
--    succ_msg
--    begin "Building the graphics driver module"
+-    log "Building the graphics driver module"
 -    if ! $BUILDINTMP \
 -        --use-module-symvers /tmp/vboxguest-Module.symvers \
 -        --module-source $MODULE_SRC/vboxvideo \
 -        --no-print-directory install >> $LOG 2>&1; then
--        show_error "Look at $LOG to find out what went wrong"
+-        info "Look at $LOG to find out what went wrong"
 -    fi
--    succ_msg
--    update_module_dependencies "${KERN_VER}"
+-    [ -d /etc/depmod.d ] || mkdir /etc/depmod.d
+-    echo "override vboxguest * misc" > /etc/depmod.d/vboxvideo-upstream.conf
+-    echo "override vboxsf * misc" >> /etc/depmod.d/vboxvideo-upstream.conf
+-    echo "override vboxvideo * misc" >> /etc/depmod.d/vboxvideo-upstream.conf
+-    depmod
 -    return 0
 -}
 -
--# Do non-kernel bits needed for the kernel modules to work properly (user
--# creation, udev, mount helper...)
--extra_setup()
+-create_vbox_user()
 -{
--    begin "Doing non-kernel setup of the Guest Additions"
--    echo "Creating user for the Guest Additions." >> $LOG
+-    log "Creating user for the Guest Additions."
 -    # This is the LSB version of useradd and should work on recent
 -    # distributions
 -    useradd -d /var/run/vboxadd -g 1 -r -s /bin/false vboxadd >/dev/null 2>&1
 -    # And for the others, we choose a UID ourselves
 -    useradd -d /var/run/vboxadd -g 1 -u 501 -o -s /bin/false vboxadd >/dev/null 2>&1
 -
--    # Add a group "vboxsf" for Shared Folders access
--    # All users which want to access the auto-mounted Shared Folders have to
--    # be added to this group.
--    groupadd -r -f vboxsf >/dev/null 2>&1
+-}
 -
+-create_udev_rule()
+-{
 -    # Create udev description file
 -    if [ -d /etc/udev/rules.d ]; then
--        echo "Creating udev rule for the Guest Additions kernel module." >> $LOG
+-        log "Creating udev rule for the Guest Additions kernel module."
 -        udev_call=""
 -        udev_app=`which udevadm 2> /dev/null`
 -        if [ $? -eq 0 ]; then
@@ -189,91 +152,97 @@
 -        echo "KERNEL=${udev_fix}\"vboxguest\", NAME=\"vboxguest\", OWNER=\"vboxadd\", MODE=\"0660\"" > /etc/udev/rules.d/60-vboxadd.rules
 -        echo "KERNEL=${udev_fix}\"vboxuser\", NAME=\"vboxuser\", OWNER=\"vboxadd\", MODE=\"0666\"" >> /etc/udev/rules.d/60-vboxadd.rules
 -    fi
+-}
+-
+-create_module_rebuild_script()
+-{
+-    # And a post-installation script for rebuilding modules when a new kernel
+-    # is installed.
+-    mkdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d
+-    cat << EOF > /etc/kernel/postinst.d/vboxadd
+-#!/bin/sh
+-test -d "/lib/modules/\${1}/build" || exit 0
+-KERN_VER="\${1}" /sbin/rcvboxadd quicksetup
+-exit 0
+-EOF
+-    cat << EOF > /etc/kernel/prerm.d/vboxadd
+-#!/bin/sh
+-for i in ${OLDMODULES}; do rm -f /lib/modules/"\${1}"/misc/"\${i}".ko; done
+-rmdir -p /lib/modules/"\$1"/misc 2>/dev/null
+-exit 0
+-EOF
+-    chmod 0755 /etc/kernel/postinst.d/vboxadd /etc/kernel/prerm.d/vboxadd
+-}
+-
+-shared_folder_setup()
+-{
+-    # Add a group "vboxsf" for Shared Folders access
+-    # All users which want to access the auto-mounted Shared Folders have to
+-    # be added to this group.
+-    groupadd -r -f vboxsf >/dev/null 2>&1
 -
--    # Put mount.vboxsf in the right place
--    ln -sf "$lib_path/$PACKAGE/mount.vboxsf" /sbin
--    # And an rc file to re-build the kernel modules and re-set-up the X server.
--    ln -sf "$lib_path/$PACKAGE/vboxadd" /sbin/rcvboxadd
--    ln -sf "$lib_path/$PACKAGE/vboxadd-x11" /sbin/rcvboxadd-x11
+-    # Put the mount.vboxsf mount helper in the right place.
+-    ## @todo It would be nicer if the kernel module just parsed parameters
+-    # itself instead of needing a separate binary to do that.
+-    ln -sf "${INSTALL_DIR}/other/mount.vboxsf" /sbin
 -    # SELinux security context for the mount helper.
 -    if test -e /etc/selinux/config; then
 -        # This is correct.  semanage maps this to the real path, and it aborts
 -        # with an error, telling you what you should have typed, if you specify
--        # the real path.  The "chcon" is there as a back-up in case this is
--        # different on old guests.
--        semanage fcontext -a -t mount_exec_t "/usr/lib/$PACKAGE/mount.vboxsf"
--        chcon -t mount_exec_t "$lib_path/$PACKAGE/mount.vboxsf"
+-        # the real path.  The "chcon" is there as a back-up for old guests.
+-        command -v semanage > /dev/null &&
+-            semanage fcontext -a -t mount_exec_t "${INSTALL_DIR}/other/mount.vboxsf"
+-        chcon -t mount_exec_t "${INSTALL_DIR}/other/mount.vboxsf"
 -    fi
--    succ_msg
 -}
 -
  # setup_script
  setup()
  {
--    if test -r $config; then
--      . $config
--    else
--      fail "Configuration file $config not found"
--    fi
--    test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
--      fail "Configuration file $config not complete"
 -    export BUILD_TYPE
 -    export USERNAME
 -
--    rm -f $LOG
 -    MODULE_SRC="$INSTALL_DIR/src/vboxguest-$INSTALL_VER"
 -    BUILDINTMP="$MODULE_SRC/build_in_tmp"
--    DODKMS="$MODULE_SRC/do_dkms"
 -    chcon -t bin_t "$BUILDINTMP" > /dev/null 2>&1
--    chcon -t bin_t "$DODKMS"     > /dev/null 2>&1
 -
--    setup_modules
--    mod_succ="$?"
--    extra_setup
--    if [ "$mod_succ" -eq "0" ]; then
--        if running_vboxguest || running_vboxadd; then
--            printf "You should restart your guest to make sure the new modules are actually used\n\n"
--        else
--            start
--        fi
+-    test -z "${INSTALL_NO_MODULE_BUILDS}" && setup_modules
+-    create_vbox_user
+-    create_udev_rule
+-    test -z "${INSTALL_NO_MODULE_BUILDS}" && create_module_rebuild_script
+-    test -n "${QUICKSETUP}" && return 0
+-    shared_folder_setup
+-    if  running_vboxguest || running_vboxadd; then
+-        info "Running kernel modules will not be replaced until the system is restarted"
 -    fi
+-    return 0
 +    echo "Not implemented! Please use the virtualbox-kernel-addons.SlackBuild available at SlackBuilds.org instead."
  }
  
  # cleanup_script
  cleanup()
  {
--    if test -r $config; then
--      . $config
--      test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
--        fail "Configuration file $config not complete"
--      DODKMS="$INSTALL_DIR/src/vboxguest-$INSTALL_VER/do_dkms"
--    elif test -x ./do_dkms; then  # Executing as part of the installer...
--      DODKMS=./do_dkms
--    else
--      fail "Configuration file $config not found"
+-    if test -z "${INSTALL_NO_MODULE_BUILDS}"; then
+-        # Delete old versions of VBox modules.
+-        cleanup_modules
+-        depmod
+-
+-        # Remove old module sources
+-        for i in $OLDMODULES; do
+-          rm -rf /usr/src/$i-*
+-        done
 -    fi
 -
--    # Delete old versions of VBox modules.
--    cleanup_modules
--    for i in /lib/modules/*; do
--        update_module_dependencies "${i#/lib/modules/}"
--    done
--
--    # Remove old module sources
--    for i in $OLDMODULES; do
--      rm -rf /usr/src/$i-*
--    done
--
 -    # Clean-up X11-related bits
--    /sbin/rcvboxadd-x11 cleanup
+-    "${INSTALL_DIR}/init/vboxadd-x11" cleanup 2>> "${LOG}"
 -
 -    # Remove other files
 -    rm /sbin/mount.vboxsf 2>/dev/null
--    rm /sbin/rcvboxadd 2>/dev/null
--    rm /sbin/rcvboxadd-x11 2>/dev/null
+-    if test -z "${INSTALL_NO_MODULE_BUILDS}"; then
+-        rm -f /etc/kernel/postinst.d/vboxadd /etc/kernel/prerm.d/vboxadd
+-        rmdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d 2>/dev/null
+-    fi
 -    rm /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null
--    rm -f /lib/modules/*/initrd/vboxvideo
 +    echo "Not implemented! Please use removepkg or pkgtool to remove virtualbox-addons and/or virtualbox-kernel-addons instead."
  }
  
diff --git a/system/virtualbox-addons/virtualbox-addons.SlackBuild b/system/virtualbox-addons/virtualbox-addons.SlackBuild
index 063fa71844..fd72c91ad3 100644
--- a/system/virtualbox-addons/virtualbox-addons.SlackBuild
+++ b/system/virtualbox-addons/virtualbox-addons.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for virtualbox-addons
 
-# Copyright 2008-2017 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2018 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=virtualbox-addons
 SRCNAM=VirtualBox
-VERSION=${VERSION:-5.0.40}
+VERSION=${VERSION:-5.2.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -86,22 +86,20 @@ find -L . \
 # Use virtualbox-kernel-addons.SlackBuild for this.
 patch -d src/VBox/Additions/linux/installer/ -i $CWD/rc.vboxadd.diff
 
-# We set the environment variables manually to avoid dependency on acpica
-export BUILD_PLATFORM="linux"
-export BUILD_PLATFORM_ARCH="$TARGET"
-export BUILD_TARGET="linux"
-export BUILD_TARGET_ARCH="$TARGET"
-export BUILD_TARGET_CPU="$ARCH"
-export BUILD_TYPE="release"
-export PATH_KBUILD="$TMP/$SRCNAM-${VERSION}/kBuild"
-export PATH_DEVTOOLS="$TMP/$SRCNAM-${VERSION}/tools"
-path_kbuild_bin="$PATH_KBUILD/bin/$BUILD_TARGET.$BUILD_PLATFORM_ARCH"
-export PATH_KBUILD_BIN="$path_kbuild_bin"
-path_dev_bin="$PATH_DEVTOOLS/$BUILD_TARGET.$BUILD_PLATFORM_ARCH"/bin
-echo "$PATH" | grep -q "$path_kbuild_bin" || PATH="$path_kbuild_bin:$PATH"
-echo "$PATH" | grep -q "$path_dev_bin" || PATH="$path_dev_bin:$PATH"
-export PATH
-unset path_kbuild_bin path_dev_bin
+# Cheat!
+sed -i "s|cc_maj -gt 7|cc_maj -gt 9|" configure
+
+./configure \
+  --only-additions \
+  --disable-kmods \
+  --with-makeself=/usr/bin/echo
+
+. ./env.sh
+
+OPENSSL=$(grep openssl src/libs/Makefile.kmk | cut -d "/" -f 2)
+
+mkdir -p src/libs/$OPENSSL
+touch src/libs/$OPENSSL/Makefile.kmk
 
 kmk -j ${JOBS} LOCALCFG=$CWD/LocalConfig.kmk
 
@@ -135,8 +133,9 @@ cd out/linux.$TARGET/release/bin/additions
   install -m 755 VBoxClient $PKG/usr/bin/
   install -m 755 VBoxService $PKG/usr/sbin/
   install -m 4755 mount.vboxsf $PKG/sbin/mount.vboxsf
-  install -m 644 vboxvideo_drv_$XSERVER.so \
-    $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/vboxvideo_drv.so
+## slackware > 14.2 already ships this
+#  install -m 644 vboxvideo_drv_$XSERVER.so \
+#    $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/vboxvideo_drv.so
 
   install -m 644 VBoxOGLcrutil.so $PKG/usr/lib$LIBDIRSUFFIX
   install -m 644 VBoxOGLerrorspu.so $PKG/usr/lib$LIBDIRSUFFIX
@@ -145,12 +144,9 @@ cd out/linux.$TARGET/release/bin/additions
   install -m 644 VBoxOGLpackspu.so $PKG/usr/lib$LIBDIRSUFFIX
   install -m 644 VBoxOGLpassthroughspu.so $PKG/usr/lib$LIBDIRSUFFIX
   install -m 644 VBoxOGL.so $PKG/usr/lib$LIBDIRSUFFIX
+  install -m 644 VBoxEGL.so $PKG/usr/lib$LIBDIRSUFFIX
 
   install -m 755 $CWD/vbox-uninstall-guest-additions $PKG/usr/sbin/
-
-  mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/dri
-  ln -s /usr/lib$LIBDIRSUFFIX/VBoxOGL.so \
-    $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/dri/vboxvideo_dri.so
 cd -
 
 # kconf_update script to disable OpenGL within KDE
diff --git a/system/virtualbox-addons/virtualbox-addons.info b/system/virtualbox-addons/virtualbox-addons.info
index bf313e7e8d..df1ddc3012 100644
--- a/system/virtualbox-addons/virtualbox-addons.info
+++ b/system/virtualbox-addons/virtualbox-addons.info
@@ -1,8 +1,8 @@
 PRGNAM="virtualbox-addons"
-VERSION="5.0.40"
+VERSION="5.2.8"
 HOMEPAGE="https://www.virtualbox.org"
-DOWNLOAD="http://download.virtualbox.org/virtualbox/5.0.40/VirtualBox-5.0.40.tar.bz2"
-MD5SUM="53b259e48a137b0185c169590e2dcb77"
+DOWNLOAD="http://download.virtualbox.org/virtualbox/5.2.8/VirtualBox-5.2.8.tar.bz2"
+MD5SUM="e731ea9c5c31096ec4c2a3bfba26665c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/virtualbox-extension-pack/virtualbox-extension-pack.SlackBuild b/system/virtualbox-extension-pack/virtualbox-extension-pack.SlackBuild
index 9115605537..8273192e91 100644
--- a/system/virtualbox-extension-pack/virtualbox-extension-pack.SlackBuild
+++ b/system/virtualbox-extension-pack/virtualbox-extension-pack.SlackBuild
@@ -4,7 +4,7 @@
 
 # Originally written by Vliegendehuiskat, vliegendehuiskat [at] gmail [dot] com
 
-# Copyright 2014-2017 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2014-2020 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=virtualbox-extension-pack
-VERSION=${VERSION:-5.0.40}
+VERSION=${VERSION:-6.1.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/virtualbox-extension-pack/virtualbox-extension-pack.info b/system/virtualbox-extension-pack/virtualbox-extension-pack.info
index 701af5aaef..5ad3bc7be1 100644
--- a/system/virtualbox-extension-pack/virtualbox-extension-pack.info
+++ b/system/virtualbox-extension-pack/virtualbox-extension-pack.info
@@ -1,8 +1,8 @@
 PRGNAM="virtualbox-extension-pack"
-VERSION="5.0.40"
+VERSION="6.1.16"
 HOMEPAGE="https://www.virtualbox.org"
-DOWNLOAD="http://download.virtualbox.org/virtualbox/5.0.40/Oracle_VM_VirtualBox_Extension_Pack-5.0.40.vbox-extpack"
-MD5SUM="6991b332555f07a14189478486d4aae6"
+DOWNLOAD="http://download.virtualbox.org/virtualbox/6.1.16/Oracle_VM_VirtualBox_Extension_Pack-6.1.16.vbox-extpack"
+MD5SUM="f5359ff5a94af51b8aec9ab97dd35935"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/virtualbox-kernel-addons/virtualbox-kernel-addons.SlackBuild b/system/virtualbox-kernel-addons/virtualbox-kernel-addons.SlackBuild
index 722e60c9b8..e9a70ab605 100644
--- a/system/virtualbox-kernel-addons/virtualbox-kernel-addons.SlackBuild
+++ b/system/virtualbox-kernel-addons/virtualbox-kernel-addons.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for virtualbox-kernel-addons
 
-# Copyright 2008-2019 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2018 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=virtualbox-kernel-addons
-VERSION=${VERSION:-5.0.40}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-5.2.8}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 KERNEL=${KERNEL:-$(uname -r)}
@@ -79,7 +79,21 @@ if [ "$KERNEL_MINOR" = 4 -a "$KERNEL_PATCH" -ge 168 ]; then
   sed -i "s|KERNEL_VERSION(4, 9, 0)|KERNEL_VERSION(4, 4, 168)|" vboxguest/r0drv/linux/memobj-r0drv-linux.c
 fi
 
-for i in vboxguest vboxsf vboxvideo; do
+MODULES=""
+
+if ! [ -e /lib/modules/$KERNEL/kernel/drivers/staging/vboxvideo ]; then
+  MODULES="$MODULES vboxvideo"
+fi
+
+if ! [ -e /lib/modules/$KERNEL/kernel/virt/vboxguest ]; then
+  MODULES="$MODULES vboxguest"
+fi
+
+if ! [ -e /lib/modules/$KERNEL/kernel/fs/vboxsf ]; then
+  MODULES="$MODULES vboxsf"
+fi
+
+for i in $MODULES; do
   cd $i
     make KERN_DIR=$KERNELPATH
     install -m 0644 $i.ko $PKG/lib/modules/$KERNEL/misc/
diff --git a/system/virtualbox-kernel-addons/virtualbox-kernel-addons.info b/system/virtualbox-kernel-addons/virtualbox-kernel-addons.info
index 33c005b4fe..6b86b209b4 100644
--- a/system/virtualbox-kernel-addons/virtualbox-kernel-addons.info
+++ b/system/virtualbox-kernel-addons/virtualbox-kernel-addons.info
@@ -1,8 +1,8 @@
 PRGNAM="virtualbox-kernel-addons"
-VERSION="5.0.40"
+VERSION="5.2.8"
 HOMEPAGE="https://www.virtualbox.org"
-DOWNLOAD="http://www.liwjatan.at/files/src/virtualbox-kernel-addons/virtualbox-kernel-addons-5.0.40.tar.xz"
-MD5SUM="6146afd44b37c65bd7acc01e067b6e86"
+DOWNLOAD="http://www.liwjatan.at/files/src/virtualbox-kernel-addons/virtualbox-kernel-addons-5.2.8.tar.xz"
+MD5SUM="e4202f46e4adeb1da588a86fe51d58d5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/virtualbox-kernel/virtualbox-kernel.SlackBuild b/system/virtualbox-kernel/virtualbox-kernel.SlackBuild
index d879686802..4215f0ea98 100644
--- a/system/virtualbox-kernel/virtualbox-kernel.SlackBuild
+++ b/system/virtualbox-kernel/virtualbox-kernel.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for virtualbox-kernel
 
-# Copyright 2008-2019 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2020 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,8 +25,8 @@
 # Modified by SlackBuilds.org
 
 PRGNAM=virtualbox-kernel
-VERSION=${VERSION:-5.0.40}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-6.1.16}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 KERNEL=${KERNEL:-$(uname -r)}
@@ -67,21 +67,7 @@ find -L . \
 
 if ! [ "${HARDENING:-yes}" = "yes" ]; then
   sed -i "s/ -DVBOX_WITH_HARDENING//g" \
-   {vboxdrv,vboxnetadp,vboxnetflt,vboxpci}/Makefile
-fi
-
-KERNEL_LOCALVERSION=$(zgrep "CONFIG_LOCALVERSION=" /proc/config.gz | cut -d '"' -f 2)
-if [ -z "$KERNEL_LOCALVERSION" ]; then
-  KERNEL_MINOR=$(echo $KERNEL | cut -d "." -f 2)
-  KERNEL_PATCH=$(echo $KERNEL | cut -d "." -f 3)
-else
-  KERNEL_MINOR=$(echo $KERNEL | sed "s|$KERNEL_LOCALVERSION||" | cut -d "." -f 2)
-  KERNEL_PATCH=$(echo $KERNEL | sed "s|$KERNEL_LOCALVERSION||" | cut -d "." -f 3)
-fi
-
-# Work around API break introduced in kernel 4.4.168
-if [ "$KERNEL_MINOR" = 4 -a "$KERNEL_PATCH" -ge 168 ]; then
-  sed -i "s|KERNEL_VERSION(4, 9, 0)|KERNEL_VERSION(4, 4, 168)|" vboxdrv/r0drv/linux/memobj-r0drv-linux.c
+   {vboxdrv,vboxnetadp,vboxnetflt}/Makefile
 fi
 
 make KERN_DIR=${KERNELPATH}
@@ -90,7 +76,6 @@ mkdir -p $PKG/lib/modules/$KERNEL/misc
 install -m 0644 vboxdrv.ko $PKG/lib/modules/$KERNEL/misc/
 install -m 0644 vboxnetflt.ko $PKG/lib/modules/$KERNEL/misc/
 install -m 0644 vboxnetadp.ko $PKG/lib/modules/$KERNEL/misc/
-install -m 0644 vboxpci.ko $PKG/lib/modules/$KERNEL/misc/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$PKG_VERS
 cat $CWD/COPYING > $PKG/usr/doc/$PRGNAM-$PKG_VERS/COPYING
diff --git a/system/virtualbox-kernel/virtualbox-kernel.info b/system/virtualbox-kernel/virtualbox-kernel.info
index deded0026e..dd19e0aae3 100644
--- a/system/virtualbox-kernel/virtualbox-kernel.info
+++ b/system/virtualbox-kernel/virtualbox-kernel.info
@@ -1,8 +1,8 @@
 PRGNAM="virtualbox-kernel"
-VERSION="5.0.40"
+VERSION="6.1.16"
 HOMEPAGE="https://www.virtualbox.org"
-DOWNLOAD="http://www.liwjatan.at/files/src/virtualbox-kernel/virtualbox-kernel-5.0.40.tar.xz"
-MD5SUM="475de2d0a915ce7c0c623ac50696bb79"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/virtualbox-kernel-6.1.16.tar.xz"
+MD5SUM="9f697000cfe206c100466a3a640d664d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/virtualbox/006-rdesktop-vrdp-keymap-path.patch b/system/virtualbox/006-rdesktop-vrdp-keymap-path.patch
index 46c72c1ccf..217aa4970b 100644
--- a/system/virtualbox/006-rdesktop-vrdp-keymap-path.patch
+++ b/system/virtualbox/006-rdesktop-vrdp-keymap-path.patch
@@ -1,6 +1,6 @@
 # 2015 © Sébastien Luttringer
---- a/src/VBox/RDP/client-1.8.3/Makefile.kmk 2013-02-19 23:12:20.207464901 +0100
-+++ b/src/VBox/RDP/client-1.8.3/Makefile.kmk 2014-01-04 04:17:26.700618600 +0100
+--- a/src/VBox/RDP/client-1.8.4/Makefile.kmk 2013-02-19 23:12:20.207464901 +0100
++++ b/src/VBox/RDP/client-1.8.4/Makefile.kmk 2014-01-04 04:17:26.700618600 +0100
 @@ -41,7 +41,7 @@
  	EGD_SOCKET=\"/var/run/egd-pool\" WITH_RDPSND=1 HAVE_DIRENT_H=1 \
  	HAVE_ICONV=1 HAVE_SYS_STATVFS_H=1 \
diff --git a/system/virtualbox/10-virtualbox.rules b/system/virtualbox/10-virtualbox.rules
index cdddafb97c..db7ade9e0a 100644
--- a/system/virtualbox/10-virtualbox.rules
+++ b/system/virtualbox/10-virtualbox.rules
@@ -1,7 +1,8 @@
 KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660"
 KERNEL=="vboxdrvu", NAME="vboxdrvu", OWNER="root", GROUP="root", MODE="0666"
 KERNEL=="vboxnetctl", NAME="vboxnetctl", OWNER="root", GROUP="vboxusers", MODE="0660"
-SUBSYSTEM=="usb_device", ACTION=="add", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
+
+SUBSYSTEM=="usb_device", ACTION=="add", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
+SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
 SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
 SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
diff --git a/system/virtualbox/LocalConfig.kmk b/system/virtualbox/LocalConfig.kmk
index 379c93fb45..8003032c10 100644
--- a/system/virtualbox/LocalConfig.kmk
+++ b/system/virtualbox/LocalConfig.kmk
@@ -5,6 +5,7 @@ DEFS += RTPATH_APP_PRIVATE=\"/usr/share/virtualbox\"
 # don't build testcases to save time, they are not needed for the package
 VBOX_WITH_TESTCASES     :=
 VBOX_WITH_TESTSUITE     :=
+VBOX_WITH_VALIDATIONKIT :=
 
 # don't build guest-additions, they will come in a separate build
 VBOX_WITHOUT_ADDITIONS  := 1
@@ -32,3 +33,13 @@ VBOX_JAVA_HOME := /usr/LIBDIR/java
 
 # Do not build docs from source. Depends on texlive...
 VBOX_WITHOUT_DOCS := 1
+
+# Use our CFLAGS
+VBOX_GCC_OPT := CXXFLAGS
+
+# Don't display update requests as we manage updates via packages
+VBOX_WITH_UPDATE_REQUEST :=
+
+# Build useful tools linked to testcases
+VBOX_WITH_VBOX_IMG     := 1
+VBOX_WITH_VBOXIMGMOUNT := 1
diff --git a/system/virtualbox/vboxdrv.sh-setup.diff b/system/virtualbox/vboxdrv.sh-setup.diff
index 0adf8ec237..bb2be6fc89 100644
--- a/system/virtualbox/vboxdrv.sh-setup.diff
+++ b/system/virtualbox/vboxdrv.sh-setup.diff
@@ -1,93 +1,299 @@
---- VirtualBox-4.3.4.orig/src/VBox/Installer/linux/vboxdrv.sh.in	2013-11-29 20:24:07.000000000 +0100
-+++ VirtualBox-4.3.4/src/VBox/Installer/linux/vboxdrv.sh.in	2013-12-08 18:08:09.667571974 +0100
-@@ -44,17 +44,13 @@
+--- VirtualBox-6.1.4.orig/src/VBox/Installer/linux/vboxdrv.sh	2020-02-18 18:20:19.000000000 +0100
++++ VirtualBox-6.1.4/src/VBox/Installer/linux/vboxdrv.sh	2020-02-22 14:33:41.141337430 +0100
+@@ -61,23 +61,8 @@
+ export USERNAME
+ export USER=$USERNAME
  
- if [ -n "$INSTALL_DIR" ]; then
-     VBOXMANAGE="$INSTALL_DIR/VBoxManage"
--    MODULE_SRC="$INSTALL_DIR/src/vboxhost"
- else
-     VBOXMANAGE="/usr/lib/virtualbox/VBoxManage"
+-if test -n "${INSTALL_DIR}" && test -x "${INSTALL_DIR}/VirtualBox"; then
+-    MODULE_SRC="${INSTALL_DIR}/src/vboxhost"
+-elif test -x /usr/lib/virtualbox/VirtualBox; then
+-    INSTALL_DIR=/usr/lib/virtualbox
 -    MODULE_SRC="/usr/share/virtualbox/src/vboxhost"
- fi
--BUILDINTMP="$MODULE_SRC/build_in_tmp"
--DODKMS="$MODULE_SRC/do_dkms"
+-elif test -x "${SCRIPT_DIR}/VirtualBox"; then
+-    # Executing from the build directory
+-    INSTALL_DIR="${SCRIPT_DIR}"
+-    MODULE_SRC="${INSTALL_DIR}/src"
+-else
+-    # Silently exit if the package was uninstalled but not purged.
+-    # Applies to Debian packages only (but shouldn't hurt elsewhere)
+-    exit 0
+-fi
+ VIRTUALBOX="${INSTALL_DIR}/VirtualBox"
+ VBOXMANAGE="${INSTALL_DIR}/VBoxManage"
+-BUILDINTMP="${MODULE_SRC}/build_in_tmp"
+ if test -u "${VIRTUALBOX}"; then
+     GROUP=root
+     DEVICE_MODE=0600
+@@ -148,125 +133,6 @@
+     echo "${1}" >> "${LOG}"
+ }
+ 
+-module_build_log()
+-{
+-    setup_log
+-    echo "${1}" | egrep -v \
+-        "^test -e include/generated/autoconf.h|^echo >&2|^/bin/false\)$" \
+-        >> "${LOG}"
+-}
+-
+-## Output the vboxdrv part of our udev rule.  This is redirected to the right file.
+-udev_write_vboxdrv() {
+-    VBOXDRV_GRP="$1"
+-    VBOXDRV_MODE="$2"
+-
+-    echo "KERNEL==\"vboxdrv\", NAME=\"vboxdrv\", OWNER=\"root\", GROUP=\"$VBOXDRV_GRP\", MODE=\"$VBOXDRV_MODE\""
+-    echo "KERNEL==\"vboxdrvu\", NAME=\"vboxdrvu\", OWNER=\"root\", GROUP=\"root\", MODE=\"0666\""
+-    echo "KERNEL==\"vboxnetctl\", NAME=\"vboxnetctl\", OWNER=\"root\", GROUP=\"$VBOXDRV_GRP\", MODE=\"$VBOXDRV_MODE\""
+-}
+-
+-## Output the USB part of our udev rule.  This is redirected to the right file.
+-udev_write_usb() {
+-    INSTALLATION_DIR="$1"
+-    USB_GROUP="$2"
+-
+-    echo "SUBSYSTEM==\"usb_device\", ACTION==\"add\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh \$major \$minor \$attr{bDeviceClass}${USB_GROUP}\""
+-    echo "SUBSYSTEM==\"usb\", ACTION==\"add\", ENV{DEVTYPE}==\"usb_device\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh \$major \$minor \$attr{bDeviceClass}${USB_GROUP}\""
+-    echo "SUBSYSTEM==\"usb_device\", ACTION==\"remove\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh --remove \$major \$minor\""
+-    echo "SUBSYSTEM==\"usb\", ACTION==\"remove\", ENV{DEVTYPE}==\"usb_device\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh --remove \$major \$minor\""
+-}
+-
+-## Generate our udev rule file.  This takes a change in udev rule syntax in
+-## version 55 into account.  It only creates rules for USB for udev versions
+-## recent enough to support USB device nodes.
+-generate_udev_rule() {
+-    VBOXDRV_GRP="$1"      # The group owning the vboxdrv device
+-    VBOXDRV_MODE="$2"     # The access mode for the vboxdrv device
+-    INSTALLATION_DIR="$3" # The directory VirtualBox is installed in
+-    USB_GROUP="$4"        # The group that has permission to access USB devices
+-    NO_INSTALL="$5"       # Set this to "1" to remove but not re-install rules
+-
+-    # Extra space!
+-    case "$USB_GROUP" in ?*) USB_GROUP=" $USB_GROUP" ;; esac
+-    case "$NO_INSTALL" in "1") return ;; esac
+-    udev_write_vboxdrv "$VBOXDRV_GRP" "$VBOXDRV_MODE"
+-    udev_write_usb "$INSTALLATION_DIR" "$USB_GROUP"
+-}
+-
+-## Install udev rule (disable with INSTALL_NO_UDEV=1 in
+-## /etc/default/virtualbox).
+-install_udev() {
+-    VBOXDRV_GRP="$1"      # The group owning the vboxdrv device
+-    VBOXDRV_MODE="$2"     # The access mode for the vboxdrv device
+-    INSTALLATION_DIR="$3" # The directory VirtualBox is installed in
+-    USB_GROUP="$4"        # The group that has permission to access USB devices
+-    NO_INSTALL="$5"       # Set this to "1" to remove but not re-install rules
+-
+-    if test -d /etc/udev/rules.d; then
+-        generate_udev_rule "$VBOXDRV_GRP" "$VBOXDRV_MODE" "$INSTALLATION_DIR" \
+-                           "$USB_GROUP" "$NO_INSTALL"
+-    fi
+-    # Remove old udev description file
+-    rm -f /etc/udev/rules.d/10-vboxdrv.rules 2> /dev/null
+-}
+-
+-## Create a usb device node for a given sysfs path to a USB device.
+-install_create_usb_node_for_sysfs() {
+-    path="$1"           # sysfs path for the device
+-    usb_createnode="$2" # Path to the USB device node creation script
+-    usb_group="$3"      # The group to give ownership of the node to
+-    if test -r "${path}/dev"; then
+-        dev="`cat "${path}/dev" 2> /dev/null`"
+-        major="`expr "$dev" : '\(.*\):' 2> /dev/null`"
+-        minor="`expr "$dev" : '.*:\(.*\)' 2> /dev/null`"
+-        class="`cat ${path}/bDeviceClass 2> /dev/null`"
+-        sh "${usb_createnode}" "$major" "$minor" "$class" \
+-              "${usb_group}" 2>/dev/null
+-    fi
+-}
+-
+-udev_rule_file=/etc/udev/rules.d/60-vboxdrv.rules
+-sysfs_usb_devices="/sys/bus/usb/devices/*"
+-
+-## Install udev rules and create device nodes for usb access
+-setup_usb() {
+-    VBOXDRV_GRP="$1"      # The group that should own /dev/vboxdrv
+-    VBOXDRV_MODE="$2"     # The mode to be used for /dev/vboxdrv
+-    INSTALLATION_DIR="$3" # The directory VirtualBox is installed in
+-    USB_GROUP="$4"        # The group that should own the /dev/vboxusb device
+-                          # nodes unless INSTALL_NO_GROUP=1 in
+-                          # /etc/default/virtualbox.  Optional.
+-    usb_createnode="$INSTALLATION_DIR/VBoxCreateUSBNode.sh"
+-    # install udev rule (disable with INSTALL_NO_UDEV=1 in
+-    # /etc/default/virtualbox)
+-    if [ "$INSTALL_NO_GROUP" != "1" ]; then
+-        usb_group=$USB_GROUP
+-        vboxdrv_group=$VBOXDRV_GRP
+-    else
+-        usb_group=root
+-        vboxdrv_group=root
+-    fi
+-    install_udev "${vboxdrv_group}" "$VBOXDRV_MODE" \
+-                 "$INSTALLATION_DIR" "${usb_group}" \
+-                 "$INSTALL_NO_UDEV" > ${udev_rule_file}
+-    # Build our device tree
+-    for i in ${sysfs_usb_devices}; do  # This line intentionally without quotes.
+-        install_create_usb_node_for_sysfs "$i" "${usb_createnode}" \
+-                                          "${usb_group}"
+-    done
+-}
+-
+-cleanup_usb()
+-{
+-    # Remove udev description file
+-    rm -f /etc/udev/rules.d/60-vboxdrv.rules
+-    rm -f /etc/udev/rules.d/10-vboxdrv.rules
+-
+-    # Remove our USB device tree
+-    rm -rf /dev/vboxusb
+-}
+-
+ start()
+ {
+     begin_msg "Starting VirtualBox services" console
+@@ -287,10 +153,7 @@
+             failure "Cannot remove $DEVICE"
+         fi
+         if ! $MODPROBE vboxdrv > /dev/null 2>&1; then
+-            setup
+-            if ! $MODPROBE vboxdrv > /dev/null 2>&1; then
+-                failure "modprobe vboxdrv failed. Please use 'dmesg' to find out why"
+-            fi
++            failure "modprobe vboxdrv failed. Please use 'dmesg' to find out why"
+         fi
+         sleep .2
+     fi
+@@ -337,8 +200,6 @@
+         mkdir -p -m 0750 /dev/vboxusb 2>/dev/null
+         chown root:vboxusers /dev/vboxusb 2>/dev/null
+     fi
+-    # Remove any kernel modules left over from previously installed kernels.
+-    cleanup only_old
+     succ_msg "VirtualBox services started"
+ }
  
- # silently exit if the package was uninstalled but not purged,
- # applies to Debian packages only (but shouldn't hurt elsewhere)
--[ ! -f /etc/debian_release -o -x $VBOXMANAGE -a -x $BUILDINTMP ] || exit 0
-+[ ! -f /etc/debian_release -o -x $VBOXMANAGE ] || exit 0
+@@ -419,102 +280,10 @@
+     fi
+ }
  
- if [ -n "$NOLSB" ]; then
-     if [ -f /etc/redhat-release ]; then
-@@ -295,70 +291,7 @@
+-cleanup()
+-{
+-    # If this is set, only remove kernel modules for no longer installed
+-    # kernels.  Note that only generated kernel modules should be placed
+-    # in /lib/modules/*/misc.  Anything that we should not remove automatically
+-    # should go elsewhere.
+-    only_old="${1}"
+-    for i in /lib/modules/*; do
+-        # Check whether we are only cleaning up for uninstalled kernels.
+-        test -n "${only_old}" && test -e "${i}/kernel/drivers" && continue
+-        # We could just do "rm -f", but we only want to try deleting folders if
+-        # we are sure they were ours, i.e. they had our modules in beforehand.
+-        if    test -e "${i}/misc/vboxdrv.ko" \
+-           || test -e "${i}/misc/vboxnetadp.ko" \
+-           || test -e "${i}/misc/vboxnetflt.ko" \
+-           || test -e "${i}/misc/vboxpci.ko"; then
+-            rm -f "${i}/misc/vboxdrv.ko" "${i}/misc/vboxnetadp.ko" \
+-                  "${i}/misc/vboxnetflt.ko" "${i}/misc/vboxpci.ko"
+-            version=`expr "${i}" : "/lib/modules/\(.*\)"`
+-            depmod -a "${version}"
+-            sync
+-        fi
+-        # Remove the kernel version folder if it was empty except for us.
+-        test   "`echo ${i}/misc/* ${i}/misc/.?* ${i}/* ${i}/.?*`" \
+-             = "${i}/misc/* ${i}/misc/.. ${i}/misc ${i}/.." &&
+-            rmdir "${i}/misc" "${i}"  # We used to leave empty folders.
+-    done
+-}
+-
  # setup_script
  setup()
  {
--    stop
--    DKMS=`which dkms 2>/dev/null`
--    if [ -n "$DKMS" ]; then
--      begin_msg "Uninstalling old VirtualBox DKMS kernel modules"
--      $DODKMS uninstall vboxhost vboxdrv vboxnetflt vboxnetadp > $LOG
--      succ_msg
+-    begin_msg "Building VirtualBox kernel modules" console
+-    log "Building the main VirtualBox module."
+-    if ! myerr=`$BUILDINTMP \
+-        --save-module-symvers /tmp/vboxdrv-Module.symvers \
+-        --module-source "$MODULE_SRC/vboxdrv" \
+-        --no-print-directory install 2>&1`; then
+-        "${INSTALL_DIR}/check_module_dependencies.sh" || exit 1
+-        log "Error building the module:"
+-        module_build_log "$myerr"
+-        failure "Look at $LOG to find out what went wrong"
 -    fi
--    if find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|grep -q vboxpci; then
--        begin_msg "Removing old VirtualBox pci kernel module"
--        find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|xargs rm -f 2>/dev/null
--        succ_msg
--    fi  
--    if find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then
--        begin_msg "Removing old VirtualBox netadp kernel module"
--        find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null
--        succ_msg
--    fi  
--    if find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|grep -q vboxnetflt; then
--        begin_msg "Removing old VirtualBox netflt kernel module"
--        find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|xargs rm -f 2>/dev/null
--        succ_msg
--    fi  
--    if find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then
--        begin_msg "Removing old VirtualBox kernel module"
--        find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null
--        succ_msg
+-    log "Building the net filter module."
+-    if ! myerr=`$BUILDINTMP \
+-        --use-module-symvers /tmp/vboxdrv-Module.symvers \
+-        --module-source "$MODULE_SRC/vboxnetflt" \
+-        --no-print-directory install 2>&1`; then
+-        log "Error building the module:"
+-        module_build_log "$myerr"
+-        failure "Look at $LOG to find out what went wrong"
 -    fi
--    if [ -n "$DKMS" ]; then
--      begin_msg "Trying to register the VirtualBox kernel modules using DKMS"
--      if ! $DODKMS install vboxhost $VERSION >> $LOG; then
--        fail_msg "Failed, trying without DKMS"
--        DKMS=""
--      fi
+-    log "Building the net adaptor module."
+-    if ! myerr=`$BUILDINTMP \
+-        --use-module-symvers /tmp/vboxdrv-Module.symvers \
+-        --module-source "$MODULE_SRC/vboxnetadp" \
+-        --no-print-directory install 2>&1`; then
+-        log "Error building the module:"
+-        module_build_log "$myerr"
+-        failure "Look at $LOG to find out what went wrong"
 -    fi
--    if [ -z "$DKMS" ]; then
--      begin_msg "Recompiling VirtualBox kernel modules"
--      if ! $BUILDINTMP \
--          --save-module-symvers /tmp/vboxdrv-Module.symvers \
--          --module-source "$MODULE_SRC/vboxdrv" \
--          --no-print-directory install >> $LOG 2>&1; then
--          failure "Look at $LOG to find out what went wrong"
--      fi
--      if ! $BUILDINTMP \
--          --use-module-symvers /tmp/vboxdrv-Module.symvers \
--          --module-source "$MODULE_SRC/vboxnetflt" \
--          --no-print-directory install >> $LOG 2>&1; then
--          failure "Look at $LOG to find out what went wrong"
--      fi
--      if ! $BUILDINTMP \
--          --use-module-symvers /tmp/vboxdrv-Module.symvers \
--          --module-source "$MODULE_SRC/vboxnetadp" \
--          --no-print-directory install >> $LOG 2>&1; then
--          failure "Look at $LOG to find out what went wrong"
--      fi
--      if ! $BUILDINTMP \
--          --use-module-symvers /tmp/vboxdrv-Module.symvers \
--          --module-source "$MODULE_SRC/vboxpci" \
--          --no-print-directory install >> $LOG 2>&1; then
--          failure "Look at $LOG to find out what went wrong"
--      fi
+-    if test -e "$MODULE_SRC/vboxpci"; then
+-        log "Building the PCI pass-through module."
+-        if ! myerr=`$BUILDINTMP \
+-            --use-module-symvers /tmp/vboxdrv-Module.symvers \
+-            --module-source "$MODULE_SRC/vboxpci" \
+-            --no-print-directory install 2>&1`; then
+-            log "Error building the module:"
+-            module_build_log "$myerr"
+-            failure "Look at $LOG to find out what went wrong"
+-        fi
 -    fi
 -    rm -f /etc/vbox/module_not_compiled
--    succ_msg
--    start
+-    depmod -a
+-    sync
+-    succ_msg "VirtualBox kernel modules built"
+-    # Secure boot on Ubuntu and Debian.
+-    if test -n "$HAVE_SEC_BOOT" &&
+-        type update-secureboot-policy >/dev/null 2>&1; then
+-        SHIM_NOTRIGGER=y update-secureboot-policy --new-key
+-    fi
+-    if test -f "$DEB_PUB_KEY" && test -f "$DEB_PRIV_KEY"; then
+-        HAVE_DEB_KEY=true
+-        for i in $MODULE_LIST; do
+-            kmodsign sha512 /var/lib/shim-signed/mok/MOK.priv \
+-                /var/lib/shim-signed/mok/MOK.der \
+-                /lib/modules/"$KERN_VER"/misc/"$i".ko
+-        done
+-        # update-secureboot-policy "expects" DKMS modules.
+-        # Work around this and talk to the authors as soon
+-        # as possible to fix it.
+-        mkdir -p /var/lib/dkms/vbox-temp
+-        update-secureboot-policy --enroll-key 2>/dev/null ||
+-            begin_msg "Failed to enroll secure boot key." console
+-        rmdir -p /var/lib/dkms/vbox-temp 2>/dev/null
+-    fi
 +    echo "Not implemented! Please use the virtualbox-kernel.SlackBuild available at SlackBuilds.org instead."
  }
  
  dmnstatus()
+@@ -564,20 +333,7 @@
+     stop && start
+     ;;
+ setup)
+-    test -n "${2}" && export KERN_VER="${2}"
+-    # Create udev rule and USB device nodes.
+-    ## todo Wouldn't it make more sense to install the rule to /lib/udev?  This
+-    ## is not a user-created configuration file after all.
+-    ## todo Do we need a udev rule to create /dev/vboxdrv[u] at all?  We have
+-    ## working fall-back code here anyway, and the "right" code is more complex
+-    ## than the fall-back.  Unnecessary duplication?
+-    stop && cleanup
+-    setup_usb "$GROUP" "$DEVICE_MODE" "$INSTALL_DIR"
+-    start
+-    ;;
+-cleanup)
+-    stop && cleanup
+-    cleanup_usb
++    setup
+     ;;
+ force-reload)
+     stop
diff --git a/system/virtualbox/virtualbox-gsoap.patch b/system/virtualbox/virtualbox-gsoap.patch
deleted file mode 100644
index a8ba6f549c..0000000000
--- a/system/virtualbox/virtualbox-gsoap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -u -r VirtualBox-5.0.10.orig/src/VBox/Main/webservice/Makefile.kmk VirtualBox-5.0.10/src/VBox/Main/webservice/Makefile.kmk
---- VirtualBox-5.0.10.orig/src/VBox/Main/webservice/Makefile.kmk	2015-11-10 18:06:29.000000000 +0100
-+++ VirtualBox-5.0.10/src/VBox/Main/webservice/Makefile.kmk	2015-11-22 09:58:21.669118291 +0100
-@@ -159,7 +159,6 @@
- RECOMPILE_ON_MAKEFILE_CURRENT := $(MAKEFILE_CURRENT)
- 
- PATH_TARGET_SOAPDEMOXML       := $(VBOXWEB_OUT_DIR)/demo_soapxml
--PATH_TARGET_SOAPDEMOHEADERS   := $(VBOXWEB_OUT_DIR)/demo_headers
- PATH_TARGET_SOAPDEMONSMAPS    := $(VBOXWEB_OUT_DIR)/demo_namespacemaps
- PATH_TARGET_WEBTEST           := $(VBOXWEB_OUT_DIR)/webtest
- 
-@@ -515,8 +514,6 @@
- 	$(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts \
- 	$(wildcard $(PATH_TARGET_SOAPDEMOXML)/*) \
- 	$(PATH_TARGET_SOAPDEMOXML)/dummy_file \
--	$(wildcard $(PATH_TARGET_SOAPDEMOHEADERS)/*) \
--	$(PATH_TARGET_SOAPDEMOHEADERS)/dummy_file \
- 	$(wildcard $(PATH_TARGET_SOAPDEMONSMAPS)/*) \
- 	$(PATH_TARGET_SOAPDEMONSMAPS)/dummy_file
- 
-@@ -695,17 +692,14 @@
- # any more. Ignoring the exit code is the simple solution, accepting the error.
- $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts: $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts | $$(dir $$@)
- 	$(RM) -f $@
--	$(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMOHEADERS) $(PATH_TARGET_SOAPDEMONSMAPS)
-+	$(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMONSMAPS)
- ifdef VBOX_GSOAP_VERBOSE
- 	$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/*.req.xml $(VBOXWEB_OUT_DIR)/*.res.xml $(PATH_TARGET_SOAPDEMOXML)/
- endif
--	-$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/soapvbox*.h $(PATH_TARGET_SOAPDEMOHEADERS)/
- 	$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/vboxBinding.nsmap $(PATH_TARGET_SOAPDEMONSMAPS)/
- 	$(APPEND) $@ done
- 
--$(PATH_TARGET_SOAPDEMONSMAPS) \
--$(PATH_TARGET_SOAPDEMOHEADERS)/soapvboxBindingProxy.h \
--$(PATH_TARGET_SOAPDEMOHEADERS)/soapvboxBindingObject.h: $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts
-+$(PATH_TARGET_SOAPDEMONSMAPS): $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts
- 
- # soapcpp2 -2: generate SOAP 1.2 calls
- # soapcpp2 -S: server-side code only
diff --git a/system/virtualbox/virtualbox.SlackBuild b/system/virtualbox/virtualbox.SlackBuild
index 1048ea0771..e239e42082 100644
--- a/system/virtualbox/virtualbox.SlackBuild
+++ b/system/virtualbox/virtualbox.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for virtualbox-ose
 
-# Copyright 2008-2017 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2020 Heinz Wiesinger, Amsterdam, The Netherlands
 # Copyright 2008 Mauro Giachero <mauro.giachero@gmail.com>
 # All rights reserved.
 #
@@ -25,7 +25,7 @@
 
 PRGNAM=virtualbox
 SRCNAM=VirtualBox
-VERSION=${VERSION:-5.0.40}
+VERSION=${VERSION:-6.1.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,12 +62,14 @@ else
   harden="--disable-hardening"
 fi
 
-# Support for the qt4-frontend
+# Support for the Qt & SDL frontends
 if [ "${HEADLESS:-no}" = "no" ]; then
-  guiapp="VirtualBox VBoxSDL"
+  guiapp="VirtualBox VirtualBoxVM VBoxSDL"
+  suidgui="VirtualBoxVM VBoxSDL"
 else
   gui+=" --build-headless"
   guiapp=""
+  suidgui=""
 fi
 
 # Enable building of java bindings
@@ -132,17 +134,15 @@ MODE="755"
 # Use virtualbox-kernel.SlackBuild for this.
 patch -d src/VBox/Installer/linux -i $CWD/vboxdrv.sh-setup.diff
 
-# Fix building against newer versions of gsoap
-patch -p1 -i $CWD/virtualbox-gsoap.patch
-
 # Fix wrong path to rdesktop-vrdp-keymaps
 patch -p1 -i $CWD/006-rdesktop-vrdp-keymap-path.patch
 
 # Remove gcc version check
 sed -i 's/^check_gcc$/#check_gcc/' ./configure
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+# Use our CFLAGS
+sed -i "s|CXX_FLAGS=\"\"|CXX_FLAGS=\"$SLKCFLAGS -std=c++11\"|" ./configure
+
 ./configure \
   --disable-kmods \
   --enable-vde \
@@ -158,20 +158,16 @@ CXXFLAGS="$SLKCFLAGS" \
 
 cp $CWD/LocalConfig.kmk .
 sed -i "s|LIBDIR|lib$LIBDIRSUFFIX|" ./LocalConfig.kmk
+sed -i "s|CXXFLAGS|$SLKCFLAGS -std=c++11|" ./LocalConfig.kmk
 
 kmk -j ${JOBS} LOCALCFG=./LocalConfig.kmk
 
-# build VBoxFUSE
-cd src/VBox/ImageMounter/VBoxFUSE
-  kmk -j ${JOBS}
-cd -
-
 mkdir -p $PKG/usr/{lib$LIBDIRSUFFIX,share,include}/virtualbox \
   $PKG/usr/{bin,src} \
   $PKG/usr/share/{pixmaps,mime/packages} \
   $PKG/etc/{default,rc.d,vbox}
 
-for i in vboxdrv.sh.in vboxballoonctrl-service.sh vboxautostart-service.sh; do
+for i in vboxdrv.sh vboxballoonctrl-service.sh vboxautostart-service.sh; do
   SCRIPT=$(echo $i | cut -d "." -f 1)
   cp -f src/VBox/Installer/linux/$i $PKG/etc/rc.d/rc.$SCRIPT.new
   sed -i "s/%PACKAGE%/virtualbox/g" $PKG/etc/rc.d/rc.$SCRIPT.new
@@ -218,17 +214,15 @@ cd out/linux.$BUILDDIR/release/bin/
   install -m $MODE -g $GROUP VBoxSysInfo.sh $PKG/usr/share/virtualbox/
   install -m $MODE -g $GROUP VBoxCreateUSBNode.sh $PKG/usr/share/virtualbox/
   install -m $MODE -g $GROUP VBoxTunctl $PKG/usr/bin/
-  install -m $MODE -g $GROUP VBoxFUSE $PKG/usr/bin/
-  rm -f VBoxSysInfo.sh VBoxCreateUSBNode.sh VBoxTunctl VBoxFUSE
+  rm -f VBoxSysInfo.sh VBoxCreateUSBNode.sh VBoxTunctl
   mv * $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/
   chown -R root:$GROUP $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/
   chmod -R $MODE $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/
   mv $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/VBox.sh $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/VBox
 cd $TMP/$SRCNAM-${VERSION}
 
-for i in VBoxManage vboxmanage VBoxHeadless \
-  vboxheadless VBoxVRDP VBoxBalloonCtrl vboxballoonctrl \
-  VBoxAutostart vboxautostart $guiapp $vboxwebsrv; do
+for i in VBoxManage VBoxHeadless VBoxVRDP VBoxBalloonCtrl VBoxBugReport \
+  VBoxAutostart $guiapp $vboxwebsrv; do
   ln -s /usr/lib$LIBDIRSUFFIX/virtualbox/VBox $PKG/usr/bin/$i
 done
 
@@ -238,6 +232,9 @@ if [ "${HEADLESS:-no}" = "no" ]; then
   done
 fi
 
+ln -s /usr/lib$LIBDIRSUFFIX/virtualbox/vbox-img $PKG/usr/bin/
+ln -s /usr/lib$LIBDIRSUFFIX/virtualbox/vboximg-mount $PKG/usr/bin/
+
 if [ "$vboxwebsrv" = "vboxwebsrv" ]; then
   mkdir -p $PKG/var/{lib,log}/vboxweb
   chown vboxweb:vboxusers $PKG/var/{lib,log}/vboxweb
@@ -249,7 +246,7 @@ if [ "$vboxwebsrv" = "vboxwebsrv" ]; then
 fi
 
 if [ "$harden" = "--enable-hardening" ]; then
-  for i in VBoxHeadless $guiapp VBoxNetDHCP VBoxNetAdpCtl; do
+  for i in VBoxHeadless $suidgui VBoxNetDHCP VBoxNetAdpCtl VBoxNetNAT; do
     chmod 4711 $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/$i
   done
 fi
@@ -257,6 +254,7 @@ fi
 # install headers. Needed by some third party tools
 cp -rf include/* $PKG/usr/include/virtualbox/
 rm -f $PKG/usr/include/virtualbox/Makefile.kmk
+find $PKG/usr/include/virtualbox -name "Makefile.kup" -print0 | xargs -0 rm -f
 
 cp -f $CWD/VBoxGuestAdditions_$VERSION.iso \
   $PKG/usr/share/virtualbox/VBoxGuestAdditions.iso
diff --git a/system/virtualbox/virtualbox.info b/system/virtualbox/virtualbox.info
index 11fef8a32a..17288f25c4 100644
--- a/system/virtualbox/virtualbox.info
+++ b/system/virtualbox/virtualbox.info
@@ -1,14 +1,14 @@
 PRGNAM="virtualbox"
-VERSION="5.0.40"
+VERSION="6.1.16"
 HOMEPAGE="https://www.virtualbox.org"
-DOWNLOAD="http://download.virtualbox.org/virtualbox/5.0.40/VirtualBox-5.0.40.tar.bz2 \
-          http://download.virtualbox.org/virtualbox/5.0.40/VBoxGuestAdditions_5.0.40.iso \
-          http://download.virtualbox.org/virtualbox/5.0.40/UserManual.pdf \
-          http://download.virtualbox.org/virtualbox/5.0.40/SDKRef.pdf"
-MD5SUM="53b259e48a137b0185c169590e2dcb77 \
-        71afc65e09d1d4d02020f0403ac47622 \
-        bdc4bf38dd3ed786385044841a4af147 \
-        684ac3f7d17532cd8396ea83ba1d57ea"
+DOWNLOAD="http://download.virtualbox.org/virtualbox/6.1.16/VirtualBox-6.1.16.tar.bz2 \
+          http://download.virtualbox.org/virtualbox/6.1.16/VBoxGuestAdditions_6.1.16.iso \
+          http://download.virtualbox.org/virtualbox/6.1.16/UserManual.pdf \
+          http://download.virtualbox.org/virtualbox/6.1.16/SDKRef.pdf"
+MD5SUM="a12a647f6c114f2cb1571089b36841fe \
+        5710cdc38e4d7185b3df1c969b4cb267 \
+        774420c89b430a631cdc96f94627153f \
+        3b39f35aabc441d1bcbb969024b759e8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="acpica virtualbox-kernel"
diff --git a/system/xdg-dbus-proxy/README b/system/xdg-dbus-proxy/README
new file mode 100644
index 0000000000..dfc102324e
--- /dev/null
+++ b/system/xdg-dbus-proxy/README
@@ -0,0 +1,3 @@
+xdg-dbus-proxy is a filtering proxy for D-Bus connections.
+It was originally part of the flatpak project, but it has been broken
+out as a standalone module to facilitate using it in other contexts.
diff --git a/system/xdg-dbus-proxy/slack-desc b/system/xdg-dbus-proxy/slack-desc
new file mode 100644
index 0000000000..1868fd972c
--- /dev/null
+++ b/system/xdg-dbus-proxy/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------------------------------------------------------|
+xdg-dbus-proxy: xdg-dbus-proxy (D-Bus proxy)
+xdg-dbus-proxy:
+xdg-dbus-proxy: xdg-dbus-proxy is a filtering proxy for D-Bus connections.
+xdg-dbus-proxy: It was originally part of the flatpak project, but it has been broken
+xdg-dbus-proxy: out as a standalone module to facilitate using it in other contexts.
+xdg-dbus-proxy:
+xdg-dbus-proxy: homepage: https://github.com/flatpak/xdg-dbus-proxy
+xdg-dbus-proxy:
+xdg-dbus-proxy:
+xdg-dbus-proxy:
+xdg-dbus-proxy:
diff --git a/system/fuse3/fuse3.SlackBuild b/system/xdg-dbus-proxy/xdg-dbus-proxy.SlackBuild
index 5b75bae99c..ace6df810a 100644
--- a/system/fuse3/fuse3.SlackBuild
+++ b/system/xdg-dbus-proxy/xdg-dbus-proxy.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for fuse3
+# Slackware build script for xdg-dbus-proxy
 
-# Copyright 2019 Vincent Batts, Raleigh, NC, USA
+# Copyright 2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=fuse3
-VERSION=${VERSION:-3.9.0}
+PRGNAM=xdg-dbus-proxy
+VERSION=${VERSION:-0.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-BASENAME=fuse
-SUFFIX=3
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -62,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $BASENAME-$VERSION
-tar xvf $CWD/$BASENAME-$VERSION.tar.xz
-cd $BASENAME-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -72,14 +69,19 @@ 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 {} \;
 
-meson build \
-	-Dexamples=false \
-	-Dudevrulesdir="/etc/udev/rules.d" \
-	--prefix="/usr" \
-	--mandir="/usr/man"
-ninja -C build
-DESTDIR=$PKG ninja -C build install
-rm -rf $PKG/dev $PKG/etc/udev
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+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
@@ -88,9 +90,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  README.md LICENSE LGPL2.txt GPL2.txt doc/ example/ \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING NEWS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/xdg-dbus-proxy/xdg-dbus-proxy.info b/system/xdg-dbus-proxy/xdg-dbus-proxy.info
new file mode 100644
index 0000000000..c3d4522e1f
--- /dev/null
+++ b/system/xdg-dbus-proxy/xdg-dbus-proxy.info
@@ -0,0 +1,10 @@
+PRGNAM="xdg-dbus-proxy"
+VERSION="0.1.2"
+HOMEPAGE="https://github.com/flatpak/xdg-dbus-proxy/"
+DOWNLOAD="https://github.com/flatpak/xdg-dbus-proxy/releases/download/0.1.2/xdg-dbus-proxy-0.1.2.tar.xz"
+MD5SUM="19cb184734e0f080dfe335fd9ffc61b1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
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 \
diff --git a/system/zerofree/README b/system/zerofree/README
deleted file mode 100644
index 14a43ae30e..0000000000
--- a/system/zerofree/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Zerofree is a utility which scans the free blocks in an ext2/3/4
-filesystem and fills any non-zero blocks with zeroes.
-
-This is useful if you have an ext2/3/4 virtual disk image
-(e.g. VirtualBox' .vdi) that you wish to compact.
-
-See project homepage for information and usage.
diff --git a/system/zerofree/slack-desc b/system/zerofree/slack-desc
deleted file mode 100644
index 864bdb3182..0000000000
--- a/system/zerofree/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-zerofree: zerofree (fills free blocks in an ext2/3/4 filesystem with zeroes)
-zerofree:
-zerofree: Zerofree is a utility which scans the free blocks in an ext2/3/4
-zerofree: filesystem and fills any non-zero blocks with zeroes.
-zerofree: This is useful if you have an ext2/3/4 virtual disk image
-zerofree: (e.g. VirtualBox' .vdi) that you wish to compact.
-zerofree: See project homepage for information and usage.
-zerofree:
-zerofree:
-zerofree: Homepage: http://intgat.tigress.co.uk/rmy/uml/index.html
-zerofree:
diff --git a/system/zerofree/zerofree.8 b/system/zerofree/zerofree.8
deleted file mode 100644
index fb6f277e7b..0000000000
--- a/system/zerofree/zerofree.8
+++ /dev/null
@@ -1,92 +0,0 @@
-.TH "ZEROFREE" "8" 
-.SH "NAME" 
-zerofree \(em zero free blocks from ext2, ext3 and ext4 file-systems 
-.SH "SYNOPSIS" 
-.PP 
-\fBzerofree\fR [\fB-n\fP]  [\fB-v\fP]  [\fB-f fillval\fP]  \fIfilesystem\fR 
-.SH "DESCRIPTION" 
-.PP 
-\fBzerofree\fR finds the unallocated, 
-blocks with non-zero value content in an ext2, ext3 or ext4 
-\fIfilesystem\fR (e.g. /dev/hda1) and 
-fills them with zeroes (or another octet of your choice). 
- 
- 
-.PP 
-Filling unused areas with zeroes is useful if the device on 
-which this file-system resides is a disk image. In this case, 
-depending on the type of disk image, a secondary utility may be 
-able to reduce the size of the disk image after zerofree has 
-been run.  
- 
-.PP 
-Filling unused areas may also be useful with solid-state 
-drives (SSDs). On some SSDs, filling blocks with ones (0xFF) 
-is reported to trigger Flash block erasure by the firmware, 
-possibly giving a write performance increase.  
- 
-.PP 
-The usual way to achieve the same result (zeroing the 
-unallocated blocks) is to run \fBdd\fR (1) to 
-create a file full of zeroes that takes up the entire free 
-space on the drive, and then delete this file. This has many 
-disadvantages, which zerofree alleviates:      
-.IP "   \(bu" 6 
-it is slow; 
-.IP "   \(bu" 6 
-it makes the disk image (temporarily) grow to its maximal 
-extent; 
-.IP "   \(bu" 6 
-it (temporarily) uses all free space on the disk, so other 
-concurrent write actions may fail.  
- 
-.PP 
-\fIfilesystem\fR has to be unmounted or 
-mounted read-only for \fBzerofree\fR to work. It 
-will exit with an error message if the 
-\fIfilesystem\fR is mounted writable. To 
-remount the root file-system readonly, you can first switch to 
-single user runlevel (\fBtelinit 1\fR) then use 
-\fBmount \-o remount,ro 
-\fIfilesystem\fR\fR.  
- 
-.PP 
-\fBzerofree\fR has been written to be run 
-from GNU/Linux systems installed as guest OSes inside a virtual 
-machine. In this case, it is typically run from within the guest 
-system, and a utility is then run from the host system to shrink 
-disk image (\fBVBoxManage modifyhd \-\-compact\fR, 
-provided with virtualbox, is able to do that for some disk image 
-formats).  
- 
-.PP 
-It may however be useful in other situations: for instance 
-it can be used to make it more difficult to retrieve deleted 
-data. Beware that securely deleting sensitive data is not in 
-general an easy task and usually requires writing several times 
-on the deleted blocks.  
- 
-.SH "OPTIONS" 
-.IP "\fB-n\fP         " 10 
-Perform a dry run  (do not modify the file-system); 
-.IP "\fB-v\fP         " 10 
-Be verbose; 
-.IP "\fB-f value\fP         " 10 
-Specify the octet value to fill empty blocks with (defaults to 
-0). Argument must be within the range 0 to 255. 
-.SH "SEE ALSO" 
-.PP 
-dd (1). 
-.SH "AUTHOR" 
-.PP 
-This manual page was written by Thibaut Paumard <paumard@users.sourceforge.net> for 
-the \fBDebian\fP system (but may be used by others).  Permission is 
-granted to copy, distribute and/or modify this document under 
-the terms of the GNU General Public License, Version 2 or any  
-later version published by the Free Software Foundation. 
- 
-.PP 
-On Debian systems, the complete text of the GNU General Public 
-License can be found in /usr/share/common-licenses/GPL-2. 
- 
-.\" created by instant / docbook-to-man, Mon 31 Mar 2014, 15:41 
diff --git a/system/zerofree/zerofree.SlackBuild b/system/zerofree/zerofree.SlackBuild
deleted file mode 100644
index a40dcdade4..0000000000
--- a/system/zerofree/zerofree.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for zerofree
-
-# Copyright 2011-2013 Roberto Neri, Palermo, 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.
-
-# 20180612 bkw: update to 1.1.1.
-# 20170122 bkw: update to 1.1.0, fix homepage/download URLs.
-# 20160803 bkw: update to 1.0.4, BUILD=1
-# 20141021 bkw: add man page, add sparsify, bump BUILD to 2.
-
-PRGNAM=zerofree
-VERSION=${VERSION:-1.1.1}
-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
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
-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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# No ./configure or "make install" provided
-make CFLAGS="$SLKCFLAGS"
-
-strip --strip-unneeded $PRGNAM 2> /dev/null
-
-mkdir -p $PKG/usr/sbin
-cp -a $PRGNAM $PKG/usr/sbin
-
-# This looks useful, include it.
-gcc $SLKCFLAGS -Wl,-s -o $PKG/usr/sbin/sparsify $CWD/sparsify.c -lext2fs
-
-# man page comes from Debian.
-mkdir -p $PKG/usr/man/man8
-gzip -9c $CWD/$PRGNAM.8 > $PKG/usr/man/man8/$PRGNAM.8.gz
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING $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/zerofree/zerofree.info b/system/zerofree/zerofree.info
deleted file mode 100644
index 51862897eb..0000000000
--- a/system/zerofree/zerofree.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="zerofree"
-VERSION="1.1.1"
-HOMEPAGE="http://frippery.org/uml/"
-DOWNLOAD="http://frippery.org/uml/zerofree-1.1.1.tgz \
-          http://frippery.org/uml/sparsify.c"
-MD5SUM="4f2d6bdba4212e54eb7dd22a8fbb6d29 \
-        919ad782c7120d1e4a9c0ccc9f45b8ef"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/system/zstd/README b/system/zstd/README
deleted file mode 100644
index 70e275669d..0000000000
--- a/system/zstd/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Zstd, short for Zstandard, is a fast lossless compression algorithm,
-targeting real-time compression scenarios at zlib-level and better
-compression ratios.
-
-Since 1.3.1, it is dual licensed as BSD and GPLv2.
diff --git a/system/zstd/slack-desc b/system/zstd/slack-desc
deleted file mode 100644
index 215674d549..0000000000
--- a/system/zstd/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-zstd: zstd (real-time compression algorithm)
-zstd:
-zstd: Zstandard, or zstd for short, is a real-time compression algorithm
-zstd: providing high compression ratios. It offers a very wide range of
-zstd: compression/speed trade-off, while being backed by a very fast
-zstd: decoder. It also offers a special mode for small data, called
-zstd: dictionary compression, and can create dictionaries from any sample
-zstd: set.
-zstd:
-zstd: Homepage: http://zstd.net/
-zstd:
diff --git a/system/zstd/zstd.SlackBuild b/system/zstd/zstd.SlackBuild
deleted file mode 100644
index 297b0b92f5..0000000000
--- a/system/zstd/zstd.SlackBuild
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for zstd
-
-# Copyright 2016-2019, Zhu Qun-Ying
-# 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=zstd
-VERSION=${VERSION:-1.4.4}
-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
-
-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
-zcat $CWD/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz | patch -p1 --verbose || exit 1
-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 {} \;
-
-# Compile it:
-make CFLAGS="$SLKCFLAGS"
-make CFLAGS="$SLKCFLAGS" -C contrib/pzstd
-
-# Install it:
-make \
-  prefix=/usr \
-  libdir=/usr/lib${LIBDIRSUFFIX} \
-  mandir=/usr/man \
-  DESTDIR=$PKG \
-  install
-install -Dm755 contrib/pzstd/pzstd $PKG/usr/bin/pzstd
-
-# Don't ship static library:
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.a
-
-# zstdmt as the same as zstd, so just make a symlink:
-( cd $PKG/usr/bin
-  ln -sf zstd zstdmt
-)
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/pzstd
-cp -a CONTRIBUTING* COPYING* LICENSE README* doc $PKG/usr/doc/$PRGNAM-$VERSION
-cp contrib/pzstd/README.md $PKG/usr/doc/$PRGNAM-$VERSION/pzstd-README.md
-
-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/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz b/system/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz
deleted file mode 100644
index 3e5d5d7c32..0000000000
--- a/system/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz
+++ /dev/null
diff --git a/system/zstd/zstd.info b/system/zstd/zstd.info
deleted file mode 100644
index 5f404b9774..0000000000
--- a/system/zstd/zstd.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="zstd"
-VERSION="1.4.4"
-HOMEPAGE="http://facebook.github.io/zstd/"
-DOWNLOAD="https://github.com/facebook/zstd/releases/download/v1.4.4/zstd-1.4.4.tar.gz"
-MD5SUM="487f7ee1562dee7c1c8adf85e2a63df9"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Zhu Qun-Ying"
-EMAIL="zhu.qunying@gmail.com"
author	Matteo Bernardini	2020-11-07 10:39:25 +0100
committer	Matteo Bernardini	2020-11-07 10:39:25 +0100
commit	69c0dd02dd77d45035c7458bbb3507bfd659bc47 (patch)
tree	67e0545ccec095bdced5501bd94b7a7c8c6ac70a /system
parent	47e77153bd7179d5081b4608265a62a12059e36f (diff)
download	slackbuilds-69c0dd02dd77d45035c7458bbb3507bfd659bc47.tar.gz