diff options
Diffstat (limited to 'redhat/docker')
114 files changed, 4632 insertions, 139 deletions
diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh index 945ce4751..a53ffd06a 100755 --- a/redhat/docker/build.sh +++ b/redhat/docker/build.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.0" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.2" [ -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 remove "localhost/${IMAGE}" +fi diff --git a/redhat/docker/el5/Dockerfile.i686 b/redhat/docker/el5/Dockerfile.i686 index a16417a58..135526498 100644 --- a/redhat/docker/el5/Dockerfile.i686 +++ b/redhat/docker/el5/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM centos32:5 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=i686 # Add local repositories diff --git a/redhat/docker/el5/Dockerfile.x86_64 b/redhat/docker/el5/Dockerfile.x86_64 index a6033ebea..1f123925e 100644 --- a/redhat/docker/el5/Dockerfile.x86_64 +++ b/redhat/docker/el5/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM centos:5 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 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 5e8c9827d..6858c0d9b 100644 --- a/redhat/docker/el6/Dockerfile.i686 +++ b/redhat/docker/el6/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM centos32:6 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 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 cbde1af99..7be807e46 100644 --- a/redhat/docker/el6/Dockerfile.x86_64 +++ b/redhat/docker/el6/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM centos:6 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Enable proxy @@ -14,6 +14,7 @@ RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \ && wget -P /etc/yum.repos.d -nv http://repo/repo/{centos6,epel6}.repo \ && yum -y clean all \ && yum -y update \ + && rm -fv /etc/yum.repos.d/CentOS-*.repo \ && rpm -Uvh --nodeps https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \ && yum -y install $(</packages) 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 cae7bab86..1366cfb18 100644 --- a/redhat/docker/el7/Dockerfile.x86_64 +++ b/redhat/docker/el7/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM centos:7 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Enable proxy @@ -22,9 +22,11 @@ RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE # Fix utempter detection # Distro-specific patches +# Fix python3.6 detection (tdebindings; kvirc) 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 + && ln -sfv libmp4v2.so /usr/lib64/libmp4.so \ + && ln -sfv python3.6m /usr/include/python3.6 # Add non-root user to build packages RUN useradd -m -s /bin/bash -u 1000 trinity \ @@ -38,11 +40,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 https://archives.fedoraproject.org/pub/archive/fedora/linux/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 https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/32/Everything/source/tree/Packages/r/rdesktop-1.9.0-2.fc32.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/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 https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/32/Everything/source/tree/Packages/p/pilot-link-0.12.5-44.fc32.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/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 diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages index 46c7034d9..a39c59cdd 100644 --- a/redhat/docker/el7/packages +++ b/redhat/docker/el7/packages @@ -9,7 +9,9 @@ binutils-devel bison bluez-libs-devel boost-devel +boost-python36-devel bzip2-devel +byacc ccache cdparanoia cdparanoia-devel @@ -19,6 +21,7 @@ clamav clamav-devel clucene-core-devel cmake +cmake3 cpp cppunit-devel createrepo @@ -64,6 +67,7 @@ gtk2-devel gtk+-devel gtk-doc guile-devel +heimdal-devel hiredis-devel hspell-devel html2ps @@ -118,6 +122,7 @@ libsamplerate-devel libsecret-devel libsmbclient-devel libsndfile-devel +libssh-devel libssh2-devel libtheora-devel libtiff-devel @@ -174,11 +179,13 @@ pigz pilot-link-devel pkcs11-helper-devel pkgconfig(pygtk-2.0) +polkit-devel poppler-devel postgresql-devel ppp pth-devel pulseaudio-libs-devel +python3-devel qt-devel readline-devel recode @@ -211,6 +218,7 @@ usbutils valgrind wireless-tools-devel xine-lib-devel +xkeyboard-config-devel xmlto xorg-x11-font-utils xscreensaver diff --git a/redhat/docker/el7/rpmmacros b/redhat/docker/el7/rpmmacros index b76d30014..f47c6c067 100644 --- a/redhat/docker/el7/rpmmacros +++ b/redhat/docker/el7/rpmmacros @@ -1,3 +1,6 @@ %dist .el7 %_smp_mflags -j8 %jobs 8 +%cmake %cmake3 +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64 index 090d63f9d..4cd5365ad 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.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Enable custom repository @@ -14,7 +14,8 @@ COPY centos-devel.repo /etc/yum.repos.d/centos-devel.repo # Enable supplementary repositories # Install Trinity build dependencies COPY packages /packages -RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \ +RUN set -x \ + && echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \ && curl -o /usr/lib/python3.6/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 \ @@ -29,7 +30,10 @@ 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 +# Fix python3.6 detection (tdebindings; kvirc) +RUN chmod a+r /usr/libexec/utempter/utempter \ + && ln -sfv python3.6m /usr/include/python3.6 \ + && ln -sfv python3 /usr/bin/python # Add non-root user to build packages RUN useradd -m -s /bin/bash -u 1000 trinity \ @@ -40,19 +44,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 https://archives.fedoraproject.org/pub/archive/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 https://archives.fedoraproject.org/pub/archive/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/30/Everything/source/tree/Packages/p/perl-PAR-1.015-8.fc30.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-1.017-5.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-28.fc30.src.rpm \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-37.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-Packer-1.047-4.fc30.src.rpm --nocheck \ +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-Packer-1.054-3.fc36.src.rpm --nocheck \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages index 6a07fbec7..cea7e8a72 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,16 @@ clucene-core-devel cmake cpp cppunit-devel -createrepo +createrepo_c cryptsetup-devel cups-devel dbus-glib-devel +djvulibre +djvulibre-devel docbook2X doxygen emacs +esound-devel exempi-devel exiv2-devel fdupes @@ -43,6 +47,7 @@ gamin-devel gcc gcc-c++ gcc-gfortran +geoip-devel gettext-devel giflib-devel glibmm24-devel @@ -59,7 +64,9 @@ gtk3-devel gtk-doc guile-devel heimdal-devel +help2man hspell-devel +html2ps icu ImageMagick-devel imake @@ -91,6 +98,7 @@ libgsf-devel libgssglue-devel libical-devel libidn-devel +libjpeg-turbo-utils libksba-devel libmad-devel libmemcached-devel @@ -112,6 +120,7 @@ libsamplerate-devel libsecret-devel libsmbclient-devel libsndfile-devel +libssh-devel libtheora-devel libtiff-devel libtirpc-devel @@ -171,6 +180,7 @@ perl(XML::Parser) pigz pkcs11-helper-devel pkgconfig(pygtk-2.0) +polkit-devel poppler-devel postgresql postgresql-devel @@ -179,8 +189,6 @@ ppp psutils pulseaudio-libs-devel pylibacl -python2 -python2-devel python3 python3-devel python3-pyxattr @@ -207,6 +215,7 @@ systemd-devel taglib-devel tcl texinfo +texlive-dvips torsocks transfig unixODBC-devel @@ -215,6 +224,7 @@ valgrind wget wireless-tools-devel xine-lib-devel +xkeyboard-config-devel xmlto xorg-x11-font-utils xscreensaver diff --git a/redhat/docker/el8/rpmmacros b/redhat/docker/el8/rpmmacros index dc2cb7e68..d2d495cbe 100644 --- a/redhat/docker/el8/rpmmacros +++ b/redhat/docker/el8/rpmmacros @@ -3,3 +3,5 @@ %jobs 8 %_debugsource_packages %nil %_debugsource_template %nil +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/el9/Dockerfile.x86_64 b/redhat/docker/el9/Dockerfile.x86_64 new file mode 100644 index 000000000..5fb5a4c01 --- /dev/null +++ b/redhat/docker/el9/Dockerfile.x86_64 @@ -0,0 +1,101 @@ +FROM rockylinux:9 + +ARG TDE_VERSION=14.1.2 +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 https://archives.fedoraproject.org/pub/archive/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 https://archives.fedoraproject.org/pub/archive/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 wget -nv -P ${HOME}/rpmbuild/RPMS/x86_64 \ + 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 \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/lib{icu69,yaz}-*.rpm + +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-1.017-5.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm + +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-37.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm + +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-Packer-1.054-3.fc36.src.rpm --nocheck \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm + +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/b/bdftopcf-1.1-4.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/bdftopcf-1*.rpm + +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/paper-2.3-4.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/paper-2*.rpm + +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/psutils-2.07-2.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/psutils-2*.rpm + +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/v/vorbis-tools-1.4.2-4.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/vorbis-tools-1*.rpm + +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*.rpm + +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/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 https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/c/chmlib-0.40-26.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/chmlib{,-devel}-0*.rpm + +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/h/html2ps-1.0-0.42.b7.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/html2ps-1*.rpm + +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libxml++-2.42.1-3.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libxml++{,-devel}-2*.rpm + +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libofx-0.10.3-2.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libofx{,-devel}-0*.rpm + +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/g/GeoIP-GeoLite-data-2018.06-9.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/GeoIP-GeoLite-data-2*.rpm + +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/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 https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/liblo-0.31-5.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/liblo{,-devel}-0*.rpm + +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/pcsc-perl-1.4.14-19.fc36.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm diff --git a/redhat/docker/el9/packages b/redhat/docker/el9/packages new file mode 100644 index 000000000..3d3239b3a --- /dev/null +++ b/redhat/docker/el9/packages @@ -0,0 +1,229 @@ +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 +djvulibre +djvulibre-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 +heimdal-devel +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 +mplayer +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-server-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 +xkeyboard-config-devel +xmlto +xorg-x11-server-utils +xorg-x11-util-macros +xscreensaver +xscreensaver-base +xscreensaver-extras +xscreensaver-gl-base +xscreensaver-gl-extras +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..67367b01a --- /dev/null +++ b/redhat/docker/el9/rpmmacros @@ -0,0 +1,8 @@ +%dist .el9 +%_smp_mflags -j8 +%jobs 8 +%__cmake_in_source_build 1 +%_debugsource_packages %nil +%_debugsource_template %nil +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/f25/Dockerfile.x86_64 b/redhat/docker/f25/Dockerfile.x86_64 index 2336d4548..a08b86185 100644 --- a/redhat/docker/f25/Dockerfile.x86_64 +++ b/redhat/docker/f25/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:25 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f26/Dockerfile.i686 b/redhat/docker/f26/Dockerfile.i686 index 7ed2344f1..86cae885c 100644 --- a/redhat/docker/f26/Dockerfile.i686 +++ b/redhat/docker/f26/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:26 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=i686 # Add RPMFUSION repository diff --git a/redhat/docker/f26/Dockerfile.x86_64 b/redhat/docker/f26/Dockerfile.x86_64 index adf0c84b3..bc24ab119 100644 --- a/redhat/docker/f26/Dockerfile.x86_64 +++ b/redhat/docker/f26/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:26 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f27/Dockerfile.i686 b/redhat/docker/f27/Dockerfile.i686 index d9ed83adb..a81c034e9 100644 --- a/redhat/docker/f27/Dockerfile.i686 +++ b/redhat/docker/f27/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:27 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=i686 # Add RPMFUSION repository diff --git a/redhat/docker/f27/Dockerfile.x86_64 b/redhat/docker/f27/Dockerfile.x86_64 index 85e843edd..ed4953b28 100644 --- a/redhat/docker/f27/Dockerfile.x86_64 +++ b/redhat/docker/f27/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:27 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f28/Dockerfile.i686 b/redhat/docker/f28/Dockerfile.i686 index d904832ad..96adf7fac 100644 --- a/redhat/docker/f28/Dockerfile.i686 +++ b/redhat/docker/f28/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:28 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 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 bc1403a5e..913b73a18 100644 --- a/redhat/docker/f28/Dockerfile.x86_64 +++ b/redhat/docker/f28/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:28 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 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 eb47cda8c..8a59d571e 100644 --- a/redhat/docker/f29/Dockerfile.i686 +++ b/redhat/docker/f29/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:29 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 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 a096b2321..f4a295247 100644 --- a/redhat/docker/f29/Dockerfile.x86_64 +++ b/redhat/docker/f29/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:29 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 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 991b5a194..fd70b9f98 100644 --- a/redhat/docker/f30/Dockerfile.i686 +++ b/redhat/docker/f30/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:30 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 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 3caf1c05e..a8610575f 100644 --- a/redhat/docker/f30/Dockerfile.x86_64 +++ b/redhat/docker/f30/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:30 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 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 9f93a9b72..894f8794f 100644 --- a/redhat/docker/f31/Dockerfile.x86_64 +++ b/redhat/docker/f31/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:31 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 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 ec0e049b8..d48a0be88 100644 --- a/redhat/docker/f32/Dockerfile.x86_64 +++ b/redhat/docker/f32/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:32 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 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 4bd74cf4a..67ea30ecb 100644 --- a/redhat/docker/f33/Dockerfile.x86_64 +++ b/redhat/docker/f33/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:33 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 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 e86d2a75d..776f750eb 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.10 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Fix DNF database corruption @@ -18,9 +18,8 @@ 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 - -RUN chmod 777 /tmp +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 \ 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 new file mode 100644 index 000000000..947dcee69 --- /dev/null +++ b/redhat/docker/f35/Dockerfile.x86_64 @@ -0,0 +1,36 @@ +FROM fedora:35 + +ARG TDE_VERSION=14.1.2 +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-35.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-* diff --git a/redhat/docker/f35/packages b/redhat/docker/f35/packages new file mode 100644 index 000000000..f541aa930 --- /dev/null +++ b/redhat/docker/f35/packages @@ -0,0 +1,236 @@ +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 +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 +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) +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 +wireless-tools-devel +xbase-devel +xine-lib-devel +xmedcon +xmedcon-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-extras +xz-devel diff --git a/redhat/docker/f35/rpmbuild.repo b/redhat/docker/f35/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f35/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/f35/rpmmacros b/redhat/docker/f35/rpmmacros new file mode 100644 index 000000000..4ce88c1fd --- /dev/null +++ b/redhat/docker/f35/rpmmacros @@ -0,0 +1,7 @@ +%dist .fc35 +%_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..ceda97e9e --- /dev/null +++ b/redhat/docker/f36/Dockerfile.x86_64 @@ -0,0 +1,40 @@ +FROM fedora:36 + +ARG TDE_VERSION=14.1.2 +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 https://archives.fedoraproject.org/pub/archive/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..e9fa47a55 --- /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 +heimdal-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-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..fc288134d --- /dev/null +++ b/redhat/docker/f37/Dockerfile.x86_64 @@ -0,0 +1,41 @@ +FROM fedora:37 + +ARG TDE_VERSION=14.1.2 +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 rpm -i https://archives.fedoraproject.org/pub/archive/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 https://archives.fedoraproject.org/pub/archive/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..6fd5a4f15 --- /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 +heimdal-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-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/f38/Dockerfile.x86_64 b/redhat/docker/f38/Dockerfile.x86_64 new file mode 100644 index 000000000..b01609519 --- /dev/null +++ b/redhat/docker/f38/Dockerfile.x86_64 @@ -0,0 +1,41 @@ +FROM fedora:38 + +ARG TDE_VERSION=14.1.2 +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|38|g" \ + && dnf -y install dnf-plugin-ovl findutils \ + && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-38.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 rpm -i https://archives.fedoraproject.org/pub/archive/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 https://archives.fedoraproject.org/pub/archive/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/f38/packages b/redhat/docker/f38/packages new file mode 100644 index 000000000..828222df7 --- /dev/null +++ b/redhat/docker/f38/packages @@ -0,0 +1,241 @@ +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 +heimdal-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 +less +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-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/f38/rpmbuild.repo b/redhat/docker/f38/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f38/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/f38/rpmmacros b/redhat/docker/f38/rpmmacros new file mode 100644 index 000000000..4d5b149f6 --- /dev/null +++ b/redhat/docker/f38/rpmmacros @@ -0,0 +1,10 @@ +%dist .fc38 +%_smp_mflags -j8 +%jobs 8 +%__brp_remove_la_files %nil +%__cmake_builddir %nil +%__cmake_in_source_build 1 +%_debugsource_packages %nil +%_debugsource_template %nil +%_fortify_level 2 +%source_date_epoch_from_changelog 0 diff --git a/redhat/docker/f39/Dockerfile.x86_64 b/redhat/docker/f39/Dockerfile.x86_64 new file mode 100644 index 000000000..51776f01f --- /dev/null +++ b/redhat/docker/f39/Dockerfile.x86_64 @@ -0,0 +1,41 @@ +FROM fedora:39 + +ARG TDE_VERSION=14.1.2 +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{,-updates}.repo -e "1,12s|enabled=0|enabled=1|" -e "s|\$releasever|39|g" \ + && dnf -y install dnf-plugin-ovl findutils \ + && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-39.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 rpm -i https://archives.fedoraproject.org/pub/archive/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 https://archives.fedoraproject.org/pub/archive/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/f39/packages b/redhat/docker/f39/packages new file mode 100644 index 000000000..4a76d8eeb --- /dev/null +++ b/redhat/docker/f39/packages @@ -0,0 +1,242 @@ +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 +heimdal-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 +less +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-private-devel +postgresql-server-devel +ppp +pulseaudio-libs-devel +python3.11 +python3.11-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 +xkeyboard-config-devel +xmedcon +xmedcon-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-extras +xz-devel diff --git a/redhat/docker/f39/rpmbuild.repo b/redhat/docker/f39/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f39/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/f39/rpmmacros b/redhat/docker/f39/rpmmacros new file mode 100644 index 000000000..e199a1097 --- /dev/null +++ b/redhat/docker/f39/rpmmacros @@ -0,0 +1,11 @@ +%dist .fc39 +%_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 +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/f40/Dockerfile.x86_64 b/redhat/docker/f40/Dockerfile.x86_64 new file mode 100644 index 000000000..775a503cd --- /dev/null +++ b/redhat/docker/f40/Dockerfile.x86_64 @@ -0,0 +1,41 @@ +FROM fedora:40 + +ARG TDE_VERSION=14.1.2 +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{,-updates}.repo -e "1,12s|enabled=0|enabled=1|" -e "s|\$releasever|40|g" \ + && dnf -y install dnf-plugin-ovl findutils \ + && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-40.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 rpm -i https://archives.fedoraproject.org/pub/archive/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 https://archives.fedoraproject.org/pub/archive/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/f40/packages b/redhat/docker/f40/packages new file mode 100644 index 000000000..7f1d9cc47 --- /dev/null +++ b/redhat/docker/f40/packages @@ -0,0 +1,242 @@ +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 +heimdal-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 +less +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-private-devel +postgresql-server-devel +ppp +pulseaudio-libs-devel +python3 +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 +xkeyboard-config-devel +xmedcon +xmedcon-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-extras +xz-devel diff --git a/redhat/docker/f40/rpmbuild.repo b/redhat/docker/f40/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f40/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/f40/rpmmacros b/redhat/docker/f40/rpmmacros new file mode 100644 index 000000000..32f75b192 --- /dev/null +++ b/redhat/docker/f40/rpmmacros @@ -0,0 +1,10 @@ +%dist .fc40 +%_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 +%python python3 diff --git a/redhat/docker/mageia.sh b/redhat/docker/mageia.sh new file mode 100755 index 000000000..e0a84588a --- /dev/null +++ b/redhat/docker/mageia.sh @@ -0,0 +1,34 @@ +#!/bin/bash -e + +NAME="mageia" +VERSION="${1:-9}" # E.g: '9' +IMAGE="${NAME}:${VERSION}" +INSTALLROOT="/dev/shm/${IMAGE}" +ARCH="x86_64" + +sudo rm -rf "${INSTALLROOT}" +sudo mkdir -p "${INSTALLROOT}" +sudo dnf -y \ + --disablerepo="*" \ + --enablerepo="mageia-${ARCH},updates-${ARCH}" \ + --installroot="${INSTALLROOT}" \ + --releasever="${VERSION}" \ + install \ + \ + bash \ + mageia-release-common \ + urpmi \ + vim + +sudo chroot "${INSTALLROOT}" rpmdb --rebuilddb + +FILE="${IMAGE//\//_}.tar" +sudo tar -C "${INSTALLROOT}" -c . >"${FILE}" +sudo rm -rf "${INSTALLROOT}" + +docker rmi -f "${IMAGE}" +docker import "${FILE}" "${IMAGE}" + +pigz "${FILE}" +mkdir -p "${HOME}/tde/docker" +mv -fv "${FILE}.gz" "${HOME}/tde/docker" diff --git a/redhat/docker/mageia32.sh b/redhat/docker/mageia32.sh index 29afb4b59..01aa1f672 100755 --- a/redhat/docker/mageia32.sh +++ b/redhat/docker/mageia32.sh @@ -3,6 +3,7 @@ NAME="mageia32" VERSION="$1" # E.g: '26' IMAGE="${NAME}:${VERSION}" +TAR="${NAME}-${VERSION}.tar" INSTALLROOT="/dev/shm/${IMAGE}" sudo rm -rf "${INSTALLROOT}" @@ -12,8 +13,8 @@ setarch i686 sudo urpmi \ --auto \ bash vim urpmi mageia-release-common -sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar" +sudo tar -C "${INSTALLROOT}" -c . >"${TAR}" sudo rm -rf "${INSTALLROOT}" docker rmi -f "${IMAGE}" -docker import "${IMAGE}.tar" "${IMAGE}" +docker import "${TAR}" "${IMAGE}" diff --git a/redhat/docker/mga5/Dockerfile.x86_64 b/redhat/docker/mga5/Dockerfile.x86_64 index 16f58288b..13b664401 100644 --- a/redhat/docker/mga5/Dockerfile.x86_64 +++ b/redhat/docker/mga5/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM mageia:5.1 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga6/Dockerfile.i686 b/redhat/docker/mga6/Dockerfile.i686 index d41472423..3df92c2bc 100644 --- a/redhat/docker/mga6/Dockerfile.i686 +++ b/redhat/docker/mga6/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM mageia32:6 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 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 36887a9dd..22a54729b 100644 --- a/redhat/docker/mga6/Dockerfile.x86_64 +++ b/redhat/docker/mga6/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM mageia:6 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga7/Dockerfile.i686 b/redhat/docker/mga7/Dockerfile.i686 index 0d7d949d4..0c75795b7 100644 --- a/redhat/docker/mga7/Dockerfile.i686 +++ b/redhat/docker/mga7/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM mageia32:7 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 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 1fcf07ccb..71b5dc862 100644 --- a/redhat/docker/mga7/Dockerfile.x86_64 +++ b/redhat/docker/mga7/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM mageia:7 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga8/Dockerfile.i686 b/redhat/docker/mga8/Dockerfile.i686 index e39ba47d2..bcb1d59e4 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.9 +ARG TDE_VERSION=14.1.2 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 f2385a34f..864b12c2b 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.9 +ARG TDE_VERSION=14.1.2 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..c44677fa0 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,11 +214,11 @@ pinentry-gtk2 pkgconfig(audiofile) pkgconfig(libpng16) polkit-agent-none +polkit-devel postgresql13 postgresql13-devel ppp -python-devel -python-sip +python3-devel qt4-devel readline-devel recode diff --git a/redhat/docker/mga8/packages.x86_64 b/redhat/docker/mga8/packages.x86_64 index ad8802b2c..22bc88e76 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,11 +217,11 @@ pinentry-gtk2 pkgconfig(audiofile) pkgconfig(libpng16) polkit-agent-none +polkit-devel postgresql13 postgresql13-devel ppp -python-devel -python-sip +python3-devel qt4-devel readline-devel recode diff --git a/redhat/docker/mga9/Dockerfile.i686 b/redhat/docker/mga9/Dockerfile.i686 new file mode 100644 index 000000000..1811d8f52 --- /dev/null +++ b/redhat/docker/mga9/Dockerfile.i686 @@ -0,0 +1,45 @@ +FROM mageia32:9 + +ARG TDE_VERSION=14.1.2 +ARG ARCH=i686 + +# Reset URPMI repositories to default +# Enable more URPMI repositories +# Enable english locales +# Update distribution +# Install Trinity build dependencies +COPY packages.${ARCH} /packages +RUN set -x \ + && urpmi.removemedia -a \ + && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/i586/ \ + && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" \ + && urpmi.update -a \ + && urpmi --replacepkgs glibc \ + && localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || : \ + && urpmi --auto-select --auto \ + && urpmi --auto $(</packages) + +# Enable ccache +# Fix utempter detection +# Fix poppler support +RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" \ + && chmod a+r /usr/libexec/utempter/utempter \ + && 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" \ + && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc + +# 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 diff --git a/redhat/docker/mga9/Dockerfile.x86_64 b/redhat/docker/mga9/Dockerfile.x86_64 new file mode 100644 index 000000000..450334eec --- /dev/null +++ b/redhat/docker/mga9/Dockerfile.x86_64 @@ -0,0 +1,45 @@ +FROM mageia:9 + +ARG TDE_VERSION=14.1.2 +ARG ARCH=x86_64 + +# Reset URPMI repositories to default +# Enable more URPMI repositories +# Enable english locales +# Update distribution +# Install Trinity build dependencies +COPY packages.${ARCH} /packages +RUN set -x \ + && urpmi.removemedia -a \ + && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/x86_64/ \ + && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" \ + && urpmi.update -a \ + && urpmi --replacepkgs glibc \ + && localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || : \ + && urpmi --auto-select --auto \ + && urpmi --auto $(</packages) + +# Enable ccache +# Fix utempter detection +# Fix poppler support +RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" \ + && chmod a+r /usr/libexec/utempter/utempter \ + && 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" \ + && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc + +# 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 diff --git a/redhat/docker/mga9/packages.i686 b/redhat/docker/mga9/packages.i686 new file mode 100644 index 000000000..01f51270c --- /dev/null +++ b/redhat/docker/mga9/packages.i686 @@ -0,0 +1,254 @@ +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 +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 +libmusicbrainz5-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libnjb-devel +libnpth-devel +libofx-devel +libotr-devel +libpaper-devel +libpaper-devel +libpcre-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 +python3-devel +qt4-devel +readline-devel +recode +rpcgen +rpm-build +rpm-devel +ruby-devel +scons +SDL-devel +speex-devel +sqlite3-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..21c9a7d60 --- /dev/null +++ b/redhat/docker/mga9/packages.x86_64 @@ -0,0 +1,258 @@ +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 +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 +lib64musicbrainz5-devel +lib64npth-devel +lib64paper-devel +lib64pcre-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 +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 +net-tools +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 +python3-devel +qt4-devel +readline-devel +recode +rpcgen +rpm-build +rpm-devel +ruby-devel +scons +SDL-devel +speex-devel +sqlite3-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..e0f078bca --- /dev/null +++ b/redhat/docker/mga9/rpmmacros @@ -0,0 +1,10 @@ +%dist .mga9 +%_smp_mflags -j8 +%jobs 8 +%__brp_remove_la_files %nil +%_program_prefix "" +%_debugsource_packages %nil +%_debugsource_template %nil +%_vpath_builddir . +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/omv5000/Dockerfile.x86_64 b/redhat/docker/omv5000/Dockerfile.x86_64 new file mode 100644 index 000000000..37b186710 --- /dev/null +++ b/redhat/docker/omv5000/Dockerfile.x86_64 @@ -0,0 +1,65 @@ +FROM openmandriva:5.0 + +ARG TDE_VERSION=14.1.2 +ARG ARCH=x86_64 + +COPY packages /packages +RUN set -x \ + && echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \ + && dnf -y update \ + && dnf -y install --skip-broken $(</packages) + +# Fix utempter detection +RUN set -x \ + && chmod a+r /usr/libexec/utempter/utempter + +# Add non-root user to build packages +RUN set -x \ + && rm -rf /home/trinity \ + && 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 \ + && chown -R trinity /home/trinity + +# Configure user trinity +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +RUN set -x \ + && rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/development/rawhide/Everything/source/tree/Packages/r/rdesktop-1.9.0-15.fc40.src.rpm --nodeps \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/sword-1.9.0-11.mga10.src.rpm \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/sword.spec --define "cmake_build %__make %{?_smp_mflags}" --define "cmake_install %__make -C build install DESTDIR=%{?buildroot}" --define "__cc /usr/bin/gcc" --define "__cxx /usr/bin/g++" --define "_disable_ld_no_undefined 1" --define "mkrel %nil" --define "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --nodeps \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64sword{1.9,-devel},sword}-1.9.0-*.rpm + +RUN set -x \ + && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/yaz-5.34.0-1.mga9.src.rpm --nodeps \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64yaz{5,-devel},yaz}-5*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdiff-backup-2.2.2-1.mga9.src.rpm \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdiff-backup.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-2*.rpm + +RUN set -x \ + && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/cscope-15.9-3.mga9.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cscope-15*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-Getopt-ArgvFile-1.110.0-10.mga9.src.rpm \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-Getopt-ArgvFile.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-1.18.0-1.mga9.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s/MYMETA.yml//" \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-Packer-1.57.0-1.mga9.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s/MYMETA.yml//" \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm diff --git a/redhat/docker/omv5000/packages b/redhat/docker/omv5000/packages new file mode 100644 index 000000000..47a126218 --- /dev/null +++ b/redhat/docker/omv5000/packages @@ -0,0 +1,256 @@ +aspell +aspell-devel +aspell-en +audiofile-devel +bind-devel +bison +boost-devel +bzip2-devel +ccache +cdparanoia +chmlib-devel +chrpath +clamav +clamav-devel +cmake +createrepo_c +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 +dssi-devel +exempi-devel +expat-devel +fdupes +fftw-devel +firebird-devel +flex +flex-devel +fontconfig-devel +freetype-devel +fribidi-devel +gamin-devel +gettext-devel +ghostscript +glib2-devel +glibc-i18ndata +gmime-devel +gnokii-devel +gperf +gpgme-devel +gsl-devel +gtk+3.0-devel +gtk-doc +hspell-devel +html2ps +iceauth +imake +imlib2-devel +intltool +java-1.8.0-openjdk +java-1.8.0-openjdk-devel +java-devel +kde-dev-scripts +less +lib64acl-devel +lib64alsa-oss-devel +lib64apr-devel +lib64apr-util-devel +lib64asound-devel +lib64attr-devel +lib64audio-devel +lib64binutils-devel +lib64cap-devel +lib64cdda-devel +lib64cdio-devel +lib64cdio_paranoia-devel +lib64cln-devel +lib64clucene-devel +lib64config-devel +lib64cryptsetup-devel +lib64curl-devel +lib64drm-devel +lib64dvdread-devel +lib64exif-devel +lib64exiv2-devel +lib64expat-devel +lib64ext2fs-devel +lib64fbclient-devel +lib64ffmpeg-devel +lib64flac++-devel +lib64flac-devel +lib64fluidsynth-devel +lib64fontenc-devel +lib64gadu-devel +lib64geoip-devel +lib64gif-devel +lib64glu-devel +lib64gmime2.6-devel +lib64gmp-devel +lib64gnutls-devel +lib64gpg-error-devel +lib64gphoto-devel +lib64gpod-devel +lib64graphicsmagick-devel +lib64gstreamer-devel +lib64gst-plugins-base1.0-devel +lib64gtk+2.0-devel +lib64hiredis-devel +lib64ical-devel +lib64icu-devel +lib64idn-devel +lib64ifp-devel +lib64jack-devel +lib64magick-devel +lib64inotifytools-devel +lib64jasper-devel +lib64jpeg-devel +lib64lame-devel +lib64lcms-devel +lib64ldap-devel +lib64lirc_client-devel +lib64lo-devel +lib64lrdf-devel +lib64ltdl-devel +lib64lua-devel +lib64mad-devel +lib64magic-devel +lib64memcached-devel +lib64mng-devel +lib64mpcdec-devel +lib64mtp-devel +lib64musicbrainz5-devel +lib64nettle-devel +lib64njb-devel +lib64nm-devel +lib64npth-devel +lib64nsl-devel +lib64nspr-devel +lib64ofx-devel +lib64openexr-devel +lib64otr-devel +lib64paper-devel +lib64pcre-devel +lib64pcsclite-devel +lib64pkcs11-helper-devel +lib64polkit1-devel +lib64poppler-devel +lib64pqxx-devel +lib64pth-devel +lib64pulseaudio-devel +lib64qalculate-devel +lib64raptor-devel +lib64raw1394-devel +lib64rsvg2-devel +lib64rsync-devel +lib64samplerate-devel +lib64sane1-devel +lib64sasl-devel +lib64SDL-devel +lib64smbclient-devel +lib64sndfile-devel +lib64t1lib-devel +lib64tasn1-devel +lib64theora-devel +lib64tiff-devel +lib64tirpc-devel +lib64twolame-devel +lib64udev-devel +lib64udisks-devel +lib64usb-compat0.1-devel +lib64usb1.0-devel +lib64utempter0 +lib64utempter-devel +lib64v4l-devel +lib64visual-devel +lib64vorbis-devel +lib64wmf-devel +lib64wpd-devel +lib64xaw-devel +lib64xdg-basedir-devel +lib64xi-devel +lib64xine-devel +lib64xkbfile-devel +lib64xscrnsaver-devel +lib64xslt-devel +lib64xtst-devel +lib64xxf86dga-devel +lib64xxf86vm-devel +lib64wrap-devel +librsvg +lm_sensors-devel +mysql-devel +nas-devel +neon-devel +netpbm +net-snmp-devel +net-tools +notification-daemon +ocaml +opensc +openslp-devel +opensp-devel +openssh-clients +optipng +pam-devel +pciutils-devel +perl-devel +perl(Archive::Zip) +perl(ExtUtils::CBuilder) +perl(ExtUtils::Embed) +perl-ExtUtils-MakeMaker +perl(IPC::Run3) +perl(Module::ScanDeps) +perl(PAR::Dist) +perl-pcsc-perl +perl(Test::More) +perl(Tk) +perl(XML::Parser) +pilot-link-devel +pinentry-gtk2 +pkgconfig(audiofile) +pkgconfig(libpng16) +postgresql +postgresql-devel +ppp +python3-devel +python-pylibacl +python-pyyaml +python-setuptools_scm +pyxattr +readline-devel +recode +rpm-build +rpm-devel +ruby-devel +scons +speex-devel +sqlite3-devel +subversion-devel +sudo +swig +taglib-devel +tcp_wrappers +torsocks +transfig +unixODBC-devel +usbutils +valgrind +x11-font-util +xbase-devel +xkeyboard-config-devel +xmlto +xscreensaver +xscreensaver-base +xscreensaver-extrusion +xscreensaver-gl +zlib-devel diff --git a/redhat/docker/omv5000/rpmmacros b/redhat/docker/omv5000/rpmmacros new file mode 100644 index 000000000..0a954f906 --- /dev/null +++ b/redhat/docker/omv5000/rpmmacros @@ -0,0 +1,11 @@ +%dist %nil +%_smp_mflags -j8 +%jobs 8 +%dont_remove_libtool_files 1 +%_disable_rebuild_configure 1 +%_program_prefix "" +%_debugsource_packages %nil +%_debugsource_template %nil +%_vpath_builddir . +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/omvcooker/Dockerfile.x86_64 b/redhat/docker/omvcooker/Dockerfile.x86_64 new file mode 100644 index 000000000..55f8a0abf --- /dev/null +++ b/redhat/docker/omvcooker/Dockerfile.x86_64 @@ -0,0 +1,65 @@ +FROM openmandriva/cooker:latest + +ARG TDE_VERSION=14.1.2 +ARG ARCH=x86_64 + +COPY packages /packages +RUN set -x \ + && echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \ + && dnf -y update \ + && dnf -y install --skip-broken $(</packages) + +# Fix utempter detection +RUN set -x \ + && chmod a+r /usr/libexec/utempter/utempter + +# Add non-root user to build packages +RUN set -x \ + && rm -rf /home/trinity \ + && 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 \ + && chown -R trinity /home/trinity + +# Configure user trinity +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +RUN set -x \ + && rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/development/rawhide/Everything/source/tree/Packages/r/rdesktop-1.9.0-15.fc40.src.rpm --nodeps \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/sword-1.9.0-11.mga10.src.rpm \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/sword.spec --define "cmake_build %__make %{?_smp_mflags}" --define "cmake_install %__make -C build install DESTDIR=%{?buildroot}" --define "__cc /usr/bin/gcc" --define "__cxx /usr/bin/g++" --define "_disable_ld_no_undefined 1" --define "mkrel %nil" --define "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --nodeps \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64sword{1.9,-devel},sword}-1.9.0-*.rpm + +#RUN set -x \ +# && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/yaz-5.34.0-1.mga9.src.rpm --define "mkrel %nil" --nodeps \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64yaz{5,-devel},yaz}-5*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdiff-backup-2.2.2-1.mga9.src.rpm \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdiff-backup.spec --define "mkrel %nil" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-2*.rpm + +RUN set -x \ + && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/cscope-15.9-3.mga9.src.rpm --define "mkrel %nil" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cscope-15*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-Getopt-ArgvFile-1.110.0-10.mga9.src.rpm \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-Getopt-ArgvFile.spec --define "mkrel %nil" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-1.18.0-1.mga9.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s/MYMETA.yml//" \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR.spec --define "mkrel %nil" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-Packer-1.57.0-1.mga9.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s/MYMETA.yml//" \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec --define "mkrel %nil" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm diff --git a/redhat/docker/omvcooker/packages b/redhat/docker/omvcooker/packages new file mode 100644 index 000000000..47a126218 --- /dev/null +++ b/redhat/docker/omvcooker/packages @@ -0,0 +1,256 @@ +aspell +aspell-devel +aspell-en +audiofile-devel +bind-devel +bison +boost-devel +bzip2-devel +ccache +cdparanoia +chmlib-devel +chrpath +clamav +clamav-devel +cmake +createrepo_c +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 +dssi-devel +exempi-devel +expat-devel +fdupes +fftw-devel +firebird-devel +flex +flex-devel +fontconfig-devel +freetype-devel +fribidi-devel +gamin-devel +gettext-devel +ghostscript +glib2-devel +glibc-i18ndata +gmime-devel +gnokii-devel +gperf +gpgme-devel +gsl-devel +gtk+3.0-devel +gtk-doc +hspell-devel +html2ps +iceauth +imake +imlib2-devel +intltool +java-1.8.0-openjdk +java-1.8.0-openjdk-devel +java-devel +kde-dev-scripts +less +lib64acl-devel +lib64alsa-oss-devel +lib64apr-devel +lib64apr-util-devel +lib64asound-devel +lib64attr-devel +lib64audio-devel +lib64binutils-devel +lib64cap-devel +lib64cdda-devel +lib64cdio-devel +lib64cdio_paranoia-devel +lib64cln-devel +lib64clucene-devel +lib64config-devel +lib64cryptsetup-devel +lib64curl-devel +lib64drm-devel +lib64dvdread-devel +lib64exif-devel +lib64exiv2-devel +lib64expat-devel +lib64ext2fs-devel +lib64fbclient-devel +lib64ffmpeg-devel +lib64flac++-devel +lib64flac-devel +lib64fluidsynth-devel +lib64fontenc-devel +lib64gadu-devel +lib64geoip-devel +lib64gif-devel +lib64glu-devel +lib64gmime2.6-devel +lib64gmp-devel +lib64gnutls-devel +lib64gpg-error-devel +lib64gphoto-devel +lib64gpod-devel +lib64graphicsmagick-devel +lib64gstreamer-devel +lib64gst-plugins-base1.0-devel +lib64gtk+2.0-devel +lib64hiredis-devel +lib64ical-devel +lib64icu-devel +lib64idn-devel +lib64ifp-devel +lib64jack-devel +lib64magick-devel +lib64inotifytools-devel +lib64jasper-devel +lib64jpeg-devel +lib64lame-devel +lib64lcms-devel +lib64ldap-devel +lib64lirc_client-devel +lib64lo-devel +lib64lrdf-devel +lib64ltdl-devel +lib64lua-devel +lib64mad-devel +lib64magic-devel +lib64memcached-devel +lib64mng-devel +lib64mpcdec-devel +lib64mtp-devel +lib64musicbrainz5-devel +lib64nettle-devel +lib64njb-devel +lib64nm-devel +lib64npth-devel +lib64nsl-devel +lib64nspr-devel +lib64ofx-devel +lib64openexr-devel +lib64otr-devel +lib64paper-devel +lib64pcre-devel +lib64pcsclite-devel +lib64pkcs11-helper-devel +lib64polkit1-devel +lib64poppler-devel +lib64pqxx-devel +lib64pth-devel +lib64pulseaudio-devel +lib64qalculate-devel +lib64raptor-devel +lib64raw1394-devel +lib64rsvg2-devel +lib64rsync-devel +lib64samplerate-devel +lib64sane1-devel +lib64sasl-devel +lib64SDL-devel +lib64smbclient-devel +lib64sndfile-devel +lib64t1lib-devel +lib64tasn1-devel +lib64theora-devel +lib64tiff-devel +lib64tirpc-devel +lib64twolame-devel +lib64udev-devel +lib64udisks-devel +lib64usb-compat0.1-devel +lib64usb1.0-devel +lib64utempter0 +lib64utempter-devel +lib64v4l-devel +lib64visual-devel +lib64vorbis-devel +lib64wmf-devel +lib64wpd-devel +lib64xaw-devel +lib64xdg-basedir-devel +lib64xi-devel +lib64xine-devel +lib64xkbfile-devel +lib64xscrnsaver-devel +lib64xslt-devel +lib64xtst-devel +lib64xxf86dga-devel +lib64xxf86vm-devel +lib64wrap-devel +librsvg +lm_sensors-devel +mysql-devel +nas-devel +neon-devel +netpbm +net-snmp-devel +net-tools +notification-daemon +ocaml +opensc +openslp-devel +opensp-devel +openssh-clients +optipng +pam-devel +pciutils-devel +perl-devel +perl(Archive::Zip) +perl(ExtUtils::CBuilder) +perl(ExtUtils::Embed) +perl-ExtUtils-MakeMaker +perl(IPC::Run3) +perl(Module::ScanDeps) +perl(PAR::Dist) +perl-pcsc-perl +perl(Test::More) +perl(Tk) +perl(XML::Parser) +pilot-link-devel +pinentry-gtk2 +pkgconfig(audiofile) +pkgconfig(libpng16) +postgresql +postgresql-devel +ppp +python3-devel +python-pylibacl +python-pyyaml +python-setuptools_scm +pyxattr +readline-devel +recode +rpm-build +rpm-devel +ruby-devel +scons +speex-devel +sqlite3-devel +subversion-devel +sudo +swig +taglib-devel +tcp_wrappers +torsocks +transfig +unixODBC-devel +usbutils +valgrind +x11-font-util +xbase-devel +xkeyboard-config-devel +xmlto +xscreensaver +xscreensaver-base +xscreensaver-extrusion +xscreensaver-gl +zlib-devel diff --git a/redhat/docker/omvcooker/rpmmacros b/redhat/docker/omvcooker/rpmmacros new file mode 100644 index 000000000..0a954f906 --- /dev/null +++ b/redhat/docker/omvcooker/rpmmacros @@ -0,0 +1,11 @@ +%dist %nil +%_smp_mflags -j8 +%jobs 8 +%dont_remove_libtool_files 1 +%_disable_rebuild_configure 1 +%_program_prefix "" +%_debugsource_packages %nil +%_debugsource_template %nil +%_vpath_builddir . +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/openmandriva.sh b/redhat/docker/openmandriva.sh new file mode 100755 index 000000000..ff121c54e --- /dev/null +++ b/redhat/docker/openmandriva.sh @@ -0,0 +1,27 @@ +#!/bin/bash -ex + +NAME="openmandriva" +VERSION="${1:-5.0}" # E.g: '26' +IMAGE="${NAME}:${VERSION}" +TAR="${NAME}-${VERSION}.tar" +INSTALLROOT="/dev/shm/${IMAGE}" + +sudo rm -rf "${INSTALLROOT}" +sudo dnf install \ + --assumeyes \ + --disablerepo="*" \ + --enablerepo="omv*" \ + --installroot="${INSTALLROOT}" \ + --nodocs \ + --nogpgcheck \ + --refresh \ + --releasever="${VERSION}" \ + --repofrompath 'omv-release,http://mirror.openmandriva.org/$releasever/repository/x86_64/main/release/' \ + --repofrompath 'omv-updates,http://mirror.openmandriva.org/$releasever/repository/x86_64/main/updates/' \ + bash curl dnf vim + +sudo tar -C "${INSTALLROOT}" -c . >"${TAR}" +sudo rm -rf "${INSTALLROOT}" + +docker rmi -f "${IMAGE}" +docker import "${TAR}" "${IMAGE}" diff --git a/redhat/docker/opensuse32.sh b/redhat/docker/opensuse32.sh index f2d686df5..5d4dce450 100755 --- a/redhat/docker/opensuse32.sh +++ b/redhat/docker/opensuse32.sh @@ -1,9 +1,13 @@ #!/bin/bash -e +if [ "$(whoami)" != "root" ]; then + sudo exec $0 $@ +fi + VERSION="$1" # E.g: '42.3' if [ "${VERSION}" = "tumbleweed" ]; then - URL="http://download.opensuse.org/tumbleweed" + URL="https://download.opensuse.org/ports/i586/tumbleweed" NAME="opensuse32/tumbleweed" else URL="http://download.opensuse.org/distribution/leap/${VERSION}" @@ -13,44 +17,70 @@ fi IMAGE="${NAME}:latest" INSTALLROOT="/dev/shm/${IMAGE}" -sudo rm -rf "${INSTALLROOT}" -sudo mkdir -p "${INSTALLROOT}" +for dir in dev proc sys; do + if [ -d "${INSTALLROOT}/${dir}" ]; then + umount "${INSTALLROOT}/${dir}" + fi +done + +rm -rf "${INSTALLROOT}" +mkdir -p "${INSTALLROOT}" -sudo zypper --root "${INSTALLROOT}" \ +for dir in dev proc sys; do + mkdir -p "${INSTALLROOT}/${dir}" + mount --bind "/${dir}" "${INSTALLROOT}/${dir}" +done + +zypper --root "${INSTALLROOT}" \ ar "${URL}/repo/oss/" "oss" -sudo zypper --root "${INSTALLROOT}" \ +zypper --root "${INSTALLROOT}" \ ar "${URL}/repo/non-oss/" "non-oss" if [ "${VERSION}" != "tumbleweed" ]; then - sudo zypper --root "${INSTALLROOT}" \ + zypper --root "${INSTALLROOT}" \ ar "http://download.opensuse.org/update/leap/${VERSION}/oss/" "update-oss" - sudo zypper --root "${INSTALLROOT}" \ + zypper --root "${INSTALLROOT}" \ ar "http://download.opensuse.org/update/leap/${VERSION}/non-oss/" "update-non-oss" fi -sudo zypper --root "${INSTALLROOT}" \ +zypper --root "${INSTALLROOT}" \ --gpg-auto-import-keys ref -sudo setarch i686 zypper --root "${INSTALLROOT}" \ +setarch i686 zypper --root "${INSTALLROOT}" \ install --download-only -y \ bash \ + ca-certificates \ + curl \ + docbook-utils \ filesystem \ + gawk \ glibc \ glibc-extra \ + grep \ + gzip \ libpcre1 \ libselinux1 \ openSUSE-release \ system-user-root \ util-linux vim \ + xz \ + zlib \ zypper -sudo rpm -Uvh --root "${INSTALLROOT}" "${INSTALLROOT}/var/cache/zypp/packages/oss/"*"/"*".rpm" +rpm -Uvh --root "${INSTALLROOT}" "${INSTALLROOT}/var/cache/zypp/packages/oss/"*"/"*".rpm" + +chroot "${INSTALLROOT}" rpmdb --rebuilddb + +for dir in dev proc sys; do + umount "${INSTALLROOT}/${dir}" +done -sudo chroot "${INSTALLROOT}" rpmdb --rebuilddb +rm -rfv "${INSTALLROOT}/var/cache/zypp/packages/"* FILE="${IMAGE//\//_}.tar" -sudo tar -C "${INSTALLROOT}" -c . >"${FILE}" -sudo rm -rf "${INSTALLROOT}" +tar -C "${INSTALLROOT}" -c . >"${FILE}" +rm -rf "${INSTALLROOT}" docker rmi -f "${IMAGE}" docker import "${FILE}" "${IMAGE}" pigz "${FILE}" -mv -fv "${FILE}.gz" "${HOME}/tde/docker" +mkdir -p "/home/${SUDO_USER}/tde/docker" +mv -fv "${FILE}.gz" "/home/${SUDO_USER}/tde/docker" diff --git a/redhat/docker/oss131/Dockerfile.x86_64 b/redhat/docker/oss131/Dockerfile.x86_64 index 69f9fdbe2..5ebc69ac7 100644 --- a/redhat/docker/oss131/Dockerfile.x86_64 +++ b/redhat/docker/oss131/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse:13.1 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss132/Dockerfile.x86_64 b/redhat/docker/oss132/Dockerfile.x86_64 index 292e7303a..f80f0aaa0 100644 --- a/redhat/docker/oss132/Dockerfile.x86_64 +++ b/redhat/docker/oss132/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse:13.2 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss150/Dockerfile.x86_64 b/redhat/docker/oss150/Dockerfile.x86_64 index a1d56c0b6..8bbccfb44 100644 --- a/redhat/docker/oss150/Dockerfile.x86_64 +++ b/redhat/docker/oss150/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/leap:15.0 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss151/Dockerfile.x86_64 b/redhat/docker/oss151/Dockerfile.x86_64 index c3a341c78..be2e75b61 100644 --- a/redhat/docker/oss151/Dockerfile.x86_64 +++ b/redhat/docker/oss151/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/leap:15.1 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss152/Dockerfile.x86_64 b/redhat/docker/oss152/Dockerfile.x86_64 index 57da91765..fd2294119 100644 --- a/redhat/docker/oss152/Dockerfile.x86_64 +++ b/redhat/docker/oss152/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/leap:15.2 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss152/packages b/redhat/docker/oss152/packages index 0fd341899..ec21f7f6b 100644 --- a/redhat/docker/oss152/packages +++ b/redhat/docker/oss152/packages @@ -163,8 +163,8 @@ perl-PAR-Packer perl-pcsc pkcs11-helper-devel pkgconfig(pygtk-2.0) -postgresql10 -postgresql10-devel +postgresql +postgresql-devel python-devel python3-devel python-sip-devel diff --git a/redhat/docker/oss153/Dockerfile.x86_64 b/redhat/docker/oss153/Dockerfile.x86_64 index cf1d2e93d..d2e770b22 100644 --- a/redhat/docker/oss153/Dockerfile.x86_64 +++ b/redhat/docker/oss153/Dockerfile.x86_64 @@ -1,16 +1,17 @@ FROM opensuse/leap:15.3 -ARG TDE_VERSION=14.0.10 +ARG TDE_VERSION=14.1.2 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 update \ && zypper -n install -l $(</packages) @@ -26,3 +27,10 @@ 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 + +# Install heimdal development files +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.3/repo/oss/src/libheimdal-7.7.0-bp153.1.19.src.rpm \ + && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.7.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.7.0/heimdal-7.7.0.tar.gz" \ + && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.7.0.tar.gz|" -e "/^%patch0/ s|^%|#|" \ + && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ + && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.7.0/tools/ install diff --git a/redhat/docker/oss153/packages b/redhat/docker/oss153/packages index 70b135dd7..1b18b1d8b 100644 --- a/redhat/docker/oss153/packages +++ b/redhat/docker/oss153/packages @@ -21,13 +21,14 @@ clucene-core-devel cmake createrepo cups-devel +curl cyrus-sasl-devel dbus-1-devel dbus-1-glib-devel djvulibre +docbook2x docbook-utils docbook-xsl-stylesheets -docbook2x doxygen GraphicsMagick dssi-devel fdupes @@ -36,6 +37,7 @@ fftw3-devel file-devel flac-devel flex +font-util freetype-devel fribidi-devel gamin-devel @@ -43,15 +45,15 @@ gcc-c++ giflib-devel git glu-devel -gmime-devel gmime2_6-devel +gmime-devel gmp-devel gperf xmlto GraphicsMagick-devel gsl-devel gstreamer-devel -gstreamer-plugins-base-devel gstreamer-devel +gstreamer-plugins-base-devel gtk2-devel gtk3-devel gtk-doc @@ -60,6 +62,7 @@ html2ps hunspell-devel iceauth ImageMagick-devel +imake imlib2-devel intltool java-1_8_0-openjdk-devel @@ -83,6 +86,7 @@ libdb-4_8-devel libdvdread-devel libexempi-devel libexiv2-devel +libfontenc-devel libgadu-devel libGeoIP-devel libgpgme-devel @@ -90,6 +94,7 @@ libgphoto2-devel libgpod-devel libgssglue-devel libical-devel +libICE-devel libidn-devel libiw-devel libjack-devel @@ -121,7 +126,9 @@ librsvg-devel libsamplerate-devel libSDL-devel libsmbclient-devel +libSM-devel libsndfile-devel +libssh-devel libtag-devel libtheora-devel libtiff-devel @@ -135,8 +142,17 @@ libvisual-devel libvorbis-devel libwmf-devel libwpd-devel +libXaw-devel +libXdmcp-devel libxine-devel +libxkbfile-devel +libXmu-devel +libXScrnSaver-devel libxslt-devel +libXt-devel +libXv-devel +libXxf86dga-devel +libXxf86vm-devel libyaz-devel libzrtpcpp-devel lirc-devel @@ -160,19 +176,23 @@ patch pciutils-devel pcre-devel pcsc-lite-devel +perl-JSON perl-PAR-Packer perl-pcsc pkcs11-helper-devel pkgconfig(pygtk-2.0) -postgresql10 -postgresql10-devel -python-devel +polkit-devel +postgresql +postgresql-server-devel python3-devel python3-sip-devel +python-devel recode rpcgen rpm-build +rpmlint rsvg-convert +rsync ruby ruby-devel sane-backends-devel @@ -183,6 +203,7 @@ subversion-devel sudo swig sword-devel +texinfo torsocks transfig unixODBC-devel diff --git a/redhat/docker/oss154/Dockerfile.x86_64 b/redhat/docker/oss154/Dockerfile.x86_64 new file mode 100644 index 000000000..8285a64f0 --- /dev/null +++ b/redhat/docker/oss154/Dockerfile.x86_64 @@ -0,0 +1,37 @@ +FROM opensuse/leap:15.4 + +ARG TDE_VERSION=14.1.2 +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 \ + && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.4/ packman \ + && zypper -n refresh \ + && zypper -n update \ + && 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 + +# Install heimdal development files +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.4/repo/oss/src/libheimdal-7.7.0-bp154.1.43.src.rpm \ + && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.7.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.7.0/heimdal-7.7.0.tar.gz" \ + && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.7.0.tar.gz|" -e "/^%patch0/ s|^%|#|" \ + && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ + && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.7.0/tools/ install diff --git a/redhat/docker/oss154/packages b/redhat/docker/oss154/packages new file mode 100644 index 000000000..0eeaa3da6 --- /dev/null +++ b/redhat/docker/oss154/packages @@ -0,0 +1,223 @@ +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 +curl +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(JSON) +perl-PAR-Packer +perl-pcsc +pkcs11-helper-devel +polkit-devel +postgresql +postgresql-devel +postgresql-server-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 +texinfo +torsocks +transfig +unixODBC-devel +update-desktop-files +usbutils +utempter-devel +valgrind +vim +wget +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/oss155/Dockerfile.x86_64 b/redhat/docker/oss155/Dockerfile.x86_64 new file mode 100644 index 000000000..394650a12 --- /dev/null +++ b/redhat/docker/oss155/Dockerfile.x86_64 @@ -0,0 +1,38 @@ +FROM opensuse/leap:15.5 + +ARG TDE_VERSION=14.1.2 +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 \ + && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.5/ packman \ + && zypper -n refresh \ + && zypper -n update \ + && zypper -n install -l $(</packages) + +RUN ln -sfv python3.6m /usr/include/python3.6 \ + && 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 + +# Install heimdal development files +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.5/repo/oss/src/libheimdal-7.8.0-bp155.2.7.src.rpm \ + && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \ + && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \ + && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ + && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install diff --git a/redhat/docker/oss155/packages b/redhat/docker/oss155/packages new file mode 100644 index 000000000..3d3897e5b --- /dev/null +++ b/redhat/docker/oss155/packages @@ -0,0 +1,225 @@ +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 +curl +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(JSON) +perl-PAR-Packer +perl-pcsc +pkcs11-helper-devel +polkit-devel +postgresql +postgresql-devel +postgresql-server-devel +ppp +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 +systemd-sysvinit +texinfo +torsocks +transfig +unixODBC-devel +update-desktop-files +usbutils +utempter-devel +valgrind +vim +wget +wireless-tools +wv2-devel +xbase-devel +xcb-proto-devel +xorg-x11 +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xz-devel diff --git a/redhat/docker/oss155/rpmmacros b/redhat/docker/oss155/rpmmacros new file mode 100644 index 000000000..7fe3f58e6 --- /dev/null +++ b/redhat/docker/oss155/rpmmacros @@ -0,0 +1,7 @@ +%dist .oss155 +%_smp_mflags -j8 +%jobs 8 +%sle_version 150500 +%_build_insert_debug_package %nil +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/oss156/Dockerfile.x86_64 b/redhat/docker/oss156/Dockerfile.x86_64 new file mode 100644 index 000000000..a41198e38 --- /dev/null +++ b/redhat/docker/oss156/Dockerfile.x86_64 @@ -0,0 +1,41 @@ +FROM opensuse/leap:15.6 + +ARG TDE_VERSION=14.1.2 +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.vtf:3128/" >>/etc/sysconfig/proxy \ + && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.6/ packman \ + && zypper -n refresh \ + && zypper -n update \ + && zypper -n install -l $(</packages) + +RUN ln -sfv python3.6m /usr/include/python3.6 + +# 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 + +RUN rpm -Uvh http://download.opensuse.org/source/distribution/leap/15.5/repo/oss/src/perl-PAR-Packer-1.057-bp155.1.4.src.rpm \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \ + && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer"*".rpm" + +# Install heimdal development files +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.6/repo/oss/src/libheimdal-7.8.0-bp156.4.4.src.rpm \ + && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \ + && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \ + && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ + && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install diff --git a/redhat/docker/oss156/packages b/redhat/docker/oss156/packages new file mode 100644 index 000000000..cb0acc404 --- /dev/null +++ b/redhat/docker/oss156/packages @@ -0,0 +1,231 @@ +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 +curl +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(Archive::Zip) +perl(Getopt::ArgvFile) +perl(IPC::Run3) +perl(JSON) +perl(Module::ScanDeps) +perl(PAR) +perl(PAR::Dist) +perl-macros +perl-pcsc +pkcs11-helper-devel +polkit-devel +postgresql +postgresql-devel +postgresql-server-devel +ppp +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 +systemd-sysvinit +texinfo +torsocks +transfig +unixODBC-devel +update-desktop-files +usbutils +utempter-devel +valgrind +vim +wget +wireless-tools +wv2-devel +xbase-devel +xcb-proto-devel +xorg-x11 +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xz-devel diff --git a/redhat/docker/oss156/rpmmacros b/redhat/docker/oss156/rpmmacros new file mode 100644 index 000000000..f34912d6c --- /dev/null +++ b/redhat/docker/oss156/rpmmacros @@ -0,0 +1,7 @@ +%dist .oss156 +%_smp_mflags -j8 +%jobs 8 +%sle_version 150600 +%_build_insert_debug_package %nil +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/oss421/Dockerfile.x86_64 b/redhat/docker/oss421/Dockerfile.x86_64 index 72102ab0c..47b0054bd 100644 --- a/redhat/docker/oss421/Dockerfile.x86_64 +++ b/redhat/docker/oss421/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse:42.1 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss422/Dockerfile.x86_64 b/redhat/docker/oss422/Dockerfile.x86_64 index d2c6b2d2e..640c56f42 100644 --- a/redhat/docker/oss422/Dockerfile.x86_64 +++ b/redhat/docker/oss422/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse:42.2 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss423/Dockerfile.x86_64 b/redhat/docker/oss423/Dockerfile.x86_64 index fc33ddfd6..8da0fffe3 100644 --- a/redhat/docker/oss423/Dockerfile.x86_64 +++ b/redhat/docker/oss423/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse:42.3 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index 9b74d32ec..19aa7b6f4 100644 --- a/redhat/docker/osstw/Dockerfile.i686 +++ b/redhat/docker/osstw/Dockerfile.i686 @@ -1,19 +1,19 @@ FROM opensuse32/tumbleweed:latest -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=i686 # Add PACKMAN repository COPY packages /packages -RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \ - && zypper ar -f -G -n gnome http://ftp.lysator.liu.se/pub/opensuse/repositories/GNOME:/Next/openSUSE_Factory gnome \ +RUN set -x \ + && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \ && 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 dup \ + && 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 \ +RUN /usr/sbin/useradd -m -s /bin/bash -u 1000 trinity \ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers USER trinity @@ -24,3 +24,16 @@ 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 + +# Install heimdal development files +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.5.src.rpm \ + && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \ + && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \ + && setarch ${ARCH} rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ + && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install + +# Add lilypond (i686 only) +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.3-1.5.src.rpm \ + && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \ + && setarch ${ARCH} rpmbuild -ba "${HOME}/rpmbuild/SPECS/lilypond.spec" \ + && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/lilypond"{,-fonts-common,-emmentaler-fonts}"-2"*".rpm" diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64 index aec6aeb62..50ac34c5b 100644 --- a/redhat/docker/osstw/Dockerfile.x86_64 +++ b/redhat/docker/osstw/Dockerfile.x86_64 @@ -1,19 +1,19 @@ FROM opensuse/tumbleweed:latest -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Add PACKMAN repository COPY packages /packages -RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \ +RUN set -x \ + && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman \ && zypper -n refresh \ - && zypper -n install busybox perl shadow \ && zypper -n dup \ && zypper -n update \ - && zypper -n install $(</packages) + && zypper -n install --allow-vendor-change $(</packages) # Add non-root user to build packages -RUN useradd -m -s /bin/bash -u 1000 trinity \ +RUN /usr/sbin/useradd -m -s /bin/bash -u 1000 trinity \ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers USER trinity @@ -24,3 +24,12 @@ 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 + +# Install heimdal development files +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.5.src.rpm \ + && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \ + && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \ + && export ac_cv_sys_large_files=no \ + && export ac_cv_sys_file_offset_bits=no \ + && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ + && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages index 623129a61..7032cacde 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,19 +23,23 @@ createrepo_c cups-devel curl cyrus-sasl-devel +dblatex dbus-1-devel dbus-1-glib-devel +dejavu-fonts djvulibre docbook-utils docbook-xsl-stylesheets doxygen GraphicsMagick docbook2x dssi-devel +extractpdfmark fdupes ffmpeg-4-libavcodec-devel ffmpeg-4-libavdevice-devel fftw3-devel file-devel +findutils flac-devel flex font-util @@ -45,6 +48,7 @@ freetype-devel fribidi-devel gamin-devel gcc-c++ +ghostscript-fonts-other mftrace giflib-devel glu-devel gmime-devel @@ -93,6 +97,7 @@ libical-devel libidn-devel libiw-devel libjack-devel +libjasper7 libjasper-devel liblcms2-devel liblo-devel @@ -111,7 +116,6 @@ libofx-devel libopenssl-devel libotr-devel libpaper-devel -libpisock-devel libpng16-devel libpoppler-devel libpqxx-devel @@ -124,6 +128,7 @@ libSDL-devel libsensors4-devel libsmbclient-devel libsndfile-devel +libssh-devel libtag-devel libtheora-devel libtiff-devel @@ -132,6 +137,7 @@ libtool libtwolame-devel libudev-devel libudisks2-0-devel +libuuid-devel libv4l-devel libvisual-devel libvorbis-devel @@ -153,6 +159,7 @@ libyaz-devel lirc-devel make makeinfo +mc meanwhile-devel Mesa-devel Mesa-libGL-devel @@ -173,11 +180,19 @@ patch pciutils-devel pcre-devel pcsc-lite-devel +perl-JSON perl-PAR-Packer perl-pcsc pkcs11-helper-devel -postgresql10 -postgresql10-devel +pkgconfig(bdw-gc) +pkgconfig(guile-1.8) +pkgconfig(guile-3.0) +polkit-devel +postgresql +postgresql-devel +postgresql-server-devel +potrace-devel +ppp python-devel python-gtk-devel python3-devel @@ -186,26 +201,33 @@ rpcgen rpm-build rpm-devel rsvg-convert +rsync ruby ruby-devel sane-backends-devel scons +shadow speex-devel sqlite3-devel subversion-devel sudo swig sword-devel +t1utils +texi2html +texinfo texlive-adjustbox texlive-etoc 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 @@ -215,6 +237,7 @@ usbutils utempter-devel valgrind vim +wget wireless-tools wv2-devel xcb-proto-devel @@ -224,3 +247,4 @@ xscreensaver-data xscreensaver-data-extra xz xz-devel +zip diff --git a/redhat/docker/osstw/rpmmacros b/redhat/docker/osstw/rpmmacros index cb1ceaa06..37788e61e 100644 --- a/redhat/docker/osstw/rpmmacros +++ b/redhat/docker/osstw/rpmmacros @@ -1,4 +1,5 @@ %dist .osstw %_smp_mflags -j8 %jobs 8 -%__python %__python2 +%python python3 +%__python %__python3 diff --git a/redhat/docker/pclinuxos.pkg b/redhat/docker/pclinuxos.pkg index 1b72a6d01..504e271c8 100644 --- a/redhat/docker/pclinuxos.pkg +++ b/redhat/docker/pclinuxos.pkg @@ -22,13 +22,13 @@ gawk gcrypt gdk-pixbuf2.0 glibc -glibc-devel gnupg gnutls grep gzip icu -icu65-data +icu69-data +icu71-data info-install kernel-userspace-headers krb5 @@ -39,7 +39,6 @@ lib64apt-pkg0 lib64assuan0 lib64attr1 lib64audit1 -lib64audit-devel lib64blkid1 lib64brotlicommon1 lib64brotlidec1 @@ -50,12 +49,15 @@ lib64cdio12 lib64crack2 lib64curl4 lib64db4.8 +lib64db5.3 lib64dbnss4.8 lib64elfutils1 +lib64ev4 lib64expat1 lib64ext2fs2 lib64fdisk1 lib64ffi6 +lib64ffi8 lib64fuse2 lib64fuse3_3 lib64gcrypt20 @@ -67,8 +69,12 @@ lib64glib2.0_0 lib64gmp10 lib64gnutls30 lib64gpg-error0 +libgpg-error-common +lib64gsasl lib64gudev1.0_0 -lib64icu65 +lib64icu69 +lib64icu71 +lib64idn11 lib64idn2_0 lib64intl8 lib64iso9660_7 @@ -82,8 +88,10 @@ lib64ksba8 lib64ldap2.4_2 lib64cap-ng0 lib64lua5.1 +lib64lua5.2 lib64lzma5 lib64magic1 +lib64mnl0 lib64mount1 lib64mpfr6 lib64ncurses5 @@ -95,11 +103,11 @@ lib64notify4 lib64npth0 lib64nspr4 lib64nss3 +lib64ntlm lib64openssl1.0.0 lib64openssl1.1.0 lib64opts25 lib64pam0 -lib64pam-devel lib64pam_userpass1 lib64pcre1 lib64pcre2_0 @@ -108,12 +116,15 @@ lib64png16_16 lib64png3 lib64popt0 lib64psl5 -lib64python3.6 +lib64python3.10 +lib64readline7 lib64readline8 lib64rpm1 lib64rtmp1 lib64sasl2 lib64secret1_0 +lib64selinux +lib64sharpyuv0 lib64sigsegv2 lib64smartcols1 lib64sqlite3_0 @@ -124,6 +135,8 @@ lib64tiff3 lib64tiff5 lib64tirpc3 lib64udev0 +lib64udev +lib64unbound8 lib64unistring2 lib64usb1.0_0 lib64usb-compat0.1_4 @@ -133,16 +146,17 @@ lib64webp7 lib64x11_6 lib64xau6 lib64xcrypt1 -lib64xcrypt-devel lib64xdmcp6 lib64xml2_2 lib64zstd1 libgcc1 +libgomp1 libidn2-i18n libnotify libstdc++6 libtirpc libxcb +lsb-release makedev mktemp multiarch-utils @@ -154,6 +168,7 @@ openssl p11-kit pam pam_tcb +patch perl perl-base perl-File-Sync @@ -165,6 +180,7 @@ popt-data procps publicsuffix-list-dafsa python3 +python3-rpm-macros rmt rootcerts rpm diff --git a/redhat/docker/pclinuxos.sh b/redhat/docker/pclinuxos.sh index aa906f26c..42ab539cc 100755 --- a/redhat/docker/pclinuxos.sh +++ b/redhat/docker/pclinuxos.sh @@ -1,7 +1,7 @@ #!/bin/bash -ex NAME="pclinuxos" -VERSION="${1:-2021}" # E.g: '2020' +VERSION="${1:-2024}" # E.g: '2020' IMAGE="${NAME}:${VERSION}" INSTALLROOT="/dev/shm/${IMAGE}" @@ -29,29 +29,25 @@ sudo mount --bind "/dev" "${INSTALLROOT}/dev" sudo mkdir -p "${INSTALLROOT}/var/lib/rpm" sudo rpmdb --initdb --root="${INSTALLROOT}" -sudo rpm -Uvh --noscripts --root="${INSTALLROOT}" "/dev/shm/packages/"*".rpm" - -# Fix lzma library location -sudo mv "${INSTALLROOT}/lib/liblzma."* "${INSTALLROOT}/lib64" +sudo rpm -Uvh --noscripts --nodeps --root="${INSTALLROOT}" "/dev/shm/packages/"*".rpm" # Réinstall distro from inside chroot sudo mount --bind "/dev/shm" "${INSTALLROOT}/dev/shm" sudo rm -rf "${INSTALLROOT}/var/lib/rpm" sudo chroot "${INSTALLROOT}" rpmdb --initdb -sudo chroot "${INSTALLROOT}" rpm -Uvh "/dev/shm/packages/"*".rpm" +sudo chroot "${INSTALLROOT}" rpm -Uvh --nodeps "/dev/shm/packages/"*".rpm" sudo cp "/etc/resolv.conf" "${INSTALLROOT}/etc/resolv.conf" sudo chroot "${INSTALLROOT}" apt-get -y update +sudo chroot "${INSTALLROOT}" apt-get -y --fix-broken install sudo chroot "${INSTALLROOT}" apt-get -y upgrade sudo umount "${INSTALLROOT}/dev/shm" sudo umount "${INSTALLROOT}/dev" -sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar" +docker rmi -f "${IMAGE}" || : +sudo tar -C "${INSTALLROOT}" -c . | docker import - "${IMAGE}" +docker run -ti --rm "${IMAGE}" ls -l sudo rm -rf "${INSTALLROOT}" -docker rmi -f "${IMAGE}" || : -cat "${IMAGE}.tar" | docker import - "${IMAGE}" -rm -f "${IMAGE}.tar.gz" -pigz -9 "${IMAGE}.tar" -mv -vf "${IMAGE}.tar.gz" "${HOME}/tde/obs" +docker image save "${IMAGE}" | pigz -9 >"${HOME}/tde/docker/${IMAGE}.tar.gz" diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64 index a31c81396..1d92b8a8a 100644 --- a/redhat/docker/pclinuxos/Dockerfile.x86_64 +++ b/redhat/docker/pclinuxos/Dockerfile.x86_64 @@ -1,13 +1,13 @@ -FROM pclinuxos:2021 +FROM pclinuxos:2024 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Update distribution # Install Trinity build dependencies COPY packages.${ARCH} /packages -RUN apt-get -y update \ - && apt-get -y install glibc \ +RUN set -x \ + && apt-get -y update \ && apt-get -y dist-upgrade \ && apt-get -y install $(</packages) @@ -37,12 +37,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 +51,12 @@ 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 + +RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/updates/heimdal-7.7.1-1.3.mga8.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/heimdal.spec -e "s|%autopatch|%patch1|" -e "/Conflicts: krb5-devel/ s|^|#|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/heimdal.spec \ + && echo sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/heimdal-{devel,libs}-7*.rpm diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64 index 3d9b6c38b..d34407ee8 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 @@ -33,6 +34,7 @@ gamin-devel gcc-c++ gettext-devel glib2-devel +gnokii-devel gnutls-devel gpgme-devel gphoto2-devel @@ -52,26 +54,32 @@ java-sun lcms-devel lib64clucene2-devel lib64cryptsetup-devel -lib64db4.8-devel lib64dvdread-devel lib64exiv2-devel lib64fbclient-devel +lib64ffmpeg-devel lib64geoip-devel lib64gif-devel lib64gpod4 lib64gpod-devel +lib64gstreamer1.0-devel +lib64gstreamer-plugins-base1.0-devel lib64idn-devel lib64inotifytools-devel lib64iw29-devel +lib64jack-devel lib64nm-devel 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 lib64wv2-devel @@ -79,12 +87,12 @@ lib64xaw-devel lib64xine1.2-devel lib64xtst-devel lib64yaz-devel +libattr-devel libcap-devel libcdda-devel libcln-devel libconfig-devel libcurl-devel -libffmpeg-devel libflac-devel libflac++-devel libfontenc-devel @@ -154,19 +162,24 @@ net-snmp-devel ocaml OpenEXR-devel openldap-devel +openldap-servers 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) +popt-devel postgresql postgresql-devel +ppp pth-devel python3 -python-devel +python3-devel python-rpm qt4-devel recode diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros index 067e3aa64..5c9fcc2e4 100644 --- a/redhat/docker/pclinuxos/rpmmacros +++ b/redhat/docker/pclinuxos/rpmmacros @@ -1,4 +1,7 @@ %dist .pclos %_smp_mflags -j8 %jobs 8 -%pclinuxos 2021 +%pclinuxos 2022 +%configure %configure2_5x +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/pull.sh b/redhat/docker/pull.sh index 028dfc578..bb626a9cc 100755 --- a/redhat/docker/pull.sh +++ b/redhat/docker/pull.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.0" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.2" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/push.sh b/redhat/docker/push.sh index 9bed4159a..c5f8fb873 100755 --- a/redhat/docker/push.sh +++ b/redhat/docker/push.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.0" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.2" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/remove.sh b/redhat/docker/remove.sh index 4e3b51673..2773f64ce 100755 --- a/redhat/docker/remove.sh +++ b/redhat/docker/remove.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.0" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.2" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh index 974e21ead..5a59db78c 100755 --- a/redhat/docker/run.sh +++ b/redhat/docker/run.sh @@ -4,12 +4,13 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.0" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.2" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" DIST="$(sed -n ${DISTRIB}/rpmmacros -e "/%dist/ s|.* ||p")" +if [ "${DIST}" = "%nil" ]; then DIST=".${DISTRIB}"; fi mkdir -p "${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}" mkdir -p "${HOME}/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION}" @@ -18,6 +19,7 @@ chmod 777 "${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}" "${HOME}/rpmbui case "${TDE_VERSION}" in "14.0."*) TDE_BRANCH="r14.0.x";; + "14.1."*) TDE_BRANCH="r14.1.x";; *) TDE_BRANCH="master";; esac @@ -31,10 +33,12 @@ ${DOCKER} run -ti --rm \ -e TMPPATH=/tmp \ -e TDE_VERSION=${TDE_VERSION} \ -e TDE_BRANCH=${TDE_BRANCH} \ - -w /home/trinity/tde/${TDE_BRANCH}/tde-packaging/redhat \ + -w /home/trinity/tde/${TDE_BRANCH}/tde/packaging/redhat \ -v ${HOME}/.gnupg:/home/trinity/.gnupg \ + -v ${HOME}/tde/3rdparty:/home/trinity/tde/3rdparty \ -v ${HOME}/tde/master:/home/trinity/tde/master \ -v ${HOME}/tde/r14.0.x:/home/trinity/tde/r14.0.x \ + -v ${HOME}/tde/r14.1.x:/home/trinity/tde/r14.1.x \ -v ${HOME}/tde/patches:/home/trinity/tde/patches \ -v ${HOME}/tde/tarballs:/home/trinity/tde/tarballs \ -v ${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}:/home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION} \ |