ACE+TAO-6_5_8ACE+TAO-6_5_8

60 files changed, 961 insertions, 76 deletions

diff --git a/ACE/ChangeLogs/ACE-6_5_8 b/ACE/ChangeLogs/ACE-6_5_8
new file mode 100644
index 00000000000..c2e42abcbda
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-6_5_8
@@ -0,0 +1,544 @@
+commit 4d7f65535e1050d284dcf1d16f78751b38adfdde
+Merge: 937821529f1 76ee5a67011
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Feb 7 11:05:19 2020 -0600
+
+    Merge pull request #1039 from jonesc-oci/iOS-changes
+    
+    Configuration changes for iOS builds.
+
+commit 76ee5a67011243f5ae7595e324f08ee77a73408a
+Author: Chip Jones <jonesc@objectcomputing.com>
+Date:   Thu Feb 6 14:54:28 2020 -0600
+
+    Add ACE_HAS_IOS preprocessor macro. Change CXXFLAGS to CCFLAGS.
+
+commit dfe0e0929249c1c417c4d98ac9aee05476e43c9e
+Author: Chip Jones <jonesc@objectcomputing.com>
+Date:   Wed Feb 5 16:49:28 2020 -0600
+
+    Add bitcode compile feature.
+
+commit b40e6033e033d10b1f59b7627467ed9f12ed5970
+Author: Chip Jones <jonesc@objectcomputing.com>
+Date:   Wed Feb 5 16:13:41 2020 -0600
+
+    Use single config file for iOS builds. Update build flags for iOS hardware.
+
+commit b04b660d7d52f5d0c8019f1de29791c565bac1b7
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed Feb 5 13:06:37 2020 -0600
+
+    Update ACE/ACE-INSTALL.html
+    
+    Co-Authored-By: Adam Mitz <mitza@objectcomputing.com>
+
+commit 87351e3ca860d234eb9206c006afa4726bc7335e
+Author: Chip Jones <jonesc@objectcomputing.com>
+Date:   Wed Feb 5 12:33:49 2020 -0600
+
+    Remove whitespace.
+
+commit 2afe9dc16a75cbbb3b9e0280af7bc182895338da
+Author: Chip Jones <jonesc@objectcomputing.com>
+Date:   Wed Feb 5 08:41:05 2020 -0600
+
+    Suppress "has no symbols" warnings for iOS builds.
+
+commit 8e75fd9d1b48373e709b3d90abb949deef6b9c8d
+Author: Chip Jones <jonesc@objectcomputing.com>
+Date:   Wed Feb 5 08:38:41 2020 -0600
+
+    Move ACE_LACKS_SYSTEM to iOS-specific header.
+
+commit 848c22e162de492caa4c1c9a3ce39a4cff0849b8
+Author: Chip Jones <jonesc@objectcomputing.com>
+Date:   Tue Feb 4 14:14:09 2020 -0600
+
+    Configuration changes for iOS builds.
+
+commit 7c1ba7b90306bec2a3479f81d15a51ad8834fd44
+Merge: c9ac5fecf46 37ddee2ee71
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Feb 4 16:13:58 2020 -0600
+
+    Merge branch 'igtd/android-on-windows' of github.com:iguessthislldo/ACE_TAO into igtd/android-on-windows
+
+commit c9ac5fecf4621d2e186932a4003890506ce37b58
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Feb 4 16:08:45 2020 -0600
+
+    Add VERSION rename to NEWS files
+
+commit 9d2fcbf4c5dde4294ed44ad7d741d929eccc4e04
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Feb 4 16:02:07 2020 -0600
+
+    ACE-INSTALL: Update Android on Windows
+
+commit b810cc85ddbcac1a066e4036a441a57712e822f0
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Feb 4 15:26:59 2020 -0600
+
+    platform_clang_common.GNU: Remove Alt GNU ld Check
+
+commit 977c354addc03b848b47c392658dfc00338bf1cb
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Feb 4 15:23:17 2020 -0600
+
+    Change More References to VERSION.txt
+
+commit dc64a430fe1aa6b5245af09a354b98b78773b572
+Merge: 5c9bcb4f64b 816fca07086
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Feb 4 14:56:25 2020 -0600
+
+    Merge remote-tracking branch 'upstream/master' into igtd/android-on-windows
+
+commit cd1cef25211ce104cf784bf2cba14a5b52d93d51
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 30 11:50:22 2020 +0100
+
+    List some important changes
+    
+        * ACE/NEWS:
+        * TAO/NEWS:
+
+commit b666e6ce5b5f26d51ac0a2a28df54ea046e7e718
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jan 29 09:46:15 2020 +0100
+
+    Remove empty lines
+    
+        * ACE/tests/INET_Addr_Test.cpp:
+        * ACE/tests/IOStream_Test.cpp:
+        * ACE/tests/Multicast_Test.cpp:
+
+commit 47c1ae25ed0ffccdd0d9ce93035850066d09eac9
+Merge: 1afb3f00e95 b0f830ea66e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jan 22 11:05:20 2020 +0100
+
+    Merge branch 'master' into jwi-layout
+
+commit 1afb3f00e95cf72bf39305bf62c6f06b90d39add
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 21 20:13:29 2020 +0100
+
+    Some more layout changes to trigger CI builds
+    
+        * ACE/ace/Activation_Queue.h:
+        * ACE/ace/Active_Map_Manager.h:
+        * ACE/ace/Active_Map_Manager_T.h:
+        * ACE/ace/Argv_Type_Converter.h:
+        * ACE/ace/Array_Map.h:
+        * ACE/ace/Asynch_Connector.h:
+        * ACE/ace/Atomic_Op.h:
+        * ACE/ace/Atomic_Op_GCC_T.h:
+        * ACE/ace/Based_Pointer_Repository.h:
+        * ACE/ace/Bound_Ptr.h:
+        * ACE/ace/CDR_Stream.h:
+        * ACE/ace/Cache_Map_Manager_T.h:
+        * ACE/ace/Caching_Strategies_T.h:
+        * ACE/ace/Capabilities.h:
+        * ACE/ace/Containers_T.h:
+        * ACE/ace/DLL.h:
+        * ACE/ace/DLL_Manager.h:
+        * ACE/ace/Dev_Poll_Reactor.h:
+
+commit b4e58d8b62f59bc92912dda32754cc0e4dd70672
+Merge: 6627fe21df7 8dae504b784
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Jan 20 10:30:21 2020 -0600
+
+    Merge pull request #1029 from mitza-oci/rwlock-init
+    
+    wchar fix for #1023
+
+commit 8dae504b784400157d5d07c506db942abd4d56b8
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Jan 20 09:17:55 2020 -0600
+
+    wchar fix
+
+commit d6c5fa19716b710de9738e80cc5c2840670a921e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 20 14:28:57 2020 +0100
+
+    Minor layout/doxygen changes, gathered through time
+    
+        * ACE/ace/ACE.inl:
+        * ACE/ace/ATM_Acceptor.cpp:
+        * ACE/ace/ATM_Addr.cpp:
+        * ACE/ace/ATM_Connector.cpp:
+        * ACE/ace/ATM_Params.cpp:
+        * ACE/ace/ATM_QoS.cpp:
+        * ACE/ace/ATM_QoS.h:
+        * ACE/ace/ATM_Stream.h:
+        * ACE/ace/Acceptor.h:
+        * ACE/ace/Active_Map_Manager_T.h:
+        * ACE/ace/Argv_Type_Converter.h:
+        * ACE/ace/Array_Base.h:
+        * ACE/ace/Array_Map.h:
+        * ACE/ace/Asynch_IO.h:
+        * ACE/ace/Atomic_Op_T.h:
+        * ACE/ace/Base_Thread_Adapter.h:
+        * ACE/ace/CDR_Base.h:
+        * ACE/ace/CDR_Size.h:
+        * ACE/ace/CDR_Stream.h:
+        * ACE/ace/CE_Screen_Output.h:
+        * ACE/ace/Cache_Map_Manager_T.h:
+        * ACE/ace/Cached_Connect_Strategy_T.h:
+        * ACE/ace/Caching_Strategies_T.h:
+        * ACE/ace/Caching_Utility_T.h:
+        * ACE/ace/Capabilities.h:
+        * ACE/ace/Cleanup_Strategies_T.h:
+        * ACE/ace/Codecs.h:
+        * ACE/ace/Codeset_Registry.h:
+        * ACE/ace/Compression/Compressor.h:
+        * ACE/ace/Configuration.h:
+        * ACE/ace/Connector.h:
+        * ACE/ace/Containers_T.h:
+        * ACE/ace/Copy_Disabled.h:
+        * ACE/ace/DEV_Connector.h:
+        * ACE/ace/DLL.h:
+        * ACE/ace/DLL_Manager.h:
+        * ACE/ace/Dev_Poll_Reactor.h:
+        * ACE/ace/Dynamic_Message_Strategy.h:
+        * ACE/ace/ETCL/ETCL_Constraint.h:
+        * ACE/ace/MEM_Stream.h:
+        * ACE/ace/Profile_Timer.h:
+        * ACE/ace/SUN_Proactor.h:
+        * ACE/ace/String_Base_Const.h:
+        * ACE/ace/Svc_Handler.h:
+
+commit 37ddee2ee7109a5093b360da104116389292acd5
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Fri Jan 17 17:27:34 2020 -0600
+
+    Rename VERSION files to VERSION.txt
+    
+    C++20 brings a new standard header called "version". This wouldn't be an
+    issue except for on Windows where filenames can be case insensitive.
+    This issue was discovered why trying to cross-compile for Android on
+    Windows.
+
+commit d662f7dff3a3980f60af918227d4bf10fcb4a6a2
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Fri Jan 17 16:46:24 2020 -0600
+
+    android: export CROSS_COMPILE var
+    
+    Export it so child processes can use tools from the same toolchain.
+
+commit 6627fe21df7aa79ad6ba7fa31d25863bd673e26e
+Merge: 4065ae9592e 1bdbb759df2
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Jan 17 15:27:35 2020 -0600
+
+    Merge pull request #1023 from mitza-oci/rwlock-init
+    
+    ACE_OS::rwlock_init - fixed bug when RW Lock is emulated and creating a condition variable fails
+
+commit 1bdbb759df28e9ea36796c23a969ed1d847c91b0
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Jan 17 09:05:34 2020 -0600
+
+    code review changes
+
+commit 4065ae9592e4d914d404d1b7e03223c8291d0a20
+Merge: 314d3ed8af0 d109e9f7982
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 17 15:35:03 2020 +0100
+
+    Merge pull request #1025 from jwillemsen/jwi-mpctag
+    
+    Add Latest_ACETAO tag to MPC
+
+commit f480c6cc4f2335b79e350b596cbbe225b728ca7e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 17 10:14:41 2020 +0100
+
+    Fixed error
+    
+        * ACE/tests/NonBlocking_Conn_Test.cpp:
+
+commit ef05a48c6f326bbb15eedd2d5606dd5134c05e0f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 17 09:22:28 2020 +0100
+
+    Updated the host we use to check our code with, some seem to be non responsive
+    
+        * ACE/tests/NonBlocking_Conn_Test.cpp:
+
+commit d109e9f7982997ba6a2047ddac4b6576bd51e16f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 17 09:08:28 2020 +0100
+
+    Removing tag on origin could also fail
+    
+        * ACE/bin/make_release.py:
+
+commit 15f0c6938a0ae2b88a498bd2fed7f353a5c51558
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 17 09:06:14 2020 +0100
+
+    Removing tag can fail when the tag is not yet there
+    
+        * ACE/bin/make_release.py:
+
+commit 76fab02113b0821c9bad447f357232ad9c3259eb
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 17 09:02:42 2020 +0100
+
+    Add missing quotes and also push all latest tags
+    
+        * ACE/bin/make_release.py:
+
+commit 02b1d932b76e76760fbcb5a275e19f5b1a61b251
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 17 08:54:57 2020 +0100
+
+    Add Latest_ACETAO tags to MPC to make it easier to clone the latest ACETAO+MPC using a CI build
+    
+        * ACE/bin/make_release.py:
+
+commit 1604249b469d6b82f6ac03d8324420bfe3f8ef75
+Merge: ecdb3766eff 32b858f84cf
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jan 16 17:35:54 2020 -0600
+
+    Merge pull request #1014 from iguessthislldo/igtd/auto_run_tests
+    
+    Rewrote auto_run_tests.pl Arg Parsing
+
+commit 8161bcb366447083d67791bf14392a8882dc6659
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jan 16 16:46:31 2020 -0600
+
+    ACE_OS::rwlock_init - fixed bug when RW Lock is emulated and creating a condition variable fails
+
+commit 5c9bcb4f64b416d4330455dc034d292c76869f82
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed Jan 15 16:05:52 2020 -0600
+
+    Revert Changes to Platform Files for Android
+
+commit 32b858f84cf4220a51287b537f15e3176a9d7e7a
+Author: Fred Hornsey <fred@hornsey.us>
+Date:   Wed Jan 15 13:45:26 2020 -0600
+
+    auto_run_tests.pl: remove spaces in calls
+
+commit 77504588d955e031f286528308ab6efefda2d8dc
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Jan 14 18:48:07 2020 -0600
+
+    Update ACE NEWS
+
+commit 373ac1d54f1f02bef2472fe7dcb3da0b2c9cd976
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Jan 14 18:39:08 2020 -0600
+
+    ACE-INSTALL: Cleanup
+
+commit 9b1927e2c8bda3c693c47b887189269f4bbecd7a
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Jan 14 15:22:41 2020 -0600
+
+    ACE-INSTALL: Document VERSION file issue
+
+commit 1d9eb0db5c2a525dee79221af9cb77c9c48e6d31
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Jan 14 13:22:16 2020 -0600
+
+    Fix platform_linux_common.GNU again
+
+commit 4d1f635e4b12eb49ef8b7372b51b3915d95400d7
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Jan 14 13:05:51 2020 -0600
+
+    Fix platform_linux_common.GNU
+
+commit de523d8c2149b489a12c453d8e12dd0655ada279
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Jan 14 12:59:17 2020 -0600
+
+    Building for Android on Windows
+
+commit 9028d05555bbe6f24f18ee0d93dc4c7521c49638
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 9 09:16:21 2020 +0100
+
+    Add cast to silence new warning
+    
+        * ACE/tests/SOCK_Dgram_Bcast_Test.cpp:
+
+commit 3429716fe5689b312bdcccc57feceba49d8cad97
+Merge: f853b84db13 dc125f1c8f9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 9 09:13:33 2020 +0100
+
+    Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO
+
+commit f853b84db13f3a3441a2bd78a752cd0b88bec2b5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jan 8 17:18:23 2020 +0100
+
+    Fixed typo in debug message
+    
+        * ACE/tests/SOCK_Dgram_Bcast_Test.cpp:
+
+commit dc125f1c8f9d0b60afbae36af9ddeb0342d90de8
+Merge: db04c975067 234cbc8f26c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jan 8 10:25:17 2020 +0100
+
+    Merge pull request #1013 from likema/proc-opts-fmt-attr
+    
+    Add ACE_GCC_FORMAT_ATTRIBUTE to ACE_Process_Options
+
+commit db04c97506766eda27f7ecb795cea8c26f0259d3
+Merge: 24caadcb663 a3bd9a4ff7f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jan 8 08:46:34 2020 +0100
+
+    Merge pull request #1018 from jwillemsen/jwi-embrio1033
+    
+    Embarcadero C++ Builder 10.3.3 changes (Rio)
+
+commit a3bd9a4ff7f464d69657b3482be2311572ddd892
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 7 14:54:23 2020 +0000
+
+    Embarcadero C++ Builder 10.3.3 changes (Rio)
+
+commit 71d507a8c63570dcf28b531838bf0223e0ac2c87
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 7 15:17:57 2020 +0100
+
+    Removed operator*& as it triggers the ambiguity issues
+    
+        * ACE/tests/Compiler_Features_38_Test.cpp:
+
+commit 127092869ecfd58450be59b7626b89180df6d670
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 6 09:30:18 2020 +0100
+
+    Make use of ACE_CDR::ULong for the operator[], that matches with TAO and should work with any compiler
+    
+        * ACE/tests/Compiler_Features_38_Test.cpp:
+
+commit eb87718ef82f6f7557e661b56e12aa72a5aae932
+Merge: 2075eb4e4ab c51ab9b2998
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Jan 3 14:43:10 2020 -0600
+
+    Merge pull request #1015 from adamsj-oci/master
+    
+    add generate_export_file.pl to installed files
+
+commit c51ab9b29982fb81720f154ac23f34cb8915cae9
+Author: Jeremy Adams <adamsj@objectcomputing.com>
+Date:   Thu Jan 2 15:41:21 2020 -0600
+
+    add generate_export_file.pl to installed files
+
+commit 5aff54de415de4a223b401576b62f5a96133ba7b
+Author: Fred Hornsey <fred@hornsey.us>
+Date:   Tue Dec 31 17:39:02 2019 -0600
+
+    Rewrote auto_run_tests.pl Arg Parsing
+    
+    - Help message:
+      - It said test list options, like `-l` or `-a`, "only" do the tests
+        from that option. That isn't true, they include the tests in the
+        run.
+      - Removed reference to non-existent `-c` option which is supposed to
+        be an alias to `-Config`.
+      - Removed outdated synopsis and try to give a slightly more detailed
+        explanation of the script.
+      - Documented `-Exclude`
+      - Moved configuration listing to its own option and made it do it for
+        all test list files that would ran otherwise.
+    
+    - Argument Parsing:
+      - Switched to using `GetOpt::Long` and added long options.
+      - Fixed dry run `-z` option which wasn't being parsed.
+      - Fixed that when using `-l` to specify multiple files it only uses
+        the last one. Also made it so it takes non-option arguments as test
+        lists.
+    
+    - Documented what arguments are being parsed by `PerlACE` modules.
+    - Added 'use strict' and fixes for that.
+    - Removed seemingly unused `use English;`.
+
+commit 234cbc8f26c41ff53c1956ff3582c5fbdead28f1
+Author: Like Ma <likemartinma@gmail.com>
+Date:   Sun Dec 29 01:27:56 2019 +0800
+
+    Add ACE_GCC_FORMAT_ATTRIBUTE to ACE_Process_Options::{command_line,setenv}.
+
+commit 06ee4ac4822a084fcdb296f00356721283bb158c
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Fri Dec 20 16:59:03 2019 -0600
+
+    Use ACE_Time_Value(0) in ACE_Sync_Options::set
+    
+    Respond to Review in https://github.com/DOCGroup/ACE_TAO/pull/1010
+
+commit 77a212244fc64003da9f078738b4fa0863595210
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed Dec 18 12:18:52 2019 -0600
+
+    Style Fixes
+
+commit 077f03e97ed4cf43325b32fff14eadcfd8fa6bba
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed Dec 18 01:11:27 2019 -0600
+
+    Fixes for tao_idl compiled with asan and ubsan
+    
+    Various fixes for tao_idl built using clang with
+    -fsanitize=undefined,address passed.
+    
+    - Work around static init ub in ACE_Sync_Options based on if
+      ACE_INITIALIZE_MEMORY_BEFORE_USE is defined.
+    - Fix a memory leak in UTL_Scope and a possible null dereference in
+      tao_idl be.
+    - Fixed a hard to track down memory leak involving AST_InterfaceFwd not
+      handling ownership of its placeholder AST_Interface correctly under
+      a case when a forward declaration of an interface is made after the
+      interface was already declared.
+
+commit e6f2f93b584212545359a5f8ceb71f58f81e99e9
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Wed Dec 11 17:01:54 2019 -0600
+
+    recvmsg on Windows with control data: controllen may be changed during the recv call, needs to be copied back out
+
+commit 7f2d38e7214361e25ff4ae6cd6609bccd1237e41
+Author: Like Ma <likemartinma@gmail.com>
+Date:   Tue Dec 10 17:33:42 2019 +0800
+
+    Fix ACE_SOCK_Acceptor ctor comment.
+
+commit f968df011a227fc7f4406ff9c268593bc378305a
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Fri Dec 6 13:25:02 2019 +0100
+
+    Fixed typo in config-posix.h
+
+commit cab5c35b998c07e98d5c5b360a774e65d973b733
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Nov 22 10:13:31 2019 +0100
+
+    Make x.5.7 available
+    
+        * ACE/NEWS:
+        * ACE/bin/copy-script.sh:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/docs/bczar/bczar.html:
+        * ACE/etc/index.html:
+        * TAO/NEWS:
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index b99e9467f04..91fe85ad2f5 100644
--- a/ACE/PROBLEM-REPORT-FORM
+++ b/ACE/PROBLEM-REPORT-FORM
@@ -40,7 +40,7 @@
 To: ace-bugs@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 6.5.7
