From 00e94b1881dc880664ded43f60434e184f58c763 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Jun 27 2022 10:04:56 +0000 Subject: Merge branch 'f35' into c9s-sig-messaging-rabbitmq --- diff --git a/.erlang.metadata b/.erlang.metadata index de08470..bf52a50 100644 --- a/.erlang.metadata +++ b/.erlang.metadata @@ -1 +1 @@ -d13ee8af60147120cb8c6f08389600021029bb0a SOURCES/otp-OTP-24.3.4.tar.gz +88f5b522227d861bdc094d079ec73c25db16dd35 SOURCES/otp-OTP-24.3.4.2.tar.gz diff --git a/SOURCES/otp-0010-Revert-crypto-Temporarily-disable-FIPS-for-cryptolib.patch b/SOURCES/otp-0010-Revert-crypto-Temporarily-disable-FIPS-for-cryptolib.patch deleted file mode 100644 index b0419db..0000000 --- a/SOURCES/otp-0010-Revert-crypto-Temporarily-disable-FIPS-for-cryptolib.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Peter Lemenkov -Date: Tue, 29 Mar 2022 19:38:13 +0200 -Subject: [PATCH] Revert "crypto: Temporarily disable FIPS for cryptolib ver - 3.0 and above" - -This reverts commit 6bb9c51e900fe8fb5a88bd2498f6e5a92f94ed8d. - -diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h -index 647ab25ad4..ab681183a3 100644 ---- a/lib/crypto/c_src/openssl_config.h -+++ b/lib/crypto/c_src/openssl_config.h -@@ -452,11 +452,6 @@ do { \ - # undef FIPS_SUPPORT - #endif - --/* Disable FIPS for 3.0 temporaryly until the support is added */ --#if defined(FIPS_SUPPORT) && \ -- defined(HAS_3_0_API) --# undef FIPS_SUPPORT --#endif - - #if defined(FIPS_SUPPORT) && \ - defined(HAS_3_0_API) diff --git a/SPECS/erlang.spec b/SPECS/erlang.spec index a9db146..4df867f 100644 --- a/SPECS/erlang.spec +++ b/SPECS/erlang.spec @@ -63,7 +63,7 @@ Name: erlang -Version: 24.3.4 +Version: 24.3.4.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -104,7 +104,6 @@ Patch6: otp-0006-Do-not-install-erlang-sources.patch Patch7: otp-0007-Add-extra-search-directory.patch Patch8: otp-0008-Avoid-forking-sed-to-get-basename.patch Patch9: otp-0009-Load-man-pages-from-system-wide-directory.patch -#Patch10: otp-0010-Revert-crypto-Temporarily-disable-FIPS-for-cryptolib.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -239,7 +238,10 @@ A byte code compiler for Erlang which produces highly compact code. %package crypto Summary: Cryptographical support -BuildRequires: pkgconfig(openssl) +#BuildRequires: pkgconfig(openssl) +# FIXME there is something wrong with OpenSSL 3.0 support in Erlang right now. +# We have to fallback to OpenSSL1 explicitly. +BuildRequires: openssl1.1-devel Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -1908,6 +1910,15 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Jun 23 2022 Peter Lemenkov - 24.3.4.2-1 +- Ver. 24.3.4.2 + +* Wed Jun 8 2022 Peter Lemenkov - 24.3.4.1-1 +- Ver. 24.3.4.1 + +* Tue May 24 2022 Peter Lemenkov - 24.3.4-2 +- Downgrade to OpenSSL 1.x + * Wed May 4 2022 Peter Lemenkov - 24.3.4-1 - Ver. 24.3.4 diff --git a/sources b/sources index eb0cdda..527c3cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.3.4.tar.gz) = bd3fb31d69ef64a87fc436f610409308bdb44493422974ae563bdf001dabd0a5aadfcdb0334b430ebb385f7e91f629e793fdf03801ab48df5f265472e3af540a +SHA512 (otp-OTP-24.3.4.2.tar.gz) = 78bc2dc67fe60d3ea6049c361a017c054e12b0adeeae890b0a1ee5301744505593bd19f3731acebff8312b323a3bd21a1359507d122fc34f0eb85eefb3aac88c