RPM: update docker scripts

3 files changed, 76 insertions, 7 deletions

diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686
index e8e4dbb8d..ccca2f0d3 100644
--- a/redhat/docker/el6/Dockerfile.i686
+++ b/redhat/docker/el6/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM centos32:6
 
-ARG TDE_VERSION=14.0.5
+ARG TDE_VERSION=14.0.7
 ARG ARCH=i686
 
 RUN echo "proxy=http://proxy:3128" >>/etc/yum.conf
@@ -16,6 +16,9 @@ ADD packages.trinity /packages
 RUN setarch ${ARCH} yum -y update
 RUN setarch ${ARCH} yum -y install $(</packages)
 
+# 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|"
+
 # Add YUM repository for locally built packages
 WORKDIR /etc/yum.repos.d
 ADD rpmbuild.repo rpmbuild.repo
@@ -24,7 +27,30 @@ RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE
 # 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
+
+USER trinity
 ADD rpmmacros /home/trinity/.rpmmacros
 
-# 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|"
+# Build supplementary development tools
+
+RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/m4-1.4.16-10.el7.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/m4-1*.rpm
+
+RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm
+
+RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-Install-1.06-4.el7.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-Install-*.rpm
+
+RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-ScanDeps-1.10-3.el7.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-ScanDeps-*.rpm
+
+RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-1.015-4.el7.src.rpm
+RUN sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s|%license|%doc|"
+RUN rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR.spec
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
+
+RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer-1.041-2.el7.src.rpm
+RUN sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s|%license|%doc|"
+RUN rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps
diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64
index 9b845631f..51953f916 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.5
+ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
 RUN echo "proxy=http://proxy:3128" >>/etc/yum.conf
@@ -16,6 +16,9 @@ ADD packages.trinity /packages
 RUN yum -y update
 RUN yum -y install $(</packages)
 
+# 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|"
+
 # Add YUM repository for locally built packages
 WORKDIR /etc/yum.repos.d
 ADD rpmbuild.repo rpmbuild.repo
@@ -24,7 +27,30 @@ RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE
 # 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
+
+USER trinity
 ADD rpmmacros /home/trinity/.rpmmacros
 
-# 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|"
+# Build supplementary development tools
+
+RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/m4-1.4.16-10.el7.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/m4-1*.rpm
+
+RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm
+
+RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-Install-1.06-4.el7.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-Install-*.rpm
+
+RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-ScanDeps-1.10-3.el7.src.rpm
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-ScanDeps-*.rpm
+
+RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-1.015-4.el7.src.rpm
+RUN sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s|%license|%doc|"
+RUN rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR.spec
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
+
+RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer-1.041-2.el7.src.rpm
+RUN sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s|%license|%doc|"
+RUN rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps
diff --git a/redhat/docker/el6/packages.trinity b/redhat/docker/el6/packages.trinity
index ee5f0ba89..d24bc6636 100644
--- a/redhat/docker/el6/packages.trinity
+++ b/redhat/docker/el6/packages.trinity
@@ -131,13 +131,14 @@ libXcomposite-devel
 libXdamage-devel
 libXdmcp-devel
 libxkbfile-devel
-libXScrnSa
+libXScrnSaver
 libXScrnSaver-devel
 libxslt-devel
 libXtst-devel
 libXv-devel
 libXxf86dga-devel
 libXxf86vm-devel
+libyaz-devel
 libzrtpcpp-devel
 lirc-devel
 lm_sensors-devel
@@ -160,9 +161,25 @@ pam-devel
 pciutils-devel
 pcre-devel
 pcsc-lite-devel
+pcsc-perl
 perl
 perl-devel
+perl(Archive::Zip)
+perl(CPAN)
+perl(CPANPLUS::Backend)
 perl(ExtUtils::MakeMaker)
+perl(ExtUtils::Embed)
+perl(Getopt::ArgvFile)
+perl(inc::Module::Install)
+perl(IPC::Run3)
+perl(JSON)
+perl(Module::ScanDeps)
+perl(Module::Signature)
+perl(prefork)
+perl(Test::CPAN::Meta)
+perl(Test::MinimumVersion)
+perl(Test::More)
+perl(Test::Pod)
 perl(XML::Parser)
 pilot-link-devel
 pkcs11-helper-devel