From fd8131a35e1f66355986ee3d92d47e1f12ad3d74 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Dec 28 2019 08:28:19 +0000 Subject: Erlang ver. 22.2.1 Signed-off-by: Peter Lemenkov --- diff --git a/erlang.spec b/erlang.spec index 3a62e98..4083ac1 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 22.1.8 +Version: 22.2.1 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1943,6 +1943,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Sat Dec 28 2019 Peter Lemenkov - 22.2.1-1 +- Ver. 22.2.1 + * Thu Nov 21 2019 John Eckersberg - 22.1.8-1 - Ver. 22.1.8 - Re-enable s390x, but disable kernel polling, see rhbz#1770256 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 5f2f83f..e252e26 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,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 1f35cef669..f603eb2946 100644 +index 3a03374fbf..aef68348dd 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in -@@ -496,10 +496,6 @@ endif +@@ -504,10 +504,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" endif diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index dd08460..b590de1 100644 --- a/otp-0002-Remove-rpath.patch +++ b/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 b6a65d7488..cd60549711 100644 +index f922c3fb9b..78ce3eeec6 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -114,7 +114,7 @@ TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@ +@@ -113,7 +113,7 @@ TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@ DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ ifeq ($(DYNAMIC_CRYPTO_LIB),yes) diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index f70afb1..86e64ee 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -27,10 +27,10 @@ index 1f714df357..95835d6ed2 100644 release_docs_spec: diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index cd60549711..5be70391d2 100644 +index 78ce3eeec6..5bcb8363f3 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -223,16 +223,11 @@ docs: +@@ -222,16 +222,11 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 595a92d..a2cdd5f 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 27d450c873..d3ea19286e 100644 +index 38b85915cc..1501eadd29 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile -@@ -112,8 +112,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk +@@ -120,8 +120,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: $(APP_TARGET) @@ -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 80eaed70bd..cde0c6823d 100644 +index 76689dab8c..1f3512b027 100644 --- a/lib/common_test/src/Makefile +++ b/lib/common_test/src/Makefile -@@ -152,7 +152,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -149,7 +149,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -343,10 +343,10 @@ 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 1c05d454a5..88f9f62d3b 100644 +index 9848fd4b35..387475febb 100644 --- a/lib/inets/src/http_server/Makefile +++ b/lib/inets/src/http_server/Makefile -@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -136,7 +136,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/http_server" @@ -369,10 +369,10 @@ index ec1ae70305..88c084ef58 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile -index fcb599859b..14f82f9ea4 100644 +index 2d2b84c206..9d67cb0c01 100644 --- a/lib/kernel/src/Makefile +++ b/lib/kernel/src/Makefile -@@ -228,7 +228,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -231,7 +231,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -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 a920ea87ea..7672ef3470 100644 +index 10952106c6..dc07102803 100644 --- a/lib/public_key/asn1/Makefile +++ b/lib/public_key/asn1/Makefile @@ -96,8 +96,8 @@ release_spec: opt @@ -588,10 +588,10 @@ 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 fd62588f5c..07373bfa78 100644 +index a5b9a5e731..69bda2e0e1 100644 --- a/lib/sasl/src/Makefile +++ b/lib/sasl/src/Makefile -@@ -97,7 +97,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -94,7 +94,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -600,17 +600,17 @@ index fd62588f5c..07373bfa78 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 2943a4d550..8203e62361 100644 +index 1bde1ca972..acc42385f3 100644 --- a/lib/snmp/src/agent/Makefile +++ b/lib/snmp/src/agent/Makefile -@@ -131,7 +131,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -140,7 +140,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/agent" - $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/agent" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/agent" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ + $(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 6f2b8a4077..bd062a6473 100644 @@ -626,10 +626,10 @@ index 6f2b8a4077..bd062a6473 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 4093ffa9ca..18878aa5db 100644 +index d9678669a5..ff9dff95d9 100644 --- a/lib/snmp/src/compile/Makefile +++ b/lib/snmp/src/compile/Makefile -@@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -125,7 +125,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/compiler" @@ -639,17 +639,17 @@ index 4093ffa9ca..18878aa5db 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 0cc87492f1..d203f2846a 100644 +index 57ff08c160..d51f627ca5 100644 --- a/lib/snmp/src/manager/Makefile +++ b/lib/snmp/src/manager/Makefile -@@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/manager" - $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/manager" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/manager" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(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 adc2c4858f..89ce954e99 100644 @@ -665,7 +665,7 @@ 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 6d64a45112..5b1249ca5b 100644 +index 9627b70eeb..a4853985f5 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile @@ -139,7 +139,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -678,10 +678,10 @@ index 6d64a45112..5b1249ca5b 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 8dc76f2638..3c2f73f5be 100644 +index e961f05b37..5cac5a231b 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -183,7 +183,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -190,7 +190,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -716,10 +716,10 @@ index c21d2f49c8..03dbc74ef7 100644 $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" diff --git a/lib/tftp/src/Makefile b/lib/tftp/src/Makefile -index 602ae845a4..a1f2f09a00 100644 +index 029bd731bd..85c633b4f0 100644 --- a/lib/tftp/src/Makefile +++ b/lib/tftp/src/Makefile -@@ -98,7 +98,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" 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 4cd87ce..dc1ca1b 100644 --- a/otp-0009-Load-man-pages-from-system-wide-directory.patch +++ b/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 8203c46a39..631b93a92e 100644 +index f18ed0c983..5bdbe5153a 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c -@@ -706,8 +706,10 @@ int main(int argc, char **argv) +@@ -719,8 +719,10 @@ int main(int argc, char **argv) error("-man not supported on Windows"); #else argv[i] = "man"; diff --git a/otp-0010-erl_child_setup-reduce-number-of-calls-to-close.patch b/otp-0010-erl_child_setup-reduce-number-of-calls-to-close.patch index 0a2a3a5..8739391 100644 --- a/otp-0010-erl_child_setup-reduce-number-of-calls-to-close.patch +++ b/otp-0010-erl_child_setup-reduce-number-of-calls-to-close.patch @@ -1,4 +1,3 @@ -From 8a5bf2ad16c416c389147ca59c56545e038470e1 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Fri, 11 Oct 2019 13:06:20 -0400 Subject: [PATCH] erl_child_setup: reduce number of calls to close() @@ -10,9 +9,6 @@ been tuned to a large number. Instead, walk the open descriptors under /dev/fd and close only those which are open. ---- - erts/emulator/sys/unix/erl_child_setup.c | 25 +++++++++++++++++++++--- - 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/erts/emulator/sys/unix/erl_child_setup.c b/erts/emulator/sys/unix/erl_child_setup.c index 129861ebd5..7ddd753136 100644 @@ -59,6 +55,3 @@ index 129861ebd5..7ddd753136 100644 #endif if (pipe(sigchld_pipe) < 0) { --- -2.23.0 - diff --git a/sources b/sources index 9f7d87a..d2e45f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-22.1.8.tar.gz) = 4260fab3f6cd9338ca167371cd982bcf9557729e93d58c3911e485529ed8ee97089e1de3466745d21206c94276f9865ac4fddcb2803afe915494b43feda46dda +SHA512 (otp-OTP-22.2.1.tar.gz) = 4c0e5b963def01e02f8550414bee9e15a79681ac19547c4707d4cf3a67924e252dde7f8f94dfeca5eb3d34730acaffd193603711531bdf7c22d47d8880c5e5f4