diff --git a/erlang.spec b/erlang.spec index 280cafb..85fa346 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 22.2.8 +Version: 22.3.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -107,7 +107,6 @@ 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-erl_child_setup-reduce-number-of-calls-to-close.patch -Patch11: otp-0011-Add-fno-common-gcc-option.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -1944,6 +1943,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Apr 9 2020 Peter Lemenkov - 22.3.2-1 +- Ver. 22.3.2 + * Fri Feb 28 2020 Peter Lemenkov - 22.2.8-1 - Ver. 22.2.8 diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index e252e26..dff0d12 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch @@ -6,7 +6,7 @@ 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 3a03374fbf..aef68348dd 100644 +index 05d7b5679f..cbac9956bc 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in @@ -504,10 +504,6 @@ endif diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index b590de1..51bfbad 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,7 +5,7 @@ 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 f922c3fb9b..78ce3eeec6 100644 +index 129d0a7822..56af1b60bc 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in @@ -113,7 +113,7 @@ TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@ diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 86e64ee..08d9363 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -27,7 +27,7 @@ index 1f714df357..95835d6ed2 100644 release_docs_spec: diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 78ce3eeec6..5bcb8363f3 100644 +index 56af1b60bc..141168d3f8 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in @@ -222,16 +222,11 @@ docs: @@ -48,7 +48,7 @@ index 78ce3eeec6..5bcb8363f3 100644 release_docs_spec: diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 6e0d3476c7..55499fd9d4 100644 +index ba0164ea51..9ccbbee1b3 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in @@ -848,14 +848,14 @@ ifneq ($(EXE_TARGETS),) @@ -75,7 +75,7 @@ index 6e0d3476c7..55499fd9d4 100644 release_docs: diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index 26d2ddd44c..753925ed77 100644 +index cd409fa54f..c65e817385 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in @@ -251,7 +251,7 @@ release_spec: opt @@ -117,7 +117,7 @@ index 27b156a2c9..f11ff303b6 100644 $(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin" diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in -index 289322b6fa..9e2b9b7e7c 100644 +index 0cd760b137..b2d7cf94c9 100644 --- a/lib/tools/c_src/Makefile.in +++ b/lib/tools/c_src/Makefile.in @@ -189,8 +189,6 @@ include ../vsn.mk diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 5bbcf37..8533794 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -8,10 +8,10 @@ Signed-off-by: Peter Lemenkov Signed-off-by: Hans Ulrich Niedermann diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index 38b85915cc..1501eadd29 100644 +index d2153f23e1..1eb33a5922 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile -@@ -120,8 +120,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk +@@ -121,8 +121,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: $(APP_TARGET) @@ -21,10 +21,10 @@ index 38b85915cc..1501eadd29 100644 $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index ba459f6cd3..5565126214 100644 +index a6ff72898c..35d4530f32 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile -@@ -154,7 +154,7 @@ release_spec: opt +@@ -155,7 +155,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -34,10 +34,10 @@ index ba459f6cd3..5565126214 100644 $(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples" diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile -index 76689dab8c..1f3512b027 100644 +index a20de14e0e..3ef8516521 100644 --- a/lib/common_test/src/Makefile +++ b/lib/common_test/src/Makefile -@@ -149,7 +149,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -150,7 +150,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -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 87b0d345f2..db0ea47135 100644 +index e42032c3ae..501ed4d3d6 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile @@ -179,8 +179,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -205,7 +205,7 @@ index 3510d3cc93..9179e9b4c2 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile -index 5c367b5b77..b7a85ba115 100644 +index affbb10ff6..44598beff2 100644 --- a/lib/hipe/cerl/Makefile +++ b/lib/hipe/cerl/Makefile @@ -105,7 +105,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -244,7 +244,7 @@ index b220bc16a0..d4073277be 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/llvm/Makefile b/lib/hipe/llvm/Makefile -index 9f7a2def6d..def1b4be52 100644 +index 5e8f2076db..06d3f2684d 100644 --- a/lib/hipe/llvm/Makefile +++ b/lib/hipe/llvm/Makefile @@ -104,7 +104,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -283,7 +283,7 @@ index e5033e444b..74a444b386 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile -index 0c0f6e24f5..fcffc1f8b5 100644 +index 67485875a6..f83a2bb9e2 100644 --- a/lib/hipe/rtl/Makefile +++ b/lib/hipe/rtl/Makefile @@ -108,7 +108,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -420,7 +420,7 @@ index 869b516b05..fa7d774d84 100644 diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index 753925ed77..c6b68e225f 100644 +index c65e817385..3bc4dea207 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in @@ -248,7 +248,6 @@ release_spec: opt @@ -534,7 +534,7 @@ index ba206904ec..281cc8657c 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile -index 10952106c6..dc07102803 100644 +index 1fef168463..e5411b903b 100644 --- a/lib/public_key/asn1/Makefile +++ b/lib/public_key/asn1/Makefile @@ -96,8 +96,8 @@ release_spec: opt @@ -588,7 +588,7 @@ index 76286c5499..d921f9f294 100644 $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/examples" diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile -index a5b9a5e731..69bda2e0e1 100644 +index 16a42caf11..674364281d 100644 --- a/lib/sasl/src/Makefile +++ b/lib/sasl/src/Makefile @@ -94,7 +94,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -665,10 +665,10 @@ index adc2c4858f..89ce954e99 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index 9627b70eeb..a4853985f5 100644 +index 2b96020678..3e692d25b2 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile -@@ -139,7 +139,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -148,7 +148,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -678,7 +678,7 @@ index 9627b70eeb..a4853985f5 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 e961f05b37..5cac5a231b 100644 +index 03c39b4722..4a8fc58a18 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile @@ -190,7 +190,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -691,7 +691,7 @@ index e961f05b37..5cac5a231b 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile -index 86003c953d..69bfbefeb9 100644 +index 9d8a5f98f9..e5afdcfa27 100644 --- a/lib/stdlib/src/Makefile +++ b/lib/stdlib/src/Makefile @@ -216,7 +216,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk diff --git a/otp-0007-Add-extra-search-directory.patch b/otp-0007-Add-extra-search-directory.patch index a8b3649..18d8e5e 100644 --- a/otp-0007-Add-extra-search-directory.patch +++ b/otp-0007-Add-extra-search-directory.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add extra search directory Signed-off-by: Peter Lemenkov diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl -index 68e1205301..0f534ff814 100644 +index 126de66d13..ad926ea1da 100644 --- a/lib/kernel/src/code_server.erl +++ b/lib/kernel/src/code_server.erl @@ -79,11 +79,17 @@ init(Ref, Parent, [Root,Mode]) -> diff --git a/otp-0009-Load-man-pages-from-system-wide-directory.patch b/otp-0009-Load-man-pages-from-system-wide-directory.patch index dc1ca1b..0b6cb3d 100644 --- a/otp-0009-Load-man-pages-from-system-wide-directory.patch +++ b/otp-0009-Load-man-pages-from-system-wide-directory.patch @@ -7,7 +7,7 @@ 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 f18ed0c983..5bdbe5153a 100644 +index 681a4c1299..034f7902ae 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c @@ -719,8 +719,10 @@ int main(int argc, char **argv) diff --git a/otp-0011-Add-fno-common-gcc-option.patch b/otp-0011-Add-fno-common-gcc-option.patch deleted file mode 100644 index 758c78d..0000000 --- a/otp-0011-Add-fno-common-gcc-option.patch +++ /dev/null @@ -1,56 +0,0 @@ -From: Sverker Eriksson -Date: Fri, 17 Jan 2020 17:21:32 +0100 -Subject: [PATCH] Add -fno-common gcc option - - -diff --git a/erts/aclocal.m4 b/erts/aclocal.m4 -index 5fefd72d5d..5d274e69c3 100644 ---- a/erts/aclocal.m4 -+++ b/erts/aclocal.m4 -@@ -2935,6 +2935,12 @@ fi - # DED_EMU_THR_DEFS=$EMU_THR_DEFS - DED_CFLAGS="$CFLAGS $CPPFLAGS $DED_CFLAGS" - if test "x$GCC" = xyes; then -+ # Use -fno-common for gcc, that is link error if multiple definitions of -+ # global variables are encountered. This is ISO C compliant. -+ # Until version 10, gcc has had -fcommon as default, which allows and merges -+ # such dubious duplicates. -+ LM_TRY_ENABLE_CFLAG([-fno-common], [DED_CFLAGS]) -+ - DED_STATIC_CFLAGS="$DED_CFLAGS" - DED_CFLAGS="$DED_CFLAGS -fPIC" - fi -diff --git a/erts/configure.in b/erts/configure.in -index a887f86621..0a466ad5cc 100644 ---- a/erts/configure.in -+++ b/erts/configure.in -@@ -566,6 +566,12 @@ if test "x$GCC" = xyes; then - WFLAGS="$WFLAGS -Wdeclaration-after-statement" - fi - CFLAGS=$saved_CFLAGS -+ -+ # Use -fno-common for gcc, that is link error if multiple definitions of -+ # global variables are encountered. This is ISO C compliant. -+ # Until version 10, gcc has had -fcommon as default, which allows and merges -+ # such dubious duplicates. -+ LM_TRY_ENABLE_CFLAG([-fno-common], [CFLAGS]) - else - WFLAGS="" - WERRORFLAGS="" -diff --git a/lib/erl_interface/configure.in b/lib/erl_interface/configure.in -index f0e9b2eb3f..230dba25d6 100644 ---- a/lib/erl_interface/configure.in -+++ b/lib/erl_interface/configure.in -@@ -315,6 +315,12 @@ if test "x$GCC" = xyes; then - WFLAGS="$WFLAGS -fno-strict-aliasing";; - esac - CFLAGS="$WERRORFLAGS $CFLAGS" -+ -+ # Use -fno-common for gcc, that is link error if multiple definitions of -+ # global variables are encountered. This is ISO C compliant. -+ # Until version 10, gcc has had -fcommon as default, which allows and merges -+ # such dubious duplicates. -+ LM_TRY_ENABLE_CFLAG([-fno-common], [CFLAGS]) - else - WFLAGS="" - WERRORFLAGS="" diff --git a/sources b/sources index fbc61b7..d17587f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-22.2.8.tar.gz) = ed65067e1cff82eb17e0ea758dac93f860ec4e2b661690cffa6bd43575de23f8dfbd570e13e548faef2ee51c6482faca35e21ea69ac0c585f61105f930df483d +SHA512 (otp-OTP-22.3.2.tar.gz) = 02333fed57394012834452aff38d9a3340c52b109b14e444b6e7975ac3a65485de1deda6ae6c732a28f75ca2518000de576f70497118306699e35af5f249a0d1