+    ACE VERSION: 6.5.8
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/ACE/VERSION.txt b/ACE/VERSION.txt
index b9fe9066970..abe0fcef491 100644
--- a/ACE/VERSION.txt
+++ b/ACE/VERSION.txt
@@ -1,4 +1,4 @@
-This is ACE version 6.5.7, released Fri Nov 22 09:24:48 CET 2019
+This is ACE version 6.5.8, released Mon Feb 10 09:28:37 CET 2020
 
 If you have any problems with or questions about ACE, please send
 e-mail to the ACE mailing list (ace-bugs@list.isis.vanderbilt.edu),
diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h
index 3ef421fe12c..42cc249bfd6 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -4,9 +4,9 @@
 
 #define ACE_MAJOR_VERSION 6
 #define ACE_MINOR_VERSION 5
-#define ACE_MICRO_VERSION 7
-#define ACE_BETA_VERSION 7
-#define ACE_VERSION "6.5.7"
-#define ACE_VERSION_CODE 394503
+#define ACE_MICRO_VERSION 8
+#define ACE_BETA_VERSION 8
+#define ACE_VERSION "6.5.8"
+#define ACE_VERSION_CODE 394504
 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 
diff --git a/ACE/debian/control b/ACE/debian/control
index 86a7b36452f..57bbcd77226 100644
--- a/ACE/debian/control
+++ b/ACE/debian/control
@@ -27,7 +27,7 @@ Description: makefile, project, and workspace creator
   * mpc-ace: generates project files for a single target
   * mwc-ace: generates workspace files for a set of projects
 
