RPM: massive update and cleanup

2 files changed, 51 insertions, 17 deletions

diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64
index 23b191982..5d1a2e4cd 100644
--- a/redhat/docker/el7/Dockerfile.x86_64
+++ b/redhat/docker/el7/Dockerfile.x86_64
@@ -1,27 +1,48 @@
 FROM centos:7
 
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.8
 ARG ARCH=x86_64
 
+# Enable proxy
 # Add EPEL repository
-RUN rpm -Uvh https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/epel-release-7-11.noarch.rpm
-
-# Add NUX repository
-RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm
-
+# Add RPMFUSION repository
 # Install Trinity build dependencies
-ADD packages /packages
-RUN yum update -y
-RUN yum install -y $(</packages)
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \
+ && yum -y install epel-release \
+ && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm \
+ && yum -y clean all \
+ && yum -y update \
+ && yum -y install $(</packages)
 
 # 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"
+WORKDIR /etc/yum.repos.d
+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
+# Distro-specific patches
+RUN 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|" \
+ && ln -sf libmp4v2.so /usr/lib64/libmp4.so
 
 # 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
+
+# Build supplementary development tools
+
+RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Everything/source/SRPMS/d/dirmngr-1.1.1-5.fc21.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/dirmngr-1*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/y/yaz-5.14.11-17.fc30.src.rpm --define "_pkgdocdir /usr/share/doc/yaz" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libyaz{,-devel}-5*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/r/rdesktop-1.9.0-2.fc32.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/pilot-link-0.12.5-44.fc32.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel,-libs}-0*.rpm
diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages
index 60229d64f..7368877e2 100644
--- a/redhat/docker/el7/packages
+++ b/redhat/docker/el7/packages
@@ -7,6 +7,7 @@ avahi-devel
 bind-devel
 binutils-devel
 bison
+bluez-libs-devel
 boost-devel
 bzip2-devel
 ccache
@@ -27,6 +28,7 @@ db4-devel
 dbus-glib-devel
 djvulibre
 djvulibre-devel
+docbook2X
 doxygen
 emacs
 esound-devel
@@ -61,7 +63,7 @@ gtk2-devel
 gtk+-devel
 gtk-doc
 guile-devel
-heimdal-devel
+hiredis-devel
 hspell-devel
 html2ps
 icu
@@ -97,6 +99,7 @@ libical-devel
 libidn-devel
 libksba-devel
 libmad-devel
+libmemcached-devel
 libmng-devel
 libmp4v2-devel
 libmpcdec-devel
@@ -106,6 +109,7 @@ libofx-devel
 libogg-devel
 libotr-devel
 libpaper-devel
+libpcap-devel
 libqalculate-devel
 libraw1394-devel
 librsvg2-tools
@@ -138,6 +142,7 @@ libXxf86vm-devel
 libusb-devel
 lirc-devel
 lm_sensors-devel
+logrotate
 meanwhile-devel
 mysql-devel
 neon-devel
@@ -156,14 +161,20 @@ pam-devel
 pciutils-devel
 pcre-devel
 pcsc-lite-devel
+pcsc-perl
 perl
 perl-devel
+perl-generators
 perl(ExtUtils::MakeMaker)
+perl(PAR::Packer)
 perl(XML::Parser)
+pigz
 pilot-link-devel
 pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
 poppler-devel
 postgresql-devel
+ppp
 pth-devel
 pulseaudio-libs-devel
 qt-devel
@@ -176,6 +187,7 @@ ruby-devel
 sane-backends-devel
 scons
 SDL-devel
+selinux-policy-devel
 sip-devel
 speex-devel
 sqlite-devel
@@ -188,6 +200,7 @@ t1lib-devel
 t1utils
 taglib-devel
 tar
+tcl
 texinfo
 torsocks
 transfig