Skip to content

Commit

Permalink
openssl: move SymCrypt and SymCrypt-OpenSSL Recommends from main pack…
Browse files Browse the repository at this point in the history
…age 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
  • Loading branch information
tobiasb-ms authored and Binu Jose Philip committed Jan 31, 2025
1 parent 38b4cc9 commit b2c2ae0
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 26 deletions.
10 changes: 6 additions & 4 deletions SPECS/openssl/openssl.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -358,6 +357,9 @@ install -m644 %{SOURCE9} \
%ldconfig_scriptlets libs

%changelog
* Fri Jan 31 2025 Tobias Brick <[email protected]> - 3.3.2-2
- Move SymCrypt and SymCrypt-OpenSSL Recommends from main package to libs

* Thu Sep 19 2024 Tobias Brick <[email protected]> - 3.3.2-1
- Upgrade to 3.3.2

Expand Down
10 changes: 5 additions & 5 deletions toolkit/resources/manifests/package/pkggen_core_aarch64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions toolkit/resources/manifests/package/pkggen_core_x86_64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions toolkit/resources/manifests/package/toolchain_aarch64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions toolkit/resources/manifests/package/toolchain_x86_64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b2c2ae0

Please sign in to comment.