From 6581dc50b83f203d65eac61c00a159ab2a6ddb5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 30 Jan 2021 14:34:02 +0100 Subject: RPM: massive update and cleanup --- redhat/docker/el6/Dockerfile.i686 | 60 ++++++++-- redhat/docker/el6/Dockerfile.x86_64 | 64 +++++++--- redhat/docker/el6/centos-6.repo | 30 ----- redhat/docker/el6/epel-6.repo | 5 - redhat/docker/el6/packages | 231 ++++++++++++++++++++++++++++++++++++ redhat/docker/el6/packages.base | 7 -- redhat/docker/el6/packages.trinity | 208 -------------------------------- redhat/docker/el6/repoforge-6.repo | 5 - 8 files changed, 325 insertions(+), 285 deletions(-) delete mode 100644 redhat/docker/el6/centos-6.repo delete mode 100644 redhat/docker/el6/epel-6.repo create mode 100644 redhat/docker/el6/packages delete mode 100644 redhat/docker/el6/packages.base delete mode 100644 redhat/docker/el6/packages.trinity delete mode 100644 redhat/docker/el6/repoforge-6.repo (limited to 'redhat/docker/el6') diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686 index e8e4dbb8d..8844adabc 100644 --- a/redhat/docker/el6/Dockerfile.i686 +++ b/redhat/docker/el6/Dockerfile.i686 @@ -1,30 +1,64 @@ FROM centos32:6 -ARG TDE_VERSION=14.0.5 +ARG TDE_VERSION=14.0.8 ARG ARCH=i686 -RUN echo "proxy=http://proxy:3128" >>/etc/yum.conf +# Enable proxy +RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" # Add EPEL repository -RUN yum -y install epel-release - -# Add NUX repository -RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el6/x86_64/nux-dextop-release-0-2.el6.nux.noarch.rpm +# Add RPMFUSION repository +RUN rpm -Uvh \ + https://fr2.rpmfind.net/linux/epel/6/x86_64/Packages/e/epel-release-6-8.noarch.rpm \ + https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm # Install Trinity build dependencies -ADD packages.trinity /packages -RUN setarch ${ARCH} yum -y update -RUN setarch ${ARCH} yum -y install $(/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" \ + && ln -sf libmp4v2.so /usr/lib/libmp4.so + # Add non-root user to build packages -RUN useradd -m -s /bin/bash -u 1000 trinity -RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" + +USER trinity ADD rpmmacros /home/trinity/.rpmmacros -# Distro-specific patches -RUN sed -i "/usr/include/jasper/jas_math.h" -e "/#include / s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" +# Build supplementary development tools + +RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/m4-1.4.16-10.el7.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/m4-1*.rpm + +RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm + +RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-Install-1.06-4.el7.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-Install-*.rpm + +RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-ScanDeps-1.10-3.el7.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-ScanDeps-*.rpm + +RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-1.015-4.el7.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s|%license|%doc|" \ + && setarch i686 rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm + +RUN setarch i686 rpmbuild --rebuild https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-Getopt-ArgvFile-1.11-24.el7.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-*.rpm + +RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer-1.041-2.el7.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s|%license|%doc|" -e "/^make test/ s|^|#|" \ + && setarch i686 rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64 index 9b845631f..3836529c2 100644 --- a/redhat/docker/el6/Dockerfile.x86_64 +++ b/redhat/docker/el6/Dockerfile.x86_64 @@ -1,30 +1,60 @@ FROM centos:6 -ARG TDE_VERSION=14.0.5 +ARG TDE_VERSION=14.0.8 ARG ARCH=x86_64 -RUN echo "proxy=http://proxy:3128" >>/etc/yum.conf - +# Enable proxy # Add EPEL repository -RUN yum -y install epel-release - -# Add NUX repository -RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el6/x86_64/nux-dextop-release-0-2.el6.nux.noarch.rpm - +# Add RPMFUSION repository # Install Trinity build dependencies -ADD packages.trinity /packages -RUN yum -y update -RUN yum -y install $(>"/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 $(/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" \ + && ln -sf libmp4v2.so /usr/lib64/libmp4.so + # Add non-root user to build packages -RUN useradd -m -s /bin/bash -u 1000 trinity -RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers -ADD rpmmacros /home/trinity/.rpmmacros +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" -# Distro-specific patches -RUN sed -i "/usr/include/jasper/jas_math.h" -e "/#include / s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +# Build supplementary development tools + +RUN sudo rpm -Uvh http://repo/repo/build-tools/el6/RPMS/x86_64/m4-1.4.16-10.el6.x86_64.rpm + +RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm + +RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-Install-1.06-4.el7.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-Install-*.rpm + +RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-ScanDeps-1.10-3.el7.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-ScanDeps-*.rpm + +RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-1.015-4.el7.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s|%license|%doc|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm + +RUN rpmbuild --rebuild https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-Getopt-ArgvFile-1.11-24.el7.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-*.rpm + +RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer-1.041-2.el7.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s|%license|%doc|" -e "/^make test/ s|^|#|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps diff --git a/redhat/docker/el6/centos-6.repo b/redhat/docker/el6/centos-6.repo deleted file mode 100644 index a00a85ad5..000000000 --- a/redhat/docker/el6/centos-6.repo +++ /dev/null @@ -1,30 +0,0 @@ -[centos-6-base] -name=CentOS-6 - Base -baseurl=http://repo/repo/centos/6/os/$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 -enabled=1 - -#released updates -[centos-6-updates] -name=CentOS-6 - Updates -baseurl=http://repo/repo/centos/6/updates/$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 -enabled=1 - -#additional packages that may be useful -[centos-6-extras] -name=CentOS-6 - Extras -baseurl=http://repo/repo/centos/6/extras/$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 -enabled=1 - -#additional packages that extend functionality of existing packages -[centos-6-centosplus] -name=CentOS-6 - Plus -baseurl=http://repo/repo/centos/6/centosplus/$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 -enabled=1 diff --git a/redhat/docker/el6/epel-6.repo b/redhat/docker/el6/epel-6.repo deleted file mode 100644 index 24134a301..000000000 --- a/redhat/docker/el6/epel-6.repo +++ /dev/null @@ -1,5 +0,0 @@ -[epel] -name=epel -baseurl=http://repo/repo/epel/6/$basearch/ -enabled=1 -gpgcheck=0 diff --git a/redhat/docker/el6/packages b/redhat/docker/el6/packages new file mode 100644 index 000000000..beeba9fff --- /dev/null +++ b/redhat/docker/el6/packages @@ -0,0 +1,231 @@ +alsa-lib-devel +aspell +aspell-devel +audiofile-devel +autotrace +avahi-devel +bind-devel +binutils-devel +bison +boost-devel +bzip2-devel +ccache +ccrtp-devel +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +clamav-devel +clucene-core-devel +cmake +commoncpp2-devel +cpp +cppunit-devel +createrepo +cryptsetup-luks-devel +cups-devel +db4-devel +dbus-glib-devel +djvulibre +djvulibre-devel +docbook2X +doxygen +e2fsprogs-devel +emacs +esound-devel +exempi-devel +exiv2-devel +fdupes +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-devel +fontpackages-devel +fribidi-devel +gamin-devel +gcc +gcc-c++ +gcc-gfortran +gcc-java +gettext-devel +glib-devel +gmp-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +gpsim-devel +GraphicsMagick-devel +gsl-devel +gstreamer-devel +gstreamer-plugins-base-devel +gtk2-devel +gtk+-devel +gtk-doc +guile-devel +hal-devel +hspell-devel +htdig +html2ps +icu +ImageMagick-devel +imake +imlib-devel +imlib2-devel +intltool +jack-audio-connection-kit-devel +jasper-devel +java-1.4.2-gcj-compat-devel +java-1.6.0-openjdk-devel +java-1.7.0-openjdk-devel +java-devel +java-openjdk +lame-devel +lcms-devel +libacl-devel +libarchive-devel +libart_lgpl-devel +libblkid-devel +libcap-devel +libcdio-devel +libconfig-devel +libcurl-devel +libdvdread-devel +libfontenc-devel +libgcj-devel +libgpod-devel +libgsf-devel +libgssapi-devel +libical-devel +libidn-devel +liblo-devel +libmad-devel +libmng-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz-devel +libofx-devel +libogg-devel +libotr-devel +libpaper-devel +libraw1394-devel +libsamplerate-devel +libsmbclient-devel +libsndfile-devel +libssh2-devel +libtheora-devel +libtiff-devel +libtool +libtool-ltdl-devel +libudev-devel +libutempter-devel +libv4l-devel +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libXaw-devel +libXcomposite-devel +libXdamage-devel +libXdmcp-devel +libxkbfile-devel +libXScrnSaver +libXScrnSaver-devel +libxslt-devel +libXtst-devel +libXv-devel +libXxf86dga-devel +libXxf86vm-devel +libyaz-devel +libzrtpcpp-devel +lirc-devel +lm_sensors-devel +meanwhile-devel +mysql-devel +nas-devel +neon-devel +netpbm-progs +net-snmp-devel +net-tools +NetworkManager-glib-devel +ocaml +ocaml(compiler) +OpenEXR-devel +openldap-devel +opensc +openslp-devel +opensp-devel +pam-devel +pciutils-devel +pcre-devel +pcsc-lite-devel +pcsc-perl +perl +perl-devel +perl(Archive::Zip) +perl(CPAN) +perl(CPANPLUS::Backend) +perl(ExtUtils::MakeMaker) +perl(ExtUtils::Embed) +perl(Getopt::ArgvFile) +perl(inc::Module::Install) +perl(IPC::Run3) +perl(JSON) +perl(Module::ScanDeps) +perl(Module::Signature) +perl(prefork) +perl(Test::CPAN::Meta) +perl(Test::MinimumVersion) +perl(Test::More) +perl(Test::Pod) +perl(Test::Pod::Coverage) +perl(XML::Parser) +pigz +pilot-link-devel +pkgconfig(pygtk-2.0) +pkcs11-helper-devel +poppler-devel +postgresql-devel +pth-devel +pulseaudio-libs-devel +recode +redhat-rpm-config +rpm-build +ruby +ruby-devel +sane-backends-devel +scons +SDL-devel +selinux-policy-devel +sip-devel +speex-devel +sqlite-devel +subversion-devel +sudo +swig +sword-devel +t1lib-devel +t1utils +taglib-devel +tar +texinfo +texlive-utils +torsocks +transfig +udisks-devel +unixODBC-devel +usbutils +valgrind +ver-devel +wireless-tools-devel +xine-lib-devel +xmlto +xorg-x11-font-utils +xorg-x11-server-utils +xscreensaver +xscreensaver-extras +xulrunner-devel +xz-devel diff --git a/redhat/docker/el6/packages.base b/redhat/docker/el6/packages.base deleted file mode 100644 index 21345a31b..000000000 --- a/redhat/docker/el6/packages.base +++ /dev/null @@ -1,7 +0,0 @@ -bash -perl -setarch -tar -vim-enhanced -yum -yum-plugin-ovl diff --git a/redhat/docker/el6/packages.trinity b/redhat/docker/el6/packages.trinity deleted file mode 100644 index 4ee743b2a..000000000 --- a/redhat/docker/el6/packages.trinity +++ /dev/null @@ -1,208 +0,0 @@ -alsa-lib-devel -aspell -aspell-devel -audiofile-devel -autotrace -avahi-devel -bind-devel -binutils-devel -bison -boost-devel -bzip2-devel -ccache -ccrtp-devel -cdparanoia -cdparanoia-devel -chmlib-devel -chrpath -clamav -clamav-devel -clucene-core-devel -cmake -commoncpp2-devel -cpp -cppunit-devel -createrepo -cryptsetup-luks-devel -cups-devel -db4-devel -dbus-glib-devel -djvulibre -djvulibre-devel -doxygen -e2fsprogs-devel -emacs -esound-devel -exempi-devel -exiv2-devel -fdupes -ffmpeg-devel -fftw-devel -file-devel -flac-devel -flex-devel -fontpackages-devel -fribidi-devel -gamin-devel -gcc -gcc-c++ -gcc-gfortran -gcc-java -gettext-devel -glib-devel -gmime-devel -gmp-devel -gnokii-devel -gperf -gpgme-devel -gphoto2-devel -GraphicsMagick-devel -gsl-devel -gstreamer-devel -gstreamer-plugins-base-devel -gtk2-devel -gtk+-devel -gtk-doc -guile-devel -hal-devel -heimdal-devel -hspell-devel -htdig -html2ps -icu -ImageMagick-devel -imake -imlib-devel -imlib2-devel -intltool -jack-audio-connection-kit-devel -jasper-devel -java-1.4.2-gcj-compat-devel -java-1.6.0-openjdk-devel -java-1.7.0-openjdk-devel -java-devel -java-openjdk -lame-devel -lcms-devel -libacl-devel -libarchive-devel -libart_lgpl-devel -libblkid-devel -libcap-devel -libcdio-devel -libconfig-devel -libcurl-devel -libdvdread-devel -libfontenc-devel -libgcj-devel -libgpod-devel -libgsf-devel -libgssapi-devel -libical-devel -libidn-devel -liblo-devel -libmad-devel -libmng-devel -libmp4v2-devel -libmpcdec-devel -libmtp-devel -libmusicbrainz-devel -libofx-devel -libogg-devel -libotr-devel -libpaper-devel -libraw1394-devel -libsamplerate-devel -libsmbclient-devel -libsndfile-devel -libssh2-devel -libtheora-devel -libtiff-devel -libtool -libtool-ltdl-devel -libudev-devel -libutempter-devel -libv4l-devel -libvisual-devel -libvorbis-devel -libwmf-devel -libwpd-devel -libXaw-devel -libXcomposite-devel -libXdamage-devel -libXdmcp-devel -libxkbfile-devel -libXScrnSa -libXScrnSaver-devel -libxslt-devel -libXtst-devel -libXv-devel -libXxf86dga-devel -libXxf86vm-devel -libzrtpcpp-devel -lirc-devel -lm_sensors-devel -meanwhile-devel -mysql-devel -nas-devel -neon-devel -netpbm-progs -net-snmp-devel -net-tools -NetworkManager-glib-devel -ocaml -ocaml(compiler) -OpenEXR-devel -openldap-devel -opensc -openslp-devel -opensp-devel -pam-devel -pciutils-devel -pcre-devel -pcsc-lite-devel -perl -perl-devel -perl(ExtUtils::MakeMaker) -perl(XML::Parser) -pilot-link-devel -pkcs11-helper-devel -poppler-devel -postgresql-devel -pth-devel -pulseaudio-libs-devel -recode -redhat-rpm-config -rpm-build -ruby -ruby-devel -sane-backends-devel -scons -SDL-devel -sip-devel -speex-devel -sqlite-devel -subversion-devel -sudo -sword-devel -t1lib-devel -t1utils -taglib-devel -tar -texinfo -texlive-utils -torsocks -transfig -udisks-devel -unixODBC-devel -usbutils -valgrind -ver-devel -wireless-tools-devel -xine-lib-devel -xmlto -xorg-x11-font-utils -xscreensaver -xscreensaver-extras -xulrunner-devel -xz-devel diff --git a/redhat/docker/el6/repoforge-6.repo b/redhat/docker/el6/repoforge-6.repo deleted file mode 100644 index 8747bf2df..000000000 --- a/redhat/docker/el6/repoforge-6.repo +++ /dev/null @@ -1,5 +0,0 @@ -[dag] -name=dag -baseurl=http://repo/repo/repoforge/redhat/el6/en/$basearch/dag/ -enabled=1 -gpgcheck=0 -- cgit v1.2.3