RPM: update build scripts for Fedora 33 / CentOS 8

56 files changed, 469 insertions, 142 deletions

diff --git a/redhat/docker/el5/Dockerfile.i686 b/redhat/docker/el5/Dockerfile.i686
index 39400e044..02659ef80 100644
--- a/redhat/docker/el5/Dockerfile.i686
+++ b/redhat/docker/el5/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM centos32:5
 
-ARG TDE_VERSION=14.0.7
+ARG TDE_VERSION=14.0.9
 ARG ARCH=i686
 
 # Add local repositories
diff --git a/redhat/docker/el5/Dockerfile.x86_64 b/redhat/docker/el5/Dockerfile.x86_64
index fc184f677..36506fc3b 100644
--- a/redhat/docker/el5/Dockerfile.x86_64
+++ b/redhat/docker/el5/Dockerfile.x86_64
@@ -1,33 +1,85 @@
 FROM centos:5
 
-ARG TDE_VERSION=14.0.7
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 # Add local repositories
-RUN rm -f /etc/yum.repos.d/*.repo
-ADD centos-5.repo /etc/yum.repos.d/centos-5.repo
-ADD epel-5.repo /etc/yum.repos.d/epel-5.repo
-ADD repoforge-5.repo /etc/yum.repos.d/repoforge-5.repo
-
-# Install Trinity build dependencies
-ADD packages.trinity /etc/yum.repos.d/packages
-RUN echo "multilib_policy=best" >>"/etc/yum.conf"
-RUN yum install -y setarch
-RUN setarch ${ARCH} yum update -y
-RUN setarch ${ARCH} yum install -y $(</etc/yum.repos.d/packages) || :
+COPY packages /packages
+RUN rpm -Uvh http://repo/repo/archives/centos/5/os/x86_64/CentOS/{curl-7.15.5-17.el5_9,libidn-0.6.5-1.1}.x86_64.rpm \
+ && echo "multilib_policy=best" >>/etc/yum.conf \
+ && cd /etc/yum.repos.d \
+ && rm -f *.repo \
+ && curl http://repo/repo/{centos5,epel5,repoforge5}.repo >repos.repo \
+ && rpm -e --nodeps --justdb libselinux \
+ && yum -y update \
+ && yum -y install $(</packages) || :
 
 # Avoid conflict with gnome-screensaver
-RUN setarch ${ARCH} yum remove -y gnome-screensaver
-RUN setarch ${ARCH} yum install -y --disablerepo="*" --enablerepo="centos-5-extras" xscreensaver
+RUN setarch ${ARCH} yum -y remove gnome-screensaver \
+ && setarch ${ARCH} yum -y install --disablerepo="*" --enablerepo="centos-extras" xscreensaver
 
-# Add YUM repository for locally built packages
-ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
-RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+# Updated build tools (not provided in centos5)
+# Distro-specific patches
+RUN rpm -Uvh http://repo/trinity/archives/el5/tools/RPMS/{noarch/autoconf-2.63-5.el5.noarch,noarch/automake-1.11.1-4.el5.noarch,x86_64/m4-1.4.13-5.el5.x86_64}.rpm \
+ && rpm -Uvh http://repo/trinity/archives/el5/trinity-14.0.4/RPMS/x86_64/trinity-poppler{,-devel}-0.12.4-1.el5.x86_64.rpm \
+ && chmod a+r /usr/libexec/utempter/utempter \
+ && sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|"
 
 # Add non-root user to build packages
-RUN useradd -m -s /bin/bash -u 1000 trinity
-RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
-ADD rpmmacros /home/trinity/.rpmmacros
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
 
-# Distro-specific patches
-RUN sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|"
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+RUN mkdir -p ${HOME}/rpmbuild/{BUILD,BUILDROOT,SOURCES,SPECS,RPMS/noarch,RPMS/${ARCH},SRPMS}
+
+# Build development packages
+RUN rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/file-5.04-30.el6.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/file.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/file{,-libs,-devel}-5*.rpm
+
+RUN rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/binutils-2.20.51.0.2-5.48.el6.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/binutils.spec --nodeps \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/binutils{,-devel}-2*.rpm
+
+RUN rpm -i --nomd5 http://fr2.rpmfind.net/linux/epel/6/SRPMS/Packages/p/pcsc-perl-1.4.14-2.el6.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/pcsc-perl.spec -e "s|%license|%doc|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/pcsc-perl.spec --define "__isa_bits 64" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm
+
+RUN rpm -i --nomd5 http://fr2.rpmfind.net/linux/epel/6/SRPMS/Packages/s/sword-1.7.3-2.el6.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/sword.spec -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/sword.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm
+
+RUN rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/gnuchess-5.07-14.1.el6.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/gnuchess.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-5*.rpm
+
+RUN rpm -i --nomd5 http://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-1.015-4.el7.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s|%license|%doc|" -e "/perl(AutoLoader)/ s|^|#|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" -e "/^make test/ s|^|#|" \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
+
+RUN rpm -i --nomd5 http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-ScanDeps-1.10-3.el7.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/perl-Module-ScanDeps.spec -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" -e "/^make test/ s|^|#|" \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-Module-ScanDeps.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-ScanDeps-*.rpm
+
+RUN rpm -i --nomd5 http://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer-1.041-2.el7.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s|%license|%doc|" -e "/^make test/ s|^|#|" -e "/^Summary:/ s|$|\nGroup: Development/Languages|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" -e "s|desktop-file-install|desktop-file-install --vendor=''|" \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec --define "_unpackaged_files_terminate_build 0" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps
+
+RPM rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/exempi-2.1.0-5.el6.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/exempi.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/exempi{,-devel}-2*.rpm
+ 
+RUN rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/pilot-link-0.12.4-6.el6.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/pilot-link.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel}-0*.rpm
+
+
+# sudo rm -f /usr/bin/gcc && sudo ln -sf /usr/bin/gcc44 /usr/bin/gcc
+# sudo rm -f /usr/bin/g++ && sudo ln -sf /usr/bin/g++44 /usr/bin/g++
+# sudo rm -f /usr/bin/c++ && sudo ln -sf /usr/bin/g++44 /usr/bin/c++
diff --git a/redhat/docker/el5/centos-5.repo b/redhat/docker/el5/centos-5.repo
deleted file mode 100644
index 135077b21..000000000
--- a/redhat/docker/el5/centos-5.repo
+++ /dev/null
@@ -1,30 +0,0 @@
-[centos-5-base]
-name=CentOS-5 - Base
-baseurl=http://repo/repo/archives/centos/5/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=1
-
-#released updates
-[centos-5-updates]
-name=CentOS-5 - Updates
-baseurl=http://repo/repo/archives/centos/5/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=1
-
-#additional packages that may be useful
-[centos-5-extras]
-name=CentOS-5 - Extras
-baseurl=http://repo/repo/archives/centos/5/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=1
-
-#additional packages that extend functionality of existing packages
-[centos-5-centosplus]
-name=CentOS-5 - Plus
-baseurl=http://repo/repo/archives/centos/5/centosplus/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
-enabled=1
diff --git a/redhat/docker/el5/epel-5.repo b/redhat/docker/el5/epel-5.repo
deleted file mode 100644
index f110938f8..000000000
--- a/redhat/docker/el5/epel-5.repo
+++ /dev/null
@@ -1,5 +0,0 @@
-[epel]
-name=epel
-baseurl=http://repo/repo/archives/epel/5/$basearch/
-enabled=1
-gpgcheck=0
diff --git a/redhat/docker/el5/packages.trinity b/redhat/docker/el5/packages
index 3e21635b2..dbbe2f017 100644
--- a/redhat/docker/el5/packages.trinity
+++ b/redhat/docker/el5/packages
@@ -4,9 +4,11 @@ aspell-devel
 audiofile-devel
 autotrace
 avahi-devel
+bash
 bind-devel
 binutils-devel
 bison
+bluez-libs-devel
 boost-devel
 bzip2-devel
 ccache
@@ -17,6 +19,7 @@ chmlib-devel
 chrpath
 clamav
 clamav-devel
+cln-devel
 clucene-core-devel
 cmake
 commoncpp2-devel
@@ -25,11 +28,14 @@ cpp
 cppunit-devel
 createrepo
 cryptsetup-luks-devel
+ctags
 cups-devel
 curl-devel
 db4-devel
 dbus-glib-devel
 dejagnu
+dirmngr
+dosfstools
 doxygen
 emacs
 esound-devel
@@ -38,6 +44,7 @@ expect
 fdupes
 ffmpeg-devel
 fftw-devel
+fipscheck
 flac-devel
 fontpackages-devel
 fribidi-devel
@@ -46,6 +53,9 @@ gcc
 gcc-c++
 gcc-gfortran
 gcc-java
+gcc44
+gcc44-c++
+GeoIP-devel
 gettext-devel
 glib-devel
 gmime-devel
@@ -70,6 +80,7 @@ icu
 ImageMagick-devel
 imake
 imlib-devel
+intltool
 jack-audio-connection-kit-devel
 jasper-devel
 java-1.4.2-gcj-compat-devel
@@ -131,6 +142,7 @@ libXtst-devel
 libXv-devel
 libXxf86dga-devel
 libXxf86vm-devel
+libyaz-devel
 libzrtpcpp-devel
 lm_sensors-devel
 meanwhile-devel
@@ -143,24 +155,39 @@ net-snmp-devel
 NetworkManager-glib-devel
 ocaml
 OpenEXR-devel
-openldap-devel
 openldap24-libs-devel
+openldap-devel
 opensc
 openslp-devel
 opensp-devel
+openssh
+openssh-clients
 pam-devel
 pciutils-devel
 pcre-devel
 pcsc-lite-devel
+pcsc-lite-libs
 perl
+perl-devel
+perl(Archive::Zip)
 perl(ExtUtils::MakeMaker)
+perl(Getopt::ArgvFile)
+perl(inc::Module::Install)
+perl(IPC::Run3)
+perl(Module::Pluggable)
+perl(Module::Signature)
+perl(prefork)
+perl(Test::Pod)
 perl(XML::Parser)
+php-cli
 pilot-link-devel
+pinentry
 pkcs11-helper-devel
 poppler-devel
 postgresql-devel
 pth-devel
 python-docutils
+rdesktop
 recode
 redhat-rpm-config
 rpm-build
@@ -171,28 +198,35 @@ sane-backends-devel
 scons
 SDL-devel
 setarch
+sharutils
 sip-devel
 speex-devel
 sqlite-devel
-sudo
 subversion-devel
+sudo
 t1lib-devel
 t1utils
 taglib-devel
 texinfo
 texinfo-tex
+torsocks
 transfig
 unixODBC-devel
 usbutils
 valgrind
+vim-enhanced
 wireless-tools-devel
 xine-lib-devel
+xinetd
 xmlto
 xorg-x11-font-utils
 xorg-x11-server-utils
 xscreensaver
+xscreensaver-extras
 xscreensaver-gl-base
 xscreensaver-gl-extras
-xscreensaver-extras
 xulrunner-devel
 xz-devel
+yum
+yum-plugin-ovl
+yum-utils
diff --git a/redhat/docker/el5/packages.base b/redhat/docker/el5/packages.base
deleted file mode 100644
index 7765aa5df..000000000
--- a/redhat/docker/el5/packages.base
+++ /dev/null
@@ -1,6 +0,0 @@
-bash
-perl
-setarch
-vim-enhanced
-yum
-yum-plugin-ovl
diff --git a/redhat/docker/el5/repoforge-5.repo b/redhat/docker/el5/repoforge-5.repo
deleted file mode 100644
index a08fc0ba4..000000000
--- a/redhat/docker/el5/repoforge-5.repo
+++ /dev/null
@@ -1,5 +0,0 @@
-[dag]
-name=dag
-baseurl=http://repo/repo/repoforge/redhat/el5/en/$basearch/dag/
-enabled=1
-gpgcheck=0
diff --git a/redhat/docker/el5/rpmmacros b/redhat/docker/el5/rpmmacros
index 05170915d..4f292dab3 100644
--- a/redhat/docker/el5/rpmmacros
+++ b/redhat/docker/el5/rpmmacros
@@ -3,3 +3,4 @@
 %_smp_mflags -j8
 %jobs 8
 %_topdir /home/trinity/rpmbuild
+%_gpg_name Trinity
diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686
index 8844adabc..69e8b11c6 100644
--- a/redhat/docker/el6/Dockerfile.i686
+++ b/redhat/docker/el6/Dockerfile.i686
@@ -1,26 +1,23 @@
 FROM centos32:6
 
-ARG TDE_VERSION=14.0.8
+ARG TDE_VERSION=14.0.9
 ARG ARCH=i686
 
 # Enable proxy
-RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf"
-
 # Add EPEL repository
 # Add RPMFUSION repository
-RUN rpm -Uvh \
-  https://fr2.rpmfind.net/linux/epel/6/x86_64/Packages/e/epel-release-6-8.noarch.rpm \
-  https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm
-
 # Install Trinity build dependencies
-ADD packages /packages
-RUN yum -y clean all \
- && setarch ${ARCH} yum -y update \
- && setarch ${ARCH} yum -y install $(</packages)
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \
+ && yum -y clean all \
+ && setarch i686 yum -y update \
+ && setarch i686 yum -y install epel-release \
+ && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \
+ && setarch i686 yum -y install $(</packages)
 
 # Add YUM repository for locally built packages
 WORKDIR /etc/yum.repos.d
-ADD rpmbuild.repo rpmbuild.repo
+COPY rpmbuild.repo rpmbuild.repo
 RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
 
 # Fix utempter detection
@@ -34,12 +31,11 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \
  && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
 
 USER trinity
-ADD rpmmacros /home/trinity/.rpmmacros
+COPY rpmmacros /home/trinity/.rpmmacros
 
 # Build supplementary development tools
 
-RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/m4-1.4.16-10.el7.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/m4-1*.rpm
+RUN sudo rpm -Uvh http://repo/trinity/el6/tools/RPMS/i686/m4-1.4.16-10.el6.i686.rpm
 
 RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm
diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64
index 3836529c2..36fb8f549 100644
--- a/redhat/docker/el6/Dockerfile.x86_64
+++ b/redhat/docker/el6/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM centos:6
 
-ARG TDE_VERSION=14.0.8
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 # Enable proxy
diff --git a/redhat/docker/el6/packages b/redhat/docker/el6/packages
index beeba9fff..13d9d827c 100644
--- a/redhat/docker/el6/packages
+++ b/redhat/docker/el6/packages
@@ -49,6 +49,7 @@ gcc
 gcc-c++
 gcc-gfortran
 gcc-java
+geoip-devel
 gettext-devel
 glib-devel
 gmp-devel
diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64
index 5d1a2e4cd..e76088a50 100644
--- a/redhat/docker/el7/Dockerfile.x86_64
+++ b/redhat/docker/el7/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM centos:7
 
-ARG TDE_VERSION=14.0.8
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 # Enable proxy
diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64
index 43f6b7191..f317effb7 100644
--- a/redhat/docker/el8/Dockerfile.x86_64
+++ b/redhat/docker/el8/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM centos:8
 
-ARG TDE_VERSION=14.0.8
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 # Enable custom repository
diff --git a/redhat/docker/f25/Dockerfile.x86_64 b/redhat/docker/f25/Dockerfile.x86_64
index d171bac1b..b694f3cf2 100644
--- a/redhat/docker/f25/Dockerfile.x86_64
+++ b/redhat/docker/f25/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:25
 
-ARG TDE_VERSION=14.0.7
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 # Add RPMFUSION repository
diff --git a/redhat/docker/f26/Dockerfile.i686 b/redhat/docker/f26/Dockerfile.i686
index 199c90224..03991b3cc 100644
--- a/redhat/docker/f26/Dockerfile.i686
+++ b/redhat/docker/f26/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM fedora32:26
 
-ARG TDE_VERSION=14.0.7
+ARG TDE_VERSION=14.0.9
 ARG ARCH=i686
 
 # Add RPMFUSION repository
diff --git a/redhat/docker/f26/Dockerfile.x86_64 b/redhat/docker/f26/Dockerfile.x86_64
index 5b2b15f6b..502b336da 100644
--- a/redhat/docker/f26/Dockerfile.x86_64
+++ b/redhat/docker/f26/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:26
 
-ARG TDE_VERSION=14.0.7
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 # Add RPMFUSION repository
diff --git a/redhat/docker/f27/Dockerfile.i686 b/redhat/docker/f27/Dockerfile.i686
index cd4e731bd..96801742b 100644
--- a/redhat/docker/f27/Dockerfile.i686
+++ b/redhat/docker/f27/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM fedora32:27
 
-ARG TDE_VERSION=14.0.7
+ARG TDE_VERSION=14.0.9
 ARG ARCH=i686
 
 # Add RPMFUSION repository
diff --git a/redhat/docker/f27/Dockerfile.x86_64 b/redhat/docker/f27/Dockerfile.x86_64
index 63adbe269..0e15d1517 100644
--- a/redhat/docker/f27/Dockerfile.x86_64
+++ b/redhat/docker/f27/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:27
 
-ARG TDE_VERSION=14.0.7
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 # Add RPMFUSION repository
diff --git a/redhat/docker/f28/Dockerfile.i686 b/redhat/docker/f28/Dockerfile.i686
index 0c717477d..0c498d2ed 100644
--- a/redhat/docker/f28/Dockerfile.i686
+++ b/redhat/docker/f28/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM fedora32:28
 
-ARG TDE_VERSION=14.0.7
+ARG TDE_VERSION=14.0.9
 ARG ARCH=i686
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f28/Dockerfile.x86_64 b/redhat/docker/f28/Dockerfile.x86_64
index e5875e069..48e27c76c 100644
--- a/redhat/docker/f28/Dockerfile.x86_64
+++ b/redhat/docker/f28/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:28
 
-ARG TDE_VERSION=14.0.7
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f29/Dockerfile.i686 b/redhat/docker/f29/Dockerfile.i686
index 20ea16210..cb39761f1 100644
--- a/redhat/docker/f29/Dockerfile.i686
+++ b/redhat/docker/f29/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM fedora32:29
 
-ARG TDE_VERSION=14.0.7
+ARG TDE_VERSION=14.0.9
 ARG ARCH=i686
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f29/Dockerfile.x86_64 b/redhat/docker/f29/Dockerfile.x86_64
index b95e32f0a..2fb25e83f 100644
--- a/redhat/docker/f29/Dockerfile.x86_64
+++ b/redhat/docker/f29/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:29
 
-ARG TDE_VERSION=14.0.7
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f30/Dockerfile.i686 b/redhat/docker/f30/Dockerfile.i686
index 9be8fdbfc..cc20af564 100644
--- a/redhat/docker/f30/Dockerfile.i686
+++ b/redhat/docker/f30/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM fedora32:30
 
-ARG TDE_VERSION=14.0.7
+ARG TDE_VERSION=14.0.9
 ARG ARCH=i686
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f30/Dockerfile.x86_64 b/redhat/docker/f30/Dockerfile.x86_64
index 31b7fb112..278bb8e3f 100644
--- a/redhat/docker/f30/Dockerfile.x86_64
+++ b/redhat/docker/f30/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:30
 
-ARG TDE_VERSION=14.0.7
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f31/Dockerfile.x86_64 b/redhat/docker/f31/Dockerfile.x86_64
index 4efdd8769..7c013b495 100644
--- a/redhat/docker/f31/Dockerfile.x86_64
+++ b/redhat/docker/f31/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:31
 
-ARG TDE_VERSION=14.0.8
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f31/packages b/redhat/docker/f31/packages
index 552cc3df5..bf07064e8 100644
--- a/redhat/docker/f31/packages
+++ b/redhat/docker/f31/packages
@@ -47,6 +47,7 @@ fribidi-devel
 gamin-devel
 gcc
 gcc-c++
+geoip-devel
 gettext-devel
 glib-devel
 gmime-devel
@@ -189,6 +190,7 @@ poppler-devel
 postgresql
 postgresql-devel
 postgresql-server-devel
+ppp
 pulseaudio-libs-devel
 python
 python3-devel
diff --git a/redhat/docker/f32/Dockerfile.x86_64 b/redhat/docker/f32/Dockerfile.x86_64
index 38326e028..13560403b 100644
--- a/redhat/docker/f32/Dockerfile.x86_64
+++ b/redhat/docker/f32/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:32
 
-ARG TDE_VERSION=14.0.8
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f32/packages b/redhat/docker/f32/packages
index 67b320151..7b438ade0 100644
--- a/redhat/docker/f32/packages
+++ b/redhat/docker/f32/packages
@@ -47,6 +47,7 @@ fribidi-devel
 gamin-devel
 gcc
 gcc-c++
+geoip-devel
 gettext-devel
 giflib-devel
 glib-devel
@@ -189,6 +190,7 @@ poppler-devel
 postgresql
 postgresql-devel
 postgresql-server-devel
+ppp
 pulseaudio-libs-devel
 python
 python3-devel
diff --git a/redhat/docker/f33/Dockerfile.x86_64 b/redhat/docker/f33/Dockerfile.x86_64
new file mode 100644
index 000000000..d9e3ba04b
--- /dev/null
+++ b/redhat/docker/f33/Dockerfile.x86_64
@@ -0,0 +1,26 @@
+FROM fedora:33
+
+ARG TDE_VERSION=14.0.9
+ARG ARCH=x86_64
+
+# Fix DNF database corruption
+# Add RPMFUSION repository
+# Install Trinity build dependencies
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \
+ && dnf -y install dnf-plugin-ovl findutils \
+ && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-33.noarch.rpm \
+ && dnf -y --enableplugin=ovl update \
+ && dnf -y --enableplugin=ovl install $(</packages)
+
+# Add YUM repository for locally built packages
+COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
+RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+COPY rpmmacros /home/trinity/.rpmmacros
diff --git a/redhat/docker/f33/packages b/redhat/docker/f33/packages
new file mode 100644
index 000000000..0b34e0334
--- /dev/null
+++ b/redhat/docker/f33/packages
@@ -0,0 +1,233 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bind-devel
+binutils-devel
+bison
+boost-devel
+boost-python3-devel
+bzip2-devel
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+clucene-core-devel
+cmake
+cpp
+cppunit-devel
+createrepo
+cryptsetup-devel
+cups-devel
+dbus-glib-devel
+djvulibre
+djvulibre-devel
+dnf-plugin-ovl
+docbook2X
+doxygen
+dssi-devel
+esound-devel
+exempi-devel
+exiv2-devel
+fdupes
+fedora-rpm-macros
+ffmpeg-devel
+fftw-devel
+file-devel
+flac-devel
+flex-static
+fontpackages-devel
+fribidi-devel
+gamin-devel
+gcc
+gcc-c++
+geoip-devel
+gettext-devel
+giflib-devel
+glib-devel
+gmime-devel
+gmp-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+graphviz
+gsl-devel
+gstreamer1-devel
+gstreamer1-plugins-base-devel
+gtk2-devel
+gtk3-devel
+gtk+-devel
+gtk-doc
+guile-devel
+harfbuzz-devel
+hspell-devel
+htdig
+html2ps
+icu
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+jack-audio-connection-kit-devel
+jasper-devel
+java-1.8.0-openjdk-devel
+java-devel
+java-openjdk
+lame-devel
+lcms-devel
+libacl-devel
+libblkid-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-cxx-devel
+libdb-devel
+libdvdread-devel
+libfontenc-devel
+libgadu-devel
+libgpod-devel
+libgsf-devel
+libical-devel
+libidn-devel
+libifp-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz5-devel
+libnjb-devel
+libnsl2-devel
+libofx-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libpqxx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg2
+librsvg2-tools
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libssh2-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtool-ltdl-devel
+libudev-devel
+libudisks2-devel
+libutempter-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvncserver-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXcomposite-devel
+libXdamage-devel
+libXdmcp-devel
+libxkbfile-devel
+libXScrnSaver-devel
+libxslt-devel
+libXtst-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+lm_sensors-devel
+meanwhile-devel
+mftrace
+mysql-devel
+nas-devel
+neon-devel
+netpbm-progs
+NetworkManager-libnm-devel
+net-snmp-devel
+net-tools
+nspr-devel
+ocaml
+ocaml(compiler)
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+opensc
+openslp-devel
+opensp-devel
+ortp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+pcsc-perl
+perl
+perl-devel
+perl(ExtUtils::MakeMaker)
+perl(PAR::Packer)
+perl(XML::Parser)
+pilot-link-devel
+pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
+poppler-devel
+postgresql
+postgresql-devel
+postgresql-server-devel
+ppp
+pulseaudio-libs-devel
+python
+python3-devel
+qt4-devel
+recode
+redhat-rpm-config
+rpcgen
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+scons
+SDL-devel
+selinux-policy-devel
+speex-devel
+sqlite-devel
+subversion-devel
+sudo
+swig
+sword-devel
+t1lib-devel
+t1utils
+taglib-devel
+texinfo
+texlive-newunicodechar
+torsocks
+transfig
+udisks-devel
+unixODBC-devel
+usbutils
+valgrind
+wireless-tools-devel
+xbase-devel
+xine-lib-devel
+xmedcon
+xmedcon-devel
+xmlto
+xorg-x11-font-utils
+xscreensaver
+xscreensaver-extras
+xz-devel
diff --git a/redhat/docker/el5/rpmbuild.repo b/redhat/docker/f33/rpmbuild.repo
index 750290651..750290651 100644
--- a/redhat/docker/el5/rpmbuild.repo
+++ b/redhat/docker/f33/rpmbuild.repo
diff --git a/redhat/docker/f33/rpmmacros b/redhat/docker/f33/rpmmacros
new file mode 100644
index 000000000..56410f591
--- /dev/null
+++ b/redhat/docker/f33/rpmmacros
@@ -0,0 +1,4 @@
+%dist .fc33
+%_smp_mflags -j8
+%jobs 8
+%__cmake_builddir %nil
diff --git a/redhat/docker/mga5/Dockerfile.x86_64 b/redhat/docker/mga5/Dockerfile.x86_64
index a9df3587f..71143f8d6 100644
--- a/redhat/docker/mga5/Dockerfile.x86_64
+++ b/redhat/docker/mga5/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM mageia:5.1
 
-ARG TDE_VERSION=14.0.7
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 # Reset URPMI repositories to default
diff --git a/redhat/docker/mga6/Dockerfile.i686 b/redhat/docker/mga6/Dockerfile.i686
index 3b98ac460..e4eb37873 100644
--- a/redhat/docker/mga6/Dockerfile.i686
+++ b/redhat/docker/mga6/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM mageia32:6
 
-ARG TDE_VERSION=14.0.8
+ARG TDE_VERSION=14.0.9
 ARG ARCH=i686
 
 # Reset URPMI repositories to default
diff --git a/redhat/docker/mga6/Dockerfile.x86_64 b/redhat/docker/mga6/Dockerfile.x86_64
index d8d826d48..79e83d9ac 100644
--- a/redhat/docker/mga6/Dockerfile.x86_64
+++ b/redhat/docker/mga6/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM mageia:6
 
-ARG TDE_VERSION=14.0.8
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 # Reset URPMI repositories to default
diff --git a/redhat/docker/mga6/packages.i686 b/redhat/docker/mga6/packages.i686
index 24079d712..6ee0415b2 100644
--- a/redhat/docker/mga6/packages.i686
+++ b/redhat/docker/mga6/packages.i686
@@ -82,6 +82,7 @@ libffmpeg-devel
 libflac-devel
 libflac++-devel
 libfontenc-devel
+libgeoip-devel
 libgstreamer1.0-devel
 libgstreamer-plugins-base1.0-devel
 libinotifytools-devel
diff --git a/redhat/docker/mga6/packages.x86_64 b/redhat/docker/mga6/packages.x86_64
index edf18316c..9af2ed003 100644
--- a/redhat/docker/mga6/packages.x86_64
+++ b/redhat/docker/mga6/packages.x86_64
@@ -82,6 +82,7 @@ lib64ffmpeg-devel
 lib64flac-devel
 lib64flac++-devel
 lib64fontenc-devel
+lib64geoip-devel
 lib64gstreamer1.0-devel
 lib64gstreamer-plugins-base1.0-devel
 lib64inotifytools-devel
diff --git a/redhat/docker/mga7/Dockerfile.i686 b/redhat/docker/mga7/Dockerfile.i686
index 991ee2320..0c51c70a6 100644
--- a/redhat/docker/mga7/Dockerfile.i686
+++ b/redhat/docker/mga7/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM mageia32:7
 
-ARG TDE_VERSION=14.0.8
+ARG TDE_VERSION=14.0.9
 ARG ARCH=i686
 
 # Reset URPMI repositories to default
diff --git a/redhat/docker/mga7/Dockerfile.x86_64 b/redhat/docker/mga7/Dockerfile.x86_64
index 026549071..90b30475b 100644
--- a/redhat/docker/mga7/Dockerfile.x86_64
+++ b/redhat/docker/mga7/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM mageia:7
 
-ARG TDE_VERSION=14.0.8
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 # Reset URPMI repositories to default
@@ -11,7 +11,7 @@ RUN urpmi.removemedia -a \
 
 # Update distribution
 # Install Trinity build dependencies
-ADD packages.${ARCH} /packages
+COPY packages.${ARCH} /packages
 RUN urpmi.update -a \
  && urpmi --auto-select --auto \
  && urpmi --auto $(</packages)
@@ -29,7 +29,7 @@ RUN rm -rf /home/trinity \
 
 # Configure user trinity
 USER trinity
-ADD rpmmacros /home/trinity/.rpmmacros
+COPY rpmmacros /home/trinity/.rpmmacros
 
 # Add rpmbuild repositories
 RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
diff --git a/redhat/docker/oss131/Dockerfile.x86_64 b/redhat/docker/oss131/Dockerfile.x86_64
index b98d63d4e..5fff729ba 100644
--- a/redhat/docker/oss131/Dockerfile.x86_64
+++ b/redhat/docker/oss131/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:13.1
 
-ARG TDE_VERSION=14.0.7
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss132/Dockerfile.x86_64 b/redhat/docker/oss132/Dockerfile.x86_64
index 74d1a75bd..c29b62499 100644
--- a/redhat/docker/oss132/Dockerfile.x86_64
+++ b/redhat/docker/oss132/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:13.2
 
-ARG TDE_VERSION=14.0.7
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss150/Dockerfile.x86_64 b/redhat/docker/oss150/Dockerfile.x86_64
index d1a385fc2..8a8f97004 100644
--- a/redhat/docker/oss150/Dockerfile.x86_64
+++ b/redhat/docker/oss150/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse/leap:15.0
 
-ARG TDE_VERSION=14.0.7
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss151/Dockerfile.x86_64 b/redhat/docker/oss151/Dockerfile.x86_64
index 3879c1d8e..392963792 100644
--- a/redhat/docker/oss151/Dockerfile.x86_64
+++ b/redhat/docker/oss151/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse/leap:15.1
 
-ARG TDE_VERSION=14.0.8
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss151/packages b/redhat/docker/oss151/packages
index 0af27eadc..26af91b78 100644
--- a/redhat/docker/oss151/packages
+++ b/redhat/docker/oss151/packages
@@ -57,6 +57,7 @@ gtk-doc
 htdig
 html2ps
 hunspell-devel
+iceauth
 ImageMagick-devel
 imlib2-devel
 intltool
@@ -81,6 +82,7 @@ libdvdread-devel
 libexempi-devel
 libexiv2-devel
 libgadu-devel
+libGeoIP-devel
 libgpgme-devel
 libgphoto2-devel
 libgpod-devel
@@ -192,6 +194,7 @@ wireless-tools
 wv2-devel
 xbase-devel
 xcb-proto-devel
+xorg-x11
 xscreensaver
 xscreensaver-data
 xscreensaver-data-extra
diff --git a/redhat/docker/oss152/Dockerfile.x86_64 b/redhat/docker/oss152/Dockerfile.x86_64
index 88f2c3224..9fe6d9555 100644
--- a/redhat/docker/oss152/Dockerfile.x86_64
+++ b/redhat/docker/oss152/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse/leap:15.2
 
-ARG TDE_VERSION=14.0.8
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss152/packages b/redhat/docker/oss152/packages
index e3359a007..7abef8938 100644
--- a/redhat/docker/oss152/packages
+++ b/redhat/docker/oss152/packages
@@ -83,6 +83,7 @@ libdvdread-devel
 libexempi-devel
 libexiv2-devel
 libgadu-devel
+libGeoIP-devel
 libgpgme-devel
 libgphoto2-devel
 libgpod-devel
diff --git a/redhat/docker/oss421/Dockerfile.x86_64 b/redhat/docker/oss421/Dockerfile.x86_64
index 3921f3baf..04c9cb037 100644
--- a/redhat/docker/oss421/Dockerfile.x86_64
+++ b/redhat/docker/oss421/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:42.1
 
-ARG TDE_VERSION=14.0.7
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss422/Dockerfile.x86_64 b/redhat/docker/oss422/Dockerfile.x86_64
index b38871455..e15df37ae 100644
--- a/redhat/docker/oss422/Dockerfile.x86_64
+++ b/redhat/docker/oss422/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:42.2
 
-ARG TDE_VERSION=14.0.7
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss423/Dockerfile.x86_64 b/redhat/docker/oss423/Dockerfile.x86_64
index c168ea321..edaef5572 100644
--- a/redhat/docker/oss423/Dockerfile.x86_64
+++ b/redhat/docker/oss423/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:42.3
 
-ARG TDE_VERSION=14.0.7
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686
index 7df793232..4864ac6fe 100644
--- a/redhat/docker/osstw/Dockerfile.i686
+++ b/redhat/docker/osstw/Dockerfile.i686
@@ -1,12 +1,14 @@
 FROM opensuse32/tumbleweed:latest
 
-ARG TDE_VERSION=14.0.8
+ARG TDE_VERSION=14.0.9
 ARG ARCH=i686
 
 # Add PACKMAN repository
-RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman
-ADD packages /packages
-RUN setarch ${ARCH} zypper refresh \
+COPY packages /packages
+RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \
+ && zypper ar -f -G -n gnome http://ftp.lysator.liu.se/pub/opensuse/repositories/GNOME:/Next/openSUSE_Factory gnome \
+ && setarch ${ARCH} zypper refresh \
+ && setarch ${ARCH} zypper -n refresh \
  && setarch ${ARCH} zypper -n dup \
  && setarch ${ARCH} zypper -n update \
  && setarch ${ARCH} zypper -n install $(</packages)
diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64
index 248b38f76..b82b9de29 100644
--- a/redhat/docker/osstw/Dockerfile.x86_64
+++ b/redhat/docker/osstw/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse/tumbleweed:latest
 
-ARG TDE_VERSION=14.0.8
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages
index 9d2f2cdbd..2f103ee95 100644
--- a/redhat/docker/osstw/packages
+++ b/redhat/docker/osstw/packages
@@ -9,6 +9,8 @@ binutils-devel
 bison
 bluez-devel
 boost-devel
+brp-check-suse
+brp-extract-appdata
 ccache
 cdparanoia
 cdparanoia-devel
@@ -58,6 +60,7 @@ gtk-doc
 htdig
 html2ps
 hunspell-devel
+iceauth
 ImageMagick-devel
 imake
 imlib2-devel
@@ -90,6 +93,7 @@ libical-devel
 libidn-devel
 libiw-devel
 libjack-devel
+libjasper-devel
 liblcms2-devel
 liblo-devel
 liblrdf-devel
@@ -146,7 +150,6 @@ libXv-devel
 libXxf86dga-devel
 libXxf86vm-devel
 libyaz-devel
-lilo
 lirc-devel
 make
 makeinfo
@@ -173,8 +176,8 @@ pcsc-lite-devel
 perl-PAR-Packer
 perl-pcsc
 pkcs11-helper-devel
-postgresql
-postgresql-devel
+postgresql10
+postgresql10-devel
 python-devel
 python-gtk-devel
 python3-devel
@@ -215,7 +218,9 @@ vim
 wireless-tools
 wv2-devel
 xcb-proto-devel
+xorg-x11
 xscreensaver
 xscreensaver-data
 xscreensaver-data-extra
+xz
 xz-devel
diff --git a/redhat/docker/pclinuxos.pkg b/redhat/docker/pclinuxos.pkg
index cdfd0cf21..0a3a5f767 100644
--- a/redhat/docker/pclinuxos.pkg
+++ b/redhat/docker/pclinuxos.pkg
@@ -93,6 +93,7 @@ lib64notify4
 lib64npth0
 lib64nspr4
 lib64nss3
+lib64openssl1.0.0
 lib64openssl1.1.0
 lib64opts25
 lib64pam0
diff --git a/redhat/docker/pclinuxos.sh b/redhat/docker/pclinuxos.sh
index 837e4c86f..52f858357 100755
--- a/redhat/docker/pclinuxos.sh
+++ b/redhat/docker/pclinuxos.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -ex
 
 NAME="pclinuxos"
-VERSION="${1:-2020}" # E.g: '26'
+VERSION="${1:-2020}" # E.g: '2020'
 IMAGE="${NAME}:${VERSION}"
 INSTALLROOT="/dev/shm/${IMAGE}"
 
@@ -17,7 +17,8 @@ curl "${MIRROR}/RPMS.x86_64/" | sed -n "/a href/ s|.*href=\"\(.*\)\.rpm\".*|\1.r
 
 mkdir -p "/dev/shm/packages"
 while read pkg; do
-  file="$(grep "^${pkg}[0-9]*-[0-9]" /dev/shm/pkg.list | sort | tail -n 1)"
+  file="$(grep "^${pkg}-[0-9]" /dev/shm/pkg.list | sort | tail -n 1)"
+  [ -z "${file}" ] && file="$(grep "^${pkg}[0-9]*-[0-9]" /dev/shm/pkg.list | sort | tail -n 1)"
   [ -z "${file}" ] && exit 1
   wget -nv -c "${MIRROR}/RPMS.x86_64/${file}" -O "/dev/shm/packages/${file}" || exit 2
 done < "pclinuxos.pkg"
@@ -39,6 +40,7 @@ sudo rm -rf "${INSTALLROOT}/var/lib/rpm"
 sudo chroot "${INSTALLROOT}" rpmdb --initdb
 sudo chroot "${INSTALLROOT}" rpm -Uvh "/dev/shm/packages/"*".rpm"
 
+sudo cp "/etc/resolv.conf" "${INSTALLROOT}/etc/resolv.conf"
 sudo chroot "${INSTALLROOT}" apt-get -y update
 sudo chroot "${INSTALLROOT}" apt-get -y upgrade
 
@@ -46,7 +48,10 @@ sudo umount "${INSTALLROOT}/dev/shm"
 sudo umount "${INSTALLROOT}/dev"
 
 sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar"
-#sudo rm -rf "${INSTALLROOT}"
+sudo rm -rf "${INSTALLROOT}"
 
-docker rmi -f "${IMAGE}"
-docker import "${IMAGE}.tar" "${IMAGE}"
+docker rmi -f "${IMAGE}" || :
+cat "${IMAGE}.tar" | docker import - "${IMAGE}"
+rm -f "${IMAGE}.tar.gz"
+pigz -9 "${IMAGE}.tar"
+mv -vf "${IMAGE}.tar.gz" "${HOME}/tde/obs"
diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64
index 2cd400aba..85b9bb441 100644
--- a/redhat/docker/pclinuxos/Dockerfile.x86_64
+++ b/redhat/docker/pclinuxos/Dockerfile.x86_64
@@ -1,37 +1,40 @@
 FROM pclinuxos:2020
 
-ARG TDE_VERSION=14.0.8
+ARG TDE_VERSION=14.0.9
 ARG ARCH=x86_64
 
 # Update distribution
-RUN apt-get -y update && apt-get -y install glibc && apt-get -y dist-upgrade
-
 # Install Trinity build dependencies
-ADD packages.${ARCH} /packages
-RUN apt-get -y update && apt-get -y install $(</packages)
+COPY packages.${ARCH} /packages
+RUN apt-get -y update \
+ && apt-get -y install glibc \
+ && apt-get -y dist-upgrade \
+ && apt-get -y install $(</packages)
 
 # Add rpmbuild repositories
-ADD rpmbuild.list /etc/apt/sources.list.d/rpmbuild.list
+COPY rpmbuild.list /etc/apt/sources.list.d/rpmbuild.list
 RUN sed -i "/etc/apt/sources.list.d/rpmbuild.list" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
 
 # Fix SUDO configuration
-#RUN sed -i "/etc/pam.d/sudo" -e "/pam_limits.so/ s|^|#|"
+RUN sed -i "/etc/pam.d/sudo" -e "/pam_limits.so/ s|^|#|"
 
 # Fix utempter detection
 RUN chmod a+r /usr/libexec/utempter/utempter
 
 # Fix missing '.la' files
-ADD genla.sh /usr/bin/genla.sh
+COPY genla.sh /usr/bin/genla.sh
 RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 \
  && genla.sh libjpeg \
  && genla.sh liblcms \
  && genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la
 
 # Add non-root user to build packages
-RUN rm -rf /home/trinity && useradd -m -s /bin/bash -u 1000 trinity && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
+RUN rm -rf /home/trinity \
+ && useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
 
 USER trinity
-ADD rpmmacros /home/trinity/.rpmmacros
+COPY rpmmacros /home/trinity/.rpmmacros
 
 # Build supplementary development tools
 RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/torsocks-2.3.0-1.mga7.src.rpm \
diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh
index 186ff1b22..32bc6af59 100755
--- a/redhat/docker/run.sh
+++ b/redhat/docker/run.sh
@@ -23,7 +23,7 @@ esac
 
 mkdir -p "${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}" "${HOME}/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION}"
 
-${DOCKER} run -ti --rm --privileged \
+${DOCKER} run -ti --rm \
   -h "${IMAGE}" \
   --name "${IMAGE//:/-}" \
   -v /dev/shm/${DOCKER}:/tmp:z \