diff options
Diffstat (limited to 'redhat/docker')
73 files changed, 151 insertions, 134 deletions
diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh index c9e0fc804..12a77f133 100755 --- a/redhat/docker/build.sh +++ b/redhat/docker/build.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.3" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.4" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker [ -x /usr/bin/pigz ] && GZIP=pigz || GZIP=gzip diff --git a/redhat/docker/el5/Dockerfile.i686 b/redhat/docker/el5/Dockerfile.i686 index a20359b46..977c175f1 100644 --- a/redhat/docker/el5/Dockerfile.i686 +++ b/redhat/docker/el5/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM centos32:5 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=i686 # Add local repositories diff --git a/redhat/docker/el5/Dockerfile.x86_64 b/redhat/docker/el5/Dockerfile.x86_64 index a84206ea3..151860eb4 100644 --- a/redhat/docker/el5/Dockerfile.x86_64 +++ b/redhat/docker/el5/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM centos:5 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Add local repositories diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686 index e8a7cbe14..023519fc7 100644 --- a/redhat/docker/el6/Dockerfile.i686 +++ b/redhat/docker/el6/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM centos32:6 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=i686 # Enable proxy diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64 index c9d4ceae3..e854b5704 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.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Enable proxy @@ -8,29 +8,33 @@ ARG ARCH=x86_64 # Add RPMFUSION repository # Install Trinity build dependencies COPY packages /packages -RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \ - && rpm -Uvh http://repo/repo/archives/centos/6/os/x86_64/Packages/wget-1.12-10.el6.x86_64.rpm \ - && rm -fv /etc/yum.repos.d/*.repo \ - && wget -P /etc/yum.repos.d -nv http://repo/repo/{centos6,epel6}.repo \ +RUN set -x \ + && cd /etc/yum.repos.d \ + && rm -fv *.repo \ + && curl http://repo/repo/{centos6,epel6}.repo | sed -e "s|https://|http://|g" >repos.repo \ && yum -y clean all \ && yum -y update \ && rm -fv /etc/yum.repos.d/CentOS-*.repo \ && rpm -Uvh --nodeps https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \ - && yum -y install $(</packages) + && yum -y install $(</packages) \ + && rm -rf /usr/share/doc /usr/share/man /var/cache/yum # Add YUM repository for locally built packages 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" +RUN set -x \ + && 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 \ +RUN set -x \ + && 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 set -x \ + && useradd -m -s /bin/bash -u 1000 trinity \ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" USER trinity @@ -49,23 +53,23 @@ RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-ScanDeps-1.10-3.el7.src.rpm \ && 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 rpm -i https://archives.fedoraproject.org/pub/archive/epel/7.9/SRPMS/Packages/p/perl-PAR-1.015-4.el7.src.rpm \ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s|%license|%doc|" \ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR.spec \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm -RUN rpmbuild --rebuild https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-Getopt-ArgvFile-1.11-24.el7.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/epel/7.9/SRPMS/Packages/p/perl-Getopt-ArgvFile-1.11-24.el7.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-*.rpm -RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer-1.041-2.el7.src.rpm \ +RUN rpm -i https://archives.fedoraproject.org/pub/archive/epel/7.9/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|^|#|" \ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps -RUN rpm -i https://dl.fedoraproject.org/pub/epel/7/SRPMS/Packages/c/cln-1.3.4-1.el7.src.rpm \ +RUN rpm -i https://archives.fedoraproject.org/pub/archive/epel/7.9/SRPMS/Packages/c/cln-1.3.4-1.el7.src.rpm \ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cln.spec \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cln{,-devel}-1*.rpm -RUN rpm -i https://dl.fedoraproject.org/pub/epel/7/SRPMS/Packages/l/libqalculate-0.9.7-7.el7.src.rpm \ +RUN rpm -i https://archives.fedoraproject.org/pub/archive/epel/7.9/SRPMS/Packages/l/libqalculate-0.9.7-7.el7.src.rpm \ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libqalculate.spec \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libqalculate{,-devel}-0*.rpm diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64 index 0cb9b5dee..afa39f46b 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.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Enable proxy diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages index 67be667a7..034c786c8 100644 --- a/redhat/docker/el7/packages +++ b/redhat/docker/el7/packages @@ -158,6 +158,7 @@ netpbm-progs net-snmp-devel net-tools NetworkManager-glib-devel +NetworkManager-libnm-devel ocaml ocaml(compiler) OpenEXR-devel diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64 index 18e5dceea..f78cc317f 100644 --- a/redhat/docker/el8/Dockerfile.x86_64 +++ b/redhat/docker/el8/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM rockylinux:8 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Enable custom repository diff --git a/redhat/docker/el9/Dockerfile.x86_64 b/redhat/docker/el9/Dockerfile.x86_64 index 0315334b5..abcb3110d 100644 --- a/redhat/docker/el9/Dockerfile.x86_64 +++ b/redhat/docker/el9/Dockerfile.x86_64 @@ -1,6 +1,6 @@ -FROM rockylinux:9 +FROM quay.io/rockylinux/rockylinux:9 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Enable proxy @@ -20,7 +20,8 @@ RUN set -x \ && dnf -y install dnf-plugins-core \ && dnf config-manager --enable devel \ && dnf config-manager --enable plus \ - && dnf -y --enableplugin=ovl install $(</packages) + && dnf -y --enableplugin=ovl install $(</packages) \ + && rm -rf /usr/share/doc* /var/cache/dnf/* # Add YUM repository for locally built packages WORKDIR /etc/yum.repos.d @@ -50,27 +51,6 @@ RUN wget -nv -P ${HOME}/rpmbuild/RPMS/x86_64 \ http://rpms.remirepo.net/enterprise/9/remi/x86_64/libyaz{,-devel}-5.32.0-1.el9.remi.x86_64.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/lib{icu69,yaz}-*.rpm -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-1.017-5.fc36.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm - -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-37.fc36.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm - -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-Packer-1.054-3.fc36.src.rpm --nocheck \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm - -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/b/bdftopcf-1.1-4.fc36.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/bdftopcf-1*.rpm - -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/paper-2.3-4.fc36.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/paper-2*.rpm - -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/psutils-2.07-2.fc36.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/psutils-2*.rpm - -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/v/vorbis-tools-1.4.2-4.fc36.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/vorbis-tools-1*.rpm - RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*.rpm @@ -80,15 +60,6 @@ RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/lin RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/c/chmlib-0.40-26.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/chmlib{,-devel}-0*.rpm -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/h/html2ps-1.0-0.42.b7.fc36.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/html2ps-1*.rpm - -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libxml++-2.42.1-3.fc36.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libxml++{,-devel}-2*.rpm - -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libofx-0.10.3-2.fc36.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libofx{,-devel}-0*.rpm - RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/g/GeoIP-GeoLite-data-2018.06-9.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/GeoIP-GeoLite-data-2*.rpm @@ -98,9 +69,6 @@ RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/lin RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/liblo-0.31-5.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/liblo{,-devel}-0*.rpm -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/pcsc-perl-1.4.14-19.fc36.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm - RUN rpm -ivh https://dl.fedoraproject.org/pub/epel/10/Everything/source/tree/Packages/l/libunibreak-6.1-2.el10_0.src.rpm \ && sed -i ${HOME}/rpmbuild/SPECS/libunibreak.spec -e "/^Patch:.*offline_files.patch/ s/^Patch:/Patch1:/" -e "/^Patch:.*remove_unused_var.patch/ s/^Patch:/Patch2:/" \ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libunibreak.spec \ diff --git a/redhat/docker/el9/packages b/redhat/docker/el9/packages index 1763a3653..cdaa1f70a 100644 --- a/redhat/docker/el9/packages +++ b/redhat/docker/el9/packages @@ -4,6 +4,7 @@ aspell-devel audiofile-devel autotrace avahi-devel +bdftopcf bind-devel binutils-devel bison @@ -49,6 +50,7 @@ gcc-c++ gcc-gfortran gettext-devel giflib-devel +glibc-langpack-fr glibmm24-devel gmp-devel gnulib-devel @@ -66,6 +68,7 @@ heimdal-devel help2man hiredis hspell-devel +html2ps iceauth icu ImageMagick-devel @@ -105,6 +108,7 @@ libmng-devel libmpcdec-devel libmtp-devel libnsl2-devel +libofx-devel libogg-devel libotr-devel libpaper-devel @@ -136,6 +140,7 @@ libXcomposite-devel libXdamage-devel libXdmcp-devel libxkbfile-devel +libxml++-devel libXScrnSaver-devel libxslt-devel libXtst-devel @@ -163,15 +168,20 @@ openldap-devel opensc opensp-devel pam-devel +paper pciutils-devel pcre-devel pcsc-lite-devel +pcsc-perl perl perl-devel perl-generators +perl-Getopt-ArgvFile perl(ExtUtils::MakeMaker) perl(inc::Module::Install) perl(IPC::Run3) +perl-PAR +perl-PAR-Packer perl(PAR::Dist) perl(Module::Signature) perl(Test::Pod) @@ -184,6 +194,7 @@ poppler-devel postgresql postgresql-server-devel ppp +psutils pulseaudio-libs-devel python3 python3-devel @@ -216,6 +227,7 @@ transfig unixODBC-devel usbutils valgrind +vorbis-tools wget xine-lib-devel xkeyboard-config-devel diff --git a/redhat/docker/f25/Dockerfile.x86_64 b/redhat/docker/f25/Dockerfile.x86_64 index 4dc9b5763..e739f9311 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.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f26/Dockerfile.i686 b/redhat/docker/f26/Dockerfile.i686 index 040dadf98..30e296e49 100644 --- a/redhat/docker/f26/Dockerfile.i686 +++ b/redhat/docker/f26/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:26 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=i686 # Add RPMFUSION repository diff --git a/redhat/docker/f26/Dockerfile.x86_64 b/redhat/docker/f26/Dockerfile.x86_64 index 73fe3dd7d..bfc7fad08 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.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f27/Dockerfile.i686 b/redhat/docker/f27/Dockerfile.i686 index f1212c1f9..c0ecbe472 100644 --- a/redhat/docker/f27/Dockerfile.i686 +++ b/redhat/docker/f27/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:27 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=i686 # Add RPMFUSION repository diff --git a/redhat/docker/f27/Dockerfile.x86_64 b/redhat/docker/f27/Dockerfile.x86_64 index 47a061699..b5e533488 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.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f28/Dockerfile.i686 b/redhat/docker/f28/Dockerfile.i686 index 5265a7991..65d8670d6 100644 --- a/redhat/docker/f28/Dockerfile.i686 +++ b/redhat/docker/f28/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:28 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 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 b89e5455d..5435d452e 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.1.3 +ARG TDE_VERSION=14.1.4 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 42117cf2a..331dc9e91 100644 --- a/redhat/docker/f29/Dockerfile.i686 +++ b/redhat/docker/f29/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:29 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 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 01f05ae72..2a6de8ae7 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.1.3 +ARG TDE_VERSION=14.1.4 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 22c25fe8e..72d3882c6 100644 --- a/redhat/docker/f30/Dockerfile.i686 +++ b/redhat/docker/f30/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:30 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 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 c8e285e23..fdc589f7e 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.1.3 +ARG TDE_VERSION=14.1.4 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 515fbe138..092b8dbbb 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.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f32/Dockerfile.x86_64 b/redhat/docker/f32/Dockerfile.x86_64 index b8c78a5f3..919f323bf 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.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f33/Dockerfile.x86_64 b/redhat/docker/f33/Dockerfile.x86_64 index 0182517b0..228e64fb7 100644 --- a/redhat/docker/f33/Dockerfile.x86_64 +++ b/redhat/docker/f33/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:33 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f34/Dockerfile.x86_64 b/redhat/docker/f34/Dockerfile.x86_64 index 880d3f074..b86b93250 100644 --- a/redhat/docker/f34/Dockerfile.x86_64 +++ b/redhat/docker/f34/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:34 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f35/Dockerfile.x86_64 b/redhat/docker/f35/Dockerfile.x86_64 index 55cf3a14b..dbb42b2a9 100644 --- a/redhat/docker/f35/Dockerfile.x86_64 +++ b/redhat/docker/f35/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:35 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f36/Dockerfile.x86_64 b/redhat/docker/f36/Dockerfile.x86_64 index b44e7ea1f..49807b214 100644 --- a/redhat/docker/f36/Dockerfile.x86_64 +++ b/redhat/docker/f36/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:36 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f37/Dockerfile.x86_64 b/redhat/docker/f37/Dockerfile.x86_64 index cdfc51d6d..5967079e2 100644 --- a/redhat/docker/f37/Dockerfile.x86_64 +++ b/redhat/docker/f37/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:37 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f38/Dockerfile.x86_64 b/redhat/docker/f38/Dockerfile.x86_64 index f5bb2a497..27e949922 100644 --- a/redhat/docker/f38/Dockerfile.x86_64 +++ b/redhat/docker/f38/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:38 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f39/Dockerfile.x86_64 b/redhat/docker/f39/Dockerfile.x86_64 index d560f45e0..7b5a2d23f 100644 --- a/redhat/docker/f39/Dockerfile.x86_64 +++ b/redhat/docker/f39/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:39 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f40/Dockerfile.x86_64 b/redhat/docker/f40/Dockerfile.x86_64 index 5e4501306..e40dcb324 100644 --- a/redhat/docker/f40/Dockerfile.x86_64 +++ b/redhat/docker/f40/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:40 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f41/Dockerfile.x86_64 b/redhat/docker/f41/Dockerfile.x86_64 index 0716fe8bd..c41ef09a6 100644 --- a/redhat/docker/f41/Dockerfile.x86_64 +++ b/redhat/docker/f41/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:41 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f42/Dockerfile.x86_64 b/redhat/docker/f42/Dockerfile.x86_64 index d1d846ac5..18761130b 100644 --- a/redhat/docker/f42/Dockerfile.x86_64 +++ b/redhat/docker/f42/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:42 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/mga5/Dockerfile.x86_64 b/redhat/docker/mga5/Dockerfile.x86_64 index 10f5dc4c5..54b5362bb 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.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga6/Dockerfile.i686 b/redhat/docker/mga6/Dockerfile.i686 index 83289b3c8..435522a03 100644 --- a/redhat/docker/mga6/Dockerfile.i686 +++ b/redhat/docker/mga6/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM mageia32:6 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 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 13bbc29e1..922b018eb 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.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga7/Dockerfile.i686 b/redhat/docker/mga7/Dockerfile.i686 index 08d5fe1c1..9fbfdff1b 100644 --- a/redhat/docker/mga7/Dockerfile.i686 +++ b/redhat/docker/mga7/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM mageia32:7 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 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 d3f3b5a59..06503d530 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.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga8/Dockerfile.i686 b/redhat/docker/mga8/Dockerfile.i686 index c0f4bc460..68e213fc0 100644 --- a/redhat/docker/mga8/Dockerfile.i686 +++ b/redhat/docker/mga8/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM mageia32:8 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=i686 # Reset URPMI repositories to default diff --git a/redhat/docker/mga8/Dockerfile.x86_64 b/redhat/docker/mga8/Dockerfile.x86_64 index a230497fe..300a39c63 100644 --- a/redhat/docker/mga8/Dockerfile.x86_64 +++ b/redhat/docker/mga8/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM mageia:8 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga9/Dockerfile.i686 b/redhat/docker/mga9/Dockerfile.i686 index 277f39b9a..f01eb5406 100644 --- a/redhat/docker/mga9/Dockerfile.i686 +++ b/redhat/docker/mga9/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM mageia32:9 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=i686 # Reset URPMI repositories to default diff --git a/redhat/docker/mga9/Dockerfile.x86_64 b/redhat/docker/mga9/Dockerfile.x86_64 index 3243bc50d..3e1e79c36 100644 --- a/redhat/docker/mga9/Dockerfile.x86_64 +++ b/redhat/docker/mga9/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM mageia:9 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga9/packages.i686 b/redhat/docker/mga9/packages.i686 index 1279b7cbb..ec31bc8f1 100644 --- a/redhat/docker/mga9/packages.i686 +++ b/redhat/docker/mga9/packages.i686 @@ -126,6 +126,7 @@ libmp4v2-devel libmpcdec-devel libmtp-devel libnjb-devel +libnm-devel libnpth-devel libofx-devel libotr-devel diff --git a/redhat/docker/mga9/packages.x86_64 b/redhat/docker/mga9/packages.x86_64 index 66447ca34..cfd8f46bc 100644 --- a/redhat/docker/mga9/packages.x86_64 +++ b/redhat/docker/mga9/packages.x86_64 @@ -96,6 +96,7 @@ lib64lua-devel lib64mad-devel lib64mp3lame-devel lib64musicbrainz5-devel +lib64nm-devel lib64npth-devel lib64paper-devel lib64pcre-devel diff --git a/redhat/docker/omv5000/Dockerfile.x86_64 b/redhat/docker/omv6/Dockerfile.x86_64 index b387f6b62..3bb061a55 100644 --- a/redhat/docker/omv5000/Dockerfile.x86_64 +++ b/redhat/docker/omv6/Dockerfile.x86_64 @@ -1,13 +1,15 @@ -FROM openmandriva:5.0 +FROM openmandriva:6.0 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 COPY packages /packages RUN set -x \ && echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \ + && rm -fr /var/cache/dnf \ && dnf -y update \ - && dnf -y install --skip-broken $(</packages) + && dnf -y install --skip-broken $(</packages) \ + && rm -fr /var/cache/dnf # Fix utempter detection RUN set -x \ @@ -28,44 +30,50 @@ COPY rpmmacros /home/trinity/.rpmmacros RUN set -x \ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdesktop-1.9.0-6.mga9.src.rpm \ && sed -i ${HOME}/rpmbuild/SPECS/rdesktop.spec -e "s|%{_rpmconfigdir}/%{_real_vendor}|/usr/share/libtool/config|" \ - && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdesktop.spec \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdesktop.spec --define "mkrel %nil" \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm RUN set -x \ - && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/sword-1.9.0-11.mga10.src.rpm \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/sword-1.9.0-13.mga10.src.rpm \ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/sword.spec --define "cmake_build %__make %{?_smp_mflags}" --define "cmake_install %__make -C build install DESTDIR=%{?buildroot}" --define "__cc /usr/bin/gcc" --define "__cxx /usr/bin/g++" --define "_disable_ld_no_undefined 1" --define "mkrel %nil" --define "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --nodeps \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64sword{1.9,-devel},sword}-1.9.0-*.rpm RUN set -x \ - && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/yaz-5.34.0-1.mga9.src.rpm --nodeps \ + && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/yaz-5.34.4-2.mga10.src.rpm --define "mkrel %nil" --nodeps \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64yaz{5,-devel},yaz}-5*.rpm RUN set -x \ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdiff-backup-2.2.2-1.mga9.src.rpm \ - && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdiff-backup.spec \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdiff-backup.spec --define "mkrel %nil" \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-2*.rpm RUN set -x \ - && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/cscope-15.9-3.mga9.src.rpm \ + && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/cscope-15.9-3.mga9.src.rpm --define "mkrel %nil" \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cscope-15*.rpm RUN set -x \ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-Getopt-ArgvFile-1.110.0-10.mga9.src.rpm \ - && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-Getopt-ArgvFile.spec \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-Getopt-ArgvFile.spec --define "mkrel %nil" \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm RUN set -x \ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-1.18.0-1.mga9.src.rpm \ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s/MYMETA.yml//" \ - && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR.spec \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR.spec --define "mkrel %nil" --nodeps \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm RUN set -x \ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-Packer-1.57.0-1.mga9.src.rpm \ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s/MYMETA.yml//" \ - && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec --define "mkrel %nil" --nodeps \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm RUN set -x \ - && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/wireless-tools-30-0.pre9.14.mga9.src.rpm \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/wireless-tools-30-0.pre9.14.mga9.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/wireless-tools.spec -e "s/%patch/%patch -P /" \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/wireless-tools.spec --define "mkrel %nil" \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/lib64iw{30,-devel}-30*.rpm + +RUN set -x \ + && rpmbuild --rebuild https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/tcl-8.6.16-1.mga10.src.rpm --define "mkrel %nil" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{tcl,lib64tcl{8.6,-devel}}-8.6*.rpm diff --git a/redhat/docker/omv5000/packages b/redhat/docker/omv6/packages index 9a5216e64..873ca4609 100644 --- a/redhat/docker/omv5000/packages +++ b/redhat/docker/omv6/packages @@ -190,6 +190,7 @@ lib64xv-devel lib64xxf86dga-devel lib64xxf86vm-devel lib64wrap-devel +libgcrypt-devel librsvg libwebp-devel libxt-devel diff --git a/redhat/docker/omv5000/rpmmacros b/redhat/docker/omv6/rpmmacros index 0a954f906..0a954f906 100644 --- a/redhat/docker/omv5000/rpmmacros +++ b/redhat/docker/omv6/rpmmacros diff --git a/redhat/docker/omvcooker/Dockerfile.x86_64 b/redhat/docker/omvcooker/Dockerfile.x86_64 index 0a1ac4080..b237c4192 100644 --- a/redhat/docker/omvcooker/Dockerfile.x86_64 +++ b/redhat/docker/omvcooker/Dockerfile.x86_64 @@ -1,13 +1,15 @@ FROM openmandriva/cooker:latest -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 COPY packages /packages RUN set -x \ && echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \ + && rm -fr /var/cache/dnf \ && dnf -y update \ - && dnf -y install --skip-broken $(</packages) + && dnf -y install --skip-broken $(</packages) \ + && rm -fr /var/cache/dnf # Fix utempter detection RUN set -x \ @@ -32,12 +34,12 @@ RUN set -x \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm RUN set -x \ - && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/sword-1.9.0-11.mga10.src.rpm \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/sword-1.9.0-13.mga10.src.rpm \ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/sword.spec --define "cmake_build %__make %{?_smp_mflags}" --define "cmake_install %__make -C build install DESTDIR=%{?buildroot}" --define "__cc /usr/bin/gcc" --define "__cxx /usr/bin/g++" --define "_disable_ld_no_undefined 1" --define "mkrel %nil" --define "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --nodeps \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64sword{1.9,-devel},sword}-1.9.0-*.rpm RUN set -x \ - && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/yaz-5.34.2-1.mga10.src.rpm --define "mkrel %nil" --nodeps \ + && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/yaz-5.34.4-2.mga10.src.rpm --define "mkrel %nil" --nodeps \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64yaz{5,-devel},yaz}-5*.rpm RUN set -x \ @@ -71,3 +73,7 @@ RUN set -x \ && sed -i ${HOME}/rpmbuild/SPECS/wireless-tools.spec -e "s/%patch/%patch -P /" \ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/wireless-tools.spec --define "mkrel %nil" \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/lib64iw{30,-devel}-30*.rpm + +RUN set -x \ + && rpmbuild --rebuild https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/tcl-8.6.16-1.mga10.src.rpm --define "mkrel %nil" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{tcl,lib64tcl{8.6,-devel}}-8.6*.rpm diff --git a/redhat/docker/omvcooker/packages b/redhat/docker/omvcooker/packages index 87fc9fd5f..873ca4609 100644 --- a/redhat/docker/omvcooker/packages +++ b/redhat/docker/omvcooker/packages @@ -60,6 +60,7 @@ java-1.8.0-openjdk java-1.8.0-openjdk-devel java-devel kde-dev-scripts +ladspa-devel less lib64acl-devel lib64alsa-oss-devel @@ -101,6 +102,7 @@ lib64gpg-error-devel lib64gphoto-devel lib64gpod-devel lib64graphicsmagick-devel +lib64gsf-1-devel lib64gstreamer-devel lib64gst-plugins-base1.0-devel lib64gtk+2.0-devel @@ -184,13 +186,14 @@ lib64xkbfile-devel lib64xscrnsaver-devel lib64xslt-devel lib64xtst-devel +lib64xv-devel lib64xxf86dga-devel lib64xxf86vm-devel lib64wrap-devel +libgcrypt-devel librsvg libwebp-devel libxt-devel -libxv-devel lm_sensors-devel mysql-devel nas-devel diff --git a/redhat/docker/openmandriva.sh b/redhat/docker/openmandriva.sh index ff121c54e..591f57026 100755 --- a/redhat/docker/openmandriva.sh +++ b/redhat/docker/openmandriva.sh @@ -1,7 +1,7 @@ #!/bin/bash -ex NAME="openmandriva" -VERSION="${1:-5.0}" # E.g: '26' +VERSION="${1:-6.0}" # E.g: '6.0' IMAGE="${NAME}:${VERSION}" TAR="${NAME}-${VERSION}.tar" INSTALLROOT="/dev/shm/${IMAGE}" @@ -20,6 +20,8 @@ sudo dnf install \ --repofrompath 'omv-updates,http://mirror.openmandriva.org/$releasever/repository/x86_64/main/updates/' \ bash curl dnf vim +sudo rm -rf "${INSTALLROOT}/var/cache/dnf" + sudo tar -C "${INSTALLROOT}" -c . >"${TAR}" sudo rm -rf "${INSTALLROOT}" diff --git a/redhat/docker/oss131/Dockerfile.x86_64 b/redhat/docker/oss131/Dockerfile.x86_64 index c0a2d4236..2f53dc4c5 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.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss132/Dockerfile.x86_64 b/redhat/docker/oss132/Dockerfile.x86_64 index 4e7ee141d..24120029b 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.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss150/Dockerfile.x86_64 b/redhat/docker/oss150/Dockerfile.x86_64 index 157a1944e..82f4a69b2 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.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss151/Dockerfile.x86_64 b/redhat/docker/oss151/Dockerfile.x86_64 index ac1222a38..0513b395e 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.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss152/Dockerfile.x86_64 b/redhat/docker/oss152/Dockerfile.x86_64 index 81ed57de0..5615f8483 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.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss153/Dockerfile.x86_64 b/redhat/docker/oss153/Dockerfile.x86_64 index baed78762..f7b8efd9e 100644 --- a/redhat/docker/oss153/Dockerfile.x86_64 +++ b/redhat/docker/oss153/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/leap:15.3 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss154/Dockerfile.x86_64 b/redhat/docker/oss154/Dockerfile.x86_64 index 18d92ac00..b443cbcda 100644 --- a/redhat/docker/oss154/Dockerfile.x86_64 +++ b/redhat/docker/oss154/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/leap:15.4 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss155/Dockerfile.x86_64 b/redhat/docker/oss155/Dockerfile.x86_64 index 76790a150..ec70a4649 100644 --- a/redhat/docker/oss155/Dockerfile.x86_64 +++ b/redhat/docker/oss155/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/leap:15.5 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss156/Dockerfile.x86_64 b/redhat/docker/oss156/Dockerfile.x86_64 index 5e4fb3267..9e3685946 100644 --- a/redhat/docker/oss156/Dockerfile.x86_64 +++ b/redhat/docker/oss156/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/leap:15.6 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss156/packages b/redhat/docker/oss156/packages index be5009ec0..f330fcecb 100644 --- a/redhat/docker/oss156/packages +++ b/redhat/docker/oss156/packages @@ -200,6 +200,7 @@ rpcgen rpm-build rpmlint rsvg-convert +rsync ruby ruby-devel sane-backends-devel diff --git a/redhat/docker/oss421/Dockerfile.x86_64 b/redhat/docker/oss421/Dockerfile.x86_64 index 1ed0b6e0a..2914e970e 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.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss422/Dockerfile.x86_64 b/redhat/docker/oss422/Dockerfile.x86_64 index 7c1d9c4ce..7daaa6e08 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.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss423/Dockerfile.x86_64 b/redhat/docker/oss423/Dockerfile.x86_64 index 0d02c588b..4b35dfbd0 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.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index fef8b3092..61bf0f4d9 100644 --- a/redhat/docker/osstw/Dockerfile.i686 +++ b/redhat/docker/osstw/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM opensuse32/tumbleweed:latest -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=i686 # Add PACKMAN repository @@ -28,9 +28,12 @@ RUN set -x \ && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch +RUN set -x \ + && sudo rpm -Uvh --nodeps https://download.opensuse.org/repositories/network/openSUSE_Tumbleweed/i586/torsocks-2.4.0-15.25.i586.rpm + # Add lilypond (i686 only) RUN set -x \ - && rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.4-1.5.src.rpm \ + && rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.4-1.6.src.rpm \ && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \ && setarch ${ARCH} rpmbuild -ba "${HOME}/rpmbuild/SPECS/lilypond.spec" \ && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/lilypond"{,-fonts-common,-emmentaler-fonts}"-2"*".rpm" diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64 index 6efe437d5..4498a9573 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.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Add PACKMAN repository @@ -27,3 +27,6 @@ RUN set -x \ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \ && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch + +RUN set -x \ + && sudo rpm -Uvh --nodeps https://download.opensuse.org/repositories/network/openSUSE_Tumbleweed/x86_64/torsocks-2.4.0-15.25.x86_64.rpm diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages index 6a28ed98d..b18437051 100644 --- a/redhat/docker/osstw/packages +++ b/redhat/docker/osstw/packages @@ -179,14 +179,13 @@ openssl pam-devel patch pciutils-devel -pcre-devel +pcre2-devel pcsc-lite-devel perl-JSON perl-PAR-Packer perl-pcsc pkcs11-helper-devel pkgconfig(bdw-gc) -pkgconfig(guile-1.8) pkgconfig(guile-3.0) polkit-devel postgresql diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64 index e085fe7cf..5e59d115f 100644 --- a/redhat/docker/pclinuxos/Dockerfile.x86_64 +++ b/redhat/docker/pclinuxos/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM pclinuxos:2024 -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Update distribution @@ -9,6 +9,7 @@ COPY packages.${ARCH} /packages RUN set -x \ && apt-get -y update \ && apt-get -y dist-upgrade \ + && apt-get -y update \ && apt-get -y install $(</packages) # Add rpmbuild repositories @@ -31,7 +32,8 @@ RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 \ # 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" + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" \ + && echo "export QA_RPATHS=\$(( 0x0001|0x0002|0x0020 ))" >>/home/trinity/.bashrc USER trinity COPY rpmmacros /home/trinity/.rpmmacros @@ -59,4 +61,4 @@ RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPM RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/heimdal-7.8.0-2.mga9.src.rpm \ && sed -i ${HOME}/rpmbuild/SPECS/heimdal.spec -e "s|%patch|%patch -P |" -e "/Conflicts: krb5-devel/ s|^|#|" -e "s|%mkrel 2|1%{?dist}|" \ && LDFLAGS="-lcrypt -Wl,--allow-shlib-undefined" rpmbuild -ba ${HOME}/rpmbuild/SPECS/heimdal.spec \ - #&& sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/heimdal-{devel,libs}-7*.rpm +# && sudo rpm -Uvh --force /home/trinity/rpmbuild/RPMS/*/heimdal-{devel,libs}-7*.rpm diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros index 00b98f240..f3b4d4c09 100644 --- a/redhat/docker/pclinuxos/rpmmacros +++ b/redhat/docker/pclinuxos/rpmmacros @@ -1,10 +1,12 @@ -%dist .pclos2024 +%dist .pclos2025 %_smp_mflags -j8 %jobs 8 -%pclinuxos 2024 -%configure %configure2_5x +%pclinuxos 2025 %python python3 %__python /usr/bin/python3 %_vpath_builddir . %python_sitearch %python3_sitearch %python_sitelib %python3_sitelib +%__brp_remove_la_files %nil +%_debugsource_packages %nil +%_debugsource_template %nil diff --git a/redhat/docker/pull.sh b/redhat/docker/pull.sh index f5789d104..75cc62be2 100755 --- a/redhat/docker/pull.sh +++ b/redhat/docker/pull.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.3" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.4" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/push.sh b/redhat/docker/push.sh index 5cd322ad0..9a8925430 100755 --- a/redhat/docker/push.sh +++ b/redhat/docker/push.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.3" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.4" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/rawhide/Dockerfile.x86_64 b/redhat/docker/rawhide/Dockerfile.x86_64 index 95f1d7d37..8f92141e5 100644 --- a/redhat/docker/rawhide/Dockerfile.x86_64 +++ b/redhat/docker/rawhide/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:rawhide -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/remove.sh b/redhat/docker/remove.sh index 68d4b595e..864881b55 100755 --- a/redhat/docker/remove.sh +++ b/redhat/docker/remove.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.3" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.4" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh index 7b13b0b2e..26719c6a6 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.1.3" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.4" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker |