From a77276551f352131650b4ab9b9d775f47f58f8ad Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Dec 16 2021 19:02:30 +0000 Subject: Merge branch 'f35' into c9s-sig-messaging-rabbitmq --- diff --git a/.erlang.metadata b/.erlang.metadata index b6dc66f..e4d0295 100644 --- a/.erlang.metadata +++ b/.erlang.metadata @@ -1 +1 @@ -f093be6e8c996489821fdee64f7e04d3435d50bf SOURCES/otp-OTP-24.1.7.tar.gz +d76c11368fc27b3b9b6175a6c5bb248612c012c6 SOURCES/otp-OTP-24.2.tar.gz diff --git a/SOURCES/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/SOURCES/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index 7034252..23652f1 100644 --- a/SOURCES/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/SOURCES/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Do not format man-pages and do not install miscellaneous Signed-off-by: Peter Lemenkov diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index ba4d898f79..a22e557007 100644 +index e5ff959078..7ceef28103 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in -@@ -525,10 +525,6 @@ endif +@@ -550,10 +550,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" endif @@ -21,7 +21,7 @@ index ba4d898f79..a22e557007 100644 $(INSTALL_DIR) "$(RELEASE_PATH)/erts-$(VSN)/src" $(INSTALL_DATA) $(INSTALL_SRC) "$(RELEASE_PATH)/erts-$(VSN)/src" diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src -index 2dbf628972..5151f5130a 100644 +index 7437e073e0..009ffea706 100644 --- a/erts/etc/unix/Install.src +++ b/erts/etc/unix/Install.src @@ -142,14 +142,5 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot . diff --git a/SOURCES/otp-0002-Remove-rpath.patch b/SOURCES/otp-0002-Remove-rpath.patch index 1e04c1f..1f9e1c6 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 d360d9b6cb..614e748896 100644 +index 8ad5c7889e..041bcf7e06 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -136,7 +136,7 @@ endif +@@ -139,7 +139,7 @@ endif endif ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes) diff --git a/SOURCES/otp-0006-Do-not-install-erlang-sources.patch b/SOURCES/otp-0006-Do-not-install-erlang-sources.patch index 1fc230b..7e008c1 100644 --- a/SOURCES/otp-0006-Do-not-install-erlang-sources.patch +++ b/SOURCES/otp-0006-Do-not-install-erlang-sources.patch @@ -8,7 +8,7 @@ Signed-off-by: Peter Lemenkov Signed-off-by: Hans Ulrich Niedermann diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index b0c205cec8..7fad1ddc75 100644 +index 521e5b6f67..2d818d8f75 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile @@ -121,8 +121,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk @@ -63,7 +63,7 @@ index f015064b39..57f96d2929 100644 $(INSTALL_SCRIPT) $(PROGRAMS) "$(RELEASE_PATH)/test_server" diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile -index f195e16dc6..68c6695b9e 100644 +index f050e134f8..653695aa12 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile @@ -182,8 +182,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -78,7 +78,7 @@ index f195e16dc6..68c6695b9e 100644 $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile -index c3f1c859e5..0d72d6c82d 100644 +index fea32dc4e3..183c982ff6 100644 --- a/lib/crypto/src/Makefile +++ b/lib/crypto/src/Makefile @@ -81,8 +81,6 @@ docs: @@ -104,7 +104,7 @@ index 118cb6b758..86722d8767 100644 $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile -index 0847da9d5a..24a054ac04 100644 +index 5f2c24c3c0..99eddc96e3 100644 --- a/lib/dialyzer/src/Makefile +++ b/lib/dialyzer/src/Makefile @@ -165,7 +165,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -168,7 +168,7 @@ index b79a537424..d0b231e5fc 100644 release_docs_spec: diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile -index 4c6f542ebb..d0cd6d8f68 100644 +index e4339dcb1f..f563d6fd5b 100644 --- a/lib/erl_docgen/src/Makefile +++ b/lib/erl_docgen/src/Makefile @@ -91,8 +91,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -231,7 +231,7 @@ index 8248e37c44..1f1b23184b 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile -index da9549406f..eaa14b628f 100644 +index f66a446d40..2858ae7267 100644 --- a/lib/inets/src/http_server/Makefile +++ b/lib/inets/src/http_server/Makefile @@ -134,7 +134,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -244,7 +244,7 @@ index da9549406f..eaa14b628f 100644 $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile -index edaec7655b..6969b5b5ab 100644 +index d85df269ce..0193796bc1 100644 --- a/lib/inets/src/inets_app/Makefile +++ b/lib/inets/src/inets_app/Makefile @@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -359,7 +359,7 @@ index 028a63e98e..9e11e9bfb2 100644 release_docs_spec: diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile -index 90e8780754..1a13d764b3 100644 +index dce7a359d3..7051c965b9 100644 --- a/lib/mnesia/src/Makefile +++ b/lib/mnesia/src/Makefile @@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -488,7 +488,7 @@ index 16a42caf11..674364281d 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile -index 1b7999da20..661b5a5e3f 100644 +index 1da0f33c9d..9d54271816 100644 --- a/lib/snmp/src/agent/Makefile +++ b/lib/snmp/src/agent/Makefile @@ -151,7 +151,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -501,7 +501,7 @@ index 1b7999da20..661b5a5e3f 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile -index 09ffc7d36a..090df59403 100644 +index 02800462a4..133f7c3b59 100644 --- a/lib/snmp/src/app/Makefile +++ b/lib/snmp/src/app/Makefile @@ -144,7 +144,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -514,7 +514,7 @@ index 09ffc7d36a..090df59403 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile -index a8da839bfc..c9e9e1892d 100644 +index bbd7f99378..19d1f83dda 100644 --- a/lib/snmp/src/compile/Makefile +++ b/lib/snmp/src/compile/Makefile @@ -137,7 +137,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -527,7 +527,7 @@ index a8da839bfc..c9e9e1892d 100644 $(INSTALL_DATA) $(EBIN_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/bin" diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile -index ab8c36ec5e..839dc03917 100644 +index 6f5f5d01f9..d6bc5e3e06 100644 --- a/lib/snmp/src/manager/Makefile +++ b/lib/snmp/src/manager/Makefile @@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -540,7 +540,7 @@ index ab8c36ec5e..839dc03917 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/snmp/src/misc/Makefile b/lib/snmp/src/misc/Makefile -index 51318b5c66..d4015d71f4 100644 +index eca2d949d2..4c234caf88 100644 --- a/lib/snmp/src/misc/Makefile +++ b/lib/snmp/src/misc/Makefile @@ -125,7 +125,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -553,7 +553,7 @@ index 51318b5c66..d4015d71f4 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index 517a6611c4..b348d1cfb8 100644 +index 88126f6289..831cd1d938 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile @@ -182,7 +182,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -566,10 +566,10 @@ index 517a6611c4..b348d1cfb8 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 9cbee91946..a0f494874a 100644 +index c8d0d6f12f..92471ac30e 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -210,7 +210,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -211,7 +211,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -630,7 +630,7 @@ index cc5bee9a8f..7dfa55cb41 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile -index 3780e0eea3..05c8416de7 100644 +index 7e2eb38f2f..939d03670d 100644 --- a/lib/wx/src/Makefile +++ b/lib/wx/src/Makefile @@ -121,9 +121,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES) diff --git a/SOURCES/otp-0009-Load-man-pages-from-system-wide-directory.patch b/SOURCES/otp-0009-Load-man-pages-from-system-wide-directory.patch index 35c29f3..f9b074b 100644 --- a/SOURCES/otp-0009-Load-man-pages-from-system-wide-directory.patch +++ b/SOURCES/otp-0009-Load-man-pages-from-system-wide-directory.patch @@ -7,10 +7,10 @@ Patch allows one to use standard man path with erl -man command. as required by Debian policy.) diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c -index 06182c25ce..b41ae3a90a 100644 +index bda9a94a95..e14fdc49b6 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c -@@ -722,8 +722,10 @@ int main(int argc, char **argv) +@@ -724,8 +724,10 @@ int main(int argc, char **argv) error("-man not supported on Windows"); #else argv[i] = "man"; 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 index 13c41f7..9e272ec 100644 --- a/SOURCES/otp-0010-Allow-openssl-3.0.0-FIPS-compilation.patch +++ b/SOURCES/otp-0010-Allow-openssl-3.0.0-FIPS-compilation.patch @@ -59,10 +59,10 @@ 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 9ef04fca3c..59f6e94b23 100644 +index 49627f17e7..1d12174e3e 100644 --- a/lib/crypto/c_src/openssl_config.h +++ b/lib/crypto/c_src/openssl_config.h -@@ -427,6 +427,10 @@ do { \ +@@ -438,6 +438,10 @@ do { \ # undef FIPS_SUPPORT #endif @@ -71,5 +71,5 @@ index 9ef04fca3c..59f6e94b23 100644 +#define FIPS_mode_set(fips_mode) EVP_default_properties_enable_fips(NULL, fips_mode) +#endif - #ifdef FIPS_SUPPORT - /* In FIPS mode non-FIPS algorithms are disabled and return badarg. */ + /* 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/SPECS/erlang.spec b/SPECS/erlang.spec index 1865a4d..8324545 100644 --- a/SPECS/erlang.spec +++ b/SPECS/erlang.spec @@ -63,7 +63,7 @@ Name: erlang -Version: 24.1.7 +Version: 24.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1903,6 +1903,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Dec 15 2021 Peter Lemenkov - 24.2-1 +- Ver. 24.2 + * Mon Nov 22 2021 Peter Lemenkov - 24.1.7-1 - Ver. 24.1.7