-Package: libace-6.5.7
+Package: libace-6.5.8
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -45,7 +45,7 @@ Description: C++ network programming framework
 Package: libace-dev
 Architecture: any
 Section: libdevel
-Depends: libace-6.5.7 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.5.8 (= ${binary:Version}), ${misc:Depends}
 Suggests: libace-doc, pkg-config
 Replaces: mpc-ace (<< 5.6.3-4)
 Description: C++ network programming framework - development files
@@ -62,7 +62,7 @@ Description: C++ network programming framework - documentation
  This package contains the ACE overview documentation, tutorials,
  examples, and information regarding upstream development.
 
-Package: libace-ssl-6.5.7
+Package: libace-ssl-6.5.8
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -73,12 +73,12 @@ Description: ACE secure socket layer library
 Package: libace-ssl-dev
 Architecture: any
 Section: libdevel
-Depends: libace-ssl-6.5.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
+Depends: libace-ssl-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
 Description: ACE secure socket layer library - development files
  This package contains the header files and static library for the ACE
  SSL library.
 
-Package: libace-rmcast-6.5.7
+Package: libace-rmcast-6.5.8
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -92,12 +92,12 @@ Description: ACE reliable multicast library
 Package: libace-rmcast-dev
 Architecture: any
 Section: libdevel
