From a9accfc2736bd7f2278e3dbd217385396e035388 Mon Sep 17 00:00:00 2001 From: Henry Beberman Date: Wed, 19 Aug 2020 14:53:27 -0700 Subject: [PATCH] Add libgcrypt dependency to libxslt The worker chroot now contains libgcrypt by default to support gpg. libxslt recognizes that it's there and attempts to take a dependency on it. Take that implicit dependency and make it explicit so the devel package is included. --- SPECS/libxslt/libxslt.spec | 7 ++++++- toolkit/resources/manifests/package/toolchain_aarch64.txt | 6 +++--- toolkit/resources/manifests/package/toolchain_x86_64.txt | 6 +++--- toolkit/scripts/toolchain/build_official_toolchain_rpms.sh | 6 +++--- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/SPECS/libxslt/libxslt.spec b/SPECS/libxslt/libxslt.spec index 9d4c800a37..25d8071b18 100644 --- a/SPECS/libxslt/libxslt.spec +++ b/SPECS/libxslt/libxslt.spec @@ -1,7 +1,7 @@ Summary: Libxslt is the XSLT C library developed for the GNOME project. XSLT is a an XML language to define transformation for XML. Name: libxslt Version: 1.1.34 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://xmlsoft.org/libxslt/ Group: System Environment/General Libraries @@ -9,7 +9,10 @@ Vendor: Microsoft Corporation Distribution: Mariner Source0: http://xmlsoft.org/sources/%{name}-%{version}.tar.gz Requires: libxml2-devel +Requires: libgcrypt BuildRequires: libxml2-devel +BuildRequires: libgcrypt-devel + %description The libxslt package contains XSLT libraries used for extending libxml2 libraries to support XSLT files. @@ -62,6 +65,8 @@ rm -rf %{buildroot}/* %{_mandir}/man3/* %changelog +* Wed Aug 19 2020 Henry Beberman 1.1.34-2 +- Add dependency on libgcrypt * Mon Jun 08 2020 Joe Schmitt 1.1.34-1 - Update to version 1.1.34 to resolve CVE-2019-11068. - Remove patch for CVE-2019-5815 since it is fixed in 1.1.34. diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index ab201be66c..f84772eb80 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -220,9 +220,9 @@ libxml2-2.9.10-1.cm1.aarch64.rpm libxml2-debuginfo-2.9.10-1.cm1.aarch64.rpm libxml2-devel-2.9.10-1.cm1.aarch64.rpm libxml2-python-2.9.10-1.cm1.aarch64.rpm -libxslt-1.1.34-1.cm1.aarch64.rpm -libxslt-debuginfo-1.1.34-1.cm1.aarch64.rpm -libxslt-devel-1.1.34-1.cm1.aarch64.rpm +libxslt-1.1.34-2.cm1.aarch64.rpm +libxslt-debuginfo-1.1.34-2.cm1.aarch64.rpm +libxslt-devel-1.1.34-2.cm1.aarch64.rpm lua-5.3.5-6.cm1.aarch64.rpm lua-debuginfo-5.3.5-6.cm1.aarch64.rpm lua-devel-5.3.5-6.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index e44849e482..46037b5bb0 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -220,9 +220,9 @@ libxml2-2.9.10-1.cm1.x86_64.rpm libxml2-debuginfo-2.9.10-1.cm1.x86_64.rpm libxml2-devel-2.9.10-1.cm1.x86_64.rpm libxml2-python-2.9.10-1.cm1.x86_64.rpm -libxslt-1.1.34-1.cm1.x86_64.rpm -libxslt-debuginfo-1.1.34-1.cm1.x86_64.rpm -libxslt-devel-1.1.34-1.cm1.x86_64.rpm +libxslt-1.1.34-2.cm1.x86_64.rpm +libxslt-debuginfo-1.1.34-2.cm1.x86_64.rpm +libxslt-devel-1.1.34-2.cm1.x86_64.rpm lua-5.3.5-6.cm1.x86_64.rpm lua-debuginfo-5.3.5-6.cm1.x86_64.rpm lua-devel-5.3.5-6.cm1.x86_64.rpm diff --git a/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh b/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh index d38e992edb..1251058b8f 100755 --- a/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh +++ b/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh @@ -356,8 +356,9 @@ build_rpm_in_chroot_no_install cmake build_rpm_in_chroot_no_install pam build_rpm_in_chroot_no_install docbook-dtd-xml -# libxslt needs libxml2 +# libxslt needs libxml2, libgcrypt chroot_and_install_rpms libxml2 +chroot_and_install_rpms libgcrypt build_rpm_in_chroot_no_install libxslt # docbook-style-xsl needs pam @@ -385,14 +386,13 @@ build_rpm_in_chroot_no_install libassuan build_rpm_in_chroot_no_install npth build_rpm_in_chroot_no_install libksba -# gnupg2 requires zlib, bzip2, readline, npth, libassuan, libksba, libgcrypt +# gnupg2 requires zlib, bzip2, readline, npth, libassuan, libksba chroot_and_install_rpms zlib chroot_and_install_rpms bzip2 chroot_and_install_rpms readline chroot_and_install_rpms npth chroot_and_install_rpms libassuan chroot_and_install_rpms libksba -chroot_and_install_rpms libgcrypt build_rpm_in_chroot_no_install gnupg2 build_rpm_in_chroot_no_install swig