From 07c298ecad0eb6d37d8914bff91f40328b20a9cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 11 Oct 2020 22:55:54 +0200 Subject: RPM: updates for future 14.0.9 release --- redhat/docker/el6/Dockerfile.x86_64 | 17 ++++++-------- redhat/docker/el6/packages | 3 ++- redhat/docker/el7/Dockerfile.x86_64 | 17 ++++++-------- redhat/docker/el7/packages | 1 + redhat/docker/el8/Dockerfile.x86_64 | 35 ++++++++++++----------------- redhat/docker/el8/packages | 3 +++ redhat/docker/mga6/packages.i686 | 4 ++++ redhat/docker/mga6/packages.x86_64 | 4 ++++ redhat/docker/mga7/packages.i686 | 5 +++++ redhat/docker/mga7/packages.x86_64 | 5 +++++ redhat/docker/oss152/packages | 4 ++++ redhat/docker/pclinuxos.pkg | 37 ++++++++++++++++++++++++++----- redhat/docker/pclinuxos.sh | 6 ++--- redhat/docker/pclinuxos/Dockerfile.x86_64 | 2 +- redhat/docker/pclinuxos/packages.x86_64 | 6 +++-- 15 files changed, 95 insertions(+), 54 deletions(-) (limited to 'redhat/docker') diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64 index c133b4122..3836529c2 100644 --- a/redhat/docker/el6/Dockerfile.x86_64 +++ b/redhat/docker/el6/Dockerfile.x86_64 @@ -4,23 +4,20 @@ ARG TDE_VERSION=14.0.8 ARG ARCH=x86_64 # Enable proxy -RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" - # Add EPEL repository # Add RPMFUSION repository -RUN rpm -Uvh \ - https://fr2.rpmfind.net/linux/epel/6/x86_64/Packages/e/epel-release-6-8.noarch.rpm \ - https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm - # Install Trinity build dependencies -ADD packages /packages -RUN yum -y clean all \ +COPY packages /packages +RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \ + && yum -y clean all \ && yum -y update \ + && yum -y install epel-release \ + && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \ && yum -y install $(>"/etc/sudoers" USER trinity -ADD rpmmacros /home/trinity/.rpmmacros +COPY rpmmacros /home/trinity/.rpmmacros # Build supplementary development tools diff --git a/redhat/docker/el6/packages b/redhat/docker/el6/packages index 2b9fa4b07..beeba9fff 100644 --- a/redhat/docker/el6/packages +++ b/redhat/docker/el6/packages @@ -29,7 +29,7 @@ db4-devel dbus-glib-devel djvulibre djvulibre-devel -docbook2x +docbook2X doxygen e2fsprogs-devel emacs @@ -224,6 +224,7 @@ wireless-tools-devel xine-lib-devel xmlto xorg-x11-font-utils +xorg-x11-server-utils xscreensaver xscreensaver-extras xulrunner-devel diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64 index 7693ded63..5d1a2e4cd 100644 --- a/redhat/docker/el7/Dockerfile.x86_64 +++ b/redhat/docker/el7/Dockerfile.x86_64 @@ -4,23 +4,20 @@ ARG TDE_VERSION=14.0.8 ARG ARCH=x86_64 # Enable proxy -RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" - # Add EPEL repository # Add RPMFUSION repository -RUN rpm -Uvh \ - https://fr2.rpmfind.net/linux/epel/7/x86_64/Packages/e/epel-release-7-12.noarch.rpm \ - https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm - # Install Trinity build dependencies -ADD packages /packages -RUN yum -y clean all \ +COPY packages /packages +RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \ + && yum -y install epel-release \ + && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm \ + && yum -y clean all \ && yum -y update \ && yum -y install $(>"/etc/sudoers" USER trinity -ADD rpmmacros /home/trinity/.rpmmacros +COPY rpmmacros /home/trinity/.rpmmacros # Build supplementary development tools diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages index efc202d44..7368877e2 100644 --- a/redhat/docker/el7/packages +++ b/redhat/docker/el7/packages @@ -174,6 +174,7 @@ pkcs11-helper-devel pkgconfig(pygtk-2.0) poppler-devel postgresql-devel +ppp pth-devel pulseaudio-libs-devel qt-devel diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64 index 11d0bc58e..43f6b7191 100644 --- a/redhat/docker/el8/Dockerfile.x86_64 +++ b/redhat/docker/el8/Dockerfile.x86_64 @@ -3,31 +3,29 @@ FROM centos:8 ARG TDE_VERSION=14.0.8 ARG ARCH=x86_64 -# Enable proxy -RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" +# Enable custom repository +COPY centos-devel.repo /etc/yum.repos.d/centos-devel.repo +# Enable proxy # Install OVL plugin for DNF # Update distribution packages # Add EPEL repository # Add RPMFUSION repository # Enable supplementary repositories -RUN curl -o /usr/lib/python3.6/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py \ +# Install Trinity build dependencies +COPY packages /packages +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \ + && curl -o /usr/lib/python3.6/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py \ && dnf -y update \ && dnf -y install epel-release \ && dnf -y install https://download1.rpmfusion.org/free/el/updates/8/x86_64/r/rpmfusion-free-release-8-0.1.noarch.rpm \ && dnf -y install dnf-plugins-core \ - && dnf config-manager --enable PowerTools - -# Enable custom repository -ADD centos-devel.repo /etc/yum.repos.d/centos-devel.repo - -# Install Trinity build dependencies -ADD packages /packages -RUN dnf -y --enableplugin=ovl install $(>"/etc/sudoers" USER trinity -ADD rpmmacros /home/trinity/.rpmmacros +COPY rpmmacros /home/trinity/.rpmmacros # Build supplementary development tools -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/l/libxml%2b%2b-2.40.1-8.fc30.src.rpm \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libxml++{,-devel}-2*.rpm - RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/l/libofx-0.9.13-2.fc30.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libofx{,-devel}-0*.rpm @@ -57,7 +52,7 @@ RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pylibacl-0.5.2-11.fc30.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pylibacl-0*.rpm --nodeps -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pyxattr-0.5.6-3.fc30.src.rpm \ +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pyxattr-0.5.6-3.fc30.src.rpm --nocheck \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/python2-pyxattr-0*.rpm --nodeps RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/r/rdiff-backup-1.2.8-31.fc30.src.rpm \ @@ -87,9 +82,7 @@ RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/r/rdesktop-1.8.4-3.fc30.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm -RUN cd ${HOME}/rpmbuild/RPMS \ - && wget 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 \ - && sudo rpm -Uvh hiredis-0.13.3-9.el8.remi.x86_64.rpm libyaz{,-devel}-5.14.11-14.el8.remi.x86_64.rpm +RUN sudo rpm -Uvh http://rpms.remirepo.net/enterprise/8/remi/x86_64/hiredis-0.13.3-9.el8.remi.x86_64.rpm http://rpms.remirepo.net/enterprise/8/remi/x86_64/libyaz{,-devel}-5.14.11-14.el8.remi.x86_64.rpm RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-1.015-8.fc30.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm @@ -100,5 +93,5 @@ RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-28.fc30.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-Packer-1.047-4.fc30.src.rpm \ +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-Packer-1.047-4.fc30.src.rpm --nocheck \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages index 7eafa7d52..a9018237e 100644 --- a/redhat/docker/el8/packages +++ b/redhat/docker/el8/packages @@ -121,6 +121,7 @@ libXcomposite-devel libXdamage-devel libXdmcp-devel libxkbfile-devel +libxml++-devel libXScrnSaver-devel libxslt-devel libXtst-devel @@ -165,6 +166,7 @@ poppler-devel postgresql postgresql-devel postgresql-server-devel +ppp pulseaudio-libs-devel python2 python2-devel @@ -195,6 +197,7 @@ transfig unixODBC-devel usbutils valgrind +wget wireless-tools-devel xine-lib-devel xmlto diff --git a/redhat/docker/mga6/packages.i686 b/redhat/docker/mga6/packages.i686 index 3e88f77a7..24079d712 100644 --- a/redhat/docker/mga6/packages.i686 +++ b/redhat/docker/mga6/packages.i686 @@ -56,6 +56,7 @@ gtk+3.0-devel gtk-doc hspell-devel hunspell-en +iceauth ImageMagick-devel imake imlib2-devel @@ -194,6 +195,7 @@ openldap-servers-devel opensc openslp-devel opensp-devel +openssh-clients optipng pam-devel pciutils-devel @@ -212,6 +214,7 @@ pkgconfig(pygtk-2.0) polkit-agent-none postgresql9.4 postgresql9.4-devel +ppp pth-devel python-devel python-sip @@ -226,6 +229,7 @@ SDL-devel speex-devel sqlite3-devel sqlite-devel +sshfs-fuse subversion-devel sudo sword-devel diff --git a/redhat/docker/mga6/packages.x86_64 b/redhat/docker/mga6/packages.x86_64 index f77944bae..edf18316c 100644 --- a/redhat/docker/mga6/packages.x86_64 +++ b/redhat/docker/mga6/packages.x86_64 @@ -56,6 +56,7 @@ gtk+3.0-devel gtk-doc hspell-devel hunspell-en +iceauth ImageMagick-devel imake imlib2-devel @@ -194,6 +195,7 @@ openldap-servers-devel opensc openslp-devel opensp-devel +openssh-clients optipng pam-devel pciutils-devel @@ -212,6 +214,7 @@ pkgconfig(pygtk-2.0) polkit-agent-none postgresql9.4 postgresql9.4-devel +ppp pth-devel python-devel python-sip @@ -226,6 +229,7 @@ SDL-devel speex-devel sqlite3-devel sqlite-devel +sshfs-fuse subversion-devel sudo sword-devel diff --git a/redhat/docker/mga7/packages.i686 b/redhat/docker/mga7/packages.i686 index 4cc4376ae..cc695fb73 100644 --- a/redhat/docker/mga7/packages.i686 +++ b/redhat/docker/mga7/packages.i686 @@ -55,6 +55,7 @@ gtk+3.0-devel gtk-doc hspell-devel hunspell-en +iceauth ImageMagick-devel imake imlib2-devel @@ -91,6 +92,7 @@ libflac-devel libflac-devel libfontenc-devel libgadu-devel +libgeoip-devel libgmime2.6-devel libgpod-devel libgsf-devel @@ -194,6 +196,7 @@ openldap-servers-devel opensc openslp-devel opensp-devel +openssh-clients optipng pam-devel pciutils-devel @@ -210,6 +213,7 @@ pkgconfig(pygtk-2.0) polkit-agent-none postgresql9.6 postgresql9.6-devel +ppp python-devel python-sip qt4-devel @@ -223,6 +227,7 @@ SDL-devel speex-devel sqlite3-devel sqlite-devel +sshfs-fuse subversion-devel sudo swig diff --git a/redhat/docker/mga7/packages.x86_64 b/redhat/docker/mga7/packages.x86_64 index 3b6878579..9c8f92ea0 100644 --- a/redhat/docker/mga7/packages.x86_64 +++ b/redhat/docker/mga7/packages.x86_64 @@ -55,6 +55,7 @@ gtk+3.0-devel gtk-doc hspell-devel hunspell-en +iceauth ImageMagick-devel imake imlib2-devel @@ -81,6 +82,7 @@ lib64ffmpeg-devel lib64flac++-devel lib64flac-devel lib64fontenc-devel +lib64geoip-devel lib64gmime2.6-devel lib64gstreamer1.0-devel lib64gstreamer-plugins-base1.0-devel @@ -197,6 +199,7 @@ openldap-servers-devel opensc openslp-devel opensp-devel +openssh-clients optipng pam-devel pciutils-devel @@ -213,6 +216,7 @@ pkgconfig(pygtk-2.0) polkit-agent-none postgresql9.6 postgresql9.6-devel +ppp python-devel python-sip qt4-devel @@ -226,6 +230,7 @@ SDL-devel speex-devel sqlite3-devel sqlite-devel +sshfs-fuse subversion-devel sudo swig diff --git a/redhat/docker/oss152/packages b/redhat/docker/oss152/packages index 87a9788ae..e3359a007 100644 --- a/redhat/docker/oss152/packages +++ b/redhat/docker/oss152/packages @@ -8,6 +8,8 @@ bind-devel binutils-devel bison boost-devel +brp-check-suse +brp-extract-appdata ccache cdparanoia cdparanoia-devel @@ -56,6 +58,7 @@ gtk-doc htdig html2ps hunspell-devel +iceauth ImageMagick-devel imlib2-devel intltool @@ -191,6 +194,7 @@ wireless-tools wv2-devel xbase-devel xcb-proto-devel +xorg-x11 xscreensaver xscreensaver-data xscreensaver-data-extra diff --git a/redhat/docker/pclinuxos.pkg b/redhat/docker/pclinuxos.pkg index d1ad003ed..cdfd0cf21 100644 --- a/redhat/docker/pclinuxos.pkg +++ b/redhat/docker/pclinuxos.pkg @@ -17,7 +17,9 @@ file filesystem findutils fuse +fuse-common gawk +gcrypt gdk-pixbuf2.0 glibc glibc-devel @@ -25,7 +27,8 @@ gnupg gnutls grep gzip -icu56-data +icu +icu65-data info-install kernel-userspace-headers krb5 @@ -33,10 +36,13 @@ ldetect-lst less lib64acl1 lib64apt-pkg0 +lib64assuan0 lib64attr1 lib64audit1 lib64audit-devel lib64blkid1 +lib64brotlicommon1 +lib64brotlidec1 lib64bsd0 lib64bzip2_1 lib64cap2 @@ -46,26 +52,32 @@ lib64curl4 lib64db4.8 lib64dbnss4.8 lib64elfutils1 +lib64expat1 lib64ext2fs2 lib64fdisk1 lib64ffi6 lib64fuse2 +lib64fuse3_3 +lib64gcrypt20 lib64gdbm3 lib64gdk_pixbuf2.0_0 lib64gio2.0_0 lib64glib2.0_0 lib64gmp10 lib64gnutls30 -lib64icu56 +lib64gpg-error0 +lib64gudev1.0_0 +lib64icu65 lib64idn2_0 lib64intl8 lib64iso9660_7 -lib64jasper1 +lib64jasper4 lib64jbig1 lib64jpeg62 lib64jpeg8 lib64keyutils1 lib64krb53 +lib64ksba8 lib64ldap2.4_2 lib64libcap-ng0 lib64lua5.1 @@ -76,12 +88,12 @@ lib64mpfr4 lib64ncurses5 lib64ncurses6 lib64ncursesw6 -lib64nettle6 +lib64nettle7 lib64notify4 +lib64npth0 lib64nspr4 lib64nss3 -lib64openssl1.0.0 -lib64openssl1.1 +lib64openssl1.1.0 lib64opts25 lib64pam0 lib64pam-devel @@ -93,10 +105,12 @@ lib64png16_16 lib64png3 lib64popt0 lib64psl5 +lib64python3.6 lib64readline7 lib64rpm1 lib64rtmp1 lib64sasl2 +lib64secret1_0 lib64sigsegv2 lib64smartcols1 lib64sqlite3_0 @@ -105,23 +119,30 @@ lib64tasn1_6 lib64tcb0 lib64tiff3 lib64tiff5 +lib64tirpc3 lib64udev0 lib64unistring2 lib64usb1.0_0 lib64usb-compat0.1_4 lib64uuid1 lib64verto1 +lib64webp7 lib64x11_6 lib64xau6 +lib64xcrypt1 +lib64xcrypt-devel lib64xdmcp6 lib64xml2_2 +lib64zstd1 libgcc1 libidn2-i18n libnotify libstdc++6 +libtirpc libxcb makedev mktemp +multiarch-utils ncurses nss nss_tcb @@ -134,10 +155,13 @@ perl perl-base perl-File-Sync perl-MDK-Common +perl-Module-ScanDeps +pinentry pkgconfig popt-data procps publicsuffix-list-dafsa +python3 rmt rootcerts rpm @@ -145,6 +169,7 @@ rpm-helper rpm-pclinuxos-setup rpm-rambo-setup run-parts +sd sed setup shadow-utils diff --git a/redhat/docker/pclinuxos.sh b/redhat/docker/pclinuxos.sh index e4ed68567..837e4c86f 100755 --- a/redhat/docker/pclinuxos.sh +++ b/redhat/docker/pclinuxos.sh @@ -1,7 +1,7 @@ #!/bin/bash -ex NAME="pclinuxos" -VERSION="$1" # E.g: '26' +VERSION="${1:-2020}" # E.g: '26' IMAGE="${NAME}:${VERSION}" INSTALLROOT="/dev/shm/${IMAGE}" @@ -17,7 +17,7 @@ curl "${MIRROR}/RPMS.x86_64/" | sed -n "/a href/ s|.*href=\"\(.*\)\.rpm\".*|\1.r mkdir -p "/dev/shm/packages" while read pkg; do - file="$(grep "^$pkg-[0-9]" /dev/shm/pkg.list)" + file="$(grep "^${pkg}[0-9]*-[0-9]" /dev/shm/pkg.list | sort | tail -n 1)" [ -z "${file}" ] && exit 1 wget -nv -c "${MIRROR}/RPMS.x86_64/${file}" -O "/dev/shm/packages/${file}" || exit 2 done < "pclinuxos.pkg" @@ -46,7 +46,7 @@ sudo umount "${INSTALLROOT}/dev/shm" sudo umount "${INSTALLROOT}/dev" sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar" -sudo rm -rf "${INSTALLROOT}" +#sudo rm -rf "${INSTALLROOT}" docker rmi -f "${IMAGE}" docker import "${IMAGE}.tar" "${IMAGE}" diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64 index a0fa770a1..2cd400aba 100644 --- a/redhat/docker/pclinuxos/Dockerfile.x86_64 +++ b/redhat/docker/pclinuxos/Dockerfile.x86_64 @@ -1,4 +1,4 @@ -FROM pclinuxos:2018 +FROM pclinuxos:2020 ARG TDE_VERSION=14.0.8 ARG ARCH=x86_64 diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64 index e2dfbeec1..800b9989a 100644 --- a/redhat/docker/pclinuxos/packages.x86_64 +++ b/redhat/docker/pclinuxos/packages.x86_64 @@ -31,7 +31,6 @@ gamin-devel gcc-c++ gettext-devel glib2-devel -gnokii-devel gnutls-devel gpgme-devel gphoto2-devel @@ -41,9 +40,11 @@ gtk2-devel gtk+3.0-devel hspell-devel htdig +iceauth ImageMagick-devel imake imlib2-devel +intltool java-devel java-sun lcms-devel @@ -53,6 +54,7 @@ lib64db4.8-devel lib64dvdread-devel lib64exiv2-devel lib64fbclient-devel +lib64geoip-devel lib64gif-devel lib64gpod4 lib64gpod-devel @@ -86,7 +88,7 @@ libfontenc-devel libgadu-devel libgstreamer0.10-devel libice-devel -libjasper-devel +lib64jasper-devel libjpeg-devel liblame-devel liblo-devel -- cgit v1.2.3