diff --git a/.erlang.metadata b/.erlang.metadata index c7dc68d..de08470 100644 --- a/.erlang.metadata +++ b/.erlang.metadata @@ -1 +1 @@ -b5981692b23c458edeb641a1cfa754c98eb27136 SOURCES/otp-OTP-24.2.1.tar.gz +d13ee8af60147120cb8c6f08389600021029bb0a SOURCES/otp-OTP-24.3.4.tar.gz diff --git a/SOURCES/otp-0002-Remove-rpath.patch b/SOURCES/otp-0002-Remove-rpath.patch index 1f9e1c6..1b34b19 100644 --- a/SOURCES/otp-0002-Remove-rpath.patch +++ b/SOURCES/otp-0002-Remove-rpath.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 8ad5c7889e..041bcf7e06 100644 +index 4478ed7d9c..3224c705e6 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -139,7 +139,7 @@ endif +@@ -145,7 +145,7 @@ endif endif ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes) diff --git a/SOURCES/otp-0003-Do-not-install-C-sources.patch b/SOURCES/otp-0003-Do-not-install-C-sources.patch index 8f3b803..fc8f327 100644 --- a/SOURCES/otp-0003-Do-not-install-C-sources.patch +++ b/SOURCES/otp-0003-Do-not-install-C-sources.patch @@ -14,7 +14,7 @@ https://bugzilla.redhat.com/818419 Signed-off-by: Peter Lemenkov diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile -index cb606fd74e..48a7c2f4f1 100644 +index 8fb3360f83..5fb080f206 100644 --- a/lib/asn1/c_src/Makefile +++ b/lib/asn1/c_src/Makefile @@ -136,8 +136,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -27,11 +27,11 @@ index cb606fd74e..48a7c2f4f1 100644 release_docs_spec: diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 56fdaa608e..25764ce50d 100644 +index 92459f6223..d2c7b7f765 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -690,13 +690,11 @@ release: opt - $(INSTALL_DATA) $(OBJ_TARGETS) "$(RELEASE_PATH)/usr/lib" +@@ -709,13 +709,11 @@ ifeq (@DYNAMIC_LIB@, yes) + endif $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" $(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src" - $(INSTALL_DATA) connect/*.[ch] "$(RELSYSDIR)/src/connect" @@ -63,7 +63,7 @@ index cd409fa54f..c65e817385 100644 endif diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in -index 3c16e7e294..82fe1492ef 100644 +index d1b26743a6..cf8faae1f5 100644 --- a/lib/odbc/c_src/Makefile.in +++ b/lib/odbc/c_src/Makefile.in @@ -129,11 +129,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk diff --git a/SOURCES/otp-0004-Do-not-install-Java-sources.patch b/SOURCES/otp-0004-Do-not-install-Java-sources.patch index 29f1fde..f4a08f4 100644 --- a/SOURCES/otp-0004-Do-not-install-Java-sources.patch +++ b/SOURCES/otp-0004-Do-not-install-Java-sources.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Do not install Java sources Signed-off-by: Peter Lemenkov diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile -index bcbb206db6..1451378b35 100644 +index e42fd9468d..35deacbcf3 100644 --- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile +++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile @@ -123,8 +123,6 @@ release release_docs release_tests release_html: diff --git a/SOURCES/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/SOURCES/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch index a36294b..c8dbb3c 100644 --- a/SOURCES/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch +++ b/SOURCES/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Do not install nteventlog and related doc-files on non-win32 Signed-off-by: Peter Lemenkov diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile -index d16f2b4831..c5b721f995 100644 +index 8e3882bfdc..ea999cf9c7 100644 --- a/lib/os_mon/doc/src/Makefile +++ b/lib/os_mon/doc/src/Makefile @@ -31,11 +31,16 @@ APPLICATION=os_mon @@ -28,7 +28,7 @@ index d16f2b4831..c5b721f995 100644 XML_REF6_FILES = os_mon_app.xml diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index 98c5ced068..e2f4d5a090 100644 +index 48a896265b..afb67c1793 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile @@ -34,7 +34,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN) diff --git a/SOURCES/otp-0006-Do-not-install-erlang-sources.patch b/SOURCES/otp-0006-Do-not-install-erlang-sources.patch index 7e008c1..67a3dee 100644 --- a/SOURCES/otp-0006-Do-not-install-erlang-sources.patch +++ b/SOURCES/otp-0006-Do-not-install-erlang-sources.patch @@ -397,7 +397,7 @@ index 7ca59495ed..a52ade2fe3 100644 $(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index e2f4d5a090..57f21a145b 100644 +index afb67c1793..ec6acf1fce 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile @@ -105,7 +105,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -437,7 +437,7 @@ index 1fef168463..e5411b903b 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile -index 76bdffe089..fc5e4dfa8e 100644 +index e27f02eea9..dec54a8414 100644 --- a/lib/public_key/src/Makefile +++ b/lib/public_key/src/Makefile @@ -110,8 +110,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -553,7 +553,7 @@ index eca2d949d2..4c234caf88 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index 88126f6289..831cd1d938 100644 +index cc3cfe9e96..9f3cd694f5 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile @@ -182,7 +182,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -566,7 +566,7 @@ index 88126f6289..831cd1d938 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index c8d0d6f12f..92471ac30e 100644 +index 1e55bb497d..1cf3cbf5ee 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile @@ -211,7 +211,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -604,7 +604,7 @@ index af6a472f3d..6796810ac2 100644 $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" diff --git a/lib/tftp/src/Makefile b/lib/tftp/src/Makefile -index 029bd731bd..85c633b4f0 100644 +index 4ece9ffe28..da95babcea 100644 --- a/lib/tftp/src/Makefile +++ b/lib/tftp/src/Makefile @@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk diff --git a/SOURCES/otp-0010-Allow-openssl-3.0.0-FIPS-compilation.patch b/SOURCES/otp-0010-Allow-openssl-3.0.0-FIPS-compilation.patch deleted file mode 100644 index 9e272ec..0000000 --- a/SOURCES/otp-0010-Allow-openssl-3.0.0-FIPS-compilation.patch +++ /dev/null @@ -1,75 +0,0 @@ -From: Michele Baldessari -Date: Tue, 28 Sep 2021 17:26:16 +0200 -Subject: [PATCH] Allow openssl-3.0.0 FIPS compilation - -Openssl 3.0.0 dropped support for the old way of adding fips -and in particular it dropped support for FIPS_mode() and -FIPS_mode_set(). - -In RHEL9, openssl-3.0.0 ships a compat macro for FIPS_mode(), so -this change focuses on replacing FIPS_mode_set() - -Compiled erlang-erts-24.1-1.el9.x86_64 with this patch and then tested as follows: -A. Booted the system with fips enabled: -[root@rhel9 ~]# fips-mode-setup --check -FIPS mode is enabled. - -B. Set up a fips config file: -cat > fips.config< crypto:info_fips(). -not_enabled -2> crypto:enable_fips_mode(true). -true -3> crypto:info_fips(). -enabled - -D. Verified that the ciphers when using fips are a subset of the usual -ciphers: - -4> crypto:supports(). -[{hashs,[sha,sha224,sha256,sha384,sha512,sha3_224,sha3_256, - sha3_384,sha3_512,blake2b,blake2s]}, - {ciphers,[aes_cbc,aes_ccm,aes_cfb128,aes_cfb8,aes_ctr, - aes_ecb,aes_gcm,des_ede3_cfb,aes_128_cbc,aes_192_cbc, - aes_256_cbc,aes_128_cfb128,aes_192_cfb128,aes_256_cfb128, - aes_128_cfb8,aes_192_cfb8,aes_256_cfb8,aes_128_ecb, - aes_192_ecb,aes_256_ecb,aes_256_gcm,aes_256_ccm,aes_192_gcm, - aes_192_ccm,aes_128_gcm|...]}, - {public_keys,[rsa,dss,dh,ecdsa,ecdh]}, - {macs,[cmac,hmac,poly1305]}, - {curves,[]}, - {rsa_opts,[rsa_pkcs1_pss_padding,rsa_pss_saltlen, - rsa_mgf1_md,rsa_pkcs1_oaep_padding,rsa_oaep_label, - rsa_oaep_md,signature_md,rsa_pkcs1_padding,rsa_x931_padding, - rsa_no_padding]}] - -Note that we could probably just have patched out the FIPS_mode_set() -calls as FIPS gets enforced on the system. The automatism is going to -come with a version of openssl that is later than > openssl-3.0.0-2. - -Co-Authored-By: John Eckersberg -Co-Authored-By: Damien Ciabrini - -[1] https://wiki.openssl.org/index.php/OpenSSL_3.0#Upgrading_from_the_OpenSSL_2.0_FIPS_Object_Module - -diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h -index 49627f17e7..1d12174e3e 100644 ---- a/lib/crypto/c_src/openssl_config.h -+++ b/lib/crypto/c_src/openssl_config.h -@@ -438,6 +438,10 @@ do { \ - # undef FIPS_SUPPORT - #endif - -+#if defined(FIPS_SUPPORT) \ -+ && OPENSSL_VERSION_NUMBER >= (PACKED_OPENSSL_VERSION_PLAIN(3,0,0) & ~0xff) -+#define FIPS_mode_set(fips_mode) EVP_default_properties_enable_fips(NULL, fips_mode) -+#endif - - /* This is not the final FIPS adaptation for 3.0, just making it compilable */ - #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(3,0,0) 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 new file mode 100644 index 0000000..b0419db --- /dev/null +++ b/SOURCES/otp-0010-Revert-crypto-Temporarily-disable-FIPS-for-cryptolib.patch @@ -0,0 +1,23 @@ +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 79a745d..a9db146 100644 --- a/SPECS/erlang.spec +++ b/SPECS/erlang.spec @@ -63,7 +63,7 @@ Name: erlang -Version: 24.2.1 +Version: 24.3.4 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -104,7 +104,7 @@ 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-Allow-openssl-3.0.0-FIPS-compilation.patch +#Patch10: otp-0010-Revert-crypto-Temporarily-disable-FIPS-for-cryptolib.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -294,7 +294,6 @@ Diameter (RFC 3588) library Summary: Erlang documentation BuildRequires: fop BuildRequires: libxslt -BuildArch: noarch %description doc Documentation for Erlang. @@ -814,7 +813,12 @@ cd $RPM_BUILD_ROOT%{_libdir}/erlang mv -v doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} for i in erts-* ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/$i ; done cd $RPM_BUILD_ROOT%{_libdir}/erlang/lib -for i in * ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/lib/$i || true ; done +for i in * ; do + mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/lib/$i || true + # symlink 'chunks' in the code path for EEP-48 compliance (rhbz#2068758) + mkdir $i/doc + ln -s %{_docdir}/%{name}-%{version}/lib/$i/chunks $i/doc/ +done popd cp -av AUTHORS LICENSE.txt README.md $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} @@ -1026,6 +1030,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %if %{with doc} %files doc +%{_libdir}/erlang/lib/*/doc %doc %{_docdir}/%{name}-%{version}/doc %doc %{_docdir}/%{name}-%{version}/erts-*/ %doc %{_docdir}/%{name}-%{version}/lib/ @@ -1903,6 +1908,25 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed May 4 2022 Peter Lemenkov - 24.3.4-1 +- Ver. 24.3.4 + +* Fri Apr 8 2022 Peter Lemenkov - 24.3.3-2 +- Temporarily disable FIPS (doesn't work reliably with OpenSSL 3.0 yet) + +* Tue Mar 29 2022 Peter Lemenkov - 24.3.3-1 +- Ver. 24.3.3 +- Doc sub-package no longermarked as noarch (contains links to _libdir) + +* Mon Mar 28 2022 John Eckersberg - 24.2.2-2 +- Keep documentation chunks in the code path (rhbz#2068758) + +* Tue Mar 1 2022 Peter Lemenkov - 24.2.2-1 +- Ver. 24.2.2 + +* Sat Feb 05 2022 Jiri Vanek - 24.2.1-2 +- Rebuilt for java-17-openjdk as system jdk + * Wed Jan 26 2022 Peter Lemenkov - 24.2.1-1 - Ver. 24.2.1 diff --git a/sources b/sources index ec4fdd5..eb0cdda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.2.1.tar.gz) = b4dd5c9506840fcb078b8c5820a70a07794d8e646f66941095cd9536cfcc60ed6c070d1f85952379384f774beec965521cfc567e7a4a94088ec9ce0fefafe984 +SHA512 (otp-OTP-24.3.4.tar.gz) = bd3fb31d69ef64a87fc436f610409308bdb44493422974ae563bdf001dabd0a5aadfcdb0334b430ebb385f7e91f629e793fdf03801ab48df5f265472e3af540a