summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErlang/OTP <otp@erlang.org>2021-05-20 16:05:51 +0200
committerErlang/OTP <otp@erlang.org>2021-05-20 16:05:51 +0200
commite6f7121456b61309015eff3a1bf9f6ef442c6ac3 (patch)
treec78a5a85189b7622aa3c089355da70e623ce6d10
parent400c8f74503205fb893152c69d49a0facdd5fc46 (diff)
downloaderlang-e6f7121456b61309015eff3a1bf9f6ef442c6ac3.tar.gz
Prepare release
-rw-r--r--erts/doc/src/notes.xml15
-rw-r--r--erts/vsn.mk2
-rw-r--r--lib/common_test/doc/src/notes.xml15
-rw-r--r--lib/common_test/vsn.mk2
-rw-r--r--lib/crypto/doc/src/notes.xml29
-rw-r--r--lib/crypto/vsn.mk2
-rw-r--r--lib/erl_interface/doc/src/notes.xml15
-rw-r--r--lib/erl_interface/vsn.mk2
-rw-r--r--lib/megaco/doc/src/notes.xml17
-rw-r--r--lib/megaco/vsn.mk2
-rw-r--r--lib/odbc/doc/src/notes.xml17
-rw-r--r--lib/odbc/vsn.mk2
-rw-r--r--lib/snmp/doc/src/notes.xml17
-rw-r--r--lib/snmp/vsn.mk2
-rw-r--r--lib/ssh/doc/src/notes.xml17
-rw-r--r--lib/ssh/vsn.mk2
-rw-r--r--lib/wx/doc/src/notes.xml22
-rw-r--r--lib/wx/vsn.mk2
-rw-r--r--make/otp_version_tickets227
19 files changed, 176 insertions, 233 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 4ec66b4dc5..cd10f45726 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,21 @@
</header>
<p>This document describes the changes made to the ERTS application.</p>
+<section><title>Erts 12.0.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Commit of generated <c>configure</c> script.</p>
+ <p>
+ Own Id: OTP-17420 Aux Id: OTP-17398, GH-4821 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 12.0</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 5aed65cbb9..78fb2c8cf6 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
#
-VSN = 12.0
+VSN = 12.0.1
# Port number 4365 in 4.2
# Port number 4366 in 4.3
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index 7846104543..a2111d8493 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -33,6 +33,21 @@
<file>notes.xml</file>
</header>
+<section><title>Common_Test 1.20.4</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Commit of generated <c>configure</c> script.</p>
+ <p>
+ Own Id: OTP-17420 Aux Id: OTP-17398, GH-4821 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Common_Test 1.20.3</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index 1d02006019..1503b23929 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.20.3
+COMMON_TEST_VSN = 1.20.4
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index 64d0fc3fef..1d1e14f1c5 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -31,6 +31,35 @@
</header>
<p>This document describes the changes made to the Crypto application.</p>
+<section><title>Crypto 5.0.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Removed a risk for coredump.</p>
+ <p>
+ Own Id: OTP-17391 Aux Id: GH-4810 </p>
+ </item>
+ <item>
+ <p>
+ Fixed and documented the <c>DED_LDFLAGS_CONFTEST</c>
+ configuration variable in
+ <c>$ERL_TOP/HOWTO/INSTALL.md</c>.</p>
+ <p>
+ Own Id: OTP-17419 Aux Id: GH-4821 </p>
+ </item>
+ <item>
+ <p>
+ Commit of generated <c>configure</c> script.</p>
+ <p>
+ Own Id: OTP-17420 Aux Id: OTP-17398, GH-4821 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Crypto 5.0</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index df8d618e72..3b97fc39ca 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 5.0
+CRYPTO_VSN = 5.0.1
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index 4040b1d05d..17e6a72fe5 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -31,6 +31,21 @@
</header>
<p>This document describes the changes made to the Erl_interface application.</p>
+<section><title>Erl_Interface 5.0.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Commit of generated <c>configure</c> script.</p>
+ <p>
+ Own Id: OTP-17420 Aux Id: OTP-17398, GH-4821 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erl_Interface 5.0</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
index 1d1414d0af..b884d7d998 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1,2 +1,2 @@
-EI_VSN = 5.0
+EI_VSN = 5.0.1
ERL_INTERFACE_VSN = $(EI_VSN)
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index 2fca226214..64483142a7 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -37,7 +37,22 @@
section is the version number of Megaco.</p>
- <section><title>Megaco 4.0</title>
+ <section><title>Megaco 4.0.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Commit of generated <c>configure</c> script.</p>
+ <p>
+ Own Id: OTP-17420 Aux Id: OTP-17398, GH-4821 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Megaco 4.0</title>
<section><title>Improvements and New Features</title>
<list>
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk
index 691dcb971b..7f32d1eb4a 100644
--- a/lib/megaco/vsn.mk
+++ b/lib/megaco/vsn.mk
@@ -19,6 +19,6 @@
# %CopyrightEnd%
APPLICATION = megaco
-MEGACO_VSN = 4.0
+MEGACO_VSN = 4.0.1
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)"
diff --git a/lib/odbc/doc/src/notes.xml b/lib/odbc/doc/src/notes.xml
index 2b76cdd66a..88652b2c58 100644
--- a/lib/odbc/doc/src/notes.xml
+++ b/lib/odbc/doc/src/notes.xml
@@ -32,7 +32,22 @@
<p>This document describes the changes made to the odbc application.
</p>
- <section><title>ODBC 2.13.4</title>
+ <section><title>ODBC 2.13.5</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Commit of generated <c>configure</c> script.</p>
+ <p>
+ Own Id: OTP-17420 Aux Id: OTP-17398, GH-4821 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>ODBC 2.13.4</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
diff --git a/lib/odbc/vsn.mk b/lib/odbc/vsn.mk
index 84af3fade0..04aea9d2a4 100644
--- a/lib/odbc/vsn.mk
+++ b/lib/odbc/vsn.mk
@@ -1 +1 @@
-ODBC_VSN = 2.13.4
+ODBC_VSN = 2.13.5
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index f214775449..27ec0c4941 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -34,7 +34,22 @@
</header>
- <section><title>SNMP 5.9</title>
+ <section><title>SNMP 5.9.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Commit of generated <c>configure</c> script.</p>
+ <p>
+ Own Id: OTP-17420 Aux Id: OTP-17398, GH-4821 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>SNMP 5.9</title>
<section><title>Improvements and New Features</title>
<list>
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 810caf4d58..0fd6d38bcc 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -19,6 +19,6 @@
# %CopyrightEnd%
APPLICATION = snmp
-SNMP_VSN = 5.9
+SNMP_VSN = 5.9.1
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 2a0342a7e0..5ca4ad39dd 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,23 @@
<file>notes.xml</file>
</header>
+<section><title>Ssh 4.12.1</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Add missing <c>known_hosts</c> and <c>authorized_keys</c>
+ file types to <c>ssh_file:decode/2</c> and
+ <c>ssh_file:encode/2</c>.</p>
+ <p>
+ Own Id: OTP-17397</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Ssh 4.12</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index e8edad182e..b6900c1a1d 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,4 +1,4 @@
#-*-makefile-*- ; force emacs to enter makefile-mode
-SSH_VSN = 4.12
+SSH_VSN = 4.12.1
APP_VSN = "ssh-$(SSH_VSN)"
diff --git a/lib/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml
index 25d3f4b39d..eb39a2112f 100644
--- a/lib/wx/doc/src/notes.xml
+++ b/lib/wx/doc/src/notes.xml
@@ -32,6 +32,28 @@
<p>This document describes the changes made to the wxErlang
application.</p>
+<section><title>Wx 2.0.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix build problems when wxWidgets are built with
+ -enable-std.</p>
+ <p>
+ Own Id: OTP-17407 Aux Id: GH-4834 </p>
+ </item>
+ <item>
+ <p>
+ Commit of generated <c>configure</c> script.</p>
+ <p>
+ Own Id: OTP-17420 Aux Id: OTP-17398, GH-4821 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Wx 2.0</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk
index 708e471420..22fb6e2572 100644
--- a/lib/wx/vsn.mk
+++ b/lib/wx/vsn.mk
@@ -1 +1 @@
-WX_VSN = 2.0
+WX_VSN = 2.0.1
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index aac27ef8a0..796d826e42 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1,221 +1,6 @@
-OTP-10391
-OTP-13126
-OTP-14485
-OTP-14601
-OTP-14646
-OTP-14647
-OTP-14650
-OTP-14700
-OTP-14753
-OTP-14793
-OTP-15107
-OTP-15523
-OTP-16226
-OTP-16334
-OTP-16517
-OTP-16560
-OTP-16607
-OTP-16611
-OTP-16653
-OTP-16656
-OTP-16678
-OTP-16686
-OTP-16687
-OTP-16698
-OTP-16703
-OTP-16706
-OTP-16712
-OTP-16718
-OTP-16720
-OTP-16722
-OTP-16723
-OTP-16724
-OTP-16725
-OTP-16749
-OTP-16750
-OTP-16756
-OTP-16788
-OTP-16793
-OTP-16800
-OTP-16809
-OTP-16811
-OTP-16814
-OTP-16822
-OTP-16824
-OTP-16831
-OTP-16865
-OTP-16867
-OTP-16877
-OTP-16878
-OTP-16879
-OTP-16880
-OTP-16881
-OTP-16882
-OTP-16883
-OTP-16884
-OTP-16885
-OTP-16887
-OTP-16898
-OTP-16905
-OTP-16909
-OTP-16910
-OTP-16926
-OTP-16936
-OTP-16940
-OTP-16943
-OTP-16944
-OTP-16945
-OTP-16946
-OTP-16947
-OTP-16949
-OTP-16950
-OTP-16952
-OTP-16957
-OTP-16963
-OTP-16964
-OTP-16968
-OTP-16970
-OTP-16971
-OTP-16974
-OTP-16980
-OTP-16981
-OTP-16986
-OTP-16987
-OTP-16995
-OTP-17001
-OTP-17005
-OTP-17007
-OTP-17014
-OTP-17015
-OTP-17020
-OTP-17023
-OTP-17024
-OTP-17028
-OTP-17044
-OTP-17048
-OTP-17049
-OTP-17051
-OTP-17057
-OTP-17059
-OTP-17062
-OTP-17063
-OTP-17077
-OTP-17078
-OTP-17079
-OTP-17084
-OTP-17087
-OTP-17092
-OTP-17095
-OTP-17103
-OTP-17104
-OTP-17105
-OTP-17106
-OTP-17114
-OTP-17117
-OTP-17118
-OTP-17120
-OTP-17121
-OTP-17122
-OTP-17123
-OTP-17131
-OTP-17132
-OTP-17133
-OTP-17140
-OTP-17142
-OTP-17148
-OTP-17153
-OTP-17154
-OTP-17155
-OTP-17156
-OTP-17157
-OTP-17168
-OTP-17169
-OTP-17170
-OTP-17171
-OTP-17172
-OTP-17175
-OTP-17177
-OTP-17179
-OTP-17180
-OTP-17181
-OTP-17183
-OTP-17186
-OTP-17189
-OTP-17192
-OTP-17198
-OTP-17199
-OTP-17201
-OTP-17203
-OTP-17206
-OTP-17207
-OTP-17210
-OTP-17213
-OTP-17214
-OTP-17216
-OTP-17217
-OTP-17219
-OTP-17221
-OTP-17222
-OTP-17226
-OTP-17236
-OTP-17238
-OTP-17243
-OTP-17254
-OTP-17257
-OTP-17259
-OTP-17260
-OTP-17262
-OTP-17263
-OTP-17266
-OTP-17267
-OTP-17270
-OTP-17272
-OTP-17275
-OTP-17276
-OTP-17277
-OTP-17278
-OTP-17280
-OTP-17284
-OTP-17285
-OTP-17286
-OTP-17287
-OTP-17288
-OTP-17292
-OTP-17293
-OTP-17294
-OTP-17300
-OTP-17301
-OTP-17302
-OTP-17310
-OTP-17312
-OTP-17313
-OTP-17314
-OTP-17315
-OTP-17320
-OTP-17321
-OTP-17322
-OTP-17327
-OTP-17329
-OTP-17330
-OTP-17334
-OTP-17341
-OTP-17342
-OTP-17343
-OTP-17344
-OTP-17345
-OTP-17352
-OTP-17353
-OTP-17354
-OTP-17355
-OTP-17359
-OTP-17364
-OTP-17367
-OTP-17368
-OTP-17372
-OTP-17373
-OTP-17374
-OTP-17378
-OTP-17384
-OTP-17385
-OTP-17387
-OTP-17388
+OTP-17391
+OTP-17397
+OTP-17398
+OTP-17407
+OTP-17419
+OTP-17420