-Depends: libace-rmcast-6.5.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE reliable multicast library - development files
  This package contains the header files and static library for the ACE
  reliable multicast library.
 
-Package: libace-tmcast-6.5.7
+Package: libace-tmcast-6.5.8
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -111,12 +111,12 @@ Description: ACE transactional multicast library
 Package: libace-tmcast-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tmcast-6.5.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE transactional multicast library - development files
  This package contains the header files and static library for the ACE
  transactional multicast library.
 
-Package: libace-htbp-6.5.7
+Package: libace-htbp-6.5.8
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -130,12 +130,12 @@ Description: ACE protocol over HTTP tunneling library
 Package: libace-htbp-dev
 Architecture: any
 Section: libdevel
-Depends: libace-htbp-6.5.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE protocol over HTTP tunneling library - development files
  This package contains the header files and static library for the ACE
  HTBP library.
 
-Package: libace-inet-6.5.7
+Package: libace-inet-6.5.8
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -146,15 +146,15 @@ Description: ACE Inet protocol library
 Package: libace-inet-dev
 Architecture: any
 Section: libdevel
-Depends: libace-inet-6.5.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE Inet protocol library - development files
  This package contains the header files and static library for the ACE
  Inet protocol library.
 
-Package: libace-inet-ssl-6.5.7
+Package: libace-inet-ssl-6.5.8
 Architecture: any
 Section: libs
-Depends: libace-inet-6.5.7, libace-ssl-6.5.7, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.5.8, libace-ssl-6.5.8, ${shlibs:Depends}, ${misc:Depends}
 Description: ACE SSL-enabled Inet protocol library
  This package provides an ACE addon library for clients (and possibly
  servers at some point) using Inet protocols which support SSL, such as
@@ -163,7 +163,7 @@ Description: ACE SSL-enabled Inet protocol library
 Package: libace-inet-ssl-dev
 Architecture: any
 Section: libdevel
-Depends: libace-inet-ssl-6.5.7 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.5.8 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE SSL-enabled Inet protocol library - development files
  This package contains the header files and static library for the ACE
  SSL-enabled Inet protocol library.
@@ -180,7 +180,7 @@ Description: ACE perfect hash function generator
  basically the same options and functionality. ace_gperf simply takes
  advantage of some of the features provided by the ACE library.
 
-Package: libacexml-6.5.7
+Package: libacexml-6.5.8
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -196,12 +196,12 @@ Package: libacexml-dev
 Architecture: any
 Section: libdevel
 Replaces: libace-dev (<< 5.7.7-4)
-Depends: libacexml-6.5.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE SAX based XML parsing library - development files
  This package contains the header files and static library for the ACE
  XML parsing library.
 
-Package: libace-xml-utils-6.5.7
+Package: libace-xml-utils-6.5.8
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -215,12 +215,12 @@ Package: libace-xml-utils-dev
 Architecture: any
 Section: libdevel
 Replaces: libace-dev (<< 5.7.7-4)
-Depends: libace-xml-utils-6.5.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
 Description: ACE XML utility classes and methods - development files
  This package contains the header files and static library for the ACE XML
  Utils library
 
-Package: libkokyu-6.5.7
+Package: libkokyu-6.5.8
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -234,12 +234,12 @@ Description: ACE scheduling and dispatching library
 Package: libkokyu-dev
 Architecture: any
 Section: libdevel
-Depends: libkokyu-6.5.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE scheduling and dispatching library - development files
  This package contains the header files and static library for the ACE
  scheduling and dispatching library.
 
-Package: libace-xtreactor-6.5.7
+Package: libace-xtreactor-6.5.8
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -257,12 +257,12 @@ Description: ACE-GUI reactor integration for Xt
 Package: libace-xtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-xtreactor-6.5.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
+Depends: libace-xtreactor-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
 Description: ACE-GUI reactor integration for Xt - development files
  This package contains header files and static library for the ACE-Xt
  reactor integration.
 
-Package: libace-tkreactor-6.5.7
+Package: libace-tkreactor-6.5.8
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -281,12 +281,12 @@ Description: ACE-GUI reactor integration for Tk
 Package: libace-tkreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tkreactor-6.5.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
 Description: ACE-GUI reactor integration for Tk - development files
  This package contains header files and static library for the ACE-Tk
  reactor integration.
 
-Package: libace-flreactor-6.5.7
+Package: libace-flreactor-6.5.8
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -304,12 +304,12 @@ Description: ACE-GUI reactor integration for FLTK
 Package: libace-flreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-flreactor-6.5.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
+Depends: libace-flreactor-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
 Description: ACE-GUI reactor integration for FLTK - development files
  This package contains header files and static library for the ACE-FLTK
  reactor integration.
 
-Package: libace-foxreactor-6.5.7
+Package: libace-foxreactor-6.5.8
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -326,7 +326,7 @@ Description: ACE-GUI reactor integration for FOX
 Package: libace-foxreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-foxreactor-6.5.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
 Description: ACE-GUI reactor integration for FOX - development files
  This package contains header files and static library for the ACE-FOX
  reactor integration.
@@ -343,7 +343,7 @@ Description: ACE network service implementations
  files to link the various ACE network services together, either
  statically or dynamically, and form complete server programs.
 
-Package: libnetsvcs-6.5.7
+Package: libnetsvcs-6.5.8
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -357,7 +357,7 @@ Description: ACE network service implementations - libraries
 Package: libnetsvcs-dev
 Architecture: any
 Section: libdevel
-Depends: libnetsvcs-6.5.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libnetsvcs-6.5.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE network service implementations - development files
  ACE network services provide reusable components for common
  distributed system tasks such as logging, naming, locking, and time
