diff options
Diffstat (limited to 'redhat/docker')
80 files changed, 1977 insertions, 76 deletions
diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh index f830f522e..f558d17a1 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.0.11" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.13" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker @@ -22,3 +22,9 @@ else echo "Saving image to '${FILE}'" ${DOCKER} image save "${IMAGE}" | pigz >"${FILE}" fi + +# Strip 'localhost/' prefix from image tag +if ! docker images | while read name tag blah; do echo "${name}:${tag}"; done | grep -q "^${IMAGE}$"; then + docker image tag "localhost/${IMAGE}" "${IMAGE}" + #docker image rm "localhost/${IMAGE}" +fi diff --git a/redhat/docker/el5/Dockerfile.i686 b/redhat/docker/el5/Dockerfile.i686 index 4de79617a..e12ac2c99 100644 --- a/redhat/docker/el5/Dockerfile.i686 +++ b/redhat/docker/el5/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM centos32:5 -ARG TDE_VERSION=14.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=i686 # Add local repositories diff --git a/redhat/docker/el5/Dockerfile.x86_64 b/redhat/docker/el5/Dockerfile.x86_64 index aa243f15a..cb11f82ab 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.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Add local repositories @@ -20,8 +20,8 @@ RUN setarch ${ARCH} yum -y remove gnome-screensaver \ # Updated build tools (not provided in centos5) # Distro-specific patches -RUN rpm -Uvh http://repo/trinity/archives/el5/tools/RPMS/{noarch/autoconf-2.63-5.el5.noarch,noarch/automake-1.11.1-4.el5.noarch,x86_64/m4-1.4.13-5.el5.x86_64}.rpm \ - && rpm -Uvh http://repo/trinity/archives/el5/trinity-14.0.4/RPMS/x86_64/trinity-poppler{,-devel}-0.12.4-1.el5.x86_64.rpm \ +RUN rpm -Uvh http://xh61v/trinity/archives/el5/tools/RPMS/{noarch/autoconf-2.63-5.el5.noarch,noarch/automake-1.11.1-4.el5.noarch,x86_64/m4-1.4.13-5.el5.x86_64}.rpm \ + && rpm -Uvh http://xh61v/trinity/archives/el5/trinity-14.0.4/RPMS/x86_64/trinity-poppler{,-devel}-0.12.4-1.el5.x86_64.rpm \ && 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|" diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686 index 019fb16da..36a570e32 100644 --- a/redhat/docker/el6/Dockerfile.i686 +++ b/redhat/docker/el6/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM centos32:6 -ARG TDE_VERSION=14.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=i686 # Enable proxy @@ -12,6 +12,7 @@ RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \ && rpm -Uvh http://repo/repo/archives/centos/6/os/i386/Packages/wget-1.12-10.el6.i686.rpm \ && rm -fv /etc/yum.repos.d/*.repo \ && wget -P /etc/yum.repos.d -nv http://repo/repo/{centos6,epel6}.repo \ + && sed -i /etc/yum.repos.d/*.repo -e "s|https://|http://|g" \ && setarch i686 yum -y clean all \ && setarch i686 yum -y update \ && rm -fv /etc/yum.repos.d/CentOS-*.repo \ @@ -38,7 +39,7 @@ COPY rpmmacros /home/trinity/.rpmmacros # Build supplementary development tools -RUN sudo rpm -Uvh http://repo/trinity/current/el6/tools/RPMS/i686/m4-1.4.16-10.el6.i686.rpm +RUN sudo rpm -Uvh http://xh61v/trinity/current/el6/tools/RPMS/i686/m4-1.4.16-10.el6.i686.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 diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64 index 96ed1d420..98e4a0df5 100644 --- a/redhat/docker/el6/Dockerfile.x86_64 +++ b/redhat/docker/el6/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM centos:6 -ARG TDE_VERSION=14.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Enable proxy @@ -12,8 +12,10 @@ 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 \ + && sed -i /etc/yum.repos.d/*.repo -e "s|https://|http://|g" \ && 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) diff --git a/redhat/docker/el6/packages b/redhat/docker/el6/packages index 7f9db04e2..78e50226a 100644 --- a/redhat/docker/el6/packages +++ b/redhat/docker/el6/packages @@ -9,6 +9,7 @@ binutils-devel bison boost-devel bzip2-devel +byacc ccache ccrtp-devel cdparanoia @@ -19,6 +20,7 @@ clamav clamav-devel clucene-core-devel cmake +cmake3 commoncpp2-devel cpp cppunit-devel @@ -116,6 +118,7 @@ libraw1394-devel libsamplerate-devel libsmbclient-devel libsndfile-devel +libssh-devel libssh2-devel libtheora-devel libtiff-devel diff --git a/redhat/docker/el6/rpmmacros b/redhat/docker/el6/rpmmacros index 3b33ecbc0..74a547ddb 100644 --- a/redhat/docker/el6/rpmmacros +++ b/redhat/docker/el6/rpmmacros @@ -3,3 +3,4 @@ %_smp_mflags -j8 %jobs 8 %_topdir /home/trinity/rpmbuild +%cmake %cmake3 diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64 index ba13e2e2c..11347ba7a 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.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Enable proxy @@ -38,11 +38,11 @@ COPY rpmmacros /home/trinity/.rpmmacros 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 https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/30/Everything/source/tree/Packages/y/yaz-5.14.11-17.fc30.src.rpm --define "_pkgdocdir /usr/share/doc/yaz" \ +RUN rpmbuild --rebuild http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/36/Everything/source/tree/Packages/y/yaz-5.31.1-4.fc36.src.rpm --define "_pkgdocdir /usr/share/doc/yaz" \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libyaz{,-devel}-5*.rpm -RUN rpmbuild --rebuild http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/32/Everything/source/tree/Packages/r/rdesktop-1.9.0-2.fc32.src.rpm \ +RUN rpmbuild --rebuild http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/36/Everything/source/tree/Packages/r/rdesktop-1.9.0-7.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm -RUN rpmbuild --rebuild http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/32/Everything/source/tree/Packages/p/pilot-link-0.12.5-44.fc32.src.rpm \ +RUN rpmbuild --rebuild http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.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 46c7034d9..13ff38757 100644 --- a/redhat/docker/el7/packages +++ b/redhat/docker/el7/packages @@ -10,6 +10,7 @@ bison bluez-libs-devel boost-devel bzip2-devel +byacc ccache cdparanoia cdparanoia-devel @@ -19,6 +20,7 @@ clamav clamav-devel clucene-core-devel cmake +cmake3 cpp cppunit-devel createrepo @@ -118,6 +120,7 @@ libsamplerate-devel libsecret-devel libsmbclient-devel libsndfile-devel +libssh-devel libssh2-devel libtheora-devel libtiff-devel @@ -174,6 +177,7 @@ pigz pilot-link-devel pkcs11-helper-devel pkgconfig(pygtk-2.0) +polkit-devel poppler-devel postgresql-devel ppp diff --git a/redhat/docker/el7/rpmmacros b/redhat/docker/el7/rpmmacros index b76d30014..e0a64de43 100644 --- a/redhat/docker/el7/rpmmacros +++ b/redhat/docker/el7/rpmmacros @@ -1,3 +1,4 @@ %dist .el7 %_smp_mflags -j8 %jobs 8 +%cmake %cmake3 diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64 index 697a1decd..bf260ca03 100644 --- a/redhat/docker/el8/Dockerfile.x86_64 +++ b/redhat/docker/el8/Dockerfile.x86_64 @@ -1,6 +1,6 @@ -FROM centos:8 +FROM rockylinux:8 -ARG TDE_VERSION=14.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Enable custom repository @@ -40,19 +40,19 @@ COPY rpmmacros /home/trinity/.rpmmacros # Build supplementary development tools -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/g/gnuchess-6.2.5-10.fc32.src.rpm \ +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/gnuchess-6.2.9-3.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.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 \ +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link-{devel,libs}-0*.rpm RUN sudo rpm -Uvh http://rpms.remirepo.net/enterprise/8/remi/x86_64/hiredis-0.13.3-9.el8.remi.x86_64.rpm http://rpms.remirepo.net/enterprise/8/remi/x86_64/libyaz{,-devel}-5.14.11-14.el8.remi.x86_64.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/perl-PAR-1.016-4.fc32.src.rpm \ +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/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 http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-31.fc32.src.rpm \ +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/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 http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/perl-PAR-Packer-1.049-5.fc32.src.rpm --nocheck \ +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/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 diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages index fc8af868a..06283e94e 100644 --- a/redhat/docker/el8/packages +++ b/redhat/docker/el8/packages @@ -10,6 +10,7 @@ bison bluez-libs-devel boost-devel boost-python3-devel +byacc bzip2-devel cdparanoia cdparanoia-devel @@ -21,13 +22,14 @@ clucene-core-devel cmake cpp cppunit-devel -createrepo +createrepo_c cryptsetup-devel cups-devel dbus-glib-devel docbook2X doxygen emacs +esound-devel exempi-devel exiv2-devel fdupes @@ -60,7 +62,9 @@ gtk3-devel gtk-doc guile-devel heimdal-devel +help2man hspell-devel +html2ps icu ImageMagick-devel imake @@ -92,6 +96,7 @@ libgsf-devel libgssglue-devel libical-devel libidn-devel +libjpeg-turbo-utils libksba-devel libmad-devel libmemcached-devel @@ -113,6 +118,7 @@ libsamplerate-devel libsecret-devel libsmbclient-devel libsndfile-devel +libssh-devel libtheora-devel libtiff-devel libtirpc-devel @@ -172,6 +178,7 @@ perl(XML::Parser) pigz pkcs11-helper-devel pkgconfig(pygtk-2.0) +polkit-devel poppler-devel postgresql postgresql-devel @@ -208,6 +215,7 @@ systemd-devel taglib-devel tcl texinfo +texlive-dvips torsocks transfig unixODBC-devel diff --git a/redhat/docker/el9/Dockerfile.x86_64 b/redhat/docker/el9/Dockerfile.x86_64 new file mode 100644 index 000000000..1e3df3557 --- /dev/null +++ b/redhat/docker/el9/Dockerfile.x86_64 @@ -0,0 +1,100 @@ +FROM rockylinux:9 + +ARG TDE_VERSION=14.0.13 +ARG ARCH=x86_64 + +# Enable proxy +# Install OVL plugin for DNF +# Update distribution packages +# Add EPEL repository +# Add RPMFUSION repository +# Enable supplementary repositories +# Install Trinity build dependencies +COPY packages /packages +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \ + && curl -o /usr/lib/python3.9/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py \ + && dnf -y update \ + && dnf -y install epel-release \ + && dnf -y install https://download1.rpmfusion.org/free/el/updates/9/x86_64/r/rpmfusion-free-release-9-1.noarch.rpm \ + && dnf -y install dnf-plugins-core \ + && dnf config-manager --enable devel \ + && dnf config-manager --enable plus \ + && dnf -y --enableplugin=ovl install $(</packages) + +# 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" + +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter + +# Add non-root user to build packages +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" + +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +# Build supplementary development tools + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/gnuchess-6.2.9-3.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link-{devel,libs}-0*.rpm + +RUN sudo rpm -Uvh \ + http://rpms.remirepo.net/enterprise/9/remi/x86_64/libicu69-69.1-4.el9.remi.x86_64.rpm \ + http://rpms.remirepo.net/enterprise/9/remi/x86_64/libyaz{,-devel}-5.32.0-1.el9.remi.x86_64.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/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 http://ftp.free.fr/mirrors/fedora.redhat.com/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 http://ftp.free.fr/mirrors/fedora.redhat.com/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 http://ftp.free.fr/mirrors/fedora.redhat.com/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 http://ftp.free.fr/mirrors/fedora.redhat.com/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 http://ftp.free.fr/mirrors/fedora.redhat.com/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 http://ftp.free.fr/mirrors/fedora.redhat.com/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 http://ftp.free.fr/mirrors/fedora.redhat.com/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 + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/s/sword-1.9.0-9.fc36.src.rpm --undefine "__cmake_in_source_build" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/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 http://ftp.free.fr/mirrors/fedora.redhat.com/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 http://ftp.free.fr/mirrors/fedora.redhat.com/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 http://ftp.free.fr/mirrors/fedora.redhat.com/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 http://ftp.free.fr/mirrors/fedora.redhat.com/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 + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/GeoIP-1.6.12-11.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/GeoIP{,-devel}-1*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/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 http://ftp.free.fr/mirrors/fedora.redhat.com/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 diff --git a/redhat/docker/el9/packages b/redhat/docker/el9/packages new file mode 100644 index 000000000..dda2b1b20 --- /dev/null +++ b/redhat/docker/el9/packages @@ -0,0 +1,219 @@ +alsa-lib-devel +aspell +aspell-devel +audiofile-devel +autotrace +avahi-devel +bind-devel +binutils-devel +bison +bluez-libs-devel +boost-devel +boost-python3-devel +byacc +bzip2-devel +cdparanoia +cdparanoia-devel +chrpath +clamav +clamav-devel +cln-devel +clucene-core-devel +cmake +cpp +cppunit-devel +crda +createrepo_c +cryptsetup-devel +cups-devel +dbus-glib-devel +docbook2X +doxygen +emacs +esound-devel +exempi-devel +exiv2-devel +fdupes +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-devel +fontforge +fontpackages-devel +fribidi-devel +gcc +gcc-c++ +gcc-gfortran +gettext-devel +giflib-devel +glibmm24-devel +gmp-devel +gnulib-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +gsl-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk3-devel +gtk-doc +help2man +hiredis +hspell-devel +iceauth +icu +ImageMagick-devel +imake +imlib2-devel +intltool +jack-audio-connection-kit-devel +jasper-devel +java-1.8.0-openjdk-devel +java-devel +java-openjdk +kernel +lame-devel +libacl-devel +libao-devel +libarchive-devel +libassuan-devel +libblkid-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcurl-devel +libdb-devel +libdb-cxx-devel +libdvdread-devel +libfontenc-devel +libgsf-devel +libical-devel +libidn-devel +libjpeg-turbo-utils +libjxl +libksba-devel +libmad-devel +libmemcached-devel +libmng-devel +libmpcdec-devel +libmtp-devel +libnsl2-devel +libogg-devel +libotr-devel +libpaper-devel +libpcap-devel +libqalculate-devel +libraw1394-devel +librsvg2-tools +librsync-devel +libsamplerate-devel +libsecret-devel +libsmbclient-devel +libsndfile-devel +libssh-devel +libtheora-devel +libtiff-devel +libtirpc-devel +libtool +libtool-ltdl-devel +libutempter-devel +libuuid-devel +libv4l-devel +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libXaw-devel +libXcomposite-devel +libXdamage-devel +libXdmcp-devel +libxkbfile-devel +libXScrnSaver-devel +libxslt-devel +libXtst-devel +libXv-devel +libXxf86dga-devel +libXxf86vm-devel +libudisks2-devel +libusb-devel +lirc-devel +lm_sensors-devel +mesa-libGL-devel +meson +mysql-devel +neon-devel +netpbm-progs +NetworkManager-libnm-devel +net-snmp-devel +net-tools +nspr-devel +ocaml +ocaml(compiler) +OpenEXR-devel +openldap-devel +opensc +opensp-devel +pam-devel +pciutils-devel +pcre-devel +pcsc-lite-devel +perl +perl-devel +perl-generators +perl(ExtUtils::MakeMaker) +perl(inc::Module::Install) +perl(IPC::Run3) +perl(PAR::Dist) +perl(Module::Signature) +perl(Test::Pod) +perl(Test::Pod::Coverage) +perl(XML::Parser) +pigz +pkcs11-helper-devel +polkit-devel +poppler-devel +postgresql +postgresql-devel +ppp +pulseaudio-libs-devel +python3 +python3-devel +python3-pyxattr +rdesktop +rdiff-backup +readline-devel +recode +redhat-rpm-config +redis +rpcgen +rpm-build +ruby +ruby-devel +sane-backends-devel +SDL-devel +selinux-policy-devel +speex-devel +sqlite-devel +subversion-devel +sudo +swig +systemd-devel +taglib-devel +tcl +texinfo +texlive-collection-basic +torsocks +transfig +unixODBC-devel +usbutils +valgrind +wget +xine-lib-devel +xmlto +xorg-x11-server-utils +xorg-x11-util-macros +xz-devel diff --git a/redhat/docker/el9/rpmbuild.repo b/redhat/docker/el9/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/el9/rpmbuild.repo @@ -0,0 +1,11 @@ +[rpmbuild.${ARCH}] +name=rpmbuild.${ARCH} +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} +enabled=1 +gpgcheck=0 + +[rpmbuild.noarch] +name=rpmbuild.noarch +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch +enabled=1 +gpgcheck=0 diff --git a/redhat/docker/el9/rpmmacros b/redhat/docker/el9/rpmmacros new file mode 100644 index 000000000..a6c71dccc --- /dev/null +++ b/redhat/docker/el9/rpmmacros @@ -0,0 +1,6 @@ +%dist .el9 +%_smp_mflags -j8 +%jobs 8 +%__cmake_in_source_build 1 +%_debugsource_packages %nil +%_debugsource_template %nil diff --git a/redhat/docker/f25/Dockerfile.x86_64 b/redhat/docker/f25/Dockerfile.x86_64 index 7d10d0182..f200d9eb6 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.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f26/Dockerfile.i686 b/redhat/docker/f26/Dockerfile.i686 index d091e3aa5..bc8bb6f43 100644 --- a/redhat/docker/f26/Dockerfile.i686 +++ b/redhat/docker/f26/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:26 -ARG TDE_VERSION=14.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=i686 # Add RPMFUSION repository diff --git a/redhat/docker/f26/Dockerfile.x86_64 b/redhat/docker/f26/Dockerfile.x86_64 index e7029c432..c8fda601c 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.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f27/Dockerfile.i686 b/redhat/docker/f27/Dockerfile.i686 index 18e9e4e14..53d03fe5a 100644 --- a/redhat/docker/f27/Dockerfile.i686 +++ b/redhat/docker/f27/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:27 -ARG TDE_VERSION=14.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=i686 # Add RPMFUSION repository diff --git a/redhat/docker/f27/Dockerfile.x86_64 b/redhat/docker/f27/Dockerfile.x86_64 index aa624fe33..0e29b1ee4 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.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f28/Dockerfile.i686 b/redhat/docker/f28/Dockerfile.i686 index d80632801..209fa9aab 100644 --- a/redhat/docker/f28/Dockerfile.i686 +++ b/redhat/docker/f28/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:28 -ARG TDE_VERSION=14.0.11 +ARG TDE_VERSION=14.0.13 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 f4dc09562..ea6030994 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.11 +ARG TDE_VERSION=14.0.13 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 fbc8ee876..75db326b7 100644 --- a/redhat/docker/f29/Dockerfile.i686 +++ b/redhat/docker/f29/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:29 -ARG TDE_VERSION=14.0.11 +ARG TDE_VERSION=14.0.13 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 73a15171a..018c4da28 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.0.11 +ARG TDE_VERSION=14.0.13 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 2bcba1b81..0bb6dfa50 100644 --- a/redhat/docker/f30/Dockerfile.i686 +++ b/redhat/docker/f30/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:30 -ARG TDE_VERSION=14.0.11 +ARG TDE_VERSION=14.0.13 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 ccc078697..5b42d6be3 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.0.11 +ARG TDE_VERSION=14.0.13 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 3545b0cc4..9e44bd470 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.11 +ARG TDE_VERSION=14.0.13 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 7deea66de..b07ebffcd 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.0.11 +ARG TDE_VERSION=14.0.13 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 caee0fd13..013dcb55a 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.0.11 +ARG TDE_VERSION=14.0.13 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 0d71451b1..0436b4b23 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.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f34/packages b/redhat/docker/f34/packages index e3c97e622..84825b0a8 100644 --- a/redhat/docker/f34/packages +++ b/redhat/docker/f34/packages @@ -10,6 +10,7 @@ binutils-devel bison boost-devel boost-python3-devel +byacc bzip2-devel ccache cdparanoia @@ -42,6 +43,7 @@ fftw-devel file-devel flac-devel flex-static +fontforge fontpackages-devel fribidi-devel gcc @@ -185,6 +187,7 @@ perl(XML::Parser) pilot-link-devel pkcs11-helper-devel pkgconfig(pygtk-2.0) +polkit-devel poppler-devel postgresql postgresql-devel diff --git a/redhat/docker/f35/Dockerfile.x86_64 b/redhat/docker/f35/Dockerfile.x86_64 index a45e5b058..172edbd89 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.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f35/packages b/redhat/docker/f35/packages index 619279797..f6d605f1a 100644 --- a/redhat/docker/f35/packages +++ b/redhat/docker/f35/packages @@ -10,6 +10,7 @@ binutils-devel bison boost-devel boost-python3-devel +byacc bzip2-devel ccache cdparanoia @@ -22,7 +23,7 @@ clucene-core-devel cmake cpp cppunit-devel -createrepo +createrepo_c cryptsetup-devel cups-devel dbus-glib-devel @@ -114,8 +115,8 @@ libofx-devel libogg-devel libotr-devel libpaper-devel -libqalculate-devel libpqxx-devel +libqalculate-devel libraw1394-devel librsvg2 librsvg2-tools @@ -187,6 +188,7 @@ perl(XML::Parser) pilot-link-devel pkcs11-helper-devel pkgconfig(pygtk-2.0) +polkit-devel poppler-devel postgresql postgresql-devel diff --git a/redhat/docker/f35/rpmmacros b/redhat/docker/f35/rpmmacros index f8169a30e..4ce88c1fd 100644 --- a/redhat/docker/f35/rpmmacros +++ b/redhat/docker/f35/rpmmacros @@ -2,5 +2,6 @@ %_smp_mflags -j8 %jobs 8 %__cmake_builddir %nil +%__cmake_in_source_build 1 %_debugsource_packages %nil %_debugsource_template %nil diff --git a/redhat/docker/f36/Dockerfile.x86_64 b/redhat/docker/f36/Dockerfile.x86_64 new file mode 100644 index 000000000..967534f81 --- /dev/null +++ b/redhat/docker/f36/Dockerfile.x86_64 @@ -0,0 +1,40 @@ +FROM fedora:36 + +ARG TDE_VERSION=14.0.13 +ARG ARCH=x86_64 + +# Fix DNF database corruption +# Add RPMFUSION repository +# Install Trinity build dependencies +COPY packages /packages +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \ + && dnf -y install dnf-plugin-ovl findutils \ + && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-36.noarch.rpm \ + && dnf -y --enableplugin=ovl update \ + && dnf -y --enableplugin=ovl install --skip-broken $(</packages) + +# Add YUM repository for locally built packages +COPY 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" + +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter \ + && chmod 777 /tmp + +# Add non-root user to build packages +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers \ + && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc + +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +RUN sudo rpm -Uvh https://download-ib01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/aarch64/os/Packages/p/python2-setuptools-41.2.0-4.fc34.noarch.rpm + +RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/34/Everything/source/tree/Packages/p/python-exif-2.3.2-2.fc34.src.rpm \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/python-exif.spec --define "py2 1" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/noarch/python2-exif-* + +RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* diff --git a/redhat/docker/f36/packages b/redhat/docker/f36/packages new file mode 100644 index 000000000..71b1f0d27 --- /dev/null +++ b/redhat/docker/f36/packages @@ -0,0 +1,238 @@ +alsa-lib-devel +aspell +aspell-devel +audiofile-devel +autotrace +avahi-devel +bdftopcf +bind-devel +binutils-devel +bison +boost-devel +boost-python3-devel +byacc +bzip2-devel +ccache +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +clamav-devel +clucene-core-devel +cmake +cpp +cppunit-devel +crda +createrepo_c +cryptsetup-devel +cups-devel +dbus-glib-devel +djvulibre +djvulibre-devel +dnf-plugin-ovl +docbook2X +doxygen +dssi-devel +esound-devel +exempi-devel +exiv2-devel +fdupes +fedora-rpm-macros +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-static +fontpackages-devel +fribidi-devel +gcc +gcc-c++ +geoip-devel +gettext-devel +giflib-devel +glib-devel +gmime-devel +gmp-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +graphviz +gsl-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk3-devel +gtk+-devel +gtk-doc +guile-devel +harfbuzz-devel +hspell-devel +htdig +html2ps +iceauth +icu +ImageMagick-devel +imake +imlib2-devel +intltool +jack-audio-connection-kit-devel +jasper-devel +java-1.8.0-openjdk-devel +java-devel +java-openjdk +lame-devel +lcms-devel +libacl-devel +libblkid-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcurl-devel +libdb-cxx-devel +libdb-devel +libdvdread-devel +libfontenc-devel +libgadu-devel +libgpod-devel +libgsf-devel +libical-devel +libidn-devel +libifp-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz5-devel +libnjb-devel +libnsl2-devel +libofx-devel +libogg-devel +libotr-devel +libpaper-devel +libpqxx-devel +libqalculate-devel +libraw1394-devel +librsvg2 +librsvg2-tools +libsamplerate-devel +libsmbclient-devel +libsndfile-devel +libssh-devel +libssh2-devel +libtheora-devel +libtiff-devel +libtirpc-devel +libtool +libtool-ltdl-devel +libudev-devel +libudisks2-devel +libutempter-devel +libuuid-devel +libv4l-devel +libvisual-devel +libvncserver-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libXaw-devel +libXcomposite-devel +libXdamage-devel +libXdmcp-devel +libxkbfile-devel +libXScrnSaver-devel +libxslt-devel +libXtst-devel +libXv-devel +libXxf86dga-devel +libXxf86vm-devel +libyaz-devel +libzrtpcpp-devel +lirc-devel +lm_sensors-devel +meanwhile-devel +mesa-libGL-devel +mftrace +mysql-devel +nas-devel +neon-devel +netpbm-progs +NetworkManager-libnm-devel +net-snmp-devel +net-tools +nspr-devel +ocaml +ocaml(compiler) +ocaml-facile-devel +OpenEXR-devel +openldap-devel +opensc +openslp-devel +opensp-devel +ortp-devel +pam-devel +pciutils-devel +pcre-devel +pcsc-lite-devel +pcsc-perl +perl +perl-devel +perl(ExtUtils::MakeMaker) +perl(PAR::Packer) +perl(XML::Parser) +pilot-link-devel +pkcs11-helper-devel +pkgconfig(pygtk-2.0) +polkit-devel +poppler-devel +postgresql +postgresql-devel +postgresql-private-devel +postgresql-server-devel +ppp +pulseaudio-libs-devel +python +python3-devel +qt4-devel +recode +redhat-rpm-config +rpcgen +rpm-build +ruby +ruby-devel +sane-backends-devel +scons +SDL-devel +selinux-policy-devel +speex-devel +sqlite-devel +subversion-devel +sudo +swig +sword-devel +t1lib-devel +t1utils +taglib-devel +texinfo +texlive-newunicodechar +torsocks +transfig +udisks-devel +unixODBC-devel +usbutils +valgrind +xbase-devel +xine-lib-devel +xmedcon +xmedcon-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-extras +xz-devel diff --git a/redhat/docker/f36/rpmbuild.repo b/redhat/docker/f36/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f36/rpmbuild.repo @@ -0,0 +1,11 @@ +[rpmbuild.${ARCH}] +name=rpmbuild.${ARCH} +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} +enabled=1 +gpgcheck=0 + +[rpmbuild.noarch] +name=rpmbuild.noarch +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch +enabled=1 +gpgcheck=0 diff --git a/redhat/docker/f36/rpmmacros b/redhat/docker/f36/rpmmacros new file mode 100644 index 000000000..fd63b7997 --- /dev/null +++ b/redhat/docker/f36/rpmmacros @@ -0,0 +1,8 @@ +%dist .fc36 +%_smp_mflags -j8 +%jobs 8 +%__brp_remove_la_files %nil +%__cmake_builddir %nil +%__cmake_in_source_build 1 +%_debugsource_packages %nil +%_debugsource_template %nil diff --git a/redhat/docker/f37/Dockerfile.x86_64 b/redhat/docker/f37/Dockerfile.x86_64 new file mode 100644 index 000000000..0aefc0840 --- /dev/null +++ b/redhat/docker/f37/Dockerfile.x86_64 @@ -0,0 +1,47 @@ +FROM fedora:37 + +ARG TDE_VERSION=14.0.13 +ARG ARCH=x86_64 + +# Fix DNF database corruption +# Add RPMFUSION repository +# Install Trinity build dependencies +COPY packages /packages +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \ + && rm -fv /etc/yum.repos.d/*{rawhide,testing}* \ + && sed -i /etc/yum.repos.d/fedora{,-modular,-updates,-updates-modular}.repo -e "1,12s|enabled=0|enabled=1|" -e "s|\$releasever|37|g" \ + && dnf -y install dnf-plugin-ovl findutils \ + && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-37.noarch.rpm \ + && dnf -y --enableplugin=ovl update \ + && dnf -y --enableplugin=ovl install --skip-broken $(</packages) + +# Add YUM repository for locally built packages +COPY 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" + +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter \ + && chmod 777 /tmp + +# Add non-root user to build packages +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers \ + && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc + +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +RUN sudo rpm -Uvh https://download-ib01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/aarch64/os/Packages/p/python2-setuptools-41.2.0-4.fc34.noarch.rpm + +RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/34/Everything/source/tree/Packages/p/python-exif-2.3.2-2.fc34.src.rpm \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/python-exif.spec --define "py2 1" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/noarch/python2-exif-* + +RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* + +RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/l/libnjb-2.2.7-24.fc36.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/libnjb.spec -e "s|libusb-devel|libusb1-devel|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libnjb.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libnjb{,-devel}-2* diff --git a/redhat/docker/f37/packages b/redhat/docker/f37/packages new file mode 100644 index 000000000..474a39686 --- /dev/null +++ b/redhat/docker/f37/packages @@ -0,0 +1,240 @@ +alsa-lib-devel +aspell +aspell-devel +audiofile-devel +autotrace +avahi-devel +bdftopcf +bind-devel +binutils-devel +bison +boost-devel +boost-python3-devel +byacc +bzip2-devel +ccache +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +clamav-devel +clucene-core-devel +cmake +cpp +cppunit-devel +crda +createrepo_c +cryptsetup-devel +cups-devel +dbus-glib-devel +djvulibre +djvulibre-devel +dnf-plugin-ovl +docbook2X +doxygen +dssi-devel +esound-devel +exempi-devel +exiv2-devel +fdupes +fedora-rpm-macros +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-static +fontpackages-devel +fribidi-devel +gcc +gcc-c++ +geoip-devel +gettext-devel +giflib-devel +glib-devel +gmime-devel +gmp-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +graphviz +gsl-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk3-devel +gtk+-devel +gtk-doc +guile-devel +harfbuzz-devel +hspell-devel +htdig +html2ps +iceauth +icu +ImageMagick-devel +imake +imlib2-devel +intltool +jack-audio-connection-kit-devel +jasper-devel +java-1.8.0-openjdk-devel +java-devel +java-openjdk +lame-devel +lcms-devel +libacl-devel +libblkid-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcurl-devel +libdb-cxx-devel +libdb-devel +libdvdread-devel +libfontenc-devel +libgadu-devel +libgpod-devel +libgsf-devel +libical-devel +libidn-devel +libifp-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz5-devel +libnjb-devel +libnsl2-devel +libofx-devel +libogg-devel +libotr-devel +libpaper-devel +libpqxx-devel +libqalculate-devel +libraw1394-devel +librsvg2 +librsvg2-tools +libsamplerate-devel +libsmbclient-devel +libsndfile-devel +libssh-devel +libssh2-devel +libtheora-devel +libtiff-devel +libtirpc-devel +libtool +libtool-ltdl-devel +libudev-devel +libudisks2-devel +libusb-compat-0.1-devel +libusb1-devel +libutempter-devel +libuuid-devel +libv4l-devel +libvisual-devel +libvncserver-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libXaw-devel +libXcomposite-devel +libXdamage-devel +libXdmcp-devel +libxkbfile-devel +libXScrnSaver-devel +libxslt-devel +libXtst-devel +libXv-devel +libXxf86dga-devel +libXxf86vm-devel +libyaz-devel +libzrtpcpp-devel +lirc-devel +lm_sensors-devel +meanwhile-devel +mesa-libGL-devel +mftrace +mysql-devel +nas-devel +neon-devel +netpbm-progs +NetworkManager-libnm-devel +net-snmp-devel +net-tools +nspr-devel +ocaml +ocaml(compiler) +ocaml-facile-devel +OpenEXR-devel +openldap-devel +opensc +openslp-devel +opensp-devel +ortp-devel +pam-devel +pciutils-devel +pcre-devel +pcsc-lite-devel +pcsc-perl +perl +perl-devel +perl(ExtUtils::MakeMaker) +perl(PAR::Packer) +perl(XML::Parser) +pilot-link-devel +pkcs11-helper-devel +pkgconfig(pygtk-2.0) +polkit-devel +poppler-devel +postgresql +postgresql-devel +postgresql-private-devel +postgresql-server-devel +ppp +pulseaudio-libs-devel +python +python3-devel +qt4-devel +recode +redhat-rpm-config +rpcgen +rpm-build +ruby +ruby-devel +sane-backends-devel +scons +SDL-devel +selinux-policy-devel +speex-devel +sqlite-devel +subversion-devel +sudo +swig +sword-devel +t1lib-devel +t1utils +taglib-devel +texinfo +texlive-newunicodechar +torsocks +transfig +udisks-devel +unixODBC-devel +usbutils +valgrind +xbase-devel +xine-lib-devel +xmedcon +xmedcon-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-extras +xz-devel diff --git a/redhat/docker/f37/rpmbuild.repo b/redhat/docker/f37/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f37/rpmbuild.repo @@ -0,0 +1,11 @@ +[rpmbuild.${ARCH}] +name=rpmbuild.${ARCH} +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} +enabled=1 +gpgcheck=0 + +[rpmbuild.noarch] +name=rpmbuild.noarch +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch +enabled=1 +gpgcheck=0 diff --git a/redhat/docker/f37/rpmmacros b/redhat/docker/f37/rpmmacros new file mode 100644 index 000000000..3865a262b --- /dev/null +++ b/redhat/docker/f37/rpmmacros @@ -0,0 +1,9 @@ +%dist .fc37 +%_smp_mflags -j8 +%jobs 8 +%__brp_remove_la_files %nil +%__cmake_builddir %nil +%__cmake_in_source_build 1 +%_debugsource_packages %nil +%_debugsource_template %nil +%source_date_epoch_from_changelog 0 diff --git a/redhat/docker/mga5/Dockerfile.x86_64 b/redhat/docker/mga5/Dockerfile.x86_64 index af6074cf1..a8ef08acf 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.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga6/Dockerfile.i686 b/redhat/docker/mga6/Dockerfile.i686 index e39d2c3d5..344319a5f 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.11 +ARG TDE_VERSION=14.0.13 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 68cfb8fb6..73c33dcea 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.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga7/Dockerfile.i686 b/redhat/docker/mga7/Dockerfile.i686 index c227ea2f7..0e82ab87c 100644 --- a/redhat/docker/mga7/Dockerfile.i686 +++ b/redhat/docker/mga7/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM mageia32:7 -ARG TDE_VERSION=14.0.11 +ARG TDE_VERSION=14.0.13 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 de4ab8cf4..8ad899d78 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.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga8/Dockerfile.i686 b/redhat/docker/mga8/Dockerfile.i686 index 85feee0ff..46d2810d9 100644 --- a/redhat/docker/mga8/Dockerfile.i686 +++ b/redhat/docker/mga8/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM mageia32:8 -ARG TDE_VERSION=14.0.11 +ARG TDE_VERSION=14.0.13 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 eb2064844..f9424ee50 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.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga8/packages.i686 b/redhat/docker/mga8/packages.i686 index af6c6feb7..a39a701af 100644 --- a/redhat/docker/mga8/packages.i686 +++ b/redhat/docker/mga8/packages.i686 @@ -55,6 +55,7 @@ gtk2-devel gtk+3.0-devel gtk-doc hspell-devel +html2ps hunspell-en iceauth ImageMagick-devel @@ -213,6 +214,7 @@ pinentry-gtk2 pkgconfig(audiofile) pkgconfig(libpng16) polkit-agent-none +polkit-devel postgresql13 postgresql13-devel ppp diff --git a/redhat/docker/mga8/packages.x86_64 b/redhat/docker/mga8/packages.x86_64 index ad8802b2c..998e0c682 100644 --- a/redhat/docker/mga8/packages.x86_64 +++ b/redhat/docker/mga8/packages.x86_64 @@ -55,6 +55,7 @@ gtk2-devel gtk+3.0-devel gtk-doc hspell-devel +html2ps hunspell-en iceauth ImageMagick-devel @@ -216,6 +217,7 @@ pinentry-gtk2 pkgconfig(audiofile) pkgconfig(libpng16) polkit-agent-none +polkit-devel postgresql13 postgresql13-devel ppp diff --git a/redhat/docker/mga9/Dockerfile.i686 b/redhat/docker/mga9/Dockerfile.i686 new file mode 100644 index 000000000..46d2810d9 --- /dev/null +++ b/redhat/docker/mga9/Dockerfile.i686 @@ -0,0 +1,51 @@ +FROM mageia32:8 + +ARG TDE_VERSION=14.0.13 +ARG ARCH=i686 + +# Reset URPMI repositories to default +# Enable more URPMI repositories +RUN urpmi.removemedia -a \ + && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/i586/ \ + && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" + +# Enable english locales +RUN urpmi --replacepkgs glibc \ + && localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || : + +# Update distribution +# Install Trinity build dependencies +COPY packages.${ARCH} /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\"|" + +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter + +# Fix poppler support +RUN sed -i "/usr/include/poppler/poppler-config.h" -e "/define HAVE_SPLASH/ s|^|//|" + +# 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" + +# Configure user trinity +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +# Add rpmbuild repositories +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/8/SRPMS/core/release/perl-PAR-Packer-1.51.0-2.mga8.src.rpm \ + && sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm" diff --git a/redhat/docker/mga9/Dockerfile.x86_64 b/redhat/docker/mga9/Dockerfile.x86_64 new file mode 100644 index 000000000..9d4ef301e --- /dev/null +++ b/redhat/docker/mga9/Dockerfile.x86_64 @@ -0,0 +1,51 @@ +FROM mageia:9 + +ARG TDE_VERSION=14.0.13 +ARG ARCH=x86_64 + +# Reset URPMI repositories to default +# Enable more URPMI repositories +RUN urpmi.removemedia -a \ + && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/x86_64/ \ + && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" + +# Enable english locales +RUN urpmi --replacepkgs glibc \ + && localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || : + +# Update distribution +# Install Trinity build dependencies +COPY packages.${ARCH} /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\"|" + +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter + +# Fix poppler support +RUN sed -i "/usr/include/poppler/poppler-config.h" -e "/define HAVE_SPLASH/ s|^|//|" + +# 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" + +# Configure user trinity +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +# Add rpmbuild repositories +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/8/SRPMS/core/release/perl-PAR-Packer-1.51.0-2.mga8.src.rpm \ + && sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm" diff --git a/redhat/docker/mga9/packages.i686 b/redhat/docker/mga9/packages.i686 new file mode 100644 index 000000000..a39a701af --- /dev/null +++ b/redhat/docker/mga9/packages.i686 @@ -0,0 +1,256 @@ +advancecomp +alsa-lib-devel +aspell +aspell-devel +aspell-en +audiofile-devel +bind-devel +bison +boost-devel +bzip2-devel +ccache +cdparanoia +chmlib-devel +chrpath +clamav +clamav-devel +cmake +ctags +cups-devel +curl-devel +db5-devel +dbus-devel +dbus-glib +dbus-glib-devel +djvulibre +docbook2x +docbook-dtd412-xml +docbook-style-xsl +docbook-utils +doxygen +drakconf +dssi-devel +exempi-devel +expat-devel +fdupes +fftw-devel +firebird-devel +flex +fontconfig-devel +freetype2-devel +freetype-devel +fribidi-devel +gamin-devel +gettext-devel +glib2-devel +glibc-i18ndata +gmime-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +gsl-devel +gtk2-devel +gtk+3.0-devel +gtk-doc +hspell-devel +html2ps +hunspell-en +iceauth +ImageMagick-devel +imake +imlib2-devel +intltool +java-1.8.0-openjdk +java-1.8.0-openjdk-devel +java-devel +karma-sharp +kde-dev-scripts +libapr-devel +libapr-util-devel +libart_lgpl-devel +libattr-devel +libavformat58 +libbinutils-devel +libblkid-devel +libcdda-devel +libcln-devel +libclucene-devel +libclucene-devel +libcommoncpp-devel +libcommoncpp-devel +libconfig-devel +libcryptsetup-devel +libcurl-devel +libcurl-devel +libdvdread-devel +libdvdread-devel +libecpg13_6 +libexiv2-devel +libext2fs-devel +libfbclient-devel +libffmpeg-devel +libflac++-devel +libflac-devel +libflac-devel +libfontenc-devel +libgadu-devel +libgeoip-devel +libgmime2.6-devel +libgpod-devel +libgsf-devel +libgstreamer1.0-devel +libgstreamer-plugins-base1.0-devel +libhd-devel +libical-devel +libice-devel +libidn-devel +libifp-devel +libinotifytools-devel +libiodbc-devel +libiw-devel +libjack-devel +libjasper-devel +libjasper-devel +libjpeg-devel +libkarma-devel +liblo-devel +liblrdf-devel +liblua-devel +libmad-devel +libmad-devel +libmng-devel +libmp3lame-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz-devel +libnjb-devel +libnpth-devel +libofx-devel +libotr-devel +libpaper-devel +libpaper-devel +libpkcs11-helper-devel +libpoppler-devel +libpulseaudio-devel +libpx-devel +libqalculate-devel +libraw1394-devel +librsvg +libsane1-devel +libsmbclient-devel +libsm-devel +libsndfile-devel +libt1lib-devel +libt1lib-devel +libtheora-devel +libtiff-devel +libtwolame-devel +libudev-devel +libungif-devel +libusb1.0-devel +libutempter +libutempter0 +libutempter-devel +libv4l-devel +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libx11-devel +libxaw-devel +libxcursor-devel +libxdg-basedir-devel +libxext-devel +libxft-devel +libxi-devel +libxi-devel +libxine1.2-devel +libxinerama-devel +libxkbfile-devel +libxmu-devel +libxrandr-devel +libxrender-devel +libxscrnsaver-devel +libxslt-devel +libxtst-devel +libxv-devel +libxxf86dga-devel +libxxf86dga-devel +libyaz-devel +libyaz-devel +lilo +lirc-devel +lm_sensors-devel +mesaglu-devel +mysql-devel +nas-devel +neon-devel +netpbm +net-snmp-devel +notification-daemon +ocaml +ocaml-facile-devel +OpenEXR-devel +openldap-devel +openldap-servers-devel +opensc +openslp-devel +opensp-devel +openssh-clients +optipng +pam-devel +pciutils-devel +perl-devel +perl-ExtUtils-MakeMaker +perl(IPC::Run3) +perl(PAR::Packer) +perl-pcsc-perl +perl(XML::Parser) +pilot-link-devel +pinentry-gtk2 +pkgconfig(audiofile) +pkgconfig(libpng16) +polkit-agent-none +polkit-devel +postgresql13 +postgresql13-devel +ppp +python-devel +python-sip +qt4-devel +readline-devel +recode +rpcgen +rpm-build +rpm-devel +ruby-devel +scons +SDL-devel +speex-devel +sqlite3-devel +sqlite-devel +sshfs-fuse +subversion-devel +sudo +swig +sword-devel +taglib-devel +torsocks +transfig +udisks2-devel +unixODBC-devel +usbutils +valgrind +wv2-devel +x11-font-util +xbase-devel +xmlto +xscreensaver +xscreensaver-base +xscreensaver-extrusion +xscreensaver-gl +yaz +zlib-devel diff --git a/redhat/docker/mga9/packages.x86_64 b/redhat/docker/mga9/packages.x86_64 new file mode 100644 index 000000000..998e0c682 --- /dev/null +++ b/redhat/docker/mga9/packages.x86_64 @@ -0,0 +1,259 @@ +advancecomp +alsa-lib-devel +aspell +aspell-devel +aspell-en +audiofile-devel +bind-devel +bison +boost-devel +bzip2-devel +ccache +cdparanoia +chmlib-devel +chrpath +clamav +clamav-devel +cmake +ctags +cups-devel +curl-devel +db5-devel +dbus-devel +dbus-glib +dbus-glib-devel +djvulibre +docbook2x +docbook-dtd412-xml +docbook-style-xsl +docbook-utils +doxygen +drakconf +dssi-devel +exempi-devel +expat-devel +fdupes +fftw-devel +firebird-devel +flex +fontconfig-devel +freetype2-devel +freetype-devel +fribidi-devel +gamin-devel +gettext-devel +glib2-devel +glibc-i18ndata +gmime-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +gsl-devel +gtk2-devel +gtk+3.0-devel +gtk-doc +hspell-devel +html2ps +hunspell-en +iceauth +ImageMagick-devel +imake +imlib2-devel +intltool +java-1.8.0-openjdk +java-1.8.0-openjdk-devel +java-devel +karma-sharp +kde-dev-scripts +lib64apr-devel +lib64apr-util-devel +lib64avformat58 +lib64binutils-devel +lib64boost_python3-devel +lib64cln-devel +lib64clucene-devel +lib64commoncpp-devel +lib64cryptsetup-devel +lib64curl-devel +lib64dvdread-devel +lib64ecpg13_6 +lib64exiv2-devel +lib64ext2fs-devel +lib64fbclient-devel +lib64ffmpeg-devel +lib64flac++-devel +lib64flac-devel +lib64fontenc-devel +lib64geoip-devel +lib64gmime2.6-devel +lib64gstreamer1.0-devel +lib64gstreamer-plugins-base1.0-devel +lib64inotifytools-devel +lib64jasper-devel +lib64jpeg-devel +lib64lua-devel +lib64mad-devel +lib64mp3lame-devel +lib64npth-devel +lib64paper-devel +lib64pkcs11-helper-devel +lib64poppler-devel +lib64pulseaudio-devel +lib64sane1-devel +lib64t1lib-devel +lib64tiff-devel +lib64twolame-devel +lib64udev-devel +lib64usb1.0-devel +lib64utempter0 +lib64utempter-devel +lib64v4l-devel +lib64xaw-devel +lib64xdg-basedir-devel +lib64xi-devel +lib64xine1.2-devel +lib64xscrnsaver-devel +lib64xtst-devel +lib64xxf86dga-devel +lib64yaz-devel +libart_lgpl-devel +libattr-devel +libblkid-devel +libcdda-devel +libclucene-devel +libcommoncpp-devel +libconfig-devel +libcurl-devel +libdvdread-devel +libffmpeg-devel +libflac++-devel +libflac-devel +libgadu-devel +libgpod-devel +libgsf-devel +libhd-devel +libical-devel +libice-devel +libidn-devel +libifp-devel +libiodbc-devel +libiw-devel +libjack-devel +libjasper-devel +libkarma-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz-devel +libnjb-devel +libofx-devel +libotr-devel +libpaper-devel +libpx-devel +libqalculate-devel +libraw1394-devel +librsvg +libsmbclient-devel +libsm-devel +libsndfile-devel +libt1lib-devel +libtheora-devel +libungif-devel +libutempter +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libx11-devel +libxcursor-devel +libxext-devel +libxft-devel +libxi-devel +libxinerama-devel +libxkbfile-devel +libxmu-devel +libxrandr-devel +libxrender-devel +libxslt-devel +libxv-devel +libxxf86dga-devel +libyaz-devel +lilo +lirc-devel +lm_sensors-devel +mesaglu-devel +mysql-devel +nas-devel +neon-devel +netpbm +net-snmp-devel +notification-daemon +ocaml +ocaml-facile-devel +OpenEXR-devel +openldap-devel +openldap-servers-devel +opensc +openslp-devel +opensp-devel +openssh-clients +optipng +pam-devel +pciutils-devel +perl-devel +perl-ExtUtils-MakeMaker +perl(IPC::Run3) +perl(PAR::Packer) +perl-pcsc-perl +perl(XML::Parser) +pilot-link-devel +pinentry-gtk2 +pkgconfig(audiofile) +pkgconfig(libpng16) +polkit-agent-none +polkit-devel +postgresql13 +postgresql13-devel +ppp +python-devel +python-sip +qt4-devel +readline-devel +recode +rpcgen +rpm-build +rpm-devel +ruby-devel +scons +SDL-devel +speex-devel +sqlite3-devel +sqlite-devel +sshfs-fuse +subversion-devel +sudo +swig +sword-devel +taglib-devel +torsocks +transfig +udisks2-devel +unixODBC-devel +usbutils +valgrind +wv2-devel +x11-font-util +xbase-devel +xmlto +xscreensaver +xscreensaver-base +xscreensaver-extrusion +xscreensaver-gl +yaz +zlib-devel diff --git a/redhat/docker/mga9/rpmmacros b/redhat/docker/mga9/rpmmacros new file mode 100644 index 000000000..2bc3bb37f --- /dev/null +++ b/redhat/docker/mga9/rpmmacros @@ -0,0 +1,6 @@ +%_smp_mflags -j8 +%jobs 8 +%_program_prefix "" +%_debugsource_packages %nil +%_debugsource_template %nil +%_vpath_builddir . diff --git a/redhat/docker/oss131/Dockerfile.x86_64 b/redhat/docker/oss131/Dockerfile.x86_64 index bea0dcae6..5c6329d04 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.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss132/Dockerfile.x86_64 b/redhat/docker/oss132/Dockerfile.x86_64 index cad78c029..4d9cd433b 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.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss150/Dockerfile.x86_64 b/redhat/docker/oss150/Dockerfile.x86_64 index 940ade3f2..c0c48fa74 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.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss151/Dockerfile.x86_64 b/redhat/docker/oss151/Dockerfile.x86_64 index 825c4eb2d..ad1e11ac5 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.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss152/Dockerfile.x86_64 b/redhat/docker/oss152/Dockerfile.x86_64 index 57729a74d..6efb20b54 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.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss153/Dockerfile.x86_64 b/redhat/docker/oss153/Dockerfile.x86_64 index 670d0fceb..842b020ff 100644 --- a/redhat/docker/oss153/Dockerfile.x86_64 +++ b/redhat/docker/oss153/Dockerfile.x86_64 @@ -1,16 +1,18 @@ FROM opensuse/leap:15.3 -ARG TDE_VERSION=14.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Add PACKMAN repository # Install Trinity build dependencies COPY packages /packages -RUN echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \ +RUN set -x \ + && echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \ && echo HTTP_PROXY="http://proxy:3128/" >>/etc/sysconfig/proxy \ && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.3/ packman \ && zypper refresh \ - && zypper -n install libudisks2-0-devel-2.8.1-1.39.x86_64.rpm https://ftp.lysator.liu.se/pub/opensuse/distribution/leap/15.3/repo/oss/x86_64/libudisks2-0-devel-2.8.1-1.39.x86_64.rpm \ + && zypper -n install libudisks2-0-devel-2.8.1-1.39.x86_64 \ + && zypper -n install postgresql10{,-devel,-server}-10.17-8.35.1.x86_64 \ && zypper -n update \ && zypper -n install -l $(</packages) diff --git a/redhat/docker/oss153/packages b/redhat/docker/oss153/packages index 800b1e17b..cf45a5a34 100644 --- a/redhat/docker/oss153/packages +++ b/redhat/docker/oss153/packages @@ -90,6 +90,7 @@ libgphoto2-devel libgpod-devel libgssglue-devel libical-devel +libICE-devel libidn-devel libiw-devel libjack-devel @@ -120,6 +121,7 @@ libraw1394-devel librsvg-devel libsamplerate-devel libSDL-devel +libSM-devel libsmbclient-devel libsndfile-devel libtag-devel @@ -136,7 +138,9 @@ libvorbis-devel libwmf-devel libwpd-devel libxine-devel +libXmu-devel libxslt-devel +libXt-devel libyaz-devel libzrtpcpp-devel lirc-devel @@ -164,8 +168,7 @@ perl-PAR-Packer perl-pcsc pkcs11-helper-devel pkgconfig(pygtk-2.0) -postgresql10 -postgresql10-devel +polkit-devel python-devel python3-devel python3-sip-devel @@ -201,3 +204,15 @@ xscreensaver xscreensaver-data xscreensaver-data-extra xz-devel + +font-util +imake +libXScrnSaver-devel +libXdmcp-devel +libfontenc-devel +libssh-devel +libxkbfile-devel +libXxf86vm-devel +libXxf86dga-devel +libXaw-devel +libXv-devel diff --git a/redhat/docker/oss154/Dockerfile.x86_64 b/redhat/docker/oss154/Dockerfile.x86_64 new file mode 100644 index 000000000..bf03a3966 --- /dev/null +++ b/redhat/docker/oss154/Dockerfile.x86_64 @@ -0,0 +1,32 @@ +FROM opensuse/leap:15.4 + +ARG TDE_VERSION=14.0.13 +ARG ARCH=x86_64 + +# Add PACKMAN repository +# Install Trinity build dependencies +COPY packages /packages +RUN set -x \ + && echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \ + && echo HTTP_PROXY="http://proxy:3128/" >>/etc/sysconfig/proxy \ + && rm -fv /etc/zypp/repos.d/repo-sle-* \ + && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.4/ packman \ + && zypper refresh \ + && zypper -n update \ + && zypper -n install --oldpackage libldap-2_4-2-2.4.46-150200.14.5.1.x86_64 libldap-2_4-2-2.4.46-150200.14.5.1.x86_64 libldap-data-2.4.46-150200.14.5.1.noarch \ + && zypper -n install -l $(</packages) + +RUN ln -sfv python3 /usr/bin/python + +# Add non-root user to build packages +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers + +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +# Add YUM repository for locally built packages +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 diff --git a/redhat/docker/oss154/packages b/redhat/docker/oss154/packages new file mode 100644 index 000000000..cf75e1def --- /dev/null +++ b/redhat/docker/oss154/packages @@ -0,0 +1,218 @@ +alsa-devel +aspell +aspell-devel +audiofile-devel +automake +bdftopcf +binutils-devel +bison +brp-check-suse +brp-extract-appdata +ccache +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +clamav-devel +cln-devel +clucene-core-devel +cmake +createrepo_c +cups-devel +cyrus-sasl-devel +dbus-1-devel +dbus-1-glib-devel +djvulibre +docbook-utils +docbook-xsl-stylesheets +docbook2x +doxygen GraphicsMagick +dssi-devel +fdupes +ffmpeg-devel +fftw3-devel +file-devel +flac-devel +flex +font-util +freetype-devel +fribidi-devel +gamin-devel +gcc-c++ +giflib-devel +git +glu-devel +gmime-devel +gmime2_6-devel +gmp-devel +gperf xmlto +GraphicsMagick-devel +gsl-devel +gstreamer-devel +gstreamer-plugins-base-devel +gstreamer-devel +gtk2-devel +gtk3-devel +gtk-doc +htdig +html2ps +hunspell-devel +iceauth +ImageMagick-devel +imake +imlib2-devel +intltool +java-1_8_0-openjdk-devel +less +libacl-devel +libao-devel +libart_lgpl-devel +libavahi-devel +libavcodec-devel +libblkid-devel +libboost_python-py3-1_66_0-devel +libboost_system1_66_0-devel +libbz2-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcryptsetup-devel +libcurl-devel +libdb-4_8-devel +libdvdread-devel +libexempi-devel +libexiv2-devel +libfontenc-devel +libgadu-devel +libGeoIP-devel +libgpgme-devel +libgphoto2-devel +libgpod-devel +libgssglue-devel +libical-devel +libICE-devel +libidn-devel +libiw-devel +libjack-devel +libjasper-devel +libjpeg8-devel +liblcms2-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp3lame-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz-devel +libmysqld-devel +libneon-devel +libnjb-devel +libnsl-devel +libofx-devel +libotr-devel +libpaper-devel +libpng16-devel +libpoppler-devel +libpqxx-devel +libpulse-devel +libqalculate-devel +libraw1394-devel +librsvg-devel +libsamplerate-devel +libSDL-devel +libSM-devel +libsmbclient-devel +libsndfile-devel +libssh-devel +libtag-devel +libtheora-devel +libtiff-devel +libtirpc-devel +libtool +libtwolame-devel +libudev1 +libudisks2-0-devel +libuuid-devel +libv4l-devel +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libXaw-devel +libXdmcp-devel +libxine-devel +libxkbfile-devel +libXpm-devel +libXmu-devel +libXScrnSaver-devel +libxslt-devel +libXt-devel +libXv-devel +libXxf86dga-devel +libXxf86vm-devel +libyaz-devel +libzrtpcpp-devel +lirc-devel +make +makeinfo +meanwhile-devel +Mesa-devel +Mesa-libGL-devel +mozilla-nspr-devel +mysql-devel +net-tools +net-tools-deprecated +NetworkManager-devel +ocaml +openexr-devel +opensc +openslp-devel +opensp-devel +pam-devel +patch +pciutils-devel +pcre-devel +pcsc-lite-devel +perl-PAR-Packer +perl-pcsc +pkcs11-helper-devel +polkit-devel +postgresql10 +postgresql10-devel +python3-devel +python3-sip-devel +recode +rpcgen +rpm-build +rpmlint +rsvg-convert +ruby +ruby-devel +sane-backends-devel +scons +speex-devel +sqlite3-devel +subversion-devel +sudo +swig +sword-devel +torsocks +transfig +unixODBC-devel +update-desktop-files +usbutils +utempter-devel +valgrind +vim +wireless-tools +wv2-devel +xbase-devel +xcb-proto-devel +xorg-x11 +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xz-devel diff --git a/redhat/docker/oss154/rpmmacros b/redhat/docker/oss154/rpmmacros new file mode 100644 index 000000000..9917a9332 --- /dev/null +++ b/redhat/docker/oss154/rpmmacros @@ -0,0 +1,5 @@ +%dist .oss154 +%_smp_mflags -j8 +%jobs 8 +%sle_version 150400 +%_build_insert_debug_package %nil diff --git a/redhat/docker/oss421/Dockerfile.x86_64 b/redhat/docker/oss421/Dockerfile.x86_64 index 60c2d24c7..701b47d89 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.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss422/Dockerfile.x86_64 b/redhat/docker/oss422/Dockerfile.x86_64 index 951cca684..ad34292c5 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.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss423/Dockerfile.x86_64 b/redhat/docker/oss423/Dockerfile.x86_64 index 12eb5a6f2..5f3bc940a 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.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index 9e217a5c6..ffaad703d 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.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=i686 # Add PACKMAN repository @@ -10,12 +10,15 @@ RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/op && setarch ${ARCH} zypper -n refresh \ && setarch ${ARCH} zypper -n dup \ && setarch ${ARCH} zypper -n update \ - && setarch ${ARCH} zypper -n install $(</packages) + && setarch ${ARCH} zypper -n install --allow-vendor-change $(</packages) # Add non-root user to build packages RUN useradd -m -s /bin/bash -u 1000 trinity \ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers +# Fix postgresql +RUN ln -sfv /usr/lib/postgresql10/bin/pg_config /usr/bin/pg_config + USER trinity COPY rpmmacros /home/trinity/.rpmmacros @@ -26,11 +29,11 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch # Add GeoIP -RUN rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.3/repo/oss/src/GeoIP-1.6.12-6.3.1.src.rpm \ +RUN setarch ${ARCH} rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.3/repo/oss/src/GeoIP-1.6.12-6.3.1.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/*GeoIP*.rpm # Add lilypond (i686 only) -RUN setarch ${ARCH} sudo zypper -n install dblatex fontforge ghostscript-fonts-other mftrace "pkgconfig(guile-1.8)" potrace-devel t1utils texi2html texlive-lh texinfo \ - && rpm -ivh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.23.3-2.1.src.rpm \ +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.23.3-3.9.src.rpm \ && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \ - && setarch ${ARCH} rpmbuild -ba ~/rpmbuild/SPECS/lilypond.spec + && setarch ${ARCH} rpmbuild -ba "${HOME}/rpmbuild/SPECS/lilypond.spec" \ + && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/lilypond"{,-fonts-common,-texgy-fonts,-emmentaler-fonts}"-2"*".rpm" diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64 index 574d18973..21fc9a863 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.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages index 8a8f664f1..6a0428a66 100644 --- a/redhat/docker/osstw/packages +++ b/redhat/docker/osstw/packages @@ -9,7 +9,6 @@ bison bluez-devel boost-devel brp-check-suse -brp-extract-appdata ccache cdparanoia cdparanoia-devel @@ -24,8 +23,10 @@ createrepo_c cups-devel curl cyrus-sasl-devel +dblatex dbus-1-devel dbus-1-glib-devel +dejavu-fonts djvulibre docbook-utils docbook-xsl-stylesheets @@ -45,6 +46,7 @@ freetype-devel fribidi-devel gamin-devel gcc-c++ +ghostscript-fonts-other mftrace giflib-devel glu-devel gmime-devel @@ -93,6 +95,7 @@ libical-devel libidn-devel libiw-devel libjack-devel +libjasper7 libjasper-devel liblcms2-devel liblo-devel @@ -123,14 +126,15 @@ libSDL-devel libsensors4-devel libsmbclient-devel libsndfile-devel +libssh-devel libtag-devel libtheora-devel libtiff-devel libtirpc-devel libtool libtwolame-devel -libudev-devel libudisks2-0-devel +libuuid-devel libv4l-devel libvisual-devel libvorbis-devel @@ -175,8 +179,12 @@ pcsc-lite-devel perl-PAR-Packer perl-pcsc pkcs11-helper-devel +pkgconfig(guile-1.8) +polkit-devel postgresql10 postgresql10-devel +potrace-devel +ppp python-devel python-gtk-devel python3-devel @@ -185,6 +193,7 @@ rpcgen rpm-build rpm-devel rsvg-convert +rsync ruby ruby-devel sane-backends-devel @@ -195,16 +204,22 @@ subversion-devel sudo swig sword-devel +t1utils +texi2html +texinfo texlive-adjustbox texlive-etoc +texlive-float texlive-hanging texlive-metafont-bin +texlive-metapost texlive-multirow texlive-natbib texlive-newunicodechar texlive-refman texlive-sectsty texlive-stackengine +texlive-lh texlive-tocloft torsocks transfig @@ -223,3 +238,4 @@ xscreensaver-data xscreensaver-data-extra xz xz-devel +zip diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64 index e027c7c89..66036cba0 100644 --- a/redhat/docker/pclinuxos/Dockerfile.x86_64 +++ b/redhat/docker/pclinuxos/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM pclinuxos:2021 -ARG TDE_VERSION=14.0.11 +ARG TDE_VERSION=14.0.13 ARG ARCH=x86_64 # Update distribution @@ -26,7 +26,8 @@ COPY genla.sh /usr/bin/genla.sh 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 + && genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la \ + && ln -sf /usr/lib64/libglvnd/libGL.so /usr/lib64/libGL.so # Add non-root user to build packages RUN rm -rf /home/trinity \ @@ -37,12 +38,12 @@ USER trinity COPY 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 rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/torsocks-2.3.0-2.mga8.src.rpm \ && sed -i ${HOME}/rpmbuild/SPECS/torsocks.spec -e "s|%license|%doc|" \ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec \ && sudo rpm -Uvh /home/trinity/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 rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/cscope-15.9-2.mga8.src.rpm \ && sed -i ${HOME}/rpmbuild/SPECS/cscope.spec -e "s|%autopatch|%patch0|" \ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec \ && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm @@ -51,3 +52,7 @@ RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPM && sed -i ${HOME}/rpmbuild/SPECS/rpcsvc-proto.spec -e "s|%autosetup .*|%setup -q|" -e "s|%configure|%configure2_5x|" -e "s|%license|%doc|" \ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/rpcsvc-proto.spec \ && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/rpcgen-1*.rpm + +RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/html2ps-2.0-3.b7.8.mga8.src.rpm \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/html2ps.spec \ + && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/html2ps-2*.rpm diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64 index abbbc7948..e63e1594e 100644 --- a/redhat/docker/pclinuxos/packages.x86_64 +++ b/redhat/docker/pclinuxos/packages.x86_64 @@ -13,6 +13,7 @@ clamav clamav-devel cmake cups-devel +dbus-glib-devel desktop-file-utils djvulibre docbook-style-xsl @@ -70,10 +71,12 @@ lib64mpcdec-devel lib64OpenSP5-devel lib64pcsclite-devel lib64pkcs11-helper-devel +lib64polkit1-devel lib64poppler-devel lib64readline-devel lib64sane1-devel lib64sndfile-devel +lib64ssh-devel lib64unwind-devel lib64usb1.0-devel lib64usb-compat0.1-devel @@ -160,13 +163,16 @@ openldap-devel opensc openslp-devel pam-devel +pcre-devel perl-devel +perl-Image-Magick perl-PAR-Packer perl-pcsc-perl pilot-link-devel pkgconfig(pygtk-2.0) postgresql postgresql-devel +ppp pth-devel python3 python-devel diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros index bbb269929..a8b78eb0d 100644 --- a/redhat/docker/pclinuxos/rpmmacros +++ b/redhat/docker/pclinuxos/rpmmacros @@ -1,5 +1,5 @@ %dist .pclos %_smp_mflags -j8 %jobs 8 -%pclinuxos 2021 +%pclinuxos 2022 %configure %configure2_5x diff --git a/redhat/docker/pull.sh b/redhat/docker/pull.sh index 19fd15dbb..30064325f 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.0.11" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.13" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/push.sh b/redhat/docker/push.sh index 1bc867925..0d4ea6ace 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.0.11" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.13" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/remove.sh b/redhat/docker/remove.sh index 8ba7c6ebb..7d9d87b2e 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.0.11" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.13" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh index e0d9d8815..91eb82e99 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.11" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.13" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker |