summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ChangeLogs/ACE-6_5_3367
-rw-r--r--ACE/PROBLEM-REPORT-FORM2
-rw-r--r--ACE/VERSION2
-rw-r--r--ACE/ace/Version.h8
-rw-r--r--ACE/debian/control62
-rw-r--r--ACE/debian/libace-6.5.2.lintian-overrides6
-rw-r--r--ACE/debian/libace-6.5.3.docs (renamed from ACE/debian/libace-6.5.2.docs)0
-rw-r--r--ACE/debian/libace-6.5.3.install (renamed from ACE/debian/libace-6.5.2.install)0
-rw-r--r--ACE/debian/libace-6.5.3.lintian-overrides6
-rw-r--r--ACE/debian/libace-flreactor-6.5.2.lintian-overrides1
-rw-r--r--ACE/debian/libace-flreactor-6.5.3.install (renamed from ACE/debian/libace-flreactor-6.5.2.install)0
-rw-r--r--ACE/debian/libace-flreactor-6.5.3.lintian-overrides1
-rw-r--r--ACE/debian/libace-foxreactor-6.5.2.lintian-overrides1
-rw-r--r--ACE/debian/libace-foxreactor-6.5.3.install (renamed from ACE/debian/libace-foxreactor-6.5.2.install)0
-rw-r--r--ACE/debian/libace-foxreactor-6.5.3.lintian-overrides1
-rw-r--r--ACE/debian/libace-htbp-6.5.2.lintian-overrides1
-rw-r--r--ACE/debian/libace-htbp-6.5.3.install (renamed from ACE/debian/libace-htbp-6.5.2.install)0
-rw-r--r--ACE/debian/libace-htbp-6.5.3.lintian-overrides1
-rw-r--r--ACE/debian/libace-inet-6.5.2.lintian-overrides2
-rw-r--r--ACE/debian/libace-inet-6.5.3.install (renamed from ACE/debian/libace-inet-6.5.2.install)0
-rw-r--r--ACE/debian/libace-inet-6.5.3.lintian-overrides2
-rw-r--r--ACE/debian/libace-inet-ssl-6.5.2.lintian-overrides4
-rw-r--r--ACE/debian/libace-inet-ssl-6.5.3.install (renamed from ACE/debian/libace-inet-ssl-6.5.2.install)0
-rw-r--r--ACE/debian/libace-inet-ssl-6.5.3.lintian-overrides4
-rw-r--r--ACE/debian/libace-rmcast-6.5.2.lintian-overrides1
-rw-r--r--ACE/debian/libace-rmcast-6.5.3.install (renamed from ACE/debian/libace-rmcast-6.5.2.install)0
-rw-r--r--ACE/debian/libace-rmcast-6.5.3.lintian-overrides1
-rw-r--r--ACE/debian/libace-ssl-6.5.2.lintian-overrides5
-rw-r--r--ACE/debian/libace-ssl-6.5.3.NEWS (renamed from ACE/debian/libace-ssl-6.5.2.NEWS)0
-rw-r--r--ACE/debian/libace-ssl-6.5.3.install (renamed from ACE/debian/libace-ssl-6.5.2.install)0
-rw-r--r--ACE/debian/libace-ssl-6.5.3.lintian-overrides5
-rw-r--r--ACE/debian/libace-tkreactor-6.5.2.lintian-overrides1
-rw-r--r--ACE/debian/libace-tkreactor-6.5.3.install (renamed from ACE/debian/libace-tkreactor-6.5.2.install)0
-rw-r--r--ACE/debian/libace-tkreactor-6.5.3.lintian-overrides1
-rw-r--r--ACE/debian/libace-tmcast-6.5.2.lintian-overrides1
-rw-r--r--ACE/debian/libace-tmcast-6.5.3.install (renamed from ACE/debian/libace-tmcast-6.5.2.install)0
-rw-r--r--ACE/debian/libace-tmcast-6.5.3.lintian-overrides1
-rw-r--r--ACE/debian/libace-xml-utils-6.5.2.lintian-overrides1
-rw-r--r--ACE/debian/libace-xml-utils-6.5.3.install (renamed from ACE/debian/libace-xml-utils-6.5.2.install)0
-rw-r--r--ACE/debian/libace-xml-utils-6.5.3.lintian-overrides1
-rw-r--r--ACE/debian/libace-xtreactor-6.5.2.lintian-overrides1
-rw-r--r--ACE/debian/libace-xtreactor-6.5.3.install (renamed from ACE/debian/libace-xtreactor-6.5.2.install)0
-rw-r--r--ACE/debian/libace-xtreactor-6.5.3.lintian-overrides1
-rw-r--r--ACE/debian/libacexml-6.5.2.lintian-overrides3
-rw-r--r--ACE/debian/libacexml-6.5.3.docs (renamed from ACE/debian/libacexml-6.5.2.docs)0
-rw-r--r--ACE/debian/libacexml-6.5.3.install (renamed from ACE/debian/libacexml-6.5.2.install)0
-rw-r--r--ACE/debian/libacexml-6.5.3.lintian-overrides3
-rw-r--r--ACE/debian/libkokyu-6.5.2.lintian-overrides1
-rw-r--r--ACE/debian/libkokyu-6.5.3.docs (renamed from ACE/debian/libkokyu-6.5.2.docs)0
-rw-r--r--ACE/debian/libkokyu-6.5.3.install (renamed from ACE/debian/libkokyu-6.5.2.install)0
-rw-r--r--ACE/debian/libkokyu-6.5.3.lintian-overrides1
-rw-r--r--ACE/debian/libnetsvcs-6.5.2.lintian-overrides1
-rw-r--r--ACE/debian/libnetsvcs-6.5.3.docs (renamed from ACE/debian/libnetsvcs-6.5.2.docs)0
-rw-r--r--ACE/debian/libnetsvcs-6.5.3.install (renamed from ACE/debian/libnetsvcs-6.5.2.install)0
-rw-r--r--ACE/debian/libnetsvcs-6.5.3.lintian-overrides1
-rw-r--r--ACE/rpmbuild/ace-tao.spec4
-rw-r--r--TAO/ChangeLogs/TAO-2_5_3369
-rw-r--r--TAO/PROBLEM-REPORT-FORM4
-rw-r--r--TAO/VERSION2
-rw-r--r--TAO/tao/Version.h8
60 files changed, 812 insertions, 76 deletions
diff --git a/ACE/ChangeLogs/ACE-6_5_3 b/ACE/ChangeLogs/ACE-6_5_3
new file mode 100644
index 00000000000..58130d91da7
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-6_5_3
@@ -0,0 +1,367 @@
+commit c7ef18e4589dd6a16a5d35f7eee45f1f761e5a87
+Merge: 01ff2f9dcd8 776b9cc8e60
+Author: Steve Huston <shuston@riverace.com>
+Date: Fri Nov 16 10:22:09 2018 -0500
+
+ Merge pull request #749 from DOCGroup/issue-748
+
+ Add a test case exercising user-allocated ACE_Data_Block-derived object controlled by ACE_Message_Block.
+
+commit 94ce9b72ac6cc07ac73f02368c0bed7a5ea4c80e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Nov 16 16:00:05 2018 +0100
+
+ List more changes
+
+commit ac1259a122c71dbc1a34fc06bf9289ffe5288d66
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Nov 16 11:28:02 2018 +0100
+
+ Fixed typo in comment
+
+ * ACE/ace/Message_Block.h:
+
+commit b0d2c3ec0e1c844aa6f6a1a13dc8859efcbe3879
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Nov 16 11:27:49 2018 +0100
+
+ List new changes
+
+ * ACE/NEWS:
+ * TAO/NEWS:
+
+commit 776b9cc8e609a4ddfe9e61efacb7bc8135890832
+Author: Steve Huston <shuston@riverace.com>
+Date: Fri Nov 16 00:23:16 2018 +0000
+
+ Remove trailing whitespace per fuzz
+
+commit bd3b3d8cab87cf43a15c9196858291c8a0e5965c
+Author: Steve Huston <shuston@riverace.com>
+Date: Thu Nov 15 21:07:48 2018 +0000
+
+ Use correct ACE_Allocator for user-defined data block per API requirements
+
+commit 5c8a5f3056270427afe82cdc95750b1abd8541ba
+Author: Steve Huston <shuston@riverace.com>
+Date: Thu Nov 15 17:58:07 2018 +0000
+
+ Add user-defined ACE_Data_Block test case
+
+commit 0d16c9482cc00ee70f3c8115ced0154170db748e
+Merge: e222083eee8 2bc4eca4e2b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu Nov 8 09:27:43 2018 +0100
+
+ Merge pull request #746 from mitza-oci/clang-compiler-test
+
+ Update compiler test for clang
+
+commit e222083eee80bec572611f4257315e5ddaefca30
+Merge: f6b983b175a aeb6cb47d17
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Nov 7 18:25:50 2018 +0100
+
+ Merge pull request #747 from jwillemsen/master
+
+ semun is not available on Android with NDK less 12.1b or API level 21…
+
+commit aeb6cb47d17fd0f39ae09c16ef981eec4b5bc5c1
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Nov 7 18:25:08 2018 +0100
+
+ semun is not available on Android with NDK less 12.1b or API level 21. With NDK >= 12.1 or API level >= 21 we include sys/sem.h which defines semun
+
+ * ACE/ace/config-android.h:
+
+commit 2bc4eca4e2bd4ea75433c2d5699781590df996e4
+Author: Adam Mitz <mitza@ociweb.com>
+Date: Wed Nov 7 10:45:32 2018 -0600
+
+ Current versions of clang claim to have this fixed, its bugzilla bug is closed
+
+commit 43a8c6c45a904664d0ca322c24cdba724c59b1af
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Nov 7 15:10:48 2018 +0100
+
+ Removed experiment for using linux/sem.h
+
+ * ACE/ace/os_include/sys/os_sem.h:
+
+commit 677136f06ad184103e5df1270b68cee572e900d4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Nov 7 15:06:37 2018 +0100
+
+ Android API or NDK>=15 do have a senum so don't let ACE define its version
+
+ * ACE/ace/config-android.h:
+
+commit 857dc18761d04c4fa3e88302f5090b0f0e09b108
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Nov 7 15:03:00 2018 +0100
+
+ Revert "Android NDK13 does ship a senum type, isn't usable, but ACE shouldn't…"
+
+commit 950dd74dd9ac2379c6b4ec1365738d6393313ce1
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Nov 7 14:56:01 2018 +0100
+
+ Removed define of ACE_HAS_SEMUN, when not set ACE will define a senum type, it shouldn't do that on Android
+
+ * ACE/ace/config-android.h:
+
+commit 901f33ca78dc15ff64922e42a401ee18c074a4c3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Nov 7 14:51:14 2018 +0100
+
+ Android NDK13 does ship a senum type, isn't usable, but ACE shouldn't define its own version
+
+ * ACE/ace/config-android.h:
+ * ACE/ace/os_include/sys/os_sem.h:
+
+commit 1f110c0861392f44ff76335cd3a7ac64d9c4fdb3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Nov 7 12:47:42 2018 +0100
+
+ Only define ACE_HAS_SEMUN when we have API >= 12 and at least NDK 15, if not, we just not define it
+
+ * ACE/ace/config-android.h:
+
+commit 646f3913692ea052a3f28b5c41637a3705dc0115
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Nov 7 12:46:51 2018 +0100
+
+ Fixed typo
+
+ * ACE/include/makeinclude/platform_android.GNU:
+
+commit 618533091124a97d6dcd4b106e38cb5ca2477b98
+Merge: 764ff58a2e8 40af509ec08
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date: Tue Nov 6 16:50:01 2018 -0600
+
+ Merge pull request #726 from iguessthislldo/igtd/android
+
+ Support for Clang based Android NDKs
+
+commit 097e1e7f880b2e9f55a5cf557f373a44035e0b93
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Nov 2 09:14:22 2018 +0100
+
+ Use SSL_INCDIR and SSL_LIBDIR as they are now generated by MPC
+
+commit ad1c781d9f20082620aaf27f69ccbd829991017e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Oct 31 12:17:01 2018 +0100
+
+ Only set CXX and CC when they are not set by the user
+
+ * ACE/include/makeinclude/platform_linux_clang.GNU:
+
+commit 40af509ec08305295db1db5e8c4ed6b74eb13ec8
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Tue Oct 30 17:19:29 2018 -0500
+
+ platform_android.GNU: Fix android_neon
+
+commit f50935c83e7c627ab0b17c76c825ea081a2487ce
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Tue Oct 30 16:47:51 2018 -0500
+
+ ACE-INSTALL.html: Update Android Section
+
+ Also made other small changes throughout the file. The largest of these
+ is changing the style of pre and code tags to stand out more with a grey
+ background, and any changes to fix broken html revealed by that style
+ change.
+
+commit d39c21045d5747b1cfec09653038c9f09fa305b1
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Tue Oct 30 15:24:54 2018 -0500
+
+ config-android.h: Adjust a NDK version macro
+
+commit c1f4fbaa1b07651b2e212f1bd568bb6abe6751d9
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Tue Oct 30 11:39:23 2018 -0500
+
+ platform_android.GNU: Combine arm7 marcos
+
+commit 02ab4d6ef4606ad7fea5f9c0a87aee3b2e06ee53
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Mon Oct 29 17:29:40 2018 -0500
+
+ config-android.h: Fix error message
+
+commit ef125b3b256e85068b74f2e74755139caada6ecb
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Mon Oct 29 17:15:48 2018 -0500
+
+ platform_android.GNU: Force clang by default
+
+ This tries to fix a problem with NDKs where the transision between GCC
+ and clang is causing problems using g++. android_force_clang will have
+ to be set to 0 to use g++, which can be GCC or clang.
+
+commit cddb2d2bb178b0d618c3f4ea6be1a1351ad3998e
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Mon Oct 29 16:01:49 2018 -0500
+
+ Error if Android NDK < r15 and Android API >= 21
+
+commit baf54e97e1f00d18c90d2241e3d75ec3298c6475
+Author: Fred Hornsey <fred@hornsey.us>
+Date: Wed Oct 24 21:47:18 2018 -0500
+
+ Force Non-Versioned SOs on Android
+
+commit 5f8a64354dc7293591caf4f011f16f4f9e98239f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Oct 22 10:52:27 2018 +0200
+
+ Layout changes
+
+ * ACE/ace/Reactor.h:
+ * ACE/ace/Select_Reactor_T.h:
+ * ACE/ace/Select_Reactor_T.inl:
+
+commit 6d77d231876be9f18e8e54dc4fd43d5a9c7177e5
+Author: Fred Hornsey <fred@hornsey.us>
+Date: Thu Oct 18 15:22:43 2018 -0500
+
+ Try to fix semaphores in older Android NDKs
+
+commit cc9d5d4d536cc031253b986b5fbd4abd07f3652e
+Author: Fred Hornsey <fred@hornsey.us>
+Date: Wed Oct 17 20:24:30 2018 -0500
+
+ config-android.h: Update for Newer NDK
+
+commit 85291bed9f9e941d64e3e2b91c36e9761908f55c
+Author: Fred Hornsey <fred@hornsey.us>
+Date: Tue Oct 16 18:00:31 2018 -0500
+
+ Update platform make files to support android clang
+
+commit 10983a559cf292c3c3255c869de8d024769cbe57
+Merge: f44396b9b5a 09adcb36020
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 9 17:05:33 2018 +0100
+
+ Merge pull request #722 from jwillemsen/master
+
+ Const enhancements
+
+commit 09adcb360201488de3635baf7d662f4e28ad0927
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 9 11:42:22 2018 +0200
+
+ Const enhancements
+
+ * ACE/ace/Time_Value.cpp:
+
+commit f44396b9b5a3f0f7496e207a554798616fde0c7d
+Merge: 40998af8327 cefeaac755c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Sun Oct 7 09:14:18 2018 +0100
+
+ Merge pull request #703 from likema/feature/rpath
+
+ Fix AIX and Solaris linking rpath errors.
+
+commit 1b27e1d8bb7c9246b7f7ffd53532fb1d1123e896
+Author: Adam Mitz <mitza@ociweb.com>
+Date: Wed Sep 26 09:05:14 2018 -0500
+
+ clang 7
+
+commit b12d3a7598f4017b864af9ae6b49b2067e262f6e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu Sep 20 14:34:38 2018 +0200
+
+ Fixed typo
+
+commit 8de28a4880d600d2ed08aa414aadf2f2576e3acc
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu Sep 20 14:31:54 2018 +0200
+
+ Removed broken links
+
+ * ACE/docs/ACE-subsets.html:
+
+commit bac61a111f3c0e22275a07f7098f1bd9356882c5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu Sep 20 14:21:30 2018 +0200
+
+ Removed broken link
+
+ * ACE/ACE-INSTALL.html:
+
+commit 6881ff62f2d8bc16efb060307bad5deb4fc7a7fd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Sep 18 14:36:37 2018 +0200
+
+ Upgraded to latest doxygen configuration file version
+
+ * ACE/etc/ace.doxygen:
+ * ACE/etc/ace_inet.doxygen:
+ * ACE/etc/ace_qos.doxygen:
+ * ACE/etc/ace_rmcast.doxygen:
+ * ACE/etc/ace_ssl.doxygen:
+ * ACE/etc/acexml.doxygen:
+ * TAO/etc/tao.doxygen:
+ * TAO/etc/tao_anytypecode.doxygen:
+ * TAO/etc/tao_av.doxygen:
+ * TAO/etc/tao_compression.doxygen:
+ * TAO/etc/tao_cosevent.doxygen:
+ * TAO/etc/tao_cosnaming.doxygen:
+ * TAO/etc/tao_cosnotification.doxygen:
+ * TAO/etc/tao_costime.doxygen:
+ * TAO/etc/tao_costrader.doxygen:
+ * TAO/etc/tao_dynamicany.doxygen:
+ * TAO/etc/tao_dynamicinterface.doxygen:
+ * TAO/etc/tao_esf.doxygen:
+ * TAO/etc/tao_ifr.doxygen:
+ * TAO/etc/tao_implrepo.doxygen:
+ * TAO/etc/tao_iormanip.doxygen:
+ * TAO/etc/tao_iortable.doxygen:
+ * TAO/etc/tao_pi.doxygen:
+ * TAO/etc/tao_pi_server.doxygen:
+ * TAO/etc/tao_portablegroup.doxygen:
+ * TAO/etc/tao_portableserver.doxygen:
+ * TAO/etc/tao_rtcorba.doxygen:
+ * TAO/etc/tao_rtevent.doxygen:
+ * TAO/etc/tao_rtportableserver.doxygen:
+ * TAO/etc/tao_security.doxygen:
+ * TAO/etc/tao_smartproxies.doxygen:
+ * TAO/etc/tao_ssliop.doxygen:
+ * TAO/etc/tao_strategies.doxygen:
+ * TAO/etc/tao_transportcurrent.doxygen:
+ * TAO/etc/tao_ziop.doxygen:
+
+commit d6adab822decfad3e7408d6f4538490f5566c0d8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Sep 18 11:40:28 2018 +0200
+
+ Use https links to OBS and remove link to Ken Sedgwick's RPMs because these are not updated anymore
+
+ * ACE/docs/Download.html:
+
+commit 01fc7a23cf7e6772d85f9fee367803b3e85a1118
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Sep 18 09:36:39 2018 +0200
+
+ Make x.5.2 public as new release
+
+ * ACE/NEWS:
+ * 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:
+
+commit cefeaac755c65d4a6969163733e2e92928dff849
+Author: Like Ma <likemartinma@gmail.com>
+Date: Wed Sep 12 19:40:38 2018 +0800
+
+ Fix AIX and Solaris linking rpath errors.
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index 75b1119c9a2..3f83fa6bb73 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.2
+ ACE VERSION: 6.5.3
HOST MACHINE and OPERATING SYSTEM:
If on Windows based OS's, which version of WINSOCK do you
diff --git a/ACE/VERSION b/ACE/VERSION
index 9241f2bc305..dd5359ba80b 100644
--- a/ACE/VERSION
+++ b/ACE/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 6.5.2, released Tue Sep 18 09:25:49 CEST 2018
+This is ACE version 6.5.3, released Mon Nov 19 10:44:23 CET 2018
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 145af28027e..910d84df986 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 2
-#define ACE_BETA_VERSION 2
-#define ACE_VERSION "6.5.2"
-#define ACE_VERSION_CODE 394498
+#define ACE_MICRO_VERSION 3
+#define ACE_BETA_VERSION 3
+#define ACE_VERSION "6.5.3"
+#define ACE_VERSION_CODE 394499
#define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git a/ACE/debian/control b/ACE/debian/control
index 25d98b26a84..4b81b6dbdea 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.2
+Package: libace-6.5.3
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.2 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.5.3 (= ${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.2
+Package: libace-ssl-6.5.3
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.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
+Depends: libace-ssl-6.5.3 (= ${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.2
+Package: libace-rmcast-6.5.3
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.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.5.3 (= ${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.2
+Package: libace-tmcast-6.5.3
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.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.5.3 (= ${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.2
+Package: libace-htbp-6.5.3
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.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.5.3 (= ${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.2
+Package: libace-inet-6.5.3
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.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.5.3 (= ${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.2
+Package: libace-inet-ssl-6.5.3
Architecture: any
Section: libs
-Depends: libace-inet-6.5.2, libace-ssl-6.5.2, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.5.3, libace-ssl-6.5.3, ${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.2 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.5.3 (= ${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.2
+Package: libacexml-6.5.3
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.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.5.3 (= ${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.2
+Package: libace-xml-utils-6.5.3
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.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-6.5.3 (= ${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.2
+Package: libkokyu-6.5.3
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.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.5.3 (= ${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.2
+Package: libace-xtreactor-6.5.3
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.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
+Depends: libace-xtreactor-6.5.3 (= ${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.2
+Package: libace-tkreactor-6.5.3
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.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.5.3 (= ${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.2
+Package: libace-flreactor-6.5.3
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.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
+Depends: libace-flreactor-6.5.3 (= ${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.2
+Package: libace-foxreactor-6.5.3
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.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.5.3 (= ${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.2
+Package: libnetsvcs-6.5.3
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.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libnetsvcs-6.5.3 (= ${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.2.lintian-overrides b/ACE/debian/libace-6.5.2.lintian-overrides
deleted file mode 100644
index 2c6a8f23a26..00000000000
--- a/ACE/debian/libace-6.5.2.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-libace-6.5.2: no-symbols-control-file usr/lib/libACE-6.5.2.so
-libace-6.5.2: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.5.2.so
-libace-6.5.2: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.5.2.so
-libace-6.5.2: no-symbols-control-file usr/lib/libACE_ETCL-6.5.2.so
-libace-6.5.2: no-symbols-control-file usr/lib/libACE_RLECompression-6.5.2.so
-libace-6.5.2: no-symbols-control-file usr/lib/libACE_Compression-6.5.2.so
diff --git a/ACE/debian/libace-6.5.2.docs b/ACE/debian/libace-6.5.3.docs
index 3bdab5b0089..3bdab5b0089 100644
--- a/ACE/debian/libace-6.5.2.docs
+++ b/ACE/debian/libace-6.5.3.docs
diff --git a/ACE/debian/libace-6.5.2.install b/ACE/debian/libace-6.5.3.install
index 182a5eda411..182a5eda411 100644
--- a/ACE/debian/libace-6.5.2.install
+++ b/ACE/debian/libace-6.5.3.install
diff --git a/ACE/debian/libace-6.5.3.lintian-overrides b/ACE/debian/libace-6.5.3.lintian-overrides
new file mode 100644
index 00000000000..f6271121c15
--- /dev/null
+++ b/ACE/debian/libace-6.5.3.lintian-overrides
@@ -0,0 +1,6 @@
+libace-6.5.3: no-symbols-control-file usr/lib/libACE-6.5.3.so
+libace-6.5.3: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.5.3.so
+libace-6.5.3: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.5.3.so
+libace-6.5.3: no-symbols-control-file usr/lib/libACE_ETCL-6.5.3.so
+libace-6.5.3: no-symbols-control-file usr/lib/libACE_RLECompression-6.5.3.so
+libace-6.5.3: no-symbols-control-file usr/lib/libACE_Compression-6.5.3.so
diff --git a/ACE/debian/libace-flreactor-6.5.2.lintian-overrides b/ACE/debian/libace-flreactor-6.5.2.lintian-overrides
deleted file mode 100644
index d2c0a3aa593..00000000000
--- a/ACE/debian/libace-flreactor-6.5.2.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-flreactor-6.5.2: no-symbols-control-file usr/lib/libACE_FlReactor-6.5.2.so
diff --git a/ACE/debian/libace-flreactor-6.5.2.install b/ACE/debian/libace-flreactor-6.5.3.install
index 528836aacee..528836aacee 100644
--- a/ACE/debian/libace-flreactor-6.5.2.install
+++ b/ACE/debian/libace-flreactor-6.5.3.install
diff --git a/ACE/debian/libace-flreactor-6.5.3.lintian-overrides b/ACE/debian/libace-flreactor-6.5.3.lintian-overrides
new file mode 100644
index 00000000000..cef17d2cbdb
--- /dev/null
+++ b/ACE/debian/libace-flreactor-6.5.3.lintian-overrides
@@ -0,0 +1 @@
+libace-flreactor-6.5.3: no-symbols-control-file usr/lib/libACE_FlReactor-6.5.3.so
diff --git a/ACE/debian/libace-foxreactor-6.5.2.lintian-overrides b/ACE/debian/libace-foxreactor-6.5.2.lintian-overrides
deleted file mode 100644
index 552b11a964b..00000000000
--- a/ACE/debian/libace-foxreactor-6.5.2.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-foxreactor-6.5.2: no-symbols-control-file usr/lib/libACE_FoxReactor-6.5.2.so
diff --git a/ACE/debian/libace-foxreactor-6.5.2.install b/ACE/debian/libace-foxreactor-6.5.3.install
index e360f29f5af..e360f29f5af 100644
--- a/ACE/debian/libace-foxreactor-6.5.2.install
+++ b/ACE/debian/libace-foxreactor-6.5.3.install
diff --git a/ACE/debian/libace-foxreactor-6.5.3.lintian-overrides b/ACE/debian/libace-foxreactor-6.5.3.lintian-overrides
new file mode 100644
index 00000000000..863f086953e
--- /dev/null
+++ b/ACE/debian/libace-foxreactor-6.5.3.lintian-overrides
@@ -0,0 +1 @@
+libace-foxreactor-6.5.3: no-symbols-control-file usr/lib/libACE_FoxReactor-6.5.3.so
diff --git a/ACE/debian/libace-htbp-6.5.2.lintian-overrides b/ACE/debian/libace-htbp-6.5.2.lintian-overrides
deleted file mode 100644
index 386b435edb5..00000000000
--- a/ACE/debian/libace-htbp-6.5.2.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-htbp-6.5.2: no-symbols-control-file usr/lib/libACE_HTBP-6.5.2.so
diff --git a/ACE/debian/libace-htbp-6.5.2.install b/ACE/debian/libace-htbp-6.5.3.install
index 08103fd5cad..08103fd5cad 100644
--- a/ACE/debian/libace-htbp-6.5.2.install
+++ b/ACE/debian/libace-htbp-6.5.3.install
diff --git a/ACE/debian/libace-htbp-6.5.3.lintian-overrides b/ACE/debian/libace-htbp-6.5.3.lintian-overrides
new file mode 100644
index 00000000000..b6715089b19
--- /dev/null
+++ b/ACE/debian/libace-htbp-6.5.3.lintian-overrides
@@ -0,0 +1 @@
+libace-htbp-6.5.3: no-symbols-control-file usr/lib/libACE_HTBP-6.5.3.so
diff --git a/ACE/debian/libace-inet-6.5.2.lintian-overrides b/ACE/debian/libace-inet-6.5.2.lintian-overrides
deleted file mode 100644
index 8f451dc7ad4..00000000000
--- a/ACE/debian/libace-inet-6.5.2.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libace-inet-6.5.2: extended-description-is-probably-too-short
-libace-inet-6.5.2: no-symbols-control-file usr/lib/libACE_INet-6.5.2.so
diff --git a/ACE/debian/libace-inet-6.5.2.install b/ACE/debian/libace-inet-6.5.3.install
index 59a73a509d0..59a73a509d0 100644
--- a/ACE/debian/libace-inet-6.5.2.install
+++ b/ACE/debian/libace-inet-6.5.3.install
diff --git a/ACE/debian/libace-inet-6.5.3.lintian-overrides b/ACE/debian/libace-inet-6.5.3.lintian-overrides
new file mode 100644
index 00000000000..fc60f5c3130
--- /dev/null
+++ b/ACE/debian/libace-inet-6.5.3.lintian-overrides
@@ -0,0 +1,2 @@
+libace-inet-6.5.3: extended-description-is-probably-too-short
+libace-inet-6.5.3: no-symbols-control-file usr/lib/libACE_INet-6.5.3.so
diff --git a/ACE/debian/libace-inet-ssl-6.5.2.lintian-overrides b/ACE/debian/libace-inet-ssl-6.5.2.lintian-overrides
deleted file mode 100644
index bcb3079d1db..00000000000
--- a/ACE/debian/libace-inet-ssl-6.5.2.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-libace-inet-ssl-6.5.2: no-symbols-control-file usr/lib/libACE_INet_SSL-6.5.2.so
-
-# It's Bison-generate code covered by the GNU Bison GPL-exception
-libace-inet-ssl-6.5.2: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-inet-ssl-6.5.2.install b/ACE/debian/libace-inet-ssl-6.5.3.install
index b9b8b9045f7..b9b8b9045f7 100644
--- a/ACE/debian/libace-inet-ssl-6.5.2.install
+++ b/ACE/debian/libace-inet-ssl-6.5.3.install
diff --git a/ACE/debian/libace-inet-ssl-6.5.3.lintian-overrides b/ACE/debian/libace-inet-ssl-6.5.3.lintian-overrides
new file mode 100644
index 00000000000..81624536bcf
--- /dev/null
+++ b/ACE/debian/libace-inet-ssl-6.5.3.lintian-overrides
@@ -0,0 +1,4 @@
+libace-inet-ssl-6.5.3: no-symbols-control-file usr/lib/libACE_INet_SSL-6.5.3.so
+
+# It's Bison-generate code covered by the GNU Bison GPL-exception
+libace-inet-ssl-6.5.3: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-rmcast-6.5.2.lintian-overrides b/ACE/debian/libace-rmcast-6.5.2.lintian-overrides
deleted file mode 100644
index cf94e80df3d..00000000000
--- a/ACE/debian/libace-rmcast-6.5.2.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-rmcast-6.5.2: no-symbols-control-file usr/lib/libACE_RMCast-6.5.2.so
diff --git a/ACE/debian/libace-rmcast-6.5.2.install b/ACE/debian/libace-rmcast-6.5.3.install
index 86e78259853..86e78259853 100644
--- a/ACE/debian/libace-rmcast-6.5.2.install
+++ b/ACE/debian/libace-rmcast-6.5.3.install
diff --git a/ACE/debian/libace-rmcast-6.5.3.lintian-overrides b/ACE/debian/libace-rmcast-6.5.3.lintian-overrides
new file mode 100644
index 00000000000..88acc1b27ed
--- /dev/null
+++ b/ACE/debian/libace-rmcast-6.5.3.lintian-overrides
@@ -0,0 +1 @@
+libace-rmcast-6.5.3: no-symbols-control-file usr/lib/libACE_RMCast-6.5.3.so
diff --git a/ACE/debian/libace-ssl-6.5.2.lintian-overrides b/ACE/debian/libace-ssl-6.5.2.lintian-overrides
deleted file mode 100644
index 9b9d32fdba8..00000000000
--- a/ACE/debian/libace-ssl-6.5.2.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-libace-ssl-6.5.2: extended-description-is-probably-too-short
-libace-ssl-6.5.2: no-symbols-control-file usr/lib/libACE_SSL-6.5.2.so
-
-# It's Bison-generate code covered by the GNU Bison GPL-exception
-libace-ssl-6.5.2: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-ssl-6.5.2.NEWS b/ACE/debian/libace-ssl-6.5.3.NEWS
index e5bd0e4aa10..e5bd0e4aa10 100644
--- a/ACE/debian/libace-ssl-6.5.2.NEWS
+++ b/ACE/debian/libace-ssl-6.5.3.NEWS
diff --git a/ACE/debian/libace-ssl-6.5.2.install b/ACE/debian/libace-ssl-6.5.3.install
index 8df45a6d55f..8df45a6d55f 100644
--- a/ACE/debian/libace-ssl-6.5.2.install
+++ b/ACE/debian/libace-ssl-6.5.3.install
diff --git a/ACE/debian/libace-ssl-6.5.3.lintian-overrides b/ACE/debian/libace-ssl-6.5.3.lintian-overrides
new file mode 100644
index 00000000000..d57e65e1158
--- /dev/null
+++ b/ACE/debian/libace-ssl-6.5.3.lintian-overrides
@@ -0,0 +1,5 @@
+libace-ssl-6.5.3: extended-description-is-probably-too-short
+libace-ssl-6.5.3: no-symbols-control-file usr/lib/libACE_SSL-6.5.3.so
+
+# It's Bison-generate code covered by the GNU Bison GPL-exception
+libace-ssl-6.5.3: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-tkreactor-6.5.2.lintian-overrides b/ACE/debian/libace-tkreactor-6.5.2.lintian-overrides
deleted file mode 100644
index 57332e40e76..00000000000
--- a/ACE/debian/libace-tkreactor-6.5.2.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-tkreactor-6.5.2: no-symbols-control-file usr/lib/libACE_TkReactor-6.5.2.so
diff --git a/ACE/debian/libace-tkreactor-6.5.2.install b/ACE/debian/libace-tkreactor-6.5.3.install
index 12ab35062d2..12ab35062d2 100644
--- a/ACE/debian/libace-tkreactor-6.5.2.install
+++ b/ACE/debian/libace-tkreactor-6.5.3.install
diff --git a/ACE/debian/libace-tkreactor-6.5.3.lintian-overrides b/ACE/debian/libace-tkreactor-6.5.3.lintian-overrides
new file mode 100644
index 00000000000..97a42b1b136
--- /dev/null
+++ b/ACE/debian/libace-tkreactor-6.5.3.lintian-overrides
@@ -0,0 +1 @@
+libace-tkreactor-6.5.3: no-symbols-control-file usr/lib/libACE_TkReactor-6.5.3.so
diff --git a/ACE/debian/libace-tmcast-6.5.2.lintian-overrides b/ACE/debian/libace-tmcast-6.5.2.lintian-overrides
deleted file mode 100644
index 9ee76d5186e..00000000000
--- a/ACE/debian/libace-tmcast-6.5.2.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-tmcast-6.5.2: no-symbols-control-file usr/lib/libACE_TMCast-6.5.2.so
diff --git a/ACE/debian/libace-tmcast-6.5.2.install b/ACE/debian/libace-tmcast-6.5.3.install
index e066131dea0..e066131dea0 100644
--- a/ACE/debian/libace-tmcast-6.5.2.install
+++ b/ACE/debian/libace-tmcast-6.5.3.install
diff --git a/ACE/debian/libace-tmcast-6.5.3.lintian-overrides b/ACE/debian/libace-tmcast-6.5.3.lintian-overrides
new file mode 100644
index 00000000000..d830c04851a
--- /dev/null
+++ b/ACE/debian/libace-tmcast-6.5.3.lintian-overrides
@@ -0,0 +1 @@
+libace-tmcast-6.5.3: no-symbols-control-file usr/lib/libACE_TMCast-6.5.3.so
diff --git a/ACE/debian/libace-xml-utils-6.5.2.lintian-overrides b/ACE/debian/libace-xml-utils-6.5.2.lintian-overrides
deleted file mode 100644
index 42c31526464..00000000000
--- a/ACE/debian/libace-xml-utils-6.5.2.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-xml-utils-6.5.2: no-symbols-control-file usr/lib/libACE_XML_Utils-6.5.2.so
diff --git a/ACE/debian/libace-xml-utils-6.5.2.install b/ACE/debian/libace-xml-utils-6.5.3.install
index 2428ec9f109..2428ec9f109 100644
--- a/ACE/debian/libace-xml-utils-6.5.2.install
+++ b/ACE/debian/libace-xml-utils-6.5.3.install
diff --git a/ACE/debian/libace-xml-utils-6.5.3.lintian-overrides b/ACE/debian/libace-xml-utils-6.5.3.lintian-overrides
new file mode 100644
index 00000000000..41a55a73dce
--- /dev/null
+++ b/ACE/debian/libace-xml-utils-6.5.3.lintian-overrides
@@ -0,0 +1 @@
+libace-xml-utils-6.5.3: no-symbols-control-file usr/lib/libACE_XML_Utils-6.5.3.so
diff --git a/ACE/debian/libace-xtreactor-6.5.2.lintian-overrides b/ACE/debian/libace-xtreactor-6.5.2.lintian-overrides
deleted file mode 100644
index ee0bc214bdd..00000000000
--- a/ACE/debian/libace-xtreactor-6.5.2.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-xtreactor-6.5.2: no-symbols-control-file usr/lib/libACE_XtReactor-6.5.2.so
diff --git a/ACE/debian/libace-xtreactor-6.5.2.install b/ACE/debian/libace-xtreactor-6.5.3.install
index c53614c7208..c53614c7208 100644
--- a/ACE/debian/libace-xtreactor-6.5.2.install
+++ b/ACE/debian/libace-xtreactor-6.5.3.install
diff --git a/ACE/debian/libace-xtreactor-6.5.3.lintian-overrides b/ACE/debian/libace-xtreactor-6.5.3.lintian-overrides
new file mode 100644
index 00000000000..327db86d2a5
--- /dev/null
+++ b/ACE/debian/libace-xtreactor-6.5.3.lintian-overrides
@@ -0,0 +1 @@
+libace-xtreactor-6.5.3: no-symbols-control-file usr/lib/libACE_XtReactor-6.5.3.so
diff --git a/ACE/debian/libacexml-6.5.2.lintian-overrides b/ACE/debian/libacexml-6.5.2.lintian-overrides
deleted file mode 100644
index b4d34a87a85..00000000000
--- a/ACE/debian/libacexml-6.5.2.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-libacexml-6.5.2: no-symbols-control-file usr/lib/libACEXML_Parser-6.5.2.so
-libacexml-6.5.2: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.5.2.so
-libacexml-6.5.2: no-symbols-control-file usr/lib/libACEXML-6.5.2.so
diff --git a/ACE/debian/libacexml-6.5.2.docs b/ACE/debian/libacexml-6.5.3.docs
index 002855d7915..002855d7915 100644
--- a/ACE/debian/libacexml-6.5.2.docs
+++ b/ACE/debian/libacexml-6.5.3.docs
diff --git a/ACE/debian/libacexml-6.5.2.install b/ACE/debian/libacexml-6.5.3.install
index d3e912ffa51..d3e912ffa51 100644
--- a/ACE/debian/libacexml-6.5.2.install
+++ b/ACE/debian/libacexml-6.5.3.install
diff --git a/ACE/debian/libacexml-6.5.3.lintian-overrides b/ACE/debian/libacexml-6.5.3.lintian-overrides
new file mode 100644
index 00000000000..f2083dbd3f3
--- /dev/null
+++ b/ACE/debian/libacexml-6.5.3.lintian-overrides
@@ -0,0 +1,3 @@
+libacexml-6.5.3: no-symbols-control-file usr/lib/libACEXML_Parser-6.5.3.so
+libacexml-6.5.3: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.5.3.so
+libacexml-6.5.3: no-symbols-control-file usr/lib/libACEXML-6.5.3.so
diff --git a/ACE/debian/libkokyu-6.5.2.lintian-overrides b/ACE/debian/libkokyu-6.5.2.lintian-overrides
deleted file mode 100644
index e759bbcfd7e..00000000000
--- a/ACE/debian/libkokyu-6.5.2.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkokyu-6.5.2: no-symbols-control-file usr/lib/libKokyu-6.5.2.so
diff --git a/ACE/debian/libkokyu-6.5.2.docs b/ACE/debian/libkokyu-6.5.3.docs
index e8869c513b2..e8869c513b2 100644
--- a/ACE/debian/libkokyu-6.5.2.docs
+++ b/ACE/debian/libkokyu-6.5.3.docs
diff --git a/ACE/debian/libkokyu-6.5.2.install b/ACE/debian/libkokyu-6.5.3.install
index 62854308f96..62854308f96 100644
--- a/ACE/debian/libkokyu-6.5.2.install
+++ b/ACE/debian/libkokyu-6.5.3.install
diff --git a/ACE/debian/libkokyu-6.5.3.lintian-overrides b/ACE/debian/libkokyu-6.5.3.lintian-overrides
new file mode 100644
index 00000000000..562551daf17
--- /dev/null
+++ b/ACE/debian/libkokyu-6.5.3.lintian-overrides
@@ -0,0 +1 @@
+libkokyu-6.5.3: no-symbols-control-file usr/lib/libKokyu-6.5.3.so
diff --git a/ACE/debian/libnetsvcs-6.5.2.lintian-overrides b/ACE/debian/libnetsvcs-6.5.2.lintian-overrides
deleted file mode 100644
index aa26fd7ba22..00000000000
--- a/ACE/debian/libnetsvcs-6.5.2.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libnetsvcs-6.5.2: no-symbols-control-file usr/lib/libnetsvcs-6.5.2.so
diff --git a/ACE/debian/libnetsvcs-6.5.2.docs b/ACE/debian/libnetsvcs-6.5.3.docs
index 0b03c55b91f..0b03c55b91f 100644
--- a/ACE/debian/libnetsvcs-6.5.2.docs
+++ b/ACE/debian/libnetsvcs-6.5.3.docs
diff --git a/ACE/debian/libnetsvcs-6.5.2.install b/ACE/debian/libnetsvcs-6.5.3.install
index c7a04b16213..c7a04b16213 100644
--- a/ACE/debian/libnetsvcs-6.5.2.install
+++ b/ACE/debian/libnetsvcs-6.5.3.install
diff --git a/ACE/debian/libnetsvcs-6.5.3.lintian-overrides b/ACE/debian/libnetsvcs-6.5.3.lintian-overrides
new file mode 100644
index 00000000000..28dd22e1d8d
--- /dev/null
+++ b/ACE/debian/libnetsvcs-6.5.3.lintian-overrides
@@ -0,0 +1 @@
+libnetsvcs-6.5.3: no-symbols-control-file usr/lib/libnetsvcs-6.5.3.so
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index 152fe30e408..081aedb603e 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.2
-%define TAOVER 2.5.2
+%define ACEVER 6.5.3
+%define TAOVER 2.5.3
# Conditional build
# Default values are
diff --git a/TAO/ChangeLogs/TAO-2_5_3 b/TAO/ChangeLogs/TAO-2_5_3
new file mode 100644
index 00000000000..65fe5c9f7df
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-2_5_3
@@ -0,0 +1,369 @@
+commit b0d2c3ec0e1c844aa6f6a1a13dc8859efcbe3879
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Nov 16 11:27:49 2018 +0100
+
+ List new changes
+
+ * ACE/NEWS:
+ * TAO/NEWS:
+
+commit 618533091124a97d6dcd4b106e38cb5ca2477b98
+Merge: 764ff58a2e8 40af509ec08
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date: Tue Nov 6 16:50:01 2018 -0600
+
+ Merge pull request #726 from iguessthislldo/igtd/android
+
+ Support for Clang based Android NDKs
+
+commit da981b00af6c6ffe6b3cef7df8840eb01ec45812
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Nov 5 15:51:21 2018 +0100
+
+ Doxygen changes and use const int for the statics to resolve the issues with Embarcadero C++ Builder pre compiled header support
+
+ * TAO/tao/Messaging/Messaging.h:
+ * TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h:
+
+commit ec0df6cbcc64f4a361b4b003fca0c9964dead887
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Nov 5 14:57:41 2018 +0100
+
+ Doxygen changes
+
+ * TAO/tao/Valuetype/ValueFactory_Map.h:
+
+commit 55dfd83e68b0bdd90b0d29c1ee20a3906156a02e
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Tue Oct 30 17:13:01 2018 -0500
+
+ TAO-INSTALL.html: Formerly not Formally
+
+commit 36e155902a9a386ab7ac80980a30edc11539befb
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Tue Oct 30 13:19:54 2018 -0500
+
+ TAO-INSTALL.html: Rephrasing
+
+ It makes it sound like TAO supported Windows 95 only until "recently",
+ which is a ambiguous way to phrase it anyway.
+
+commit e3f6c776b0abbdeff7933063e1d7a7a10b073ba1
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 15:08:22 2018 +0100
+
+ Add TIE test, bugzilla 4182
+
+ * TAO/bin/tao_orb_tests.lst:
+
+commit 91b984bfce503bf61eaa0af03b2d7fdb33b33682
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 15:07:44 2018 +0100
+
+ Fixed IOR file usage in test script
+
+ * TAO/tests/POA/TIE/run_test.pl:
+
+commit 4256451a9b89b4c8280c0976c8e03a753e003453
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 12:12:04 2018 +0100
+
+ Removed obsolete files
+
+ * TAO/orbsvcs/tests/Security/ssliop_corbaloc/pvtkey-client.pem:
+ * TAO/orbsvcs/tests/Security/ssliop_corbaloc/pvtkey.pem:
+ * TAO/orbsvcs/tests/Security/ssliop_corbaloc/selfsigncert-client.pem:
+ * TAO/orbsvcs/tests/Security/ssliop_corbaloc/selfsigncert.pem:
+ Deleted.
+
+commit 2578fef175f99ce2e03a764514c428e0ca7f7de5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 12:10:18 2018 +0100
+
+ Use different certificates
+
+ * TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml:
+ * TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf:
+ * TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml:
+ * TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf:
+
+commit c6e382658aa985f4d2cbb8fb01037c954a31d5bf
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 12:10:06 2018 +0100
+
+ Enable ssliop collocated invocation support
+
+ * TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp:
+
+commit be0958e97b739026684dd5bb3ebd2af92c6e46d3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 12:09:46 2018 +0100
+
+ Added security libs to linker and use certs from another test which do work
+
+ * TAO/orbsvcs/tests/Security/ssliop_corbaloc/cacert.pem:
+ * TAO/orbsvcs/tests/Security/ssliop_corbaloc/client_cert.pem:
+ * TAO/orbsvcs/tests/Security/ssliop_corbaloc/client_key.pem:
+ * TAO/orbsvcs/tests/Security/ssliop_corbaloc/server_cert.pem:
+ * TAO/orbsvcs/tests/Security/ssliop_corbaloc/server_key.pem:
+ Added.
+
+ * TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc:
+
+commit 6abc40ce9bd581f82422662543013689944a1f01
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 12:08:34 2018 +0100
+
+ Layout changes
+
+ * TAO/orbsvcs/tests/Security/ssliop_corbaloc/README:
+
+commit 7661e1085621c5a7548401865f3eb94407520a22
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 12:08:16 2018 +0100
+
+ Layout changes
+
+ * TAO/orbsvcs/tests/Security/Secure_Invocation/README:
+
+commit a93ce0d1ca4f6fb58e587e3335162396185845a6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 12:08:00 2018 +0100
+
+ Layout changes
+
+ * TAO/orbsvcs/tests/Security/BiDirectional/README:
+
+commit 50c131d843bf9f7c38d00ec0a4c26881756aa9aa
+Merge: 1a7f9bc556a f776ce71367
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 11:46:56 2018 +0100
+
+ Merge branch 'ssliop_corbaloc_parser_comma_fix' of git://github.com/milan-mpathix/ATCD into milan-mpathix-ssliop_corbaloc_parser_comma_fix
+
+commit e6499d3d089f100cb9eb859bf6e3bc3334fc369a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 10:03:22 2018 +0100
+
+ Layout change
+
+ * TAO/tests/Bug_4213_Regression/server.cpp:
+
+commit 31eec62b48c615088d6c70f0d7ee610d81aa0b9b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 10:03:11 2018 +0100
+
+ Only list the invocation which failed without the necesary fix
+
+ * TAO/tests/Bug_4213_Regression/run_test.pl:
+
+commit 2c747ee395016bef8bfe0a235063430e580da9c6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 10:02:52 2018 +0100
+
+ Add new bug 4213 unit test
+
+ * TAO/bin/tao_orb_tests.lst:
+
+commit 8dd037ee00f6274f79652a30ba275136ef2ce053
+Merge: ffaae9ead79 19605786704
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 09:56:09 2018 +0100
+
+ Merge branch 'bug_4213-uiop_corbaloc_key' of git://github.com/milan-mpathix/ATCD into milan-mpathix-bug_4213-uiop_corbaloc_key
+
+commit ffaae9ead794c3e56e9ef2417ddbecd568b61843
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 09:52:08 2018 +0100
+
+ Fixed typos
+
+commit 7d6b33e807e9d75a2d28248d0f69b143a18bddc3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 09:51:53 2018 +0100
+
+ New unit test for bugzilla 4213
+
+commit e56a460c00e39f00c63b4b1192a68cda35f8893f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 09:34:19 2018 +0100
+
+ Fixed link to OMG ORT spec
+
+commit 690d9efe48328e7605f3565e76b63bbd4ca8d191
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 09:27:08 2018 +0100
+
+ Fixed incorrect classname in logging statement
+
+ * TAO/tao/Strategies/SHMIOP_Profile.cpp:
+
+commit 9878a2e603a25a10972a9b5eb23c434f22ec5428
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 09:02:27 2018 +0100
+
+ Use bool instead of int
+
+ * TAO/tao/CORBALOC_Parser.cpp:
+
+commit 23d91ca6ff4b0e61ac1835c2e3c6cbf757c79d4d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 08:58:12 2018 +0100
+
+ Fixed typos
+
+ * TAO/docs/ORBEndpoint.html:
+ * TAO/docs/pluggable_messaging.html:
+
+commit c619e9ac8bd1fb1ad1e5d0c1a7b2b52f17970914
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 08:57:58 2018 +0100
+
+ Removed commented out operation
+
+ * TAO/tests/Connection_Purging/test.idl:
+
+commit 1f916302499a56d6de52d61c0c8c8a4b8f4c2d4b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 08:57:40 2018 +0100
+
+ Make formatting of debug message consistent with others in the TAO core
+
+ * TAO/tao/Strategies/UIOP_Connection_Handler.cpp:
+
+commit ed5755ec9040af82191f6d5b1190f7c7afea6830
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Oct 30 08:48:56 2018 +0100
+
+ Removed empty lines
+
+ * TAO/tests/Connection_Purging/README:
+
+commit 544206dd28b596155332e41bf70d7e1c00e0e3b0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Sep 21 15:28:55 2018 +0200
+
+ When we have an error parsing our GIOP header we should log a message using an error, not debug
+
+ * TAO/tao/GIOP_Message_State.cpp:
+
+commit 6881ff62f2d8bc16efb060307bad5deb4fc7a7fd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Sep 18 14:36:37 2018 +0200
+
+ Upgraded to latest doxygen configuration file version
+
+ * ACE/etc/ace.doxygen:
+ * ACE/etc/ace_inet.doxygen:
+ * ACE/etc/ace_qos.doxygen:
+ * ACE/etc/ace_rmcast.doxygen:
+ * ACE/etc/ace_ssl.doxygen:
+ * ACE/etc/acexml.doxygen:
+ * TAO/etc/tao.doxygen:
+ * TAO/etc/tao_anytypecode.doxygen:
+ * TAO/etc/tao_av.doxygen:
+ * TAO/etc/tao_compression.doxygen:
+ * TAO/etc/tao_cosevent.doxygen:
+ * TAO/etc/tao_cosnaming.doxygen:
+ * TAO/etc/tao_cosnotification.doxygen:
+ * TAO/etc/tao_costime.doxygen:
+ * TAO/etc/tao_costrader.doxygen:
+ * TAO/etc/tao_dynamicany.doxygen:
+ * TAO/etc/tao_dynamicinterface.doxygen:
+ * TAO/etc/tao_esf.doxygen:
+ * TAO/etc/tao_ifr.doxygen:
+ * TAO/etc/tao_implrepo.doxygen:
+ * TAO/etc/tao_iormanip.doxygen:
+ * TAO/etc/tao_iortable.doxygen:
+ * TAO/etc/tao_pi.doxygen:
+ * TAO/etc/tao_pi_server.doxygen:
+ * TAO/etc/tao_portablegroup.doxygen:
+ * TAO/etc/tao_portableserver.doxygen:
+ * TAO/etc/tao_rtcorba.doxygen:
+ * TAO/etc/tao_rtevent.doxygen:
+ * TAO/etc/tao_rtportableserver.doxygen:
+ * TAO/etc/tao_security.doxygen:
+ * TAO/etc/tao_smartproxies.doxygen:
+ * TAO/etc/tao_ssliop.doxygen:
+ * TAO/etc/tao_strategies.doxygen:
+ * TAO/etc/tao_transportcurrent.doxygen:
+ * TAO/etc/tao_ziop.doxygen:
+
+commit 01fc7a23cf7e6772d85f9fee367803b3e85a1118
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Sep 18 09:36:39 2018 +0200
+
+ Make x.5.2 public as new release
+
+ * ACE/NEWS:
+ * 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:
+
+commit f776ce71367a69b891db4164f744d62b2ca06205
+Merge: 287883987b9 ed1925da7c3
+Author: Milan Cvetkovic <milan.cvetkovic@mpathix.com>
+Date: Wed Jan 24 11:21:56 2018 -0500
+
+ Merge tag 'ACE+TAO-6_4_6' into ssliop_corbaloc_parser_comma_fix
+
+commit 1960578670452b98f7636a1e1acfc1528d455765
+Merge: dc5c956f2f0 ed1925da7c3
+Author: Milan Cvetkovic <milan.cvetkovic@mpathix.com>
+Date: Tue Jan 23 19:00:36 2018 -0500
+
+ Merge tag 'ACE+TAO-6_4_6' into bug_4213-uiop_corbaloc_key
+
+commit dc5c956f2f04b92fd28798c66aaddf53a7848d8e
+Author: Milan Cvetkovic <milan.cvetkovic@mpathix.com>
+Date: Mon Apr 25 16:11:14 2016 -0400
+
+ Fixes corbaloc:uiop:/randesvous|KEY to properly parse KEY instead of |KEY
+
+ Fix for:
+ CORBA_Object_var o = string_to_object("corbaloc:uiop:/tmp/sock|KEY");
+ MyObject_var mo = MyObject::_narrow();
+
+ _narrow() throws due to "|KEY" sent as object key.
+
+commit 287883987b9e14e78bed1a9074507f88ec6b19d2
+Author: Milan Cvetkovic <milan.cvetkovic@mpathix.com>
+Date: Thu Apr 7 14:36:56 2016 -0400
+
+ Wait for orb thread to terminate
+
+commit 2884c7b4884d6410c44f15fbeffd97b1ee20fcfb
+Merge: 9143adca7bb 6114e2b1df6
+Author: Milan Cvetkovic <milan.cvetkovic@mpathix.com>
+Date: Thu Apr 7 10:08:35 2016 -0400
+
+ Merge branch 'ssliop_corbaloc_test' into ssliop_corbaloc_parser_comma_fix
+
+commit 6114e2b1df60ec798efd27da8bf07ce742cf3b5d
+Author: Milan Cvetkovic <milan.cvetkovic@mpathix.com>
+Date: Wed Apr 6 18:28:37 2016 -0400
+
+ Fail ssliop_corbaloc test for multi-profile corbaloc
+
+commit 4e3888084fc9ebecc71856794c071836adfbc22b
+Author: Milan Cvetkovic <milan.cvetkovic@mpathix.com>
+Date: Wed Apr 6 18:17:07 2016 -0400
+
+ Fix timeout errors in orbsvcs/tests/Security/ssliop_corbaloc, enable the test
+
+ Apparently, SSLIOP cannot use collocated servants in this test.
+
+ We have to run the server orb, for all remote invocations to our server
+ to work, even though they are both in the same process (client).
+
+commit 9143adca7bbe21d476c2e4387c056158d7b83a00
+Author: Milan Cvetkovic <milan.cvetkovic@mpathix.com>
+Date: Tue Apr 5 20:17:51 2016 -0400
+
+ Fixed ssliop corbaloc parser, when there is a comma delimited list
+
+ ... use the same logic as in TAO/tao/Transport_Connector.cpp
+
+ Allows using corbaloc:iiop:host:2222,iiop:host:2223/ObjectKey with SSLIOP.
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index fac2b5b6d35..43453db7053 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.2
- ACE VERSION: 6.5.2
+ TAO VERSION: 2.5.3
+ ACE VERSION: 6.5.3
HOST MACHINE and OPERATING SYSTEM:
If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/VERSION b/TAO/VERSION
index f332d8a2106..ee7e205c96a 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 2.5.2, released Tue Sep 18 09:25:49 CEST 2018
+This is TAO version 2.5.3, released Mon Nov 19 10:44:23 CET 2018
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 87760ca851a..eba91f3bf38 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 2
-#define TAO_BETA_VERSION 2
-#define TAO_VERSION "2.5.2"
-#define TAO_VERSION_CODE 132354
+#define TAO_MICRO_VERSION 3
+#define TAO_BETA_VERSION 3
+#define TAO_VERSION "2.5.3"
+#define TAO_VERSION_CODE 132355
#define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))