diff --git a/ACE/debian/libace-6.5.7.lintian-overrides b/ACE/debian/libace-6.5.7.lintian-overrides
deleted file mode 100644
index a680e6e0aa6..00000000000
--- a/ACE/debian/libace-6.5.7.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-libace-6.5.7: no-symbols-control-file usr/lib/libACE-6.5.7.so
-libace-6.5.7: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.5.7.so
-libace-6.5.7: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.5.7.so
-libace-6.5.7: no-symbols-control-file usr/lib/libACE_ETCL-6.5.7.so
-libace-6.5.7: no-symbols-control-file usr/lib/libACE_RLECompression-6.5.7.so
-libace-6.5.7: no-symbols-control-file usr/lib/libACE_Compression-6.5.7.so
diff --git a/ACE/debian/libace-6.5.7.docs b/ACE/debian/libace-6.5.8.docs
index ca760171412..ca760171412 100644
--- a/ACE/debian/libace-6.5.7.docs
+++ b/ACE/debian/libace-6.5.8.docs
diff --git a/ACE/debian/libace-6.5.7.install b/ACE/debian/libace-6.5.8.install
index 182a5eda411..182a5eda411 100644
--- a/ACE/debian/libace-6.5.7.install
+++ b/ACE/debian/libace-6.5.8.install
diff --git a/ACE/debian/libace-6.5.8.lintian-overrides b/ACE/debian/libace-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..ccc1f750517
--- /dev/null
+++ b/ACE/debian/libace-6.5.8.lintian-overrides
@@ -0,0 +1,6 @@
+libace-6.5.8: no-symbols-control-file usr/lib/libACE-6.5.8.so
+libace-6.5.8: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.5.8.so
+libace-6.5.8: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.5.8.so
+libace-6.5.8: no-symbols-control-file usr/lib/libACE_ETCL-6.5.8.so
+libace-6.5.8: no-symbols-control-file usr/lib/libACE_RLECompression-6.5.8.so
+libace-6.5.8: no-symbols-control-file usr/lib/libACE_Compression-6.5.8.so
diff --git a/ACE/debian/libace-flreactor-6.5.7.lintian-overrides b/ACE/debian/libace-flreactor-6.5.7.lintian-overrides
deleted file mode 100644
index f3a139d2ff4..00000000000
--- a/ACE/debian/libace-flreactor-6.5.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-flreactor-6.5.7: no-symbols-control-file usr/lib/libACE_FlReactor-6.5.7.so
diff --git a/ACE/debian/libace-flreactor-6.5.7.install b/ACE/debian/libace-flreactor-6.5.8.install
index 528836aacee..528836aacee 100644
--- a/ACE/debian/libace-flreactor-6.5.7.install
+++ b/ACE/debian/libace-flreactor-6.5.8.install
diff --git a/ACE/debian/libace-flreactor-6.5.8.lintian-overrides b/ACE/debian/libace-flreactor-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..65de8107df3
--- /dev/null
+++ b/ACE/debian/libace-flreactor-6.5.8.lintian-overrides
@@ -0,0 +1 @@
+libace-flreactor-6.5.8: no-symbols-control-file usr/lib/libACE_FlReactor-6.5.8.so
diff --git a/ACE/debian/libace-foxreactor-6.5.7.lintian-overrides b/ACE/debian/libace-foxreactor-6.5.7.lintian-overrides
deleted file mode 100644
index 64374193093..00000000000
--- a/ACE/debian/libace-foxreactor-6.5.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-foxreactor-6.5.7: no-symbols-control-file usr/lib/libACE_FoxReactor-6.5.7.so
diff --git a/ACE/debian/libace-foxreactor-6.5.7.install b/ACE/debian/libace-foxreactor-6.5.8.install
index e360f29f5af..e360f29f5af 100644
--- a/ACE/debian/libace-foxreactor-6.5.7.install
+++ b/ACE/debian/libace-foxreactor-6.5.8.install
diff --git a/ACE/debian/libace-foxreactor-6.5.8.lintian-overrides b/ACE/debian/libace-foxreactor-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..1366abe881b
--- /dev/null
+++ b/ACE/debian/libace-foxreactor-6.5.8.lintian-overrides
@@ -0,0 +1 @@
+libace-foxreactor-6.5.8: no-symbols-control-file usr/lib/libACE_FoxReactor-6.5.8.so
diff --git a/ACE/debian/libace-htbp-6.5.7.lintian-overrides b/ACE/debian/libace-htbp-6.5.7.lintian-overrides
deleted file mode 100644
index d980b5c098c..00000000000
--- a/ACE/debian/libace-htbp-6.5.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-htbp-6.5.7: no-symbols-control-file usr/lib/libACE_HTBP-6.5.7.so
diff --git a/ACE/debian/libace-htbp-6.5.7.install b/ACE/debian/libace-htbp-6.5.8.install
index 08103fd5cad..08103fd5cad 100644
--- a/ACE/debian/libace-htbp-6.5.7.install
+++ b/ACE/debian/libace-htbp-6.5.8.install
diff --git a/ACE/debian/libace-htbp-6.5.8.lintian-overrides b/ACE/debian/libace-htbp-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..30f4ac9d32e
--- /dev/null
+++ b/ACE/debian/libace-htbp-6.5.8.lintian-overrides
@@ -0,0 +1 @@
+libace-htbp-6.5.8: no-symbols-control-file usr/lib/libACE_HTBP-6.5.8.so
diff --git a/ACE/debian/libace-inet-6.5.7.lintian-overrides b/ACE/debian/libace-inet-6.5.7.lintian-overrides
deleted file mode 100644
index 3a61ad9f254..00000000000
--- a/ACE/debian/libace-inet-6.5.7.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libace-inet-6.5.7: extended-description-is-probably-too-short
-libace-inet-6.5.7: no-symbols-control-file usr/lib/libACE_INet-6.5.7.so
diff --git a/ACE/debian/libace-inet-6.5.7.install b/ACE/debian/libace-inet-6.5.8.install
index 59a73a509d0..59a73a509d0 100644
--- a/ACE/debian/libace-inet-6.5.7.install
+++ b/ACE/debian/libace-inet-6.5.8.install
diff --git a/ACE/debian/libace-inet-6.5.8.lintian-overrides b/ACE/debian/libace-inet-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..e49f0b41704
--- /dev/null
+++ b/ACE/debian/libace-inet-6.5.8.lintian-overrides
@@ -0,0 +1,2 @@
+libace-inet-6.5.8: extended-description-is-probably-too-short
+libace-inet-6.5.8: no-symbols-control-file usr/lib/libACE_INet-6.5.8.so
diff --git a/ACE/debian/libace-inet-ssl-6.5.7.lintian-overrides b/ACE/debian/libace-inet-ssl-6.5.7.lintian-overrides
deleted file mode 100644
index 09579f9870d..00000000000
--- a/ACE/debian/libace-inet-ssl-6.5.7.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-libace-inet-ssl-6.5.7: no-symbols-control-file usr/lib/libACE_INet_SSL-6.5.7.so
-
-# It's Bison-generate code covered by the GNU Bison GPL-exception
-libace-inet-ssl-6.5.7: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-inet-ssl-6.5.7.install b/ACE/debian/libace-inet-ssl-6.5.8.install
index b9b8b9045f7..b9b8b9045f7 100644
--- a/ACE/debian/libace-inet-ssl-6.5.7.install
+++ b/ACE/debian/libace-inet-ssl-6.5.8.install
diff --git a/ACE/debian/libace-inet-ssl-6.5.8.lintian-overrides b/ACE/debian/libace-inet-ssl-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..9bfa0863154
--- /dev/null
+++ b/ACE/debian/libace-inet-ssl-6.5.8.lintian-overrides
@@ -0,0 +1,4 @@
+libace-inet-ssl-6.5.8: no-symbols-control-file usr/lib/libACE_INet_SSL-6.5.8.so
+
+# It's Bison-generate code covered by the GNU Bison GPL-exception
+libace-inet-ssl-6.5.8: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-rmcast-6.5.7.lintian-overrides b/ACE/debian/libace-rmcast-6.5.7.lintian-overrides
deleted file mode 100644
index f5f66b3e683..00000000000
--- a/ACE/debian/libace-rmcast-6.5.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-rmcast-6.5.7: no-symbols-control-file usr/lib/libACE_RMCast-6.5.7.so
diff --git a/ACE/debian/libace-rmcast-6.5.7.install b/ACE/debian/libace-rmcast-6.5.8.install
index 86e78259853..86e78259853 100644
--- a/ACE/debian/libace-rmcast-6.5.7.install
+++ b/ACE/debian/libace-rmcast-6.5.8.install
diff --git a/ACE/debian/libace-rmcast-6.5.8.lintian-overrides b/ACE/debian/libace-rmcast-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..3e4f8730d24
--- /dev/null
+++ b/ACE/debian/libace-rmcast-6.5.8.lintian-overrides
@@ -0,0 +1 @@
+libace-rmcast-6.5.8: no-symbols-control-file usr/lib/libACE_RMCast-6.5.8.so
diff --git a/ACE/debian/libace-ssl-6.5.7.lintian-overrides b/ACE/debian/libace-ssl-6.5.7.lintian-overrides
deleted file mode 100644
index be236c078e2..00000000000
--- a/ACE/debian/libace-ssl-6.5.7.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-libace-ssl-6.5.7: extended-description-is-probably-too-short
-libace-ssl-6.5.7: no-symbols-control-file usr/lib/libACE_SSL-6.5.7.so
-
-# It's Bison-generate code covered by the GNU Bison GPL-exception
-libace-ssl-6.5.7: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-ssl-6.5.7.NEWS b/ACE/debian/libace-ssl-6.5.8.NEWS
index e5bd0e4aa10..e5bd0e4aa10 100644
--- a/ACE/debian/libace-ssl-6.5.7.NEWS
+++ b/ACE/debian/libace-ssl-6.5.8.NEWS
diff --git a/ACE/debian/libace-ssl-6.5.7.install b/ACE/debian/libace-ssl-6.5.8.install
index 8df45a6d55f..8df45a6d55f 100644
--- a/ACE/debian/libace-ssl-6.5.7.install
+++ b/ACE/debian/libace-ssl-6.5.8.install
diff --git a/ACE/debian/libace-ssl-6.5.8.lintian-overrides b/ACE/debian/libace-ssl-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..33779b71cd6
--- /dev/null
+++ b/ACE/debian/libace-ssl-6.5.8.lintian-overrides
@@ -0,0 +1,5 @@
+libace-ssl-6.5.8: extended-description-is-probably-too-short
+libace-ssl-6.5.8: no-symbols-control-file usr/lib/libACE_SSL-6.5.8.so
+
+# It's Bison-generate code covered by the GNU Bison GPL-exception
+libace-ssl-6.5.8: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-tkreactor-6.5.7.lintian-overrides b/ACE/debian/libace-tkreactor-6.5.7.lintian-overrides
deleted file mode 100644
index 8db3eafb2e8..00000000000
--- a/ACE/debian/libace-tkreactor-6.5.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-tkreactor-6.5.7: no-symbols-control-file usr/lib/libACE_TkReactor-6.5.7.so
diff --git a/ACE/debian/libace-tkreactor-6.5.7.install b/ACE/debian/libace-tkreactor-6.5.8.install
index 12ab35062d2..12ab35062d2 100644
--- a/ACE/debian/libace-tkreactor-6.5.7.install
+++ b/ACE/debian/libace-tkreactor-6.5.8.install
diff --git a/ACE/debian/libace-tkreactor-6.5.8.lintian-overrides b/ACE/debian/libace-tkreactor-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..8c75e539987
--- /dev/null
+++ b/ACE/debian/libace-tkreactor-6.5.8.lintian-overrides
@@ -0,0 +1 @@
+libace-tkreactor-6.5.8: no-symbols-control-file usr/lib/libACE_TkReactor-6.5.8.so
diff --git a/ACE/debian/libace-tmcast-6.5.7.lintian-overrides b/ACE/debian/libace-tmcast-6.5.7.lintian-overrides
deleted file mode 100644
index 7fa02289d82..00000000000
--- a/ACE/debian/libace-tmcast-6.5.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-tmcast-6.5.7: no-symbols-control-file usr/lib/libACE_TMCast-6.5.7.so
diff --git a/ACE/debian/libace-tmcast-6.5.7.install b/ACE/debian/libace-tmcast-6.5.8.install
index e066131dea0..e066131dea0 100644
--- a/ACE/debian/libace-tmcast-6.5.7.install
+++ b/ACE/debian/libace-tmcast-6.5.8.install
diff --git a/ACE/debian/libace-tmcast-6.5.8.lintian-overrides b/ACE/debian/libace-tmcast-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..1a4e9135d1d
--- /dev/null
+++ b/ACE/debian/libace-tmcast-6.5.8.lintian-overrides
@@ -0,0 +1 @@
+libace-tmcast-6.5.8: no-symbols-control-file usr/lib/libACE_TMCast-6.5.8.so
diff --git a/ACE/debian/libace-xml-utils-6.5.7.lintian-overrides b/ACE/debian/libace-xml-utils-6.5.7.lintian-overrides
deleted file mode 100644
index 7fdfec21d25..00000000000
--- a/ACE/debian/libace-xml-utils-6.5.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-xml-utils-6.5.7: no-symbols-control-file usr/lib/libACE_XML_Utils-6.5.7.so
diff --git a/ACE/debian/libace-xml-utils-6.5.7.install b/ACE/debian/libace-xml-utils-6.5.8.install
index 2428ec9f109..2428ec9f109 100644
--- a/ACE/debian/libace-xml-utils-6.5.7.install
+++ b/ACE/debian/libace-xml-utils-6.5.8.install
diff --git a/ACE/debian/libace-xml-utils-6.5.8.lintian-overrides b/ACE/debian/libace-xml-utils-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..d63c9bc5cfa
--- /dev/null
+++ b/ACE/debian/libace-xml-utils-6.5.8.lintian-overrides
@@ -0,0 +1 @@
+libace-xml-utils-6.5.8: no-symbols-control-file usr/lib/libACE_XML_Utils-6.5.8.so
diff --git a/ACE/debian/libace-xtreactor-6.5.7.lintian-overrides b/ACE/debian/libace-xtreactor-6.5.7.lintian-overrides
deleted file mode 100644
index 65d4edd2fee..00000000000
--- a/ACE/debian/libace-xtreactor-6.5.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-xtreactor-6.5.7: no-symbols-control-file usr/lib/libACE_XtReactor-6.5.7.so
diff --git a/ACE/debian/libace-xtreactor-6.5.7.install b/ACE/debian/libace-xtreactor-6.5.8.install
index c53614c7208..c53614c7208 100644
--- a/ACE/debian/libace-xtreactor-6.5.7.install
+++ b/ACE/debian/libace-xtreactor-6.5.8.install
diff --git a/ACE/debian/libace-xtreactor-6.5.8.lintian-overrides b/ACE/debian/libace-xtreactor-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..a3e87729442
--- /dev/null
+++ b/ACE/debian/libace-xtreactor-6.5.8.lintian-overrides
@@ -0,0 +1 @@
+libace-xtreactor-6.5.8: no-symbols-control-file usr/lib/libACE_XtReactor-6.5.8.so
diff --git a/ACE/debian/libacexml-6.5.7.lintian-overrides b/ACE/debian/libacexml-6.5.7.lintian-overrides
deleted file mode 100644
index c474f3856a6..00000000000
--- a/ACE/debian/libacexml-6.5.7.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-libacexml-6.5.7: no-symbols-control-file usr/lib/libACEXML_Parser-6.5.7.so
-libacexml-6.5.7: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.5.7.so
-libacexml-6.5.7: no-symbols-control-file usr/lib/libACEXML-6.5.7.so
diff --git a/ACE/debian/libacexml-6.5.7.docs b/ACE/debian/libacexml-6.5.8.docs
index 002855d7915..002855d7915 100644
--- a/ACE/debian/libacexml-6.5.7.docs
+++ b/ACE/debian/libacexml-6.5.8.docs
diff --git a/ACE/debian/libacexml-6.5.7.install b/ACE/debian/libacexml-6.5.8.install
index d3e912ffa51..d3e912ffa51 100644
--- a/ACE/debian/libacexml-6.5.7.install
+++ b/ACE/debian/libacexml-6.5.8.install
diff --git a/ACE/debian/libacexml-6.5.8.lintian-overrides b/ACE/debian/libacexml-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..a9c6f75fafc
--- /dev/null
+++ b/ACE/debian/libacexml-6.5.8.lintian-overrides
@@ -0,0 +1,3 @@
+libacexml-6.5.8: no-symbols-control-file usr/lib/libACEXML_Parser-6.5.8.so
+libacexml-6.5.8: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.5.8.so
+libacexml-6.5.8: no-symbols-control-file usr/lib/libACEXML-6.5.8.so
diff --git a/ACE/debian/libkokyu-6.5.7.lintian-overrides b/ACE/debian/libkokyu-6.5.7.lintian-overrides
deleted file mode 100644
index f9d71b00e0b..00000000000
--- a/ACE/debian/libkokyu-6.5.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkokyu-6.5.7: no-symbols-control-file usr/lib/libKokyu-6.5.7.so
diff --git a/ACE/debian/libkokyu-6.5.7.docs b/ACE/debian/libkokyu-6.5.8.docs
index e8869c513b2..e8869c513b2 100644
--- a/ACE/debian/libkokyu-6.5.7.docs
+++ b/ACE/debian/libkokyu-6.5.8.docs
diff --git a/ACE/debian/libkokyu-6.5.7.install b/ACE/debian/libkokyu-6.5.8.install
index 62854308f96..62854308f96 100644
--- a/ACE/debian/libkokyu-6.5.7.install
+++ b/ACE/debian/libkokyu-6.5.8.install
diff --git a/ACE/debian/libkokyu-6.5.8.lintian-overrides b/ACE/debian/libkokyu-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..87c19f0fd34
--- /dev/null
+++ b/ACE/debian/libkokyu-6.5.8.lintian-overrides
@@ -0,0 +1 @@
+libkokyu-6.5.8: no-symbols-control-file usr/lib/libKokyu-6.5.8.so
diff --git a/ACE/debian/libnetsvcs-6.5.7.lintian-overrides b/ACE/debian/libnetsvcs-6.5.7.lintian-overrides
deleted file mode 100644
index 2171c607360..00000000000
--- a/ACE/debian/libnetsvcs-6.5.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libnetsvcs-6.5.7: no-symbols-control-file usr/lib/libnetsvcs-6.5.7.so
diff --git a/ACE/debian/libnetsvcs-6.5.7.docs b/ACE/debian/libnetsvcs-6.5.8.docs
index 0b03c55b91f..0b03c55b91f 100644
--- a/ACE/debian/libnetsvcs-6.5.7.docs
+++ b/ACE/debian/libnetsvcs-6.5.8.docs
diff --git a/ACE/debian/libnetsvcs-6.5.7.install b/ACE/debian/libnetsvcs-6.5.8.install
index c7a04b16213..c7a04b16213 100644
--- a/ACE/debian/libnetsvcs-6.5.7.install
+++ b/ACE/debian/libnetsvcs-6.5.8.install
diff --git a/ACE/debian/libnetsvcs-6.5.8.lintian-overrides b/ACE/debian/libnetsvcs-6.5.8.lintian-overrides
new file mode 100644
index 00000000000..9bdc70451e8
--- /dev/null
+++ b/ACE/debian/libnetsvcs-6.5.8.lintian-overrides
@@ -0,0 +1 @@
+libnetsvcs-6.5.8: no-symbols-control-file usr/lib/libnetsvcs-6.5.8.so
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index 6342ec86b78..ee5965ed229 100644
--- a/ACE/rpmbuild/ace-tao.spec
+++ b/ACE/rpmbuild/ace-tao.spec
@@ -1,6 +1,6 @@
 # Set the version number here.
