From 5259ca7ff29406043491aa22851af6b7ce32a748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Fri, 8 Nov 2019 20:47:18 +0100
Subject: RPM: update build scripts

---
 redhat/docker/el7/Dockerfile.x86_64 | 27 ++++++++++++++++++++++-----
 redhat/docker/el7/packages          |  5 +++++
 2 files changed, 27 insertions(+), 5 deletions(-)

(limited to 'redhat/docker/el7')

diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64
index 92e926cd7..c350bd995 100644
--- a/redhat/docker/el7/Dockerfile.x86_64
+++ b/redhat/docker/el7/Dockerfile.x86_64
@@ -3,6 +3,12 @@ FROM centos:7
 ARG TDE_VERSION=14.0.7
 ARG ARCH=x86_64
 
+# Enable proxy
+RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf"
+
+# Update distribution packages
+RUN yum -y update
+
 # Add EPEL repository
 RUN yum -y install epel-release
 
@@ -11,19 +17,30 @@ RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-
 
 # Install Trinity build dependencies
 ADD packages /packages
-RUN yum update -y
-RUN yum install -y $(</packages)
+RUN 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
+ADD rpmbuild.repo rpmbuild.repo
+RUN sed -i "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
 
 # 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 non-root user to build packages
 RUN useradd -m -s /bin/bash -u 1000 trinity
-RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
 
 USER trinity
 ADD 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
+RUN 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"
+RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libyaz{,-devel}-5*.rpm
diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages
index f5bd79e8d..4b6409613 100644
--- a/redhat/docker/el7/packages
+++ b/redhat/docker/el7/packages
@@ -62,6 +62,7 @@ gtk2-devel
 gtk+-devel
 gtk-doc
 guile-devel
+hiredis-devel
 hspell-devel
 html2ps
 icu
@@ -97,6 +98,7 @@ libical-devel
 libidn-devel
 libksba-devel
 libmad-devel
+libmemcached-devel
 libmng-devel
 libmp4v2-devel
 libmpcdec-devel
@@ -139,6 +141,7 @@ libXxf86vm-devel
 libusb-devel
 lirc-devel
 lm_sensors-devel
+logrotate
 meanwhile-devel
 mysql-devel
 neon-devel
@@ -163,6 +166,7 @@ perl-devel
 perl(ExtUtils::MakeMaker)
 perl(PAR::Packer)
 perl(XML::Parser)
+pigz
 pilot-link-devel
 pkcs11-helper-devel
 pkgconfig(pygtk-2.0)
@@ -192,6 +196,7 @@ t1lib-devel
 t1utils
 taglib-devel
 tar
+tcl
 texinfo
 torsocks
 transfig
-- 
cgit v1.2.1