From 8d17db2e0995db07518fec7e5fd3a568e9da769c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Tue, 4 Sep 2018 21:44:28 +0200
Subject: RPM: update packages for PCLinuxOS 2018

---
 redhat/docker/build.sh                    |  4 ++--
 redhat/docker/el6/Dockerfile.i686         | 17 ++++++++++-------
 redhat/docker/el6/Dockerfile.x86_64       | 17 ++++++++++-------
 redhat/docker/el6/packages.trinity        |  2 ++
 redhat/docker/el7/Dockerfile.x86_64       |  2 +-
 redhat/docker/el7/packages                |  9 +++++++++
 redhat/docker/f28/Dockerfile.i686         |  6 +++---
 redhat/docker/f28/Dockerfile.x86_64       |  3 ++-
 redhat/docker/f28/packages                |  1 +
 redhat/docker/mga6/Dockerfile.i686        |  2 +-
 redhat/docker/mga6/Dockerfile.x86_64      |  2 +-
 redhat/docker/mga6/packages.i686          |  2 ++
 redhat/docker/mga6/packages.x86_64        |  1 +
 redhat/docker/oss150/Dockerfile.x86_64    |  2 +-
 redhat/docker/oss150/packages             |  4 +++-
 redhat/docker/oss423/Dockerfile.x86_64    |  2 +-
 redhat/docker/oss423/packages             |  1 +
 redhat/docker/osstw/Dockerfile.i686       |  2 +-
 redhat/docker/osstw/Dockerfile.x86_64     |  2 +-
 redhat/docker/osstw/packages              |  4 ++++
 redhat/docker/pclinuxos/Dockerfile.x86_64 |  6 +++---
 redhat/docker/pclinuxos/packages.x86_64   |  8 +++++---
 redhat/docker/pclinuxos/rpmmacros         |  4 ++--
 redhat/docker/run.sh                      |  5 +++--
 24 files changed, 70 insertions(+), 38 deletions(-)

(limited to 'redhat/docker')

diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh
index a48b281cd..9aeb60f5a 100755
--- a/redhat/docker/build.sh
+++ b/redhat/docker/build.sh
@@ -4,10 +4,10 @@ DISTRIB="$1"
 TDE_VERSION="$2"
 ARCH="$3"
 
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.4"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5"
 [ -z "${ARCH}" ] && ARCH="x86_64"
 
 IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
 
-docker rmi -f "${IMAGE}"
+#docker rmi -f "${IMAGE}"
 docker build -t "${IMAGE}" -f "${DISTRIB}/Dockerfile.${ARCH}" --build-arg TDE_VERSION="${TDE_VERSION}" --build-arg ARCH="${ARCH}" "${DISTRIB}"
diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686
index b1e12529f..e8e4dbb8d 100644
--- a/redhat/docker/el6/Dockerfile.i686
+++ b/redhat/docker/el6/Dockerfile.i686
@@ -1,22 +1,25 @@
 FROM centos32:6
 
-ARG TDE_VERSION=14.0.4
+ARG TDE_VERSION=14.0.5
 ARG ARCH=i686
 
+RUN echo "proxy=http://proxy:3128" >>/etc/yum.conf
+
 # Add EPEL repository
-RUN yum install -y epel-release
+RUN yum -y install epel-release
 
 # Add NUX repository
 RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el6/x86_64/nux-dextop-release-0-2.el6.nux.noarch.rpm
 
 # Install Trinity build dependencies
-ADD packages.trinity /etc/yum.repos.d/packages
-RUN setarch ${ARCH} yum update -y
-RUN setarch ${ARCH} yum install -y $(</etc/yum.repos.d/packages) || :
+ADD packages.trinity /packages
+RUN setarch ${ARCH} yum -y update
+RUN setarch ${ARCH} 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"
 
 # Add non-root user to build packages
 RUN useradd -m -s /bin/bash -u 1000 trinity
diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64
index 297141ea1..9b845631f 100644
--- a/redhat/docker/el6/Dockerfile.x86_64
+++ b/redhat/docker/el6/Dockerfile.x86_64
@@ -1,22 +1,25 @@
 FROM centos:6
 
-ARG TDE_VERSION=14.0.4
+ARG TDE_VERSION=14.0.5
 ARG ARCH=x86_64
 
+RUN echo "proxy=http://proxy:3128" >>/etc/yum.conf
+
 # Add EPEL repository
-RUN yum install -y epel-release
+RUN yum -y install epel-release
 
 # Add NUX repository
 RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el6/x86_64/nux-dextop-release-0-2.el6.nux.noarch.rpm
 
 # Install Trinity build dependencies
-ADD packages.trinity /etc/yum.repos.d/packages
-RUN yum update -y
-RUN yum install -y $(</etc/yum.repos.d/packages) || :
+ADD packages.trinity /packages
+RUN yum -y update
+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"
 
 # Add non-root user to build packages
 RUN useradd -m -s /bin/bash -u 1000 trinity
diff --git a/redhat/docker/el6/packages.trinity b/redhat/docker/el6/packages.trinity
index 6c9e30134..4ee743b2a 100644
--- a/redhat/docker/el6/packages.trinity
+++ b/redhat/docker/el6/packages.trinity
@@ -50,6 +50,7 @@ gcc-gfortran
 gcc-java
 gettext-devel
 glib-devel
+gmime-devel
 gmp-devel
 gnokii-devel
 gperf
@@ -190,6 +191,7 @@ taglib-devel
 tar
 texinfo
 texlive-utils
+torsocks
 transfig
 udisks-devel
 unixODBC-devel
diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64
index 52038a142..23b191982 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.4
+ARG TDE_VERSION=14.0.5
 ARG ARCH=x86_64
 
 # Add EPEL repository
diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages
index 57a2f2b44..60229d64f 100644
--- a/redhat/docker/el7/packages
+++ b/redhat/docker/el7/packages
@@ -14,6 +14,8 @@ cdparanoia
 cdparanoia-devel
 chmlib-devel
 chrpath
+clamav
+clamav-devel
 clucene-core-devel
 cmake
 cpp
@@ -28,6 +30,7 @@ djvulibre-devel
 doxygen
 emacs
 esound-devel
+exempi-devel
 exiv2-devel
 fdupes
 ffmpeg-devel
@@ -43,6 +46,7 @@ gcc-c++
 gcc-gfortran
 gettext-devel
 glib-devel
+gmime-devel
 gmp-devel
 gperf
 gpgme-devel
@@ -64,6 +68,8 @@ icu
 ImageMagick-devel
 imake
 imlib-devel
+imlib2-devel
+intltool
 jack-audio-connection-kit-devel
 jasper-devel
 java-1.7.0-openjdk-devel
@@ -100,6 +106,7 @@ libofx-devel
 libogg-devel
 libotr-devel
 libpaper-devel
+libqalculate-devel
 libraw1394-devel
 librsvg2-tools
 libsamplerate-devel
@@ -159,6 +166,7 @@ poppler-devel
 postgresql-devel
 pth-devel
 pulseaudio-libs-devel
+qt-devel
 readline-devel
 recode
 redhat-rpm-config
@@ -181,6 +189,7 @@ t1utils
 taglib-devel
 tar
 texinfo
+torsocks
 transfig
 unixODBC-devel
 usbutils
diff --git a/redhat/docker/f28/Dockerfile.i686 b/redhat/docker/f28/Dockerfile.i686
index ccb8d9fce..1927d264b 100644
--- a/redhat/docker/f28/Dockerfile.i686
+++ b/redhat/docker/f28/Dockerfile.i686
@@ -1,9 +1,9 @@
 FROM fedora32:28
 
-ARG TDE_VERSION=14.0.4
+ARG TDE_VERSION=14.0.5
 ARG ARCH=i686
 
-RUN echo "proxy=http://192.168.111.249:3128" >>"/etc/yum.conf"
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
 
 # Add RPMFUSION repository
 RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-28.noarch.rpm
@@ -11,7 +11,7 @@ RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-
 # Install Trinity build dependencies
 RUN setarch i686 dnf update -y
 ADD packages /packages
-#RUN setarch i686 dnf install -y texlive-base
+RUN touch /var/lib/rpm/*
 RUN setarch i686 dnf install -y $(</packages)
 
 # Add YUM repository for locally built packages
diff --git a/redhat/docker/f28/Dockerfile.x86_64 b/redhat/docker/f28/Dockerfile.x86_64
index dc5e685c8..6c26addda 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.4
+ARG TDE_VERSION=14.0.5
 ARG ARCH=x86_64
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
@@ -11,6 +11,7 @@ RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-
 # Install Trinity build dependencies
 RUN dnf update -y
 ADD packages /packages
+RUN touch /var/lib/rpm/*
 RUN dnf install -y $(</packages)
 
 # Add YUM repository for locally built packages
diff --git a/redhat/docker/f28/packages b/redhat/docker/f28/packages
index 38e58b3cb..6ada73c34 100644
--- a/redhat/docker/f28/packages
+++ b/redhat/docker/f28/packages
@@ -35,6 +35,7 @@ esound-devel
 exempi-devel
 exiv2-devel
 fdupes
+fedora-rpm-macros
 ffmpeg-devel
 fftw-devel
 file-devel
diff --git a/redhat/docker/mga6/Dockerfile.i686 b/redhat/docker/mga6/Dockerfile.i686
index 6de263cb6..956755001 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.4
+ARG TDE_VERSION=14.0.5
 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 b76f4a724..8a1048fe8 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.4
+ARG TDE_VERSION=14.0.5
 ARG ARCH=x86_64
 
 # Reset URPMI repositories to default
diff --git a/redhat/docker/mga6/packages.i686 b/redhat/docker/mga6/packages.i686
index 3fd68985a..973e8b7b4 100644
--- a/redhat/docker/mga6/packages.i686
+++ b/redhat/docker/mga6/packages.i686
@@ -95,6 +95,7 @@ libsane1-devel
 libt1lib-devel
 libtiff-devel
 libtwolame-devel
+libutempter
 libudev-devel
 libusb1.0-devel
 libutempter-devel
@@ -186,6 +187,7 @@ notification-daemon
 ocaml
 OpenEXR-devel
 openldap-devel
+openldap-servers-devel
 opensc
 openslp-devel
 opensp-devel
diff --git a/redhat/docker/mga6/packages.x86_64 b/redhat/docker/mga6/packages.x86_64
index 58cdd1374..996963cf2 100644
--- a/redhat/docker/mga6/packages.x86_64
+++ b/redhat/docker/mga6/packages.x86_64
@@ -186,6 +186,7 @@ notification-daemon
 ocaml
 OpenEXR-devel
 openldap-devel
+openldap-servers-devel
 opensc
 openslp-devel
 opensp-devel
diff --git a/redhat/docker/oss150/Dockerfile.x86_64 b/redhat/docker/oss150/Dockerfile.x86_64
index e7d5cd188..39c03d7fd 100644
--- a/redhat/docker/oss150/Dockerfile.x86_64
+++ b/redhat/docker/oss150/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:15.0
 
-ARG TDE_VERSION=14.0.4
+ARG TDE_VERSION=14.0.5
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss150/packages b/redhat/docker/oss150/packages
index 9a9ffe93c..b1b9afe3c 100644
--- a/redhat/docker/oss150/packages
+++ b/redhat/docker/oss150/packages
@@ -60,6 +60,7 @@ intltool
 java-1_8_0-openjdk-devel
 less
 libacl-devel
+libao-devel
 libart_lgpl-devel
 libavahi-devel
 libavcodec-devel
@@ -85,6 +86,7 @@ libidn-devel
 libiw-devel
 libjack-devel
 libjasper-devel
+liblcms-devel
 liblo-devel
 liblrdf-devel
 libmad-devel
@@ -99,6 +101,7 @@ libnjb-devel
 libnsl-devel
 libofx-devel
 libotr-devel
+libpaper-devel
 libpisock-devel
 libpng16-devel
 libpoppler-devel
@@ -148,7 +151,6 @@ pciutils-devel
 pcre-devel
 pcsc-lite-devel
 pkcs11-helper-devel
-pkgconfig(ao)
 postgresql
 postgresql-devel
 python-devel
diff --git a/redhat/docker/oss423/Dockerfile.x86_64 b/redhat/docker/oss423/Dockerfile.x86_64
index 3b246d23b..ff70474da 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.4
+ARG TDE_VERSION=14.0.5
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss423/packages b/redhat/docker/oss423/packages
index b02e68e9e..fe79c5038 100644
--- a/redhat/docker/oss423/packages
+++ b/redhat/docker/oss423/packages
@@ -87,6 +87,7 @@ libiw-devel
 libjack-devel
 libjasper-devel
 liblcms-devel
+liblcms2-devel
 liblo-devel
 liblrdf-devel
 libmad-devel
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686
index e62321a73..02f84bb8c 100644
--- a/redhat/docker/osstw/Dockerfile.i686
+++ b/redhat/docker/osstw/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM opensuse32:tumbleweed
 
-ARG TDE_VERSION=14.0.4
+ARG TDE_VERSION=14.0.5
 ARG ARCH=i686
 
 # Add PACKMAN repository
diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64
index a4f5d7552..156a3a1b8 100644
--- a/redhat/docker/osstw/Dockerfile.x86_64
+++ b/redhat/docker/osstw/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:tumbleweed
 
-ARG TDE_VERSION=14.0.4
+ARG TDE_VERSION=14.0.5
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages
index 29ccaf530..f1cb04d23 100644
--- a/redhat/docker/osstw/packages
+++ b/redhat/docker/osstw/packages
@@ -102,6 +102,7 @@ libnsl-devel
 libofx-devel
 libopenssl-devel
 libotr-devel
+libpaper-devel
 libpisock-devel
 libpng16-devel
 libpoppler-devel
@@ -127,6 +128,7 @@ libvisual-devel
 libvorbis-devel
 libwmf-devel
 libwpd-devel
+libXaw-devel
 libXdmcp-devel
 libxine-devel
 libxkbfile-devel
@@ -135,6 +137,7 @@ libxslt-devel
 libXss-devel
 libXt-devel
 libXtst-devel
+libXv-devel
 libXxf86dga-devel
 lilo
 lirc-devel
@@ -144,6 +147,7 @@ meanwhile-devel
 Mesa-devel
 Mesa-libGL-devel
 mozilla-nspr-devel
+net-tools
 net-tools-deprecated
 NetworkManager-devel
 ocaml
diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64
index 6bee4f4e3..67f7893d1 100644
--- a/redhat/docker/pclinuxos/Dockerfile.x86_64
+++ b/redhat/docker/pclinuxos/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM pclinuxos:2017
 
-ARG TDE_VERSION=14.0.4
+ARG TDE_VERSION=14.0.5
 ARG ARCH=x86_64
 
 # Update distribution
@@ -8,8 +8,8 @@ RUN apt-get -y update
 RUN apt-get -y dist-upgrade
 
 # Install Trinity build dependencies
-ADD packages.${ARCH} /etc/apt/packages
-RUN apt-get -y install $(</etc/apt/packages)
+ADD packages.${ARCH} /packages
+RUN apt-get -y install $(</packages)
 
 # Add rpmbuild repositories
 ADD rpmbuild.list /etc/apt/sources.list.d/rpmbuild.list
diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64
index fc9ade644..7079d8d65 100644
--- a/redhat/docker/pclinuxos/packages.x86_64
+++ b/redhat/docker/pclinuxos/packages.x86_64
@@ -43,12 +43,15 @@ htdig
 ImageMagick-devel
 imake
 java-devel
+lcms-devel
 lib64cryptsetup-devel
 lib64dvdread-devel
 lib64exiv2-devel
 lib64gif-devel
+lib64idn-devel
 lib64inotifytools-devel
 lib64iw29-devel
+lib64nm-devel
 lib64mpcdec-devel
 lib64OpenSP5-devel
 lib64pkcs11-helper-devel
@@ -86,12 +89,11 @@ libmp4v2-devel
 libmtp-devel
 libmusicbrainz-devel
 libnjb-devel
-libnm-util-devel
 libofa-devel
 libofx-devel
 libotr-devel
 libpaper-devel
-libpng-devel
+lib64png1.6-devel
 libpqxx-devel
 libpthread-stubs
 libpulseaudio-devel
@@ -104,6 +106,7 @@ libsm-devel
 libt1lib-devel
 libtheora-devel
 libudev-devel
+libuuid-devel
 libv4l-devel
 libvisual-devel
 libvorbis-devel
@@ -131,7 +134,6 @@ mysql-devel
 nas-devel
 neon-devel
 net-snmp-devel
-NetworkManager-glib-devel
 ocaml
 OpenEXR-devel
 openldap-devel
diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros
index 6a2891f3f..59b0e9d95 100644
--- a/redhat/docker/pclinuxos/rpmmacros
+++ b/redhat/docker/pclinuxos/rpmmacros
@@ -1,4 +1,4 @@
-%dist .pclos2017
+%dist .pclos2018
 %_smp_mflags -j8
 %jobs 8
-%pclinuxos 2017
+%pclinuxos 2018
diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh
index b8138d8c3..30faba056 100755
--- a/redhat/docker/run.sh
+++ b/redhat/docker/run.sh
@@ -4,7 +4,7 @@ DISTRIB="$1"
 TDE_VERSION="$2"
 ARCH="$3"
 
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.4"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5"
 [ -z "${ARCH}" ] && ARCH="x86_64"
 
 IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
@@ -14,8 +14,9 @@ mkdir -p "${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}"
 mkdir -p "${HOME}/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION}"
 mkdir -p "/dev/shm/docker"
 
-docker run -t -i --rm \
+docker run -t -i --rm --privileged \
   -h "${IMAGE}" \
+  --name "${IMAGE//:/-}" \
   -v /dev/shm/docker:/tmp:z \
   -u trinity \
   -e TMPPATH=/tmp \
-- 
cgit v1.2.1