-%define ACEVER  6.5.7
-%define TAOVER  2.5.7
+%define ACEVER  6.5.8
+%define TAOVER  2.5.8
 
 # Conditional build
 # Default values are
diff --git a/TAO/ChangeLogs/TAO-2_5_8 b/TAO/ChangeLogs/TAO-2_5_8
new file mode 100644
index 00000000000..08bb836fae5
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-2_5_8
@@ -0,0 +1,341 @@
+commit 937821529f194235a709d6db7b5622368857d272
+Merge: 9b58bb58f48 e1ec7a61a1b
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Feb 7 11:05:02 2020 -0600
+
+    Merge pull request #1038 from iguessthislldo/igtd/packaging
+    
+    Fix Make Install With DESTDIR
+
+commit 7c1ba7b90306bec2a3479f81d15a51ad8834fd44
+Merge: c9ac5fecf46 37ddee2ee71
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Feb 4 16:13:58 2020 -0600
+
+    Merge branch 'igtd/android-on-windows' of github.com:iguessthislldo/ACE_TAO into igtd/android-on-windows
+
+commit c9ac5fecf4621d2e186932a4003890506ce37b58
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Feb 4 16:08:45 2020 -0600
+
+    Add VERSION rename to NEWS files
+
+commit 977c354addc03b848b47c392658dfc00338bf1cb
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Feb 4 15:23:17 2020 -0600
+
+    Change More References to VERSION.txt
+
+commit 816fca070860bbbb003aa59bc2acc69f98000cc0
+Merge: 38524dca083 cd1cef25211
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 30 12:20:16 2020 +0100
+
+    Merge pull request #1037 from jwillemsen/master
+    
+    List some important changes
+
+commit 38524dca083ae9a2687fca5f747f7a85cf0361b2
+Merge: 62b746c116f 2fd299e082a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 30 12:20:02 2020 +0100
+
+    Merge pull request #1036 from mcorino/mco-fix-deferred-segfault
+    
+    Fix transient error handling with deferred DII requests.
+
+commit cd1cef25211ce104cf784bf2cba14a5b52d93d51
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 30 11:50:22 2020 +0100
+
+    List some important changes
+    
+        * ACE/NEWS:
+        * TAO/NEWS:
+
+commit 2fd299e082affb7d8a98d10c4729b0b9215214f2
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Wed Jan 29 15:57:24 2020 +0100
+
+    Fix segmentation faults on transient (write) errors from DII deferred requests.
+    
+        * TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp:
+
+commit 0f723d9f5e8a77fa0b80198cc0523295c730ca01
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Wed Jan 29 10:44:17 2020 +0100
+
+    Added regression test for transient error handling with deferred DII requests.
+    
+        * TAO/tests/DII_Deferred_Transient/DII_Deferred_Transient.mpc:
+        * TAO/tests/DII_Deferred_Transient/Hello.cpp:
+        * TAO/tests/DII_Deferred_Transient/Hello.h:
+        * TAO/tests/DII_Deferred_Transient/README:
+        * TAO/tests/DII_Deferred_Transient/Test.idl:
+        * TAO/tests/DII_Deferred_Transient/client.cpp:
+        * TAO/tests/DII_Deferred_Transient/run_test.pl:
+        * TAO/tests/DII_Deferred_Transient/server.cpp:
+          Added.
+    
+        * TAO/bin/tao_orb_tests.lst:
+
+commit ea67ac4d6fbe101532dda1f7d8247f3de5b1849a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 28 15:09:36 2020 +0100
+
+    Layout changes
+    
+        * TAO/tao/Abstract_Servant_Base.h:
+        * TAO/tao/AnyTypeCode/Alias_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h:
+        * TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Enum_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h:
+        * TAO/tao/AnyTypeCode/Fixed_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Objref_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h:
+        * TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Sequence_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h:
+        * TAO/tao/AnyTypeCode/String_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Struct_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h:
+        * TAO/tao/AnyTypeCode/True_RefCount_Policy.h:
+        * TAO/tao/AnyTypeCode/TypeCode.h:
+        * TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h:
+        * TAO/tao/AnyTypeCode/Union_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Value_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Value_TypeCode_Static.h:
+        * TAO/tao/Asynch_Reply_Dispatcher_Base.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h:
+        * TAO/tao/Cleanup_Func_Registry.h:
+        * TAO/tao/Connection_Handler.h:
+        * TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h:
+        * TAO/tao/Dynamic_TP/DTP_POA_Strategy.h:
+        * TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h:
+        * TAO/tao/Endpoint.h:
+        * TAO/tao/FlResource/FlResource_Factory.h:
+        * TAO/tao/FoxResource/FoxResource_Factory.h:
+        * TAO/tao/GUIResource_Factory.h:
+        * TAO/tao/IIOP_Profile.h:
+        * TAO/tao/IIOP_Transport.h:
+        * TAO/tao/IORManipulation/IORManip_Filter.h:
+        * TAO/tao/IORManipulation/IORManip_IIOP_Filter.h:
+        * TAO/tao/IORManipulation/IORManipulation.h:
+        * TAO/tao/IORTable/Async_Table_Adapter.h:
+        * TAO/tao/IORTable/Locate_ResponseHandler.h:
+        * TAO/tao/Invocation_Adapter.h:
+        * TAO/tao/LF_Event.h:
+        * TAO/tao/LF_Invocation_Event.h:
+        * TAO/tao/LF_Multi_Event.h:
+        * TAO/tao/LocalObject.h:
+        * TAO/tao/MProfile.h:
+        * TAO/tao/Messaging/AMH_Response_Handler.h:
+        * TAO/tao/Messaging/Asynch_Invocation_Adapter.h:
+        * TAO/tao/Transport.h:
+
+commit 1540f6900d923c6f4548c90dde09bb4d6175a45a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 28 13:48:09 2020 +0100
+
+    Layout changes
+    
+        * TAO/tao/AnyTypeCode/Alias_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h:
+        * TAO/tao/AnyTypeCode/Enum_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h:
+        * TAO/tao/AnyTypeCode/Fixed_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h:
+        * TAO/tao/AnyTypeCode/NVList.h:
+        * TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Sequence_TypeCode.h:
+        * TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h:
+        * TAO/tao/AnyTypeCode/String_TypeCode.h:
+        * TAO/tao/AnyTypeCode/String_TypeCode_Static.h:
+        * TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h:
+        * TAO/tao/AnyTypeCode/TypeCode.h:
+        * TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h:
+        * TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h:
+        * TAO/tao/AnyTypeCode/TypeCode_Case_T.h:
+        * TAO/tao/AnyTypeCode/Value_TypeCode_Static.h:
+        * TAO/tao/BiDir_GIOP/BiDirGIOP.cpp:
+        * TAO/tao/CDR.h:
+        * TAO/tao/CORBALOC_Parser.h:
+        * TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h:
+        * TAO/tao/CSD_Framework/CSD_POA.h:
+        * TAO/tao/CSD_Framework/CSD_Strategy_Base.h:
+        * TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Request.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h:
+        * TAO/tao/CSD_ThreadPool/CSD_TP_Task.h:
+        * TAO/tao/Collocated_Invocation.h:
+        * TAO/tao/Connector_Impl.h:
+        * TAO/tao/Default_Endpoint_Selector_Factory.h:
+        * TAO/tao/Default_Thread_Lane_Resources_Manager.h:
+        * TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h:
+        * TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h:
+        * TAO/tao/DynamicAny/DynCommon.h:
+        * TAO/tao/DynamicInterface/DII_Invocation_Adapter.h:
+        * TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp:
+        * TAO/tao/DynamicInterface/Dynamic_Implementation.h:
+        * TAO/tests/Connection_Failure/README:
+        * TAO/tests/Crashed_Callback/README:
+
+commit 96ca3b0d0c9fc273a570a51b1193a9dea90252c6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 24 16:30:52 2020 +0100
+
+    Simplified scope
+    
+        * TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+
+commit 95564b4494e21770f94fff6295e2c6e361963364
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 24 16:30:33 2020 +0100
+
+    Removed not used operation
+    
+        * TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp:
+        * TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h:
+
+commit 37ddee2ee7109a5093b360da104116389292acd5
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Fri Jan 17 17:27:34 2020 -0600
+
+    Rename VERSION files to VERSION.txt
+    
+    C++20 brings a new standard header called "version". This wouldn't be an
+    issue except for on Windows where filenames can be case insensitive.
+    This issue was discovered why trying to cross-compile for Android on
+    Windows.
+
+commit e75bfac7b176650dc4a9933a080d58e9ebbd9a15
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Wed Jan 8 15:54:41 2020 -0600
+
+    Simplify how gperf is used to generate code for TAO_IDL_FE
+
+commit e1ec7a61a1bc893f3c9d7fb6122c2068c88ebdde
+Author: Fred Hornsey <fred@hornsey.us>
+Date:   Tue Jan 7 17:03:05 2020 -0600
+
+    Fix Make Install With DESTDIR
+    
+    When DESTDIR is specified, this ln command with a shell expansion
+    doesn't work because the libraries don't exist in the INSTALL_PREFIX
+    yet.
+
+commit eec97cc2d1d1aa09844ea0c8d5be07deaa5853e6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 7 13:38:57 2020 +0100
+
+    Doxygen changes
+    
+        * TAO/tests/Policies/Manipulation.cpp:
+
+commit 91058043be8e95f249804fd853dd626cea81b95f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 7 13:38:38 2020 +0100
+
+    Removed empty lines
+    
+        * TAO/tao/Unbounded_Object_Reference_Sequence_T.h:
+
+commit 2075eb4e4ab97dc02f705656314428fb5f20815f
+Merge: e088d1ba9fe 377169fceaa
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Fri Jan 3 11:53:20 2020 -0600
+
+    Merge pull request #1010 from iguessthislldo/igtd/tao_idl_leaks
+    
+    Various fixes for tao_idl built using clang with -fsanitize=undefined,address passed.
+
+commit 0012aac0cff7a8372dd81d4c232712681da4b866
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Fri Dec 20 21:58:38 2019 -0600
+
+    Fix for Annotation Param Scope Issue
+    
+    See: https://github.com/DOCGroup/ACE_TAO/issues/997
+    
+    When the original annotation work (https://github.com/DOCGroup/ACE_TAO/pull/723)
+    was done it was assumed that when annotations didn't define the symbol
+    being used, the lookup for the parameters would go up the scope stack to
+    the current scope. This turned out not the case, so this functionality
+    was implemented just for annotation parameters.
+
+commit 9e30891676aa30106d679b3a71cc72b5c5b76c2b
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed Dec 18 01:10:00 2019 -0600
+
+    Various Small Fixes for IDLv4/annotations
+
+commit 377169fceaa4a348334b038c236be20df6fa59ed
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Fri Dec 20 17:09:16 2019 -0600
+
+    New Method in AST_InterfaceFwd in tao_idl
+    
+    Separate out functionality for disowning memory into it's own function.
+    
+    Respond to Review in https://github.com/DOCGroup/ACE_TAO/pull/1010
+
+commit 77a212244fc64003da9f078738b4fa0863595210
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed Dec 18 12:18:52 2019 -0600
+
+    Style Fixes
+
+commit 077f03e97ed4cf43325b32fff14eadcfd8fa6bba
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed Dec 18 01:11:27 2019 -0600
+
+    Fixes for tao_idl compiled with asan and ubsan
+    
+    Various fixes for tao_idl built using clang with
+    -fsanitize=undefined,address passed.
+    
+    - Work around static init ub in ACE_Sync_Options based on if
+      ACE_INITIALIZE_MEMORY_BEFORE_USE is defined.
+    - Fix a memory leak in UTL_Scope and a possible null dereference in
+      tao_idl be.
+    - Fixed a hard to track down memory leak involving AST_InterfaceFwd not
+      handling ownership of its placeholder AST_Interface correctly under
+      a case when a forward declaration of an interface is made after the
+      interface was already declared.
+
+commit cab5c35b998c07e98d5c5b360a774e65d973b733
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Nov 22 10:13:31 2019 +0100
+
+    Make x.5.7 available
+    
+        * ACE/NEWS:
+        * ACE/bin/copy-script.sh:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/docs/bczar/bczar.html:
+        * ACE/etc/index.html:
+        * TAO/NEWS:
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index da87d66187e..fdcbead859c 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/PROBLEM-REPORT-FORM
@@ -40,8 +40,8 @@
 To: tao-bugs@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    TAO VERSION: 2.5.7
-    ACE VERSION: 6.5.7
+    TAO VERSION: 2.5.8
+    ACE VERSION: 6.5.8
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/VERSION.txt b/TAO/VERSION.txt
index f4779e6769e..50959b39a35 100644
--- a/TAO/VERSION.txt
+++ b/TAO/VERSION.txt
@@ -1,4 +1,4 @@
-This is TAO version 2.5.7, released Fri Nov 22 09:24:48 CET 2019
+This is TAO version 2.5.8, released Mon Feb 10 09:28:37 CET 2020
 
 If you have any problems with or questions about TAO, please send
 e-mail to the TAO mailing list (tao-bugs@list.isis.vanderbilt.edu),
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index f01cfb6291d..6d5a6f629c5 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -4,9 +4,9 @@
 
 #define TAO_MAJOR_VERSION 2
 #define TAO_MINOR_VERSION 5
-#define TAO_MICRO_VERSION 7
-#define TAO_BETA_VERSION 7
-#define TAO_VERSION "2.5.7"
-#define TAO_VERSION_CODE 132359
+#define TAO_MICRO_VERSION 8
+#define TAO_BETA_VERSION 8
+#define TAO_VERSION "2.5.8"
+#define TAO_VERSION_CODE 132360
 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))