diff options
Diffstat (limited to 'redhat/docker')
138 files changed, 1383 insertions, 266 deletions
diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh index 12a77f133..b7ff950a0 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.4" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.5" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker [ -x /usr/bin/pigz ] && GZIP=pigz || GZIP=gzip diff --git a/redhat/docker/el10/Dockerfile.x86_64 b/redhat/docker/el10/Dockerfile.x86_64 new file mode 100644 index 000000000..f5afce13e --- /dev/null +++ b/redhat/docker/el10/Dockerfile.x86_64 @@ -0,0 +1,44 @@ +FROM almalinux:10 + +ARG TDE_VERSION=14.1.5 +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 set -x \ + && echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \ + && curl -o /usr/lib/python3.12/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py \ + && dnf -y update \ + && dnf -y almalinux-release-devel \ + && dnf -y install epel-release \ + && dnf -y install https://download1.rpmfusion.org/free/el/updates/10/x86_64/r/rpmfusion-free-release-10-1.noarch.rpm \ + && dnf -y install dnf-plugins-core \ + && dnf config-manager --enable crb \ + && dnf -y --enableplugin=ovl install $(</packages) \ + && rm -rf /usr/share/doc* /var/cache/dnf/* + +# Add YUM repository for locally built packages +COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo +RUN set -x \ + && sed -i /etc/yum.repos.d/rpmbuild.repo -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" + +# Fix utempter detection +RUN set -x \ + && chmod a+r /usr/libexec/utempter/utempter + +# Add non-root user to build packages +RUN set -x \ + && useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" + +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros +RUN set -x \ + && mkdir -p ${HOME}/rpmbuild/{BUILD,BUILDROOT,SOURCES,SPECS,RPMS/{noarch,x86_64},SRPMS} \ + && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>${HOME}/.bashrc diff --git a/redhat/docker/el10/Jenkinsfile b/redhat/docker/el10/Jenkinsfile new file mode 100644 index 000000000..0f69083e5 --- /dev/null +++ b/redhat/docker/el10/Jenkinsfile @@ -0,0 +1,27 @@ +pipeline { + agent any; + environment { + def docker_image = "trinity.el9.x86_64" + def TDE_VERSION = "14.1.5" + def ARCH = "x86_64" + } + stages { + stage('build') { + agent { + docker { + alwaysPull true + args '-v /net/pinas/tde:/tde' + image docker_image + registryUrl 'https://registry:5000' + reuseNode true + } + } + steps { + sh ''' + cd /tde/redhat + make + ''' + } + } + } +} diff --git a/redhat/docker/el10/external-packages.sh b/redhat/docker/el10/external-packages.sh new file mode 100755 index 000000000..932eeab35 --- /dev/null +++ b/redhat/docker/el10/external-packages.sh @@ -0,0 +1,110 @@ +#!/bin/bash -ex + +# Build supplementary development tools (EPEL) + +#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 + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/i/iceauth-1.0.8-4.el9.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/iceauth-1*.rpm + +wget -nv \ + https://archives.fedoraproject.org/pub/epel/9/Everything/x86_64/Packages/p/paper-2.3-6.el9.x86_64.rpm \ + https://archives.fedoraproject.org/pub/epel/9/Everything/x86_64/Packages/p/psutils-2.07-1.el9.noarch.rpm \ + && sudo rpm -Uvh psutils-2.07-1.el9.noarch.rpm paper-2.3-6.el9.x86_64.rpm + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/g/gnulib-0-53.20250704git.el9.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnulib-devel-0*.rpm + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/p/paper-2.3-6.el9.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/paper-2*.rpm + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/p/psutils-2.07-1.el9.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/psutils-2*.rpm + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/a/audiofile-0.3.6-36.el9.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/audiofile{,-devel}-0*.rpm + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/v/vorbis-tools-1.4.2-10.el9.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/vorbis-tools-1*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/h/html2ps-1.0-0.53.b7.el9.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/html2ps-1*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-38.el9.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/p/perl-PAR-1.017-6.el9.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/p/perl-PAR-Dist-0.51-5.el9.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Dist-0*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/p/perl-PAR-Packer-1.054-3.el9.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/p/pcsc-perl-1.4.14-24.el9.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/l/lirc-0.10.0-36.el9.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/lirc-{core,devel,libs}-0*.rpm + + +# Build supplementary development tools (Fedora 42) + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/c/cvs-1.11.23-73.fc42.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cvs-1*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/t/transfig-3.2.9-7.fc42.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/transfig-3*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/l/lcms-1.19-41.fc42.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/lcms{,-libs,-devel}-1*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/h/heimdal-7.8.0-9.fc40.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/heimdal{-libs,-devel}-7*.rpm + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/l/libvisual-0.4.1-5.fc41.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libvisual{,-devel}-0*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/c/clucene-2.3.3.4-51.20130812.e8e3d20git.fc42.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/clucene-{core,contribs-lib,core-devel}-2*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/s/sword-1.9.0-29.fc42.src.rpm --undefine "__cmake_in_source_build" --define "__cmake_builddir build" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/y/yaz-5.34.4-1.fc42.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libyaz{,-devel}-5*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/c/chmlib-0.40-45.fc42.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/chmlib{,-devel}-0*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/l/librevenge-0.0.5-9.fc42.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/librevenge{,-devel}-0*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/l/libwpd-0.10.3-22.fc42.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libwpd{,-devel}-0*.rpm + +rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/l/libotr-4.1.1-23.fc42.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libotr{,-devel}-4*.rpm + +#rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/source/tree/Packages/t/torsocks-2.4.0-9.fc42.src.rpm \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/torsocks-2*.rpm + +# Build supplementary development tools (Fedora archives) + +#rpm -ivh https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \ +# && sed -i ${HOME}/rpmbuild/SPECS/pilot-link.spec -e "s|libusb-devel|libusb1-devel|" \ +# && rpmbuild -bb ${HOME}/rpmbuild/SPECS/pilot-link.spec \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel}-0*.rpm + +#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 + +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 + +#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 diff --git a/redhat/docker/el10/packages b/redhat/docker/el10/packages new file mode 100644 index 000000000..bc183f795 --- /dev/null +++ b/redhat/docker/el10/packages @@ -0,0 +1,223 @@ +alsa-lib-devel +aspell +aspell-devel +avahi-devel +bc +bdftopcf +bind-devel +binutils-devel +bison +bluez-libs-devel +boost-devel +boost-python3-devel +byacc +bzip2-devel +cdparanoia +cdparanoia-devel +cdrskin +chrpath +clamav +clamav-devel +cln-devel +cmake +cpp +cppunit-devel +crda +createrepo_c +cryptsetup-devel +cups-devel +dbus-glib-devel +djvulibre +djvulibre-devel +docbook2X +doxygen +emacs +exempi-devel +exiv2-devel +expect +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 +glibc-langpack-fr +gmp-devel +gperf +gpgme-devel +gphoto2-devel +groff +gsl-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk3-devel +gtk-doc +help2man +hiredis +hiredis-devel +hspell-devel +icu +ImageMagick-devel +imlib2-devel +intltool +jasper-devel +java-devel +java-openjdk +kernel +lame-devel +lcms2-devel +libacl-devel +libao-devel +libarchive-devel +libassuan-devel +libblkid-devel +libcap-devel +libcap-ng-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcurl-devel +libdb-devel +libdb-cxx-devel +libdvdread-devel +libedit-devel +libfontenc-devel +libftdi-devel +libgcrypt-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 +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 +libunibreak-devel +libusb1-devel +libusb-compat-0.1-devel +libutempter-devel +libuuid-devel +libv4l-devel +libvorbis-devel +libwebp-devel +libwmf-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 +lirc-devel +lm_sensors-devel +man2html-core +mariadb-devel +mesa-libGL-devel +meson +neon-devel +netpbm-progs +NetworkManager-libnm-devel +net-snmp-devel +net-tools +nspr-devel +ocaml +ocaml(compiler) +openldap-devel +opensc +opensp-devel +pam-devel +pciutils-devel +pcre2-devel +pcsc-lite-devel +perl +perl-devel +perl-generators +perl(ExtUtils::MakeMaker) +perl(inc::Module::Install) +perl(IPC::Run3) +perl(JSON) +perl(Module::Signature) +perl(Test::Pod) +perl(Test::Pod::Coverage) +perl(XML::Parser) +pigz +pipewire-jack-audio-connection-kit-devel +pkcs11-helper-devel +polkit-devel +poppler-devel +portaudio-devel +postgresql +postgresql-server-devel +ppp +psutils +pulseaudio-libs-devel +python3-devel +python3-pyxattr +rdesktop +rdiff-backup +readline-devel +recode +redhat-rpm-config +rpcgen +rpm-build +ruby +ruby-devel +sane-backends-devel +SDL-devel +selinux-policy-devel +socat +speex-devel +sqlite-devel +subversion-devel +sudo +swig +systemd-devel +taglib-devel +tcl +texinfo +texinfo-tex +texlive-collection-basic +unixODBC-devel +usbutils +valgrind +wget +xine-lib-devel +xkeyboard-config-devel +xmlto +xorg-x11-util-macros +xz-devel diff --git a/redhat/docker/el10/rpmbuild.repo b/redhat/docker/el10/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/el10/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/el10/rpmmacros b/redhat/docker/el10/rpmmacros new file mode 100644 index 000000000..99695e7de --- /dev/null +++ b/redhat/docker/el10/rpmmacros @@ -0,0 +1,10 @@ +%dist .el10 +%_smp_mflags -j8 +%jobs 8 +%__brp_remove_la_files %nil +%__cmake_builddir %nil +%__cmake_in_source_build 1 +%_debugsource_packages %nil +%_debugsource_template %nil +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/el5/Dockerfile.i686 b/redhat/docker/el5/Dockerfile.i686 index 977c175f1..2cfb23953 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=i686 # Add local repositories diff --git a/redhat/docker/el5/Dockerfile.x86_64 b/redhat/docker/el5/Dockerfile.x86_64 index 151860eb4..c72de7c23 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add local repositories diff --git a/redhat/docker/el5/packages b/redhat/docker/el5/packages index 90d09f929..cc7cc9e0e 100644 --- a/redhat/docker/el5/packages +++ b/redhat/docker/el5/packages @@ -155,7 +155,6 @@ netpbm-progs net-snmp-devel NetworkManager-glib-devel ocaml -OpenEXR-devel openldap24-libs-devel openldap-devel opensc diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686 index 023519fc7..52341f23f 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=i686 # Enable proxy diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64 index e854b5704..b155d0424 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Enable proxy diff --git a/redhat/docker/el6/packages b/redhat/docker/el6/packages index 78e50226a..3db987323 100644 --- a/redhat/docker/el6/packages +++ b/redhat/docker/el6/packages @@ -157,7 +157,6 @@ net-tools NetworkManager-glib-devel ocaml ocaml(compiler) -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64 index afa39f46b..3a1826919 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Enable proxy diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages index 034c786c8..ed142b5d9 100644 --- a/redhat/docker/el7/packages +++ b/redhat/docker/el7/packages @@ -161,7 +161,6 @@ NetworkManager-glib-devel NetworkManager-libnm-devel ocaml ocaml(compiler) -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64 index f78cc317f..0bc0c135f 100644 --- a/redhat/docker/el8/Dockerfile.x86_64 +++ b/redhat/docker/el8/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM rockylinux:8 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Enable custom repository @@ -40,28 +40,6 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" USER trinity +RUN set -x \ + && mkdir -p ${HOME}/rpmbuild 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 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 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 rpm -ivh https://dl.fedoraproject.org/pub/epel/10/Everything/source/tree/Packages/l/libunibreak-6.1-2.el10_0.src.rpm \ - && sed -i ${HOME}/rpmbuild/SPECS/libunibreak.spec -e "/^Patch:.*offline_files.patch/ s/^Patch:/Patch1:/" -e "/^Patch:.*remove_unused_var.patch/ s/^Patch:/Patch2:/" \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libunibreak.spec \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libunibreak-{6,devel}*.rpm diff --git a/redhat/docker/el8/Jenkinsfile b/redhat/docker/el8/Jenkinsfile new file mode 100644 index 000000000..fb6efa2c1 --- /dev/null +++ b/redhat/docker/el8/Jenkinsfile @@ -0,0 +1,27 @@ +pipeline { + agent any; + environment { + def docker_image = "trinity.el8.x86_64" + def TDE_VERSION = "14.1.3" + def ARCH = "x86_64" + } + stages { + stage('build') { + agent { + docker { + alwaysPull true + args '-v /net/pinas/tde:/tde' + image docker_image + registryUrl 'https://registry:5000' + reuseNode true + } + } + steps { + sh ''' + cd /tde/redhat + make + ''' + } + } + } +} diff --git a/redhat/docker/el8/external-packages.sh b/redhat/docker/el8/external-packages.sh new file mode 100644 index 000000000..1d8088e41 --- /dev/null +++ b/redhat/docker/el8/external-packages.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +# 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 + +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 + +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 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 + +rpm -ivh https://dl.fedoraproject.org/pub/epel/10/Everything/source/tree/Packages/l/libunibreak-6.1-2.el10_0.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/libunibreak.spec -e "/^Patch:.*offline_files.patch/ s/^Patch:/Patch1:/" -e "/^Patch:.*remove_unused_var.patch/ s/^Patch:/Patch2:/" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libunibreak.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libunibreak-{6,devel}*.rpm diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages index 173497991..911f28227 100644 --- a/redhat/docker/el8/packages +++ b/redhat/docker/el8/packages @@ -160,7 +160,6 @@ net-tools nspr-devel ocaml ocaml(compiler) -OpenEXR-devel openldap-devel opensc opensp-devel @@ -176,6 +175,7 @@ perl(ExtUtils::MakeMaker) perl(inc::Module::Install) perl(IPC::Run3) perl(PAR::Dist) +perl-PAR-Packer perl(Module::Signature) perl(Test::Pod) perl(Test::Pod::Coverage) diff --git a/redhat/docker/el9/Dockerfile.x86_64 b/redhat/docker/el9/Dockerfile.x86_64 index abcb3110d..fad06d3a2 100644 --- a/redhat/docker/el9/Dockerfile.x86_64 +++ b/redhat/docker/el9/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM quay.io/rockylinux/rockylinux:9 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Enable proxy @@ -36,40 +36,6 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" USER trinity +RUN set -x \ + && mkdir -p ${HOME}/rpmbuild 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/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/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 rpm -ivh https://dl.fedoraproject.org/pub/epel/10/Everything/source/tree/Packages/l/libunibreak-6.1-2.el10_0.src.rpm \ - && sed -i ${HOME}/rpmbuild/SPECS/libunibreak.spec -e "/^Patch:.*offline_files.patch/ s/^Patch:/Patch1:/" -e "/^Patch:.*remove_unused_var.patch/ s/^Patch:/Patch2:/" \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libunibreak.spec \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libunibreak-{6,devel}*.rpm diff --git a/redhat/docker/el9/Jenkinsfile b/redhat/docker/el9/Jenkinsfile new file mode 100644 index 000000000..0f69083e5 --- /dev/null +++ b/redhat/docker/el9/Jenkinsfile @@ -0,0 +1,27 @@ +pipeline { + agent any; + environment { + def docker_image = "trinity.el9.x86_64" + def TDE_VERSION = "14.1.5" + def ARCH = "x86_64" + } + stages { + stage('build') { + agent { + docker { + alwaysPull true + args '-v /net/pinas/tde:/tde' + image docker_image + registryUrl 'https://registry:5000' + reuseNode true + } + } + steps { + sh ''' + cd /tde/redhat + make + ''' + } + } + } +} diff --git a/redhat/docker/el9/external-packages.sh b/redhat/docker/el9/external-packages.sh new file mode 100755 index 000000000..f6f884782 --- /dev/null +++ b/redhat/docker/el9/external-packages.sh @@ -0,0 +1,37 @@ +#!/bin/bash -ex + +# Build supplementary development tools + +#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 + +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 + +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 + +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 + +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 + +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 + +#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 + +#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 + +#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 + +rpm -ivh https://dl.fedoraproject.org/pub/epel/10/Everything/source/tree/Packages/l/libunibreak-6.1-2.el10_0.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/libunibreak.spec -e "/^Patch:.*offline_files.patch/ s/^Patch:/Patch1:/" -e "/^Patch:.*remove_unused_var.patch/ s/^Patch:/Patch2:/" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libunibreak.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libunibreak-{6,devel}*.rpm diff --git a/redhat/docker/el9/packages b/redhat/docker/el9/packages index cdaa1f70a..1aec4bc4a 100644 --- a/redhat/docker/el9/packages +++ b/redhat/docker/el9/packages @@ -163,7 +163,6 @@ net-tools nspr-devel ocaml ocaml(compiler) -OpenEXR-devel openldap-devel opensc opensp-devel diff --git a/redhat/docker/f25/Dockerfile.x86_64 b/redhat/docker/f25/Dockerfile.x86_64 index e739f9311..658afdc47 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f25/packages b/redhat/docker/f25/packages index 7578b0a9c..78e0cacf6 100644 --- a/redhat/docker/f25/packages +++ b/redhat/docker/f25/packages @@ -155,7 +155,6 @@ net-tools NetworkManager-glib-devel ocaml ocaml(compiler) -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f26/Dockerfile.i686 b/redhat/docker/f26/Dockerfile.i686 index 30e296e49..362774d77 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=i686 # Add RPMFUSION repository diff --git a/redhat/docker/f26/Dockerfile.x86_64 b/redhat/docker/f26/Dockerfile.x86_64 index bfc7fad08..328f53f30 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f26/packages b/redhat/docker/f26/packages index fd881d1fb..dc13b8297 100644 --- a/redhat/docker/f26/packages +++ b/redhat/docker/f26/packages @@ -155,7 +155,6 @@ net-tools NetworkManager-glib-devel ocaml ocaml(compiler) -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f27/Dockerfile.i686 b/redhat/docker/f27/Dockerfile.i686 index c0ecbe472..a57cb62a7 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=i686 # Add RPMFUSION repository diff --git a/redhat/docker/f27/Dockerfile.x86_64 b/redhat/docker/f27/Dockerfile.x86_64 index b5e533488..cfda60aca 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f27/packages b/redhat/docker/f27/packages index 4ed40b178..304010acd 100644 --- a/redhat/docker/f27/packages +++ b/redhat/docker/f27/packages @@ -156,7 +156,6 @@ NetworkManager-glib-devel nspr-devel ocaml ocaml(compiler) -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f28/Dockerfile.i686 b/redhat/docker/f28/Dockerfile.i686 index 65d8670d6..4c217e8d8 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.4 +ARG TDE_VERSION=14.1.5 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 5435d452e..e12484da9 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f28/packages b/redhat/docker/f28/packages index 39096bfee..1f3fdbb4d 100644 --- a/redhat/docker/f28/packages +++ b/redhat/docker/f28/packages @@ -159,7 +159,6 @@ NetworkManager-glib-devel nspr-devel ocaml ocaml(compiler) -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f29/Dockerfile.i686 b/redhat/docker/f29/Dockerfile.i686 index 331dc9e91..f7cf6b6c3 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.4 +ARG TDE_VERSION=14.1.5 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 2a6de8ae7..789d2c096 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f29/packages b/redhat/docker/f29/packages index d15aab174..28c52731a 100644 --- a/redhat/docker/f29/packages +++ b/redhat/docker/f29/packages @@ -160,7 +160,6 @@ net-tools nspr-devel ocaml ocaml(compiler) -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f30/Dockerfile.i686 b/redhat/docker/f30/Dockerfile.i686 index 72d3882c6..987f38182 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.4 +ARG TDE_VERSION=14.1.5 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 fdc589f7e..f3819408c 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f30/packages b/redhat/docker/f30/packages index 8b9d76b4c..f93a95194 100644 --- a/redhat/docker/f30/packages +++ b/redhat/docker/f30/packages @@ -167,7 +167,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f31/Dockerfile.x86_64 b/redhat/docker/f31/Dockerfile.x86_64 index 092b8dbbb..2cc541e25 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f31/packages b/redhat/docker/f31/packages index bf07064e8..fe4f3d22a 100644 --- a/redhat/docker/f31/packages +++ b/redhat/docker/f31/packages @@ -167,7 +167,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f32/Dockerfile.x86_64 b/redhat/docker/f32/Dockerfile.x86_64 index 919f323bf..11c4f3acb 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f32/packages b/redhat/docker/f32/packages index 4bd975a1e..4508eb07a 100644 --- a/redhat/docker/f32/packages +++ b/redhat/docker/f32/packages @@ -167,7 +167,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f33/Dockerfile.x86_64 b/redhat/docker/f33/Dockerfile.x86_64 index 228e64fb7..1bbf882f6 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f33/packages b/redhat/docker/f33/packages index 2839b6997..52c76fe18 100644 --- a/redhat/docker/f33/packages +++ b/redhat/docker/f33/packages @@ -166,7 +166,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f34/Dockerfile.x86_64 b/redhat/docker/f34/Dockerfile.x86_64 index b86b93250..0b5b5ead4 100644 --- a/redhat/docker/f34/Dockerfile.x86_64 +++ b/redhat/docker/f34/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:34 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f34/packages b/redhat/docker/f34/packages index 84825b0a8..f7cc8ea97 100644 --- a/redhat/docker/f34/packages +++ b/redhat/docker/f34/packages @@ -168,7 +168,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f35/Dockerfile.x86_64 b/redhat/docker/f35/Dockerfile.x86_64 index dbb42b2a9..a658ef538 100644 --- a/redhat/docker/f35/Dockerfile.x86_64 +++ b/redhat/docker/f35/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:35 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f35/packages b/redhat/docker/f35/packages index f541aa930..e60235a10 100644 --- a/redhat/docker/f35/packages +++ b/redhat/docker/f35/packages @@ -168,7 +168,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f36/Dockerfile.x86_64 b/redhat/docker/f36/Dockerfile.x86_64 index 49807b214..f45979163 100644 --- a/redhat/docker/f36/Dockerfile.x86_64 +++ b/redhat/docker/f36/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:36 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f36/packages b/redhat/docker/f36/packages index e9fa47a55..4113a856e 100644 --- a/redhat/docker/f36/packages +++ b/redhat/docker/f36/packages @@ -171,7 +171,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f37/Dockerfile.x86_64 b/redhat/docker/f37/Dockerfile.x86_64 index 5967079e2..52337881a 100644 --- a/redhat/docker/f37/Dockerfile.x86_64 +++ b/redhat/docker/f37/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:37 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f37/packages b/redhat/docker/f37/packages index 6fd5a4f15..9aa2648f0 100644 --- a/redhat/docker/f37/packages +++ b/redhat/docker/f37/packages @@ -173,7 +173,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f38/Dockerfile.x86_64 b/redhat/docker/f38/Dockerfile.x86_64 index 27e949922..e08a6f1e3 100644 --- a/redhat/docker/f38/Dockerfile.x86_64 +++ b/redhat/docker/f38/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:38 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f38/packages b/redhat/docker/f38/packages index 828222df7..d10c04685 100644 --- a/redhat/docker/f38/packages +++ b/redhat/docker/f38/packages @@ -174,7 +174,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f39/Dockerfile.x86_64 b/redhat/docker/f39/Dockerfile.x86_64 index 7b5a2d23f..1ca718408 100644 --- a/redhat/docker/f39/Dockerfile.x86_64 +++ b/redhat/docker/f39/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:39 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f39/packages b/redhat/docker/f39/packages index 75f39fda1..3a1ef8f55 100644 --- a/redhat/docker/f39/packages +++ b/redhat/docker/f39/packages @@ -176,7 +176,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f40/Dockerfile.x86_64 b/redhat/docker/f40/Dockerfile.x86_64 index e40dcb324..2222c3fbf 100644 --- a/redhat/docker/f40/Dockerfile.x86_64 +++ b/redhat/docker/f40/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:40 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f40/packages b/redhat/docker/f40/packages index f409831a4..94d951930 100644 --- a/redhat/docker/f40/packages +++ b/redhat/docker/f40/packages @@ -175,7 +175,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f41/Dockerfile.x86_64 b/redhat/docker/f41/Dockerfile.x86_64 index c41ef09a6..9f10153b4 100644 --- a/redhat/docker/f41/Dockerfile.x86_64 +++ b/redhat/docker/f41/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:41 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Fix DNF database corruption diff --git a/redhat/docker/f41/packages b/redhat/docker/f41/packages index 1bd6d53b2..0b38ca173 100644 --- a/redhat/docker/f41/packages +++ b/redhat/docker/f41/packages @@ -173,7 +173,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f42/Dockerfile.x86_64 b/redhat/docker/f42/Dockerfile.x86_64 index 18761130b..47749fbc9 100644 --- a/redhat/docker/f42/Dockerfile.x86_64 +++ b/redhat/docker/f42/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:42 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Fix DNF database corruption @@ -30,8 +30,3 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \ 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 \ - && sed -i ${HOME}/rpmbuild/SPECS/wireless-tools.spec -e "s|%patch|%patch -P |g" \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* diff --git a/redhat/docker/f42/external-packages.sh b/redhat/docker/f42/external-packages.sh new file mode 100755 index 000000000..c11281bd9 --- /dev/null +++ b/redhat/docker/f42/external-packages.sh @@ -0,0 +1,6 @@ +#!/bin/bash -ex + +rpm -ivh https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/wireless-tools.spec -e "s|%patch|%patch -P |g" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* diff --git a/redhat/docker/f42/packages b/redhat/docker/f42/packages index 872963678..8367d3d92 100644 --- a/redhat/docker/f42/packages +++ b/redhat/docker/f42/packages @@ -28,6 +28,7 @@ createrepo_c cryptsetup-devel cups-devel dbus-glib-devel +desktop-backgrounds-compat djvulibre djvulibre-devel dnf-plugin-ovl @@ -172,7 +173,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/f43/Dockerfile.x86_64 b/redhat/docker/f43/Dockerfile.x86_64 new file mode 100644 index 000000000..1211b0298 --- /dev/null +++ b/redhat/docker/f43/Dockerfile.x86_64 @@ -0,0 +1,36 @@ +FROM fedora:43 + +ARG TDE_VERSION=14.1.5 +ARG ARCH=x86_64 + +# Fix DNF database corruption +# Add RPMFUSION repository +# Install Trinity build dependencies +COPY packages /packages +RUN set -x \ + && 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-43.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 set -x \ + && sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" + +# Fix utempter detection +RUN set -x \ + && chmod a+r /usr/libexec/utempter/utempter \ + && chmod 777 /tmp + +# Add non-root user to build packages +RUN set -x \ + && 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 +RUN set -x \ + && mkdir -p ${HOME}/rpmbuild +COPY rpmmacros /home/trinity/.rpmmacros diff --git a/redhat/docker/f43/external-packages.sh b/redhat/docker/f43/external-packages.sh new file mode 100755 index 000000000..0c0b96e31 --- /dev/null +++ b/redhat/docker/f43/external-packages.sh @@ -0,0 +1,12 @@ +#!/bin/bash -ex + +rpm -ivh https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/wireless-tools.spec -e "s|%patch|%patch -P |g" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* + +#RUN set -x \ +# && 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/f43/packages b/redhat/docker/f43/packages new file mode 100644 index 000000000..e3cdc3c41 --- /dev/null +++ b/redhat/docker/f43/packages @@ -0,0 +1,237 @@ +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 +desktop-backgrounds-compat +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 +html2ps +iceauth +icu +ImageMagick-devel +imake +imlib2-devel +intltool +jack-audio-connection-kit-devel +jasper-devel +java-21-openjdk-devel +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 +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 +libunibreak-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 +openldap-devel +opensc +openslp-devel +opensp-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 +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/f43/rpmbuild.repo b/redhat/docker/f43/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f43/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/f43/rpmmacros b/redhat/docker/f43/rpmmacros new file mode 100644 index 000000000..0b82d6547 --- /dev/null +++ b/redhat/docker/f43/rpmmacros @@ -0,0 +1,10 @@ +%dist .fc43 +%_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/mga5/Dockerfile.x86_64 b/redhat/docker/mga5/Dockerfile.x86_64 index 54b5362bb..9eea7729a 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga5/packages.x86_64 b/redhat/docker/mga5/packages.x86_64 index 4cdd228c6..37ef73ef8 100644 --- a/redhat/docker/mga5/packages.x86_64 +++ b/redhat/docker/mga5/packages.x86_64 @@ -183,7 +183,6 @@ net-snmp-devel NetworkManager-glib-devel notification-daemon ocaml -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/mga6/Dockerfile.i686 b/redhat/docker/mga6/Dockerfile.i686 index 435522a03..5c446b323 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=i686 # Reset URPMI repositories to default diff --git a/redhat/docker/mga6/Dockerfile.x86_64 b/redhat/docker/mga6/Dockerfile.x86_64 index 922b018eb..36adc55e6 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga6/packages.i686 b/redhat/docker/mga6/packages.i686 index 85ed2ec06..5538aa4d6 100644 --- a/redhat/docker/mga6/packages.i686 +++ b/redhat/docker/mga6/packages.i686 @@ -191,7 +191,6 @@ net-snmp-devel NetworkManager-glib-devel notification-daemon ocaml -OpenEXR-devel openldap-devel openldap-servers-devel opensc diff --git a/redhat/docker/mga6/packages.x86_64 b/redhat/docker/mga6/packages.x86_64 index f499915be..96eaabd1a 100644 --- a/redhat/docker/mga6/packages.x86_64 +++ b/redhat/docker/mga6/packages.x86_64 @@ -191,7 +191,6 @@ net-snmp-devel NetworkManager-glib-devel notification-daemon ocaml -OpenEXR-devel openldap-devel openldap-servers-devel opensc diff --git a/redhat/docker/mga7/Dockerfile.i686 b/redhat/docker/mga7/Dockerfile.i686 index 9fbfdff1b..c39a5c347 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.4 +ARG TDE_VERSION=14.1.5 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 06503d530..419361938 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga7/packages.i686 b/redhat/docker/mga7/packages.i686 index f94a02efd..fc1fdfe18 100644 --- a/redhat/docker/mga7/packages.i686 +++ b/redhat/docker/mga7/packages.i686 @@ -179,7 +179,6 @@ NetworkManager-glib-devel notification-daemon ocaml ocaml-facile-devel -OpenEXR-devel openldap-devel openldap-servers-devel opensc diff --git a/redhat/docker/mga7/packages.x86_64 b/redhat/docker/mga7/packages.x86_64 index 0c84baf4c..91a45b8d8 100644 --- a/redhat/docker/mga7/packages.x86_64 +++ b/redhat/docker/mga7/packages.x86_64 @@ -194,7 +194,6 @@ NetworkManager-glib-devel notification-daemon ocaml ocaml-facile-devel -OpenEXR-devel openldap-devel openldap-servers-devel opensc diff --git a/redhat/docker/mga8/Dockerfile.i686 b/redhat/docker/mga8/Dockerfile.i686 index 68e213fc0..dfc0a1565 100644 --- a/redhat/docker/mga8/Dockerfile.i686 +++ b/redhat/docker/mga8/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM mageia32:8 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 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 300a39c63..a7c7a99d8 100644 --- a/redhat/docker/mga8/Dockerfile.x86_64 +++ b/redhat/docker/mga8/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM mageia:8 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga8/packages.i686 b/redhat/docker/mga8/packages.i686 index c44677fa0..253fee3fe 100644 --- a/redhat/docker/mga8/packages.i686 +++ b/redhat/docker/mga8/packages.i686 @@ -193,7 +193,6 @@ net-snmp-devel notification-daemon ocaml ocaml-facile-devel -OpenEXR-devel openldap-devel openldap-servers-devel opensc diff --git a/redhat/docker/mga8/packages.x86_64 b/redhat/docker/mga8/packages.x86_64 index 22bc88e76..fd2861f9f 100644 --- a/redhat/docker/mga8/packages.x86_64 +++ b/redhat/docker/mga8/packages.x86_64 @@ -196,7 +196,6 @@ net-snmp-devel notification-daemon ocaml ocaml-facile-devel -OpenEXR-devel openldap-devel openldap-servers-devel opensc diff --git a/redhat/docker/mga9/Dockerfile.i686 b/redhat/docker/mga9/Dockerfile.i686 index f01eb5406..edaba68b8 100644 --- a/redhat/docker/mga9/Dockerfile.i686 +++ b/redhat/docker/mga9/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM mageia32:9 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=i686 # Reset URPMI repositories to default diff --git a/redhat/docker/mga9/Dockerfile.x86_64 b/redhat/docker/mga9/Dockerfile.x86_64 index 3e1e79c36..70d4deaaf 100644 --- a/redhat/docker/mga9/Dockerfile.x86_64 +++ b/redhat/docker/mga9/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM mageia:9 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga9/packages.i686 b/redhat/docker/mga9/packages.i686 index ec31bc8f1..f6a3cb3df 100644 --- a/redhat/docker/mga9/packages.i686 +++ b/redhat/docker/mga9/packages.i686 @@ -197,7 +197,6 @@ net-snmp-devel notification-daemon ocaml ocaml-facile-devel -OpenEXR-devel openldap-devel openldap-servers-devel opensc diff --git a/redhat/docker/mga9/packages.x86_64 b/redhat/docker/mga9/packages.x86_64 index cfd8f46bc..edeb0f95e 100644 --- a/redhat/docker/mga9/packages.x86_64 +++ b/redhat/docker/mga9/packages.x86_64 @@ -202,7 +202,6 @@ net-tools notification-daemon ocaml ocaml-facile-devel -OpenEXR-devel openldap-devel openldap-servers-devel opensc diff --git a/redhat/docker/omv6/Dockerfile.x86_64 b/redhat/docker/omv6/Dockerfile.x86_64 index 3bb061a55..ac6be8e2d 100644 --- a/redhat/docker/omv6/Dockerfile.x86_64 +++ b/redhat/docker/omv6/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM openmandriva:6.0 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 COPY packages /packages diff --git a/redhat/docker/omv6/packages b/redhat/docker/omv6/packages index 873ca4609..0f82b10c0 100644 --- a/redhat/docker/omv6/packages +++ b/redhat/docker/omv6/packages @@ -138,8 +138,7 @@ lib64npth-devel lib64nsl-devel lib64nspr-devel lib64ofx-devel -lib64openexr-devel -lib64otr-devel +lib64lib64otr-devel lib64paper-devel lib64pcre-devel lib64pcsclite-devel diff --git a/redhat/docker/omvcooker/Dockerfile.x86_64 b/redhat/docker/omvcooker/Dockerfile.x86_64 index b237c4192..8cfeed1c4 100644 --- a/redhat/docker/omvcooker/Dockerfile.x86_64 +++ b/redhat/docker/omvcooker/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM openmandriva/cooker:latest -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 COPY packages /packages @@ -27,19 +27,19 @@ RUN set -x \ USER trinity COPY rpmmacros /home/trinity/.rpmmacros -RUN set -x \ - && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdesktop-1.9.0-6.mga9.src.rpm \ - && sed -i ${HOME}/rpmbuild/SPECS/rdesktop.spec -e "s|%{_rpmconfigdir}/%{_real_vendor}|/usr/share/libtool/config|" \ - && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdesktop.spec --define "mkrel %nil" \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm +#RUN set -x \ +# && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdesktop-1.9.0-6.mga9.src.rpm \ +# && sed -i ${HOME}/rpmbuild/SPECS/rdesktop.spec -e "s|%{_rpmconfigdir}/%{_real_vendor}|/usr/share/libtool/config|" \ +# && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdesktop.spec --define "mkrel %nil" \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm -RUN set -x \ - && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/sword-1.9.0-13.mga10.src.rpm \ - && rpmbuild -bb ${HOME}/rpmbuild/SPECS/sword.spec --define "cmake_build %__make %{?_smp_mflags}" --define "cmake_install %__make -C build install DESTDIR=%{?buildroot}" --define "__cc /usr/bin/gcc" --define "__cxx /usr/bin/g++" --define "_disable_ld_no_undefined 1" --define "mkrel %nil" --define "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --nodeps \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64sword{1.9,-devel},sword}-1.9.0-*.rpm +#RUN set -x \ +# && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/sword-1.9.0-13.mga10.src.rpm \ +# && rpmbuild -bb ${HOME}/rpmbuild/SPECS/sword.spec --define "cmake_build %__make %{?_smp_mflags}" --define "cmake_install %__make -C build install DESTDIR=%{?buildroot}" --define "__cc /usr/bin/gcc" --define "__cxx /usr/bin/g++" --define "_disable_ld_no_undefined 1" --define "mkrel %nil" --define "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --nodeps \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64sword{1.9,-devel},sword}-1.9.0-*.rpm RUN set -x \ - && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/yaz-5.34.4-2.mga10.src.rpm --define "mkrel %nil" --nodeps \ + && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/yaz-5.35.1-1.mga10.src.rpm --define "mkrel %nil" --nodeps \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64yaz{5,-devel},yaz}-5*.rpm RUN set -x \ @@ -48,8 +48,12 @@ RUN set -x \ && 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 + && rpmbuild --rebuild https://archives.fedoraproject.org/pub/epel/9/Everything/source/tree/Packages/a/audiofile-0.3.6-36.el9.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/audiofile{,-devel}-0*.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 \ diff --git a/redhat/docker/omvcooker/packages b/redhat/docker/omvcooker/packages index 873ca4609..69b1c654f 100644 --- a/redhat/docker/omvcooker/packages +++ b/redhat/docker/omvcooker/packages @@ -15,6 +15,7 @@ clamav-devel cmake createrepo_c ctags +cscope cups-devel curl-devel db5-devel @@ -138,8 +139,7 @@ lib64npth-devel lib64nsl-devel lib64nspr-devel lib64ofx-devel -lib64openexr-devel -lib64otr-devel +lib64lib64otr-devel lib64paper-devel lib64pcre-devel lib64pcsclite-devel @@ -160,6 +160,7 @@ lib64sasl-devel lib64SDL-devel lib64smbclient-devel lib64sndfile-devel +lib64sword-devel lib64t1lib-devel lib64tasn1-devel lib64theora-devel @@ -236,6 +237,7 @@ python-pylibacl python-pyyaml python-setuptools_scm pyxattr +rdesktop readline-devel recode rpm-build diff --git a/redhat/docker/oss131/Dockerfile.x86_64 b/redhat/docker/oss131/Dockerfile.x86_64 index 2f53dc4c5..5909202f7 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss131/packages b/redhat/docker/oss131/packages index 31065e63f..e31147dbd 100644 --- a/redhat/docker/oss131/packages +++ b/redhat/docker/oss131/packages @@ -136,7 +136,6 @@ mozilla-nspr-devel mysql-devel NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/oss132/Dockerfile.x86_64 b/redhat/docker/oss132/Dockerfile.x86_64 index 24120029b..b0a7cd8af 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss132/packages b/redhat/docker/oss132/packages index 5043e7483..945f90f3f 100644 --- a/redhat/docker/oss132/packages +++ b/redhat/docker/oss132/packages @@ -131,7 +131,6 @@ mozilla-nspr-devel mysql-devel NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/oss150/Dockerfile.x86_64 b/redhat/docker/oss150/Dockerfile.x86_64 index 82f4a69b2..69aeceb77 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss150/packages b/redhat/docker/oss150/packages index 259133a11..49f4462f9 100644 --- a/redhat/docker/oss150/packages +++ b/redhat/docker/oss150/packages @@ -145,7 +145,6 @@ net-tools net-tools-deprecated NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/oss151/Dockerfile.x86_64 b/redhat/docker/oss151/Dockerfile.x86_64 index 0513b395e..ee2b0ea5f 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss151/packages b/redhat/docker/oss151/packages index 0d75fd57e..1a8fdbe46 100644 --- a/redhat/docker/oss151/packages +++ b/redhat/docker/oss151/packages @@ -152,7 +152,6 @@ net-tools net-tools-deprecated NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/oss152/Dockerfile.x86_64 b/redhat/docker/oss152/Dockerfile.x86_64 index 5615f8483..8a73f5522 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss152/packages b/redhat/docker/oss152/packages index ec21f7f6b..1d5529dd6 100644 --- a/redhat/docker/oss152/packages +++ b/redhat/docker/oss152/packages @@ -150,7 +150,6 @@ net-tools net-tools-deprecated NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/oss153/Dockerfile.x86_64 b/redhat/docker/oss153/Dockerfile.x86_64 index f7b8efd9e..6e4a47816 100644 --- a/redhat/docker/oss153/Dockerfile.x86_64 +++ b/redhat/docker/oss153/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/leap:15.3 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss153/packages b/redhat/docker/oss153/packages index 1b18b1d8b..421917b0b 100644 --- a/redhat/docker/oss153/packages +++ b/redhat/docker/oss153/packages @@ -167,7 +167,6 @@ net-tools net-tools-deprecated NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/oss154/Dockerfile.x86_64 b/redhat/docker/oss154/Dockerfile.x86_64 index b443cbcda..d31a278c7 100644 --- a/redhat/docker/oss154/Dockerfile.x86_64 +++ b/redhat/docker/oss154/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/leap:15.4 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss154/packages b/redhat/docker/oss154/packages index 0eeaa3da6..fb81e1d32 100644 --- a/redhat/docker/oss154/packages +++ b/redhat/docker/oss154/packages @@ -168,7 +168,6 @@ net-tools net-tools-deprecated NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/oss155/Dockerfile.x86_64 b/redhat/docker/oss155/Dockerfile.x86_64 index ec70a4649..1a94f67ca 100644 --- a/redhat/docker/oss155/Dockerfile.x86_64 +++ b/redhat/docker/oss155/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/leap:15.5 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss155/packages b/redhat/docker/oss155/packages index 5d827fe6e..7cc1025c7 100644 --- a/redhat/docker/oss155/packages +++ b/redhat/docker/oss155/packages @@ -170,7 +170,6 @@ net-tools net-tools-deprecated NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/oss156/Dockerfile.x86_64 b/redhat/docker/oss156/Dockerfile.x86_64 index 9e3685946..2a0df375d 100644 --- a/redhat/docker/oss156/Dockerfile.x86_64 +++ b/redhat/docker/oss156/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/leap:15.6 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository @@ -29,14 +29,3 @@ 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/external-packages.sh b/redhat/docker/oss156/external-packages.sh new file mode 100644 index 000000000..b03f5b080 --- /dev/null +++ b/redhat/docker/oss156/external-packages.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +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 +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 index f330fcecb..876496d61 100644 --- a/redhat/docker/oss156/packages +++ b/redhat/docker/oss156/packages @@ -169,7 +169,6 @@ net-tools net-tools-deprecated NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/oss160/Dockerfile.x86_64 b/redhat/docker/oss160/Dockerfile.x86_64 new file mode 100644 index 000000000..e55b7c7be --- /dev/null +++ b/redhat/docker/oss160/Dockerfile.x86_64 @@ -0,0 +1,39 @@ +FROM opensuse/leap:16.0 + +ARG TDE_VERSION=14.1.5 +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 al permissions \ + && zypper -n update \ + && zypper -n install -l $(</packages) + +RUN set -x \ + && ln -sfv python3.6m /usr/include/python3.6 + +## WTF in /usr/bin/libtool !!!! should be gcc15 not gcc13 ! +#sys_lib_search_path_spec="/usr/lib64/gcc/x86_64-suse-linux/13 /usr/lib64 /lib64 /usr/x86_64-suse-linux/lib /lib /usr/lib " +RUN set -x \ + && sed -i /usr/bin/libtool -e "s|x86_64-suse-linux/13|x86_64-suse-linux/15|g" + +# Add non-root user to build packages +RUN set -x \ + && 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 set -x \ + && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \ + && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ + && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch diff --git a/redhat/docker/oss160/external-packages.sh b/redhat/docker/oss160/external-packages.sh new file mode 100755 index 000000000..87b162315 --- /dev/null +++ b/redhat/docker/oss160/external-packages.sh @@ -0,0 +1,39 @@ +#!/bin/bash -ex + +# Build supplementary development tools + +# heimdal +#rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/16.0/repo/oss/src/libheimdal-7.8.0-160000.3.2.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 +sudo rpm -Uvh --force /home/trinity/rpmbuild/RPMS.tde-14.1.5/x86_64/*-7.8.0-1.oss160.x86_64.rpm + +# nmap +wget -nv \ + https://rpmfind.net/linux/opensuse/distribution/leap/15.6/repo/oss/x86_64/liblua5_3-5-5.3.6-3.6.1.x86_64.rpm \ + https://rpmfind.net/linux/opensuse/distribution/leap/15.6/repo/oss/x86_64/nmap-7.92-150600.7.3.x86_64.rpm \ +&& sudo rpm -Uvh liblua5_3-5-5.3.6-3.6.1.x86_64.rpm nmap-7.92-150600.7.3.x86_64.rpm + +# perl-Getopt-ArgvFile +rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.6/repo/oss/src/perl-Getopt-ArgvFile-1.11-bp156.3.1.src.rpm --define "perl_requires %nil"\ + && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/perl-Getopt-ArgvFile-"*".rpm" + +# perl-PAR-Packer +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" + +# sword +rpm -ivh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.6/repo/oss/src/sword-1.8.1-bp156.3.7.src.rpm \ + && sed -i "${HOME}/rpmbuild/SPECS/sword.spec" -e "s|^%patch|%patch -P |" \ + && rpmbuild -ba "${HOME}/rpmbuild/SPECS/sword.spec" \ + && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/"{libsword,sword,sword-devel}"-"*".rpm" + +# torsocks +rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.6/repo/oss/src/torsocks-2.4.0-bp156.2.4.src.rpm + +# +zypper ar --no-gpgcheck trinity.noarch https://repo/rpmbuild/RPMS/RPMS.oss160.tde-14.1.5/noarch/ +zypper ar --no-gpgcheck trinity.x86_64 https://repo/rpmbuild/RPMS/RPMS.oss160.tde-14.1.5/x86_64/ diff --git a/redhat/docker/oss160/packages b/redhat/docker/oss160/packages new file mode 100644 index 000000000..766bdd784 --- /dev/null +++ b/redhat/docker/oss160/packages @@ -0,0 +1,230 @@ +alsa-devel +aspell +aspell-devel +audiofile-devel +automake +bdftopcf +binutils-devel +bison +boost-devel +brp-check-suse +ccache +cdparanoia +cdparanoia-devel +checkpolicy +chmlib-devel +chrpath +clamav +clamav-devel +cln-devel +clucene-core-devel +cmake +createrepo_c +cups-devel +cyrus-sasl-devel +dbus-1-devel +dbus-1-glib-devel +djvulibre +docbook-utils +docbook-xsl-stylesheets +docbook2x +dos2unix +doxygen GraphicsMagick +dssi-devel +fdupes +ffmpeg-devel +fftw3-devel +file-devel +flac-devel +flex +font-util +freetype-devel +fribidi-devel +gcc-c++ +giflib-devel +git +glu-devel +gmime-devel +gmp-devel +gperf xmlto +GraphicsMagick-devel +gsl-devel +gstreamer-devel +gstreamer-plugins-base-devel +gstreamer-devel +gtk2-devel +gtk3-devel +gtk-doc +html2ps +hunspell-devel +iceauth +ImageMagick-devel +imake +imlib2-devel +intltool +java-devel +less +libacl-devel +libao-devel +libart_lgpl-devel +libattr-devel +libavahi-devel +libavcodec-devel +libblkid-devel +libboost_python3-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 +libgpgme-devel +libgphoto2-devel +libgpod-devel +libgsf-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 +libofx-devel +libotr-devel +libpaper-devel +libpcap-devel +libpng16-devel +libpoppler-devel +libpqxx-devel +libpulse-devel +libqalculate-devel +libraw1394-devel +librsvg-devel +libsamplerate-devel +libSDL-devel +libsensors4-devel +libSM-devel +libsmbclient-devel +libsndfile-devel +libssh-devel +libssh2-devel +libtag-devel +libtheora-devel +libtiff-devel +libtirpc-devel +libtool +libtwolame-devel +libudisks2-0-devel +libuuid-devel +libunibreak-devel +libusb-devel +libv4l-devel +libvisual-devel +libvorbis-devel +libwebp-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 +lirc-devel +Lua(devel) +make +makeinfo +meanwhile-devel +Mesa-devel +Mesa-libGL-devel +mozilla-nspr-devel +mysql-devel +net-snmp-devel +net-tools +net-tools-deprecated +NetworkManager-devel +ocaml +opensc +openslp-devel +opensp-devel +pam-devel +patch +pciutils-devel +pcre-devel +pcsc-lite-devel +perl(Archive::Zip) +perl(IPC::Run3) +perl(JSON) +perl(Module::ScanDeps) +perl(PAR) +perl(PAR::Dist) +perl(Test::Pod) +perl(Test::Pod::Coverage) +perl-macros +perl-pcsc +pkcs11-helper-devel +pkgconfig(cppunit) +pkgconfig(libcurl) +polkit-devel +postgresql +postgresql-devel +postgresql-server-devel +ppp +python3-devel +python3-sip-devel +recode +rpcgen +rpm-build +rpm-devel +rpmlint +rsvg-convert +rsync +ruby +ruby-devel +sane-backends-devel +scons +selinux-policy-devel +speex-devel +sqlite3-devel +subversion-devel +sudo +swig +texinfo +transfig +unixODBC-devel +update-desktop-files +usbutils +valgrind +vim +wget +wireless-tools +xcb-proto-devel +xorg-x11 +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xz-devel diff --git a/redhat/docker/oss160/rpmmacros b/redhat/docker/oss160/rpmmacros new file mode 100644 index 000000000..ce48a5a09 --- /dev/null +++ b/redhat/docker/oss160/rpmmacros @@ -0,0 +1,8 @@ +%dist .oss160 +%_smp_mflags -j8 +%jobs 8 +%sle_version 160000 +%_build_insert_debug_package %nil +%python python3 +%__python /usr/bin/python3 +%_enable_debug_packages %nil diff --git a/redhat/docker/oss421/Dockerfile.x86_64 b/redhat/docker/oss421/Dockerfile.x86_64 index 2914e970e..688ee5908 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss421/packages b/redhat/docker/oss421/packages index 2dfb4f848..175653ae0 100644 --- a/redhat/docker/oss421/packages +++ b/redhat/docker/oss421/packages @@ -128,7 +128,6 @@ mozilla-nspr-devel mysql-devel NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/oss422/Dockerfile.x86_64 b/redhat/docker/oss422/Dockerfile.x86_64 index 7daaa6e08..5a20bc141 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss422/packages b/redhat/docker/oss422/packages index fe79c5038..9d20d2d60 100644 --- a/redhat/docker/oss422/packages +++ b/redhat/docker/oss422/packages @@ -139,7 +139,6 @@ mozilla-nspr-devel mysql-devel NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/oss423/Dockerfile.x86_64 b/redhat/docker/oss423/Dockerfile.x86_64 index 4b35dfbd0..89a933d87 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.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss423/packages b/redhat/docker/oss423/packages index e76a81eb3..4d9945bcf 100644 --- a/redhat/docker/oss423/packages +++ b/redhat/docker/oss423/packages @@ -143,7 +143,6 @@ mozilla-nspr-devel mysql-devel NetworkManager-devel ocaml -openexr-devel opensc openslp-devel opensp-devel diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index 61bf0f4d9..f7488d9b7 100644 --- a/redhat/docker/osstw/Dockerfile.i686 +++ b/redhat/docker/osstw/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM opensuse32/tumbleweed:latest -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=i686 # Add PACKMAN repository @@ -30,10 +30,3 @@ RUN set -x \ RUN set -x \ && sudo rpm -Uvh --nodeps https://download.opensuse.org/repositories/network/openSUSE_Tumbleweed/i586/torsocks-2.4.0-15.25.i586.rpm - -# Add lilypond (i686 only) -RUN set -x \ - && rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.4-1.6.src.rpm \ - && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \ - && setarch ${ARCH} rpmbuild -ba "${HOME}/rpmbuild/SPECS/lilypond.spec" \ - && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/lilypond"{,-fonts-common,-emmentaler-fonts}"-2"*".rpm" diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64 index 4498a9573..9d967aa89 100644 --- a/redhat/docker/osstw/Dockerfile.x86_64 +++ b/redhat/docker/osstw/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/tumbleweed:latest -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/osstw/external-packages.sh b/redhat/docker/osstw/external-packages.sh new file mode 100644 index 000000000..edb7a3116 --- /dev/null +++ b/redhat/docker/osstw/external-packages.sh @@ -0,0 +1,7 @@ +#!/bin/bash -ex + +# Add lilypond (i686 only) +rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.4-1.6.src.rpm +sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \ +setarch i686 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/packages b/redhat/docker/osstw/packages index b18437051..a5f6cca04 100644 --- a/redhat/docker/osstw/packages +++ b/redhat/docker/osstw/packages @@ -12,6 +12,7 @@ brp-check-suse ccache cdparanoia cdparanoia-devel +checkpolicy chmlib-devel chrpath clamav @@ -35,8 +36,6 @@ docbook2x dssi-devel extractpdfmark fdupes -ffmpeg-4-libavcodec-devel -ffmpeg-4-libavdevice-devel fftw3-devel file-devel findutils @@ -67,12 +66,14 @@ ImageMagick-devel imake imlib2-devel intltool -java-1_8_0-openjdk-devel +java-21-openjdk-devel less libacl-devel libart_lgpl-devel libattr-devel libavahi-devel +libavcodec-devel +libavdevice-devel libblkid-devel libboost_python3-devel libbz2-devel @@ -170,8 +171,6 @@ net-tools net-tools-deprecated NetworkManager-devel ocaml -openexr -openexr-devel opensc openslp-devel opensp-devel @@ -205,6 +204,7 @@ ruby ruby-devel sane-backends-devel scons +selinux-policy-devel shadow speex-devel sqlite3-devel diff --git a/redhat/docker/pclinuxos.pkg b/redhat/docker/pclinuxos.pkg index 504e271c8..a0b374342 100644 --- a/redhat/docker/pclinuxos.pkg +++ b/redhat/docker/pclinuxos.pkg @@ -9,7 +9,12 @@ coreutils cpio cracklib-dicts crypto-policies +crypto-policies-scripts dash-static +db53-utils +db53_recover +lib64md +lib64sasl2 diffutils e2fsprogs fdupes @@ -17,6 +22,9 @@ file filesystem findutils fuse +curl +lib64archive +lib64kmod-devel fuse-common gawk gcrypt @@ -29,6 +37,7 @@ gzip icu icu69-data icu71-data +icu76-data info-install kernel-userspace-headers krb5 @@ -59,7 +68,7 @@ lib64fdisk1 lib64ffi6 lib64ffi8 lib64fuse2 -lib64fuse3_3 +lib64fuse3_4 lib64gcrypt20 lib64gdbm3 lib64gdk_pixbuf2.0_0 @@ -74,6 +83,7 @@ lib64gsasl lib64gudev1.0_0 lib64icu69 lib64icu71 +lib64icu76 lib64idn11 lib64idn2_0 lib64intl8 @@ -106,6 +116,7 @@ lib64nss3 lib64ntlm lib64openssl1.0.0 lib64openssl1.1.0 +lib64openssl3 lib64opts25 lib64pam0 lib64pam_userpass1 @@ -123,6 +134,7 @@ lib64rpm1 lib64rtmp1 lib64sasl2 lib64secret1_0 +lib64seccomp lib64selinux lib64sharpyuv0 lib64sigsegv2 @@ -137,7 +149,7 @@ lib64tirpc3 lib64udev0 lib64udev lib64unbound8 -lib64unistring2 +lib64unistring5 lib64usb1.0_0 lib64usb-compat0.1_4 lib64uuid1 @@ -152,9 +164,17 @@ lib64zstd1 libgcc1 libgomp1 libidn2-i18n +lib64json-c libnotify +lib64nsl +lib64assuan +lib64archive13 +lib64subid +libsecret-i18n +libsecret-tools libstdc++6 libtirpc +lib64user libxcb lsb-release makedev @@ -168,6 +188,7 @@ openssl p11-kit pam pam_tcb +passwd patch perl perl-base @@ -180,13 +201,14 @@ popt-data procps publicsuffix-list-dafsa python3 +python3-markdown python3-rpm-macros +python3-typogrify rmt rootcerts rpm rpm-helper rpm-pclinuxos-setup -rpm-rambo-setup run-parts sd sed @@ -201,3 +223,18 @@ uuidd which xz zlib1 +zlib1-devel +lib64zstd-devel +lib64lzma-devel +kmod +lib64openssl-devel +python3-toml +lib64gnutls-dane +dkms +lib64sasl2_3 +nss_ldap +kernel-devel +dkms-minimal +lib64lzo2_2 +lib64bb2_1 + diff --git a/redhat/docker/pclinuxos.sh b/redhat/docker/pclinuxos.sh index c4efb8f12..89f946a8c 100755 --- a/redhat/docker/pclinuxos.sh +++ b/redhat/docker/pclinuxos.sh @@ -1,11 +1,12 @@ #!/bin/bash -ex NAME="pclinuxos" -VERSION="${1:-2024}" # E.g: '2020' +VERSION="${1:-2025}" # E.g: '2020' IMAGE="${NAME}:${VERSION}" INSTALLROOT="/dev/shm/${IMAGE}" [ -x /usr/bin/pigz ] && GZIP=pigz || GZIP=gzip +grep -qw "${INSTALLROOT}/dev/shm" /proc/mounts && sudo umount "${INSTALLROOT}/dev/shm" grep -qw "${INSTALLROOT}/dev" /proc/mounts && sudo umount "${INSTALLROOT}/dev" sudo rm -rf "${INSTALLROOT}" sudo mkdir -p "${INSTALLROOT}" diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64 index 5e59d115f..abb4b6e46 100644 --- a/redhat/docker/pclinuxos/Dockerfile.x86_64 +++ b/redhat/docker/pclinuxos/Dockerfile.x86_64 @@ -1,6 +1,6 @@ -FROM pclinuxos:2024 +FROM pclinuxos:2025 -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Update distribution @@ -13,52 +13,30 @@ RUN set -x \ && apt-get -y install $(</packages) # Add rpmbuild repositories -COPY rpmbuild.list /etc/apt/sources.list.d/rpmbuild.list -RUN sed -i "/etc/apt/sources.list.d/rpmbuild.list" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" - # Fix SUDO configuration -RUN sed -i "/etc/pam.d/sudo" -e "/pam_limits.so/ s|^|#|" - # Fix utempter detection -RUN chmod a+r /usr/libexec/utempter/utempter +COPY rpmbuild.list /etc/apt/sources.list.d/rpmbuild.list +RUN set -x \ + && sed -i "/etc/apt/sources.list.d/rpmbuild.list" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" \ + && sed -i "/etc/pam.d/sudo" -e "/pam_limits.so/ s|^|#|" \ + && chmod a+r /usr/libexec/utempter/utempter # Fix missing '.la' files COPY genla.sh /usr/bin/genla.sh -RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 \ +RUN set -x \ + && genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 \ && genla.sh libjpeg \ && genla.sh liblcms \ && genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la # Add non-root user to build packages -RUN rm -rf /home/trinity \ +RUN 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|0x0020 ))" >>/home/trinity/.bashrc USER trinity +RUN set -x \ + && mkdir -p ${HOME}/rpmbuild COPY rpmmacros /home/trinity/.rpmmacros - -# Build supplementary development tools -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/8/SRPMS/core/release/cscope-15.9-2.mga8.src.rpm \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec \ - && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm - -RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/rpcsvc-proto-1.4-1.mga8.src.rpm \ - && 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 \ - && sed -i ${HOME}/rpmbuild/SPECS/html2ps.spec -e "s|%patch|%patch -P |" \ - && 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/9/SRPMS/core/release/heimdal-7.8.0-2.mga9.src.rpm \ - && sed -i ${HOME}/rpmbuild/SPECS/heimdal.spec -e "s|%patch|%patch -P |" -e "/Conflicts: krb5-devel/ s|^|#|" -e "s|%mkrel 2|1%{?dist}|" \ - && LDFLAGS="-lcrypt -Wl,--allow-shlib-undefined" rpmbuild -ba ${HOME}/rpmbuild/SPECS/heimdal.spec \ -# && sudo rpm -Uvh --force /home/trinity/rpmbuild/RPMS/*/heimdal-{devel,libs}-7*.rpm diff --git a/redhat/docker/pclinuxos/external-packages.sh b/redhat/docker/pclinuxos/external-packages.sh new file mode 100644 index 000000000..dd8043c30 --- /dev/null +++ b/redhat/docker/pclinuxos/external-packages.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +# Build supplementary development tools +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 + +rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/cscope-15.9-2.mga8.src.rpm \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec \ + && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm + +rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/rpcsvc-proto-1.4-1.mga8.src.rpm \ + && 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 + +rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/html2ps-2.0-3.b7.8.mga8.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/html2ps.spec -e "s|%patch|%patch -P |" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/html2ps.spec \ + && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/html2ps-2*.rpm + +rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/heimdal-7.8.0-2.mga9.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/heimdal.spec -e "s|%patch|%patch -P |" -e "/Conflicts: krb5-devel/ s|^|#|" -e "s|%mkrel 2|1%{?dist}|" \ + && LDFLAGS="-lcrypt -Wl,--allow-shlib-undefined" rpmbuild -ba ${HOME}/rpmbuild/SPECS/heimdal.spec \ + && sudo rpm -Uvh --force /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 e0e5fb2ba..8f8e07778 100644 --- a/redhat/docker/pclinuxos/packages.x86_64 +++ b/redhat/docker/pclinuxos/packages.x86_64 @@ -120,11 +120,12 @@ libofa-devel libofx-devel libotr-devel libpaper-devel -lib64png1.6-devel +lib64png-devel libpqxx-devel libpthread-stubs libpulseaudio-devel libqalculate-devel +lib64raptor-devel libraw1394-devel librsvg librsync-devel @@ -136,6 +137,7 @@ libt1lib-devel libtheora-devel libtirpc-devel libudev-devel +lib64unibreak-devel libuuid-devel libv4l-devel libvisual-devel @@ -167,7 +169,6 @@ neon-devel net-snmp-devel netpbm ocaml -OpenEXR-devel openldap-devel openldap-servers opensc @@ -187,9 +188,11 @@ ppp pth-devel python3 python3-devel +python3-setuptools python-rpm qt4-devel recode +rpcgen rpm-build rpm-devel ruby-devel diff --git a/redhat/docker/pull.sh b/redhat/docker/pull.sh index 75cc62be2..021f80130 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.4" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.5" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/push.sh b/redhat/docker/push.sh index 9a8925430..888cd856f 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.4" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.5" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/rawhide/Dockerfile.x86_64 b/redhat/docker/rawhide/Dockerfile.x86_64 index 8f92141e5..1c77d92e9 100644 --- a/redhat/docker/rawhide/Dockerfile.x86_64 +++ b/redhat/docker/rawhide/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:rawhide -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Fix DNF database corruption @@ -10,7 +10,7 @@ COPY packages /packages RUN set -x \ && 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-rawhide.noarch.rpm \ + && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-44.noarch.rpm \ && dnf -y --enableplugin=ovl update \ && dnf -y --enableplugin=ovl install --skip-broken $(</packages) @@ -32,15 +32,3 @@ RUN set -x \ USER trinity COPY rpmmacros /home/trinity/.rpmmacros - -RUN set -x \ - && rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ - && sed -i ${HOME}/rpmbuild/SPECS/wireless-tools.spec -e "s|%patch|%patch -P |g" \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* - -#RUN set -x \ -# && 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/rawhide/external-packages.sh b/redhat/docker/rawhide/external-packages.sh new file mode 100644 index 000000000..7a0c3fa36 --- /dev/null +++ b/redhat/docker/rawhide/external-packages.sh @@ -0,0 +1,12 @@ +#!/bin/bash -ex + +rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm +sed -i ${HOME}/rpmbuild/SPECS/wireless-tools.spec -e "s|%patch|%patch -P |g" +rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec +sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* + +#RUN set -x \ +# && 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/rawhide/packages b/redhat/docker/rawhide/packages index 872963678..8367d3d92 100644 --- a/redhat/docker/rawhide/packages +++ b/redhat/docker/rawhide/packages @@ -28,6 +28,7 @@ createrepo_c cryptsetup-devel cups-devel dbus-glib-devel +desktop-backgrounds-compat djvulibre djvulibre-devel dnf-plugin-ovl @@ -172,7 +173,6 @@ nspr-devel ocaml ocaml(compiler) ocaml-facile-devel -OpenEXR-devel openldap-devel opensc openslp-devel diff --git a/redhat/docker/rawhide/rpmmacros b/redhat/docker/rawhide/rpmmacros index 0b82d6547..41e776b5d 100644 --- a/redhat/docker/rawhide/rpmmacros +++ b/redhat/docker/rawhide/rpmmacros @@ -1,4 +1,4 @@ -%dist .fc43 +%dist .fc44 %_smp_mflags -j8 %jobs 8 %__brp_remove_la_files %nil diff --git a/redhat/docker/remove.sh b/redhat/docker/remove.sh index 864881b55..35f408c09 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.4" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.5" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh index 26719c6a6..39371228b 100755 --- a/redhat/docker/run.sh +++ b/redhat/docker/run.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.4" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.5" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker @@ -30,7 +30,7 @@ ${DOCKER} run -ti --rm \ --name "${IMAGE//:/-}" \ -v /dev/shm/${DOCKER}:/tmp:z \ -u trinity \ - --userns keep-id:uid=1000,gid=1000 \ + --userns keep-id:uid="$(id -u)",gid="$(id -g)" \ -e TMPPATH=/tmp \ -e TDE_VERSION=${TDE_VERSION} \ -e TDE_BRANCH=${TDE_BRANCH} \ |