From b2c2ae028d5085ef100c28d2d7277fc2ba6d0303 Mon Sep 17 00:00:00 2001 From: Tobias Brick <39196763+tobiasb-ms@users.noreply.github.com> Date: Fri, 31 Jan 2025 09:43:43 -0800 Subject: [PATCH] openssl: move SymCrypt and SymCrypt-OpenSSL Recommends from main package to libs (#12176) openssl has a Recommends on SymCrypt and SymCrypt-OpenSSL. However, it's actually the subpackage openssl-libs that needs these and we have a customer that sees these not being installed if they only install openssl-libs on a minimal container. This change moves the Recommends from the main package to the libs subpackage --- SPECS/openssl/openssl.spec | 10 ++++++---- .../manifests/package/pkggen_core_aarch64.txt | 10 +++++----- .../manifests/package/pkggen_core_x86_64.txt | 10 +++++----- .../manifests/package/toolchain_aarch64.txt | 12 ++++++------ .../resources/manifests/package/toolchain_x86_64.txt | 12 ++++++------ 5 files changed, 28 insertions(+), 26 deletions(-) diff --git a/SPECS/openssl/openssl.spec b/SPECS/openssl/openssl.spec index 4f88a92e6d5..15c5c4513ac 100644 --- a/SPECS/openssl/openssl.spec +++ b/SPECS/openssl/openssl.spec @@ -9,7 +9,7 @@ Summary: Utilities from the general purpose cryptography library with TLS implementation Name: openssl Version: 3.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Vendor: Microsoft Corporation Distribution: Azure Linux Source: https://github.com/openssl/openssl/releases/download/openssl-%{version}/openssl-%{version}.tar.gz @@ -90,9 +90,6 @@ BuildRequires: perl(Test::More) Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Recommends: SymCrypt -Recommends: SymCrypt-OpenSSL - %description The OpenSSL toolkit provides support for secure communications between machines. OpenSSL includes a certificate management tool and shared @@ -101,6 +98,8 @@ protocols. %package libs Summary: A general purpose cryptography library with TLS implementation +Recommends: SymCrypt +Recommends: SymCrypt-OpenSSL %description libs OpenSSL is a toolkit for supporting cryptography. The openssl-libs @@ -358,6 +357,9 @@ install -m644 %{SOURCE9} \ %ldconfig_scriptlets libs %changelog +* Fri Jan 31 2025 Tobias Brick - 3.3.2-2 +- Move SymCrypt and SymCrypt-OpenSSL Recommends from main package to libs + * Thu Sep 19 2024 Tobias Brick - 3.3.2-1 - Upgrade to 3.3.2 diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 75b246be5b5..8944956f6be 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -170,11 +170,11 @@ gtk-doc-1.33.2-1.azl3.noarch.rpm autoconf-2.72-2.azl3.noarch.rpm automake-1.16.5-2.azl3.noarch.rpm ocaml-srpm-macros-9-4.azl3.noarch.rpm -openssl-3.3.2-1.azl3.aarch64.rpm -openssl-devel-3.3.2-1.azl3.aarch64.rpm -openssl-libs-3.3.2-1.azl3.aarch64.rpm -openssl-perl-3.3.2-1.azl3.aarch64.rpm -openssl-static-3.3.2-1.azl3.aarch64.rpm +openssl-3.3.2-2.azl3.aarch64.rpm +openssl-devel-3.3.2-2.azl3.aarch64.rpm +openssl-libs-3.3.2-2.azl3.aarch64.rpm +openssl-perl-3.3.2-2.azl3.aarch64.rpm +openssl-static-3.3.2-2.azl3.aarch64.rpm libcap-2.69-1.azl3.aarch64.rpm libcap-devel-2.69-1.azl3.aarch64.rpm debugedit-5.0-2.azl3.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 0dec197bd5f..50254bd98a4 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -170,11 +170,11 @@ gtk-doc-1.33.2-1.azl3.noarch.rpm autoconf-2.72-2.azl3.noarch.rpm automake-1.16.5-2.azl3.noarch.rpm ocaml-srpm-macros-9-4.azl3.noarch.rpm -openssl-3.3.2-1.azl3.x86_64.rpm -openssl-devel-3.3.2-1.azl3.x86_64.rpm -openssl-libs-3.3.2-1.azl3.x86_64.rpm -openssl-perl-3.3.2-1.azl3.x86_64.rpm -openssl-static-3.3.2-1.azl3.x86_64.rpm +openssl-3.3.2-2.azl3.x86_64.rpm +openssl-devel-3.3.2-2.azl3.x86_64.rpm +openssl-libs-3.3.2-2.azl3.x86_64.rpm +openssl-perl-3.3.2-2.azl3.x86_64.rpm +openssl-static-3.3.2-2.azl3.x86_64.rpm libcap-2.69-1.azl3.x86_64.rpm libcap-devel-2.69-1.azl3.x86_64.rpm debugedit-5.0-2.azl3.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 4ce245b97a4..1932ab1715f 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -285,12 +285,12 @@ npth-debuginfo-1.6-4.azl3.aarch64.rpm npth-devel-1.6-4.azl3.aarch64.rpm ntsysv-1.25-1.azl3.aarch64.rpm ocaml-srpm-macros-9-4.azl3.noarch.rpm -openssl-3.3.2-1.azl3.aarch64.rpm -openssl-debuginfo-3.3.2-1.azl3.aarch64.rpm -openssl-devel-3.3.2-1.azl3.aarch64.rpm -openssl-libs-3.3.2-1.azl3.aarch64.rpm -openssl-perl-3.3.2-1.azl3.aarch64.rpm -openssl-static-3.3.2-1.azl3.aarch64.rpm +openssl-3.3.2-2.azl3.aarch64.rpm +openssl-debuginfo-3.3.2-2.azl3.aarch64.rpm +openssl-devel-3.3.2-2.azl3.aarch64.rpm +openssl-libs-3.3.2-2.azl3.aarch64.rpm +openssl-perl-3.3.2-2.azl3.aarch64.rpm +openssl-static-3.3.2-2.azl3.aarch64.rpm p11-kit-0.25.0-1.azl3.aarch64.rpm p11-kit-debuginfo-0.25.0-1.azl3.aarch64.rpm p11-kit-devel-0.25.0-1.azl3.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index f1a28681784..4535ff92030 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -293,12 +293,12 @@ npth-debuginfo-1.6-4.azl3.x86_64.rpm npth-devel-1.6-4.azl3.x86_64.rpm ntsysv-1.25-1.azl3.x86_64.rpm ocaml-srpm-macros-9-4.azl3.noarch.rpm -openssl-3.3.2-1.azl3.x86_64.rpm -openssl-debuginfo-3.3.2-1.azl3.x86_64.rpm -openssl-devel-3.3.2-1.azl3.x86_64.rpm -openssl-libs-3.3.2-1.azl3.x86_64.rpm -openssl-perl-3.3.2-1.azl3.x86_64.rpm -openssl-static-3.3.2-1.azl3.x86_64.rpm +openssl-3.3.2-2.azl3.x86_64.rpm +openssl-debuginfo-3.3.2-2.azl3.x86_64.rpm +openssl-devel-3.3.2-2.azl3.x86_64.rpm +openssl-libs-3.3.2-2.azl3.x86_64.rpm +openssl-perl-3.3.2-2.azl3.x86_64.rpm +openssl-static-3.3.2-2.azl3.x86_64.rpm p11-kit-0.25.0-1.azl3.x86_64.rpm p11-kit-debuginfo-0.25.0-1.azl3.x86_64.rpm p11-kit-devel-0.25.0-1.azl3.x86_64.rpm