diff options
24 files changed, 290 insertions, 232 deletions
diff --git a/redhat/Makefile b/redhat/Makefile index 44f810ea7..a409f5bfe 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -3,6 +3,7 @@ PATH := $(PATH):$(shell pwd)/build TDE_VERSION := $(shell echo $${TDE_VERSION:-14.0.7}) TDE_GIT_DIR := $(shell cd ../../tde; pwd) TDE_PACKAGING_DIR := $(shell [ -n "$${TDE_PACKAGING_DIR}" ] && cd "$${TDE_PACKAGING_DIR}" || cd ..; pwd) +RPMDIR := "$(shell rpm -E %{_rpmdir}.tde-$(TDE_VERSION))" DIST := $(shell rpm -E %dist) buildpkg = \ @@ -629,3 +630,8 @@ git: tarballs: cd "$(TDE_GIT_DIR)" && COMPRESS=pigz SUFFIX=0 ./scripts/create_all_tarballs + + +# External packages +external: + [ -d "${HOME}/rpmbuild/RPMS" ] && cp -rfv "${HOME}/rpmbuild/RPMS/"* "$(RPMDIR)" diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686 index 23358198f..8844adabc 100644 --- a/redhat/docker/el6/Dockerfile.i686 +++ b/redhat/docker/el6/Dockerfile.i686 @@ -1,23 +1,22 @@ FROM centos32:6 -ARG TDE_VERSION=14.0.7 +ARG TDE_VERSION=14.0.8 ARG ARCH=i686 # Enable proxy RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" -# Update distribution packages -RUN setarch ${ARCH} yum -y update - # Add EPEL repository -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 +# Add RPMFUSION repository +RUN rpm -Uvh \ + https://fr2.rpmfind.net/linux/epel/6/x86_64/Packages/e/epel-release-6-8.noarch.rpm \ + https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm # Install Trinity build dependencies ADD packages /packages -RUN setarch ${ARCH} yum -y install $(</packages) +RUN yum -y clean all \ + && setarch ${ARCH} yum -y update \ + && setarch ${ARCH} yum -y install $(</packages) # Add YUM repository for locally built packages WORKDIR /etc/yum.repos.d @@ -25,38 +24,41 @@ 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|" +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/lib/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" +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" USER trinity ADD rpmmacros /home/trinity/.rpmmacros # 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 setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/m4-1.4.16-10.el7.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/m4-1*.rpm + +RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm -RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps -RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm +RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-Install-1.06-4.el7.src.rpm \ + && 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-Install-1.06-4.el7.src.rpm -RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-Install-*.rpm +RUN setarch i686 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 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 \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s|%license|%doc|" \ + && setarch i686 rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR.spec \ + && 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-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 setarch i686 rpmbuild --rebuild https://fr2.rpmfind.net/linux/epel/7/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 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 +RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/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|^|#|" \ + && setarch i686 rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \ + && 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 17c83998e..c133b4122 100644 --- a/redhat/docker/el6/Dockerfile.x86_64 +++ b/redhat/docker/el6/Dockerfile.x86_64 @@ -1,23 +1,22 @@ FROM centos:6 -ARG TDE_VERSION=14.0.7 +ARG TDE_VERSION=14.0.8 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 - -# 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 +# Add RPMFUSION repository +RUN rpm -Uvh \ + https://fr2.rpmfind.net/linux/epel/6/x86_64/Packages/e/epel-release-6-8.noarch.rpm \ + https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm # Install Trinity build dependencies ADD packages /packages -RUN yum -y install $(</packages) +RUN yum -y clean all \ + && yum -y update \ + && yum -y install $(</packages) # Add YUM repository for locally built packages WORKDIR /etc/yum.repos.d @@ -25,38 +24,40 @@ 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|" +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" +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" USER trinity ADD rpmmacros /home/trinity/.rpmmacros # 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 sudo rpm -Uvh http://repo/repo/build-tools/el6/RPMS/x86_64/m4-1.4.16-10.el6.x86_64.rpm + +RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm -RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps -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 \ + && 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-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 \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-ScanDeps-*.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 \ + && 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 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 rpmbuild --rebuild https://fr2.rpmfind.net/linux/epel/7/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 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 +RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/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 diff --git a/redhat/docker/el6/packages b/redhat/docker/el6/packages index 1a713084c..2b9fa4b07 100644 --- a/redhat/docker/el6/packages +++ b/redhat/docker/el6/packages @@ -181,6 +181,7 @@ perl(Test::CPAN::Meta) perl(Test::MinimumVersion) perl(Test::More) perl(Test::Pod) +perl(Test::Pod::Coverage) perl(XML::Parser) pigz pilot-link-devel diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64 index c350bd995..7693ded63 100644 --- a/redhat/docker/el7/Dockerfile.x86_64 +++ b/redhat/docker/el7/Dockerfile.x86_64 @@ -1,23 +1,22 @@ FROM centos:7 -ARG TDE_VERSION=14.0.7 +ARG TDE_VERSION=14.0.8 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 - -# 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 +RUN rpm -Uvh \ + https://fr2.rpmfind.net/linux/epel/7/x86_64/Packages/e/epel-release-7-12.noarch.rpm \ + https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm # Install Trinity build dependencies ADD packages /packages -RUN yum -y install $(</packages) +RUN yum -y clean all \ + && yum -y update \ + && yum -y install $(</packages) # Add YUM repository for locally built packages WORKDIR /etc/yum.repos.d @@ -25,22 +24,28 @@ 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|" +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" +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && 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 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/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 +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 969834482..efc202d44 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 @@ -163,6 +164,7 @@ pcsc-lite-devel pcsc-perl perl perl-devel +perl-generators perl(ExtUtils::MakeMaker) perl(PAR::Packer) perl(XML::Parser) diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64 index af184025a..7976db169 100644 --- a/redhat/docker/el8/Dockerfile.x86_64 +++ b/redhat/docker/el8/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM centos:8 -ARG TDE_VERSION=14.0.7 +ARG TDE_VERSION=14.0.8 ARG ARCH=x86_64 # Enable proxy diff --git a/redhat/docker/f31/Dockerfile.x86_64 b/redhat/docker/f31/Dockerfile.x86_64 index 62a39e78d..4efdd8769 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.0.7 +ARG TDE_VERSION=14.0.8 ARG ARCH=x86_64 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/mga6/Dockerfile.i686 b/redhat/docker/mga6/Dockerfile.i686 index e10433ead..3b98ac460 100644 --- a/redhat/docker/mga6/Dockerfile.i686 +++ b/redhat/docker/mga6/Dockerfile.i686 @@ -1,22 +1,20 @@ FROM mageia32:6 -ARG TDE_VERSION=14.0.7 +ARG TDE_VERSION=14.0.8 ARG ARCH=i686 # Reset URPMI repositories to default -RUN urpmi.removemedia -a -RUN urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST' - # Enable more URPMI repositories -RUN sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" +RUN urpmi.removemedia -a \ + && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/6/i586/ \ + && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" # Update distribution -RUN urpmi.update -a -RUN urpmi --auto-select --auto - # Install Trinity build dependencies ADD packages.${ARCH} /packages -RUN urpmi --auto $(</packages) +RUN urpmi.update -a \ + && urpmi --auto-select --auto \ + && urpmi --auto $(</packages) # Enable ccache RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" @@ -28,22 +26,22 @@ RUN sed -i "/usr/include/poppler/PDFDoc.h" -e "/^#define PDFDOC_H/ s|$|\n#define RUN chmod a+r /usr/libexec/utempter/utempter # Add non-root user to build packages -RUN rm -rf /home/trinity -RUN useradd -m -s /bin/bash -u 1000 trinity -RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" +RUN rm -rf /home/trinity \ + && useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" # Configure user trinity USER trinity ADD rpmmacros /home/trinity/.rpmmacros # Add rpmbuild repositories -RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} -RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} -RUN sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} -RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch -RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch -RUN sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch +RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ + && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ + && sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch # Build development packages that are missing -RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/6.1/SRPMS/core/release/perl-PAR-Packer-1.32.0-1.mga6.src.rpm -RUN sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm" +RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/6.1/SRPMS/core/release/perl-PAR-Packer-1.32.0-1.mga6.src.rpm \ + && sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm" diff --git a/redhat/docker/mga6/Dockerfile.x86_64 b/redhat/docker/mga6/Dockerfile.x86_64 index b656182ec..d8d826d48 100644 --- a/redhat/docker/mga6/Dockerfile.x86_64 +++ b/redhat/docker/mga6/Dockerfile.x86_64 @@ -1,22 +1,20 @@ FROM mageia:6 -ARG TDE_VERSION=14.0.7 +ARG TDE_VERSION=14.0.8 ARG ARCH=x86_64 # Reset URPMI repositories to default -RUN urpmi.removemedia -a -RUN urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST' - # Enable more URPMI repositories -RUN sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" +RUN urpmi.removemedia -a \ + && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/6/x86_64/ \ + && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" # Update distribution -RUN urpmi.update -a -RUN urpmi --auto-select --auto - # Install Trinity build dependencies ADD packages.${ARCH} /packages -RUN urpmi --auto $(</packages) +RUN urpmi.update -a \ + && urpmi --auto-select --auto \ + && urpmi --auto $(</packages) # Enable ccache RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" @@ -28,22 +26,22 @@ RUN sed -i "/usr/include/poppler/PDFDoc.h" -e "/^#define PDFDOC_H/ s|$|\n#define RUN chmod a+r /usr/libexec/utempter/utempter # Add non-root user to build packages -RUN rm -rf /home/trinity -RUN useradd -m -s /bin/bash -u 1000 trinity -RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" +RUN rm -rf /home/trinity \ + && useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" # Configure user trinity USER trinity ADD rpmmacros /home/trinity/.rpmmacros # Add rpmbuild repositories -RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} -RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} -RUN sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} -RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch -RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch -RUN sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch +RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ + && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ + && sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch # Build development packages that are missing -RUN rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/6.1/SRPMS/core/release/perl-PAR-Packer-1.32.0-1.mga6.src.rpm -RUN sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm" +RUN rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/6.1/SRPMS/core/release/perl-PAR-Packer-1.32.0-1.mga6.src.rpm \ + && sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm" diff --git a/redhat/docker/mga7/Dockerfile.i686 b/redhat/docker/mga7/Dockerfile.i686 index 97cee52ff..991ee2320 100644 --- a/redhat/docker/mga7/Dockerfile.i686 +++ b/redhat/docker/mga7/Dockerfile.i686 @@ -1,22 +1,20 @@ FROM mageia32:7 -ARG TDE_VERSION=14.0.7 +ARG TDE_VERSION=14.0.8 ARG ARCH=i686 # Reset URPMI repositories to default -RUN urpmi.removemedia -a -RUN urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST' - # Enable more URPMI repositories -RUN sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" +RUN urpmi.removemedia -a \ + && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7/i586/ \ + && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" # Update distribution -RUN urpmi.update -a -RUN urpmi --auto-select --auto - # Install Trinity build dependencies ADD packages.${ARCH} /packages -RUN urpmi --auto $(</packages) +RUN urpmi.update -a \ + && urpmi --auto-select --auto \ + && urpmi --auto $(</packages) # Enable ccache RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" @@ -25,22 +23,22 @@ RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAUL RUN chmod a+r /usr/libexec/utempter/utempter # Add non-root user to build packages -RUN rm -rf /home/trinity -RUN useradd -m -s /bin/bash -u 1000 trinity -RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" +RUN rm -rf /home/trinity \ + && useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" # Configure user trinity USER trinity ADD rpmmacros /home/trinity/.rpmmacros # Add rpmbuild repositories -RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} -RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} -RUN sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} -RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch -RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch -RUN sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch +RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ + && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ + && sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch # Build development packages that are missing -RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/perl-PAR-Packer-1.47.0-2.mga7.src.rpm -RUN sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm" +RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/perl-PAR-Packer-1.47.0-2.mga7.src.rpm \ + && sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm" diff --git a/redhat/docker/mga7/Dockerfile.x86_64 b/redhat/docker/mga7/Dockerfile.x86_64 index 6f0599b57..026549071 100644 --- a/redhat/docker/mga7/Dockerfile.x86_64 +++ b/redhat/docker/mga7/Dockerfile.x86_64 @@ -1,22 +1,20 @@ FROM mageia:7 -ARG TDE_VERSION=14.0.7 +ARG TDE_VERSION=14.0.8 ARG ARCH=x86_64 # Reset URPMI repositories to default -RUN urpmi.removemedia -a -RUN urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST' - # Enable more URPMI repositories -RUN sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" +RUN urpmi.removemedia -a \ + && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7/x86_64/ \ + && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" # Update distribution -RUN urpmi.update -a -RUN urpmi --auto-select --auto - # Install Trinity build dependencies ADD packages.${ARCH} /packages -RUN urpmi --auto $(</packages) +RUN urpmi.update -a \ + && urpmi --auto-select --auto \ + && urpmi --auto $(</packages) # Enable ccache RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" @@ -25,22 +23,22 @@ RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAUL RUN chmod a+r /usr/libexec/utempter/utempter # Add non-root user to build packages -RUN rm -rf /home/trinity -RUN useradd -m -s /bin/bash -u 1000 trinity -RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" +RUN rm -rf /home/trinity \ + && useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" # Configure user trinity USER trinity ADD rpmmacros /home/trinity/.rpmmacros # Add rpmbuild repositories -RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} -RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} -RUN sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} -RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch -RUN genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch -RUN sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch +RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ + && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ + && sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch # Build development packages that are missing -RUN rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/perl-PAR-Packer-1.47.0-2.mga7.src.rpm -RUN sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm" +RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/perl-PAR-Packer-1.47.0-2.mga7.src.rpm \ + && sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm" diff --git a/redhat/docker/mga7/packages.x86_64 b/redhat/docker/mga7/packages.x86_64 index a23712301..3b6878579 100644 --- a/redhat/docker/mga7/packages.x86_64 +++ b/redhat/docker/mga7/packages.x86_64 @@ -67,6 +67,7 @@ lib64apr-devel lib64apr-util-devel lib64avformat58 lib64binutils-devel +lib64boost_python3-devel lib64cln-devel lib64clucene-devel lib64commoncpp-devel diff --git a/redhat/docker/opensuse32.sh b/redhat/docker/opensuse32.sh index 3a3a6c2b2..f2d686df5 100755 --- a/redhat/docker/opensuse32.sh +++ b/redhat/docker/opensuse32.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e VERSION="$1" # E.g: '42.3' @@ -10,7 +10,7 @@ else NAME="opensuse32/leap" fi -IMAGE="${NAME}:${VERSION}" +IMAGE="${NAME}:latest" INSTALLROOT="/dev/shm/${IMAGE}" sudo rm -rf "${INSTALLROOT}" @@ -27,13 +27,30 @@ if [ "${VERSION}" != "tumbleweed" ]; then sudo zypper --root "${INSTALLROOT}" \ ar "http://download.opensuse.org/update/leap/${VERSION}/non-oss/" "update-non-oss" fi -setarch i686 sudo zypper --root "${INSTALLROOT}" \ +sudo zypper --root "${INSTALLROOT}" \ --gpg-auto-import-keys ref -setarch i686 sudo zypper --root "${INSTALLROOT}" \ - install -y bash vim zypper openSUSE-release - -sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar" +sudo setarch i686 zypper --root "${INSTALLROOT}" \ + install --download-only -y \ + bash \ + filesystem \ + glibc \ + glibc-extra \ + libpcre1 \ + libselinux1 \ + openSUSE-release \ + system-user-root \ + util-linux vim \ + zypper +sudo rpm -Uvh --root "${INSTALLROOT}" "${INSTALLROOT}/var/cache/zypp/packages/oss/"*"/"*".rpm" + +sudo chroot "${INSTALLROOT}" rpmdb --rebuilddb + +FILE="${IMAGE//\//_}.tar" +sudo tar -C "${INSTALLROOT}" -c . >"${FILE}" sudo rm -rf "${INSTALLROOT}" docker rmi -f "${IMAGE}" -docker import "${IMAGE}.tar" "${IMAGE}" +docker import "${FILE}" "${IMAGE}" + +pigz "${FILE}" +mv -fv "${FILE}.gz" "${HOME}/tde/docker" diff --git a/redhat/docker/oss151/Dockerfile.x86_64 b/redhat/docker/oss151/Dockerfile.x86_64 index f0bec552a..3879c1d8e 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.0.7 +ARG TDE_VERSION=14.0.8 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss151/packages b/redhat/docker/oss151/packages index 11eeec1f3..0af27eadc 100644 --- a/redhat/docker/oss151/packages +++ b/redhat/docker/oss151/packages @@ -68,6 +68,7 @@ libart_lgpl-devel libavahi-devel libavcodec-devel libblkid-devel +libboost_python3-devel libbz2-devel libcap-devel libcdio-devel diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index 1e0b8a168..b095031b8 100644 --- a/redhat/docker/osstw/Dockerfile.i686 +++ b/redhat/docker/osstw/Dockerfile.i686 @@ -1,25 +1,31 @@ FROM opensuse32/tumbleweed:latest -ARG TDE_VERSION=14.0.7 +ARG TDE_VERSION=14.0.8 ARG ARCH=i686 # Add PACKMAN repository RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman -RUN setarch ${ARCH} zypper refresh -RUN setarch ${ARCH} zypper --non-interactive dup -RUN setarch ${ARCH} zypper --non-interactive update - -# Install Trinity build dependencies ADD packages /packages -RUN setarch ${ARCH} zypper install -l -y $(</packages) +RUN setarch ${ARCH} zypper refresh \ + && setarch ${ARCH} zypper -n dup \ + && setarch ${ARCH} zypper -n update \ + && setarch ${ARCH} zypper -n install $(</packages) # 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 useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers + +USER trinity ADD rpmmacros /home/trinity/.rpmmacros # Add YUM repository for locally built packages -RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} -RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} -RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch -RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch +RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && 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 + +# Build supplementary packages +RUN rpm -Uvh https://ftp.gwdg.de/pub/opensuse/repositories/graphics/openSUSE_Factory/src/jasper-2.0.16-260.4.src.rpm \ + && sed -i "${HOME}/rpmbuild/SPECS/jasper.spec" -e "/^%cmake / s|$| -DJAS_ENABLE_DOC=False|" \ + && setarch ${ARCH} rpmbuild -ba "${HOME}/rpmbuild/SPECS/jasper.spec" \ + && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/libjasper{4,-devel}-2*.rpm /home/trinity/rpmbuild/RPMS/*/jasper-2*.rpm diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64 index 42d7007c3..82bb96ca3 100644 --- a/redhat/docker/osstw/Dockerfile.x86_64 +++ b/redhat/docker/osstw/Dockerfile.x86_64 @@ -1,25 +1,31 @@ FROM opensuse/tumbleweed:latest -ARG TDE_VERSION=14.0.7 +ARG TDE_VERSION=14.0.8 ARG ARCH=x86_64 # Add PACKMAN repository RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman -RUN zypper refresh -RUN zypper --non-interactive dup -RUN zypper --non-interactive update - -# Install Trinity build dependencies ADD packages /packages -RUN zypper install -l -y $(</packages) +RUN zypper refresh \ + && zypper -n dup \ + && zypper -n update \ + && zypper -n install $(</packages) # 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 useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers + +USER trinity ADD rpmmacros /home/trinity/.rpmmacros # Add YUM repository for locally built packages -RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} -RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} -RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch -RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch +RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && 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 + +# Build supplementary packages +RUN rpm -Uvh https://ftp.gwdg.de/pub/opensuse/repositories/graphics/openSUSE_Factory/src/jasper-2.0.16-260.4.src.rpm \ + && sed -i "${HOME}/rpmbuild/SPECS/jasper.spec" -e "/^%cmake / s|$| -DJAS_ENABLE_DOC=False|" \ + && rpmbuild -ba "${HOME}/rpmbuild/SPECS/jasper.spec" \ + && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/libjasper{4,-devel}-2*.rpm /home/trinity/rpmbuild/RPMS/*/jasper-2*.rpm diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages index 81f51221f..9d2f2cdbd 100644 --- a/redhat/docker/osstw/packages +++ b/redhat/docker/osstw/packages @@ -7,6 +7,7 @@ bdftopcf bind-devel binutils-devel bison +bluez-devel boost-devel ccache cdparanoia @@ -19,6 +20,7 @@ clucene-core-devel cmake createrepo_c cups-devel +curl cyrus-sasl-devel dbus-1-devel dbus-1-glib-devel @@ -29,12 +31,14 @@ doxygen GraphicsMagick docbook2x dssi-devel fdupes -ffmpeg-devel +ffmpeg-4-libavcodec-devel +ffmpeg-4-libavdevice-devel fftw3-devel file-devel flac-devel flex font-util +freeglut-devel freetype-devel fribidi-devel gamin-devel @@ -43,7 +47,6 @@ giflib-devel glu-devel gmime-devel gmp-devel -gnokii-devel gperf xmlto GraphicsMagick-devel gsl-devel @@ -65,8 +68,8 @@ libacl-devel libart_lgpl-devel libattr-devel libavahi-devel -libavcodec-devel libblkid-devel +libboost_python3-devel libbz2-devel libcap-devel libcdio-devel @@ -87,7 +90,6 @@ libical-devel libidn-devel libiw-devel libjack-devel -libjasper-devel liblcms2-devel liblo-devel liblrdf-devel @@ -115,6 +117,7 @@ libraw1394-devel librsvg-devel libsamplerate-devel libSDL-devel +libsensors4-devel libsmbclient-devel libsndfile-devel libtag-devel @@ -151,6 +154,7 @@ meanwhile-devel Mesa-devel Mesa-libGL-devel mozilla-nspr-devel +net-snmp-devel net-tools net-tools-deprecated NetworkManager-devel @@ -169,15 +173,15 @@ pcsc-lite-devel perl-PAR-Packer perl-pcsc pkcs11-helper-devel +postgresql postgresql-devel -postgresql10 -postgresql10-devel python-devel python-gtk-devel python3-devel recode rpcgen rpm-build +rpm-devel rsvg-convert ruby ruby-devel @@ -189,7 +193,17 @@ subversion-devel sudo swig sword-devel +texlive-adjustbox +texlive-etoc +texlive-hanging +texlive-metafont-bin +texlive-multirow +texlive-natbib texlive-newunicodechar +texlive-refman +texlive-sectsty +texlive-stackengine +texlive-tocloft torsocks transfig unixODBC-devel @@ -197,6 +211,7 @@ update-desktop-files usbutils utempter-devel valgrind +vim wireless-tools wv2-devel xcb-proto-devel diff --git a/redhat/docker/osstw/rpmmacros b/redhat/docker/osstw/rpmmacros index 0f4902670..cb1ceaa06 100644 --- a/redhat/docker/osstw/rpmmacros +++ b/redhat/docker/osstw/rpmmacros @@ -1,3 +1,4 @@ %dist .osstw %_smp_mflags -j8 %jobs 8 +%__python %__python2 diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64 index 9617ead17..a0fa770a1 100644 --- a/redhat/docker/pclinuxos/Dockerfile.x86_64 +++ b/redhat/docker/pclinuxos/Dockerfile.x86_64 @@ -1,49 +1,48 @@ FROM pclinuxos:2018 -ARG TDE_VERSION=14.0.7 +ARG TDE_VERSION=14.0.8 ARG ARCH=x86_64 # Update distribution -RUN apt-get -y update -RUN apt-get -y install glibc -RUN apt-get -y dist-upgrade +RUN apt-get -y update && apt-get -y install glibc && apt-get -y dist-upgrade # Install Trinity build dependencies ADD packages.${ARCH} /packages -RUN apt-get -y install $(</packages) +RUN apt-get -y update && apt-get -y install $(</packages) # Add rpmbuild repositories ADD rpmbuild.list /etc/apt/sources.list.d/rpmbuild.list RUN sed -i "/etc/apt/sources.list.d/rpmbuild.list" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" # Fix SUDO configuration -RUN sed -i "/etc/pam.d/sudo" -e "/pam_limits.so/ s|^|#|" +#RUN sed -i "/etc/pam.d/sudo" -e "/pam_limits.so/ s|^|#|" # Fix utempter detection RUN chmod a+r /usr/libexec/utempter/utempter # Fix missing '.la' files ADD genla.sh /usr/bin/genla.sh -RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 -RUN genla.sh libjpeg -RUN genla.sh liblcms -RUN genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la +RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 \ + && genla.sh libjpeg \ + && genla.sh liblcms \ + && genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la # Add non-root user to build packages -RUN rm -rf /home/trinity -RUN useradd -m -s /bin/bash -u 1000 trinity -RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" +RUN rm -rf /home/trinity && useradd -m -s /bin/bash -u 1000 trinity && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" USER trinity ADD rpmmacros /home/trinity/.rpmmacros # Build supplementary development tools -RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/torsocks-2.3.0-1.mga7.src.rpm -RUN sed -i ${HOME}/rpmbuild/SPECS/torsocks.spec -e "s|%license|%doc|" -RUN rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec -RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/torsocks-2*.rpm - -RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/cscope-15.9-1.mga7.src.rpm -RUN sed -i ${HOME}/rpmbuild/SPECS/cscope.spec -e "s|%autopatch|%patch0|" -RUN rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec -RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cscope-15*.rpm +RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/torsocks-2.3.0-1.mga7.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/torsocks.spec -e "s|%license|%doc|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec + +RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/cscope-15.9-1.mga7.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/cscope.spec -e "s|%autopatch|%patch0|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec + +USER root +RUN rpm -Uvh /home/trinity/rpmbuild/RPMS/*/torsocks-2*.rpm /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm + +USER trinity diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64 index 8b485671e..e2dfbeec1 100644 --- a/redhat/docker/pclinuxos/packages.x86_64 +++ b/redhat/docker/pclinuxos/packages.x86_64 @@ -31,6 +31,7 @@ gamin-devel gcc-c++ gettext-devel glib2-devel +gnokii-devel gnutls-devel gpgme-devel gphoto2-devel @@ -85,7 +86,6 @@ libfontenc-devel libgadu-devel libgstreamer0.10-devel libice-devel -libjack-devel libjasper-devel libjpeg-devel liblame-devel @@ -109,6 +109,7 @@ libqalculate-devel libraw1394-devel librsvg librsync-devel +libsamplerate-devel libsmbclient-devel libsm-devel libt1lib-devel diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh index 94a001033..186ff1b22 100755 --- a/redhat/docker/run.sh +++ b/redhat/docker/run.sh @@ -14,6 +14,7 @@ DIST="$(sed -n ${DISTRIB}/rpmmacros -e "/%dist/ s|.* ||p")" 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}" +chmod 777 "${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}" "${HOME}/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION}" case "${TDE_VERSION}" in "14.0."*) TDE_BRANCH="r14.0.x";; diff --git a/redhat/main/tdepim/tdepim.spec b/redhat/main/tdepim/tdepim.spec index 6dbe11b47..b0ed255bc 100644 --- a/redhat/main/tdepim/tdepim.spec +++ b/redhat/main/tdepim/tdepim.spec @@ -37,17 +37,9 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity - -# KDEPIM specific features -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_gnokii 1 -BuildRequires: gnokii-devel -%endif - # TDEPIM optional features #define with_kitchensync 1 - Name: trinity-%{tde_pkg} Summary: Personal Information Management apps from the official Trinity release Version: %{tde_version} @@ -110,6 +102,15 @@ BuildRequires: brp-check-trinity BuildRequires: gamin-devel %endif +# KDEPIM specific features +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?suse_version} < 1550 +%define with_gnokii 1 +BuildRequires: gnokii-devel +%endif +%endif + + # FLEX support %if 0%{?fedora} >= 15 BuildRequires: flex-static |