ACE+TAO-6_5_4ACE+TAO-6_5_4ACE%2BTAO-6_5_4

56 files changed, 314 insertions, 69 deletions

diff --git a/ACE/ChangeLogs/ACE-6_5_4 b/ACE/ChangeLogs/ACE-6_5_4
new file mode 100644
index 00000000000..68c2f6a3b3d
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-6_5_4
@@ -0,0 +1,245 @@
+commit a2cf8d6d317716cf2d7451b799855f11f6349b51
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jan 23 19:55:20 2019 +0100
+
+    Fixed several broken links and updated bugzilla to github
+
+commit 2a3014308377c2a88aea497e2de072ab103302cb
+Merge: 46188d9eea8 3e3b0884478
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 21 08:53:44 2019 +0100
+
+    Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO
+
+commit 46188d9eea8cc340073fb8ef29f4564060870d66
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 21 08:52:58 2019 +0100
+
+    Update clang version check for android which has clang 8.0.2, see #796
+    
+        * ACE/tests/Compiler_Features_32_Test.cpp:
+
+commit 3e3b0884478587a57e24cc10a58e4094cf3b17cd
+Merge: a9684938b38 3cd2852488a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Jan 20 18:12:27 2019 +0100
+
+    Merge pull request #797 from jwillemsen/master
+    
+    Removed some empty lines
+
+commit 92289dde25e21c35161e8f1de70291afaebcb0a6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Jan 20 10:51:18 2019 +0100
+
+    Zapped multiple empty lines
+
+commit 5845c114751e79e8cbd5955ec9c16f1c55e41121
+Merge: 320b8f9c136 560f112ae96
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Sat Jan 19 23:57:28 2019 -0600
+
+    Merge remote-tracking branch 'upstream/master' into igtd/android
+
+commit 320b8f9c1365484b5e1d4f20301a39fa3a72f97c
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Sat Jan 19 23:56:52 2019 -0600
+
+    config-android.h: Should've grabbed latest first
+
+commit 709a23441a1e90b4689c1cfa9e5e745431c8939e
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Sat Jan 19 23:45:49 2019 -0600
+
+    Fixes for ACE Tests on Android
+
+commit 560f112ae96729e18e2980653ab12b8c399eaabe
+Merge: 48931304d50 76451eb994c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 17 20:37:28 2019 +0100
+
+    Merge pull request #794 from jwillemsen/jwi-getconffailre
+    
+    When getconf fails don't set the value to unknown, that gives a stran…
+
+commit 5c2dfef4413bf4480fded248269ee111a11e020d
+Merge: 3cd2852488a 48931304d50
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 17 12:36:32 2019 +0100
+
+    Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO
+
+commit 3cd2852488a6cdff8ebd19752d1566b08a3b13b4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 17 12:36:18 2019 +0100
+
+    Removed some empty lines
+    
+        * ACE/ace/Connection_Recycling_Strategy.h:
+        * ACE/ace/Connector.h:
+
+commit 76451eb994cf44aacb93b8f4925db5c5c0aed2c2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 17 09:39:18 2019 +0100
+
+    When getconf fails don't set the value to unknown, that gives a strange error to our users, issue #792
+    
+        * ACE/include/makeinclude/platform_linux_common.GNU:
+
+commit d55b73e08a69f9e747ac6102f90ce60a589d708b
+Author: Fred Hornsey <fred@hornsey.us>
+Date:   Tue Jan 15 12:12:58 2019 -0600
+
+    Update ACE/NEWS and TAO/NEWS
+
+commit ad33e68bf640bed32d212e0a94d7b8b5af600327
+Author: Like Ma <likemartinma@gmail.com>
+Date:   Wed Jan 2 20:08:32 2019 +0800
+
+    Fix typo.
+
+commit 2691dc01f2add99feab54ed25c3512b7e94f69e8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Dec 31 10:10:55 2018 +0100
+
+    Updated copyright year
+
+commit 83782cebd09e06d3117aad09ae73c5e9e96152fc
+Merge: 130b7d62d9f 0fc30571a28
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Dec 27 18:52:00 2018 +0100
+
+    Merge pull request #777 from iguessthislldo/igtd/vector
+    
+    Fix end() on ACE_Vector
+
+commit 0fc30571a28d5eb0bb1153a4f827069a15508ca8
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed Dec 26 15:46:46 2018 -0600
+
+    Add std iterator subtest to Vector_Test
+
+commit 38497d0e9a3ec28c47898fb6546158e54f25afca
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Fri Dec 21 17:11:16 2018 -0600
+
+    Fix end() on ACE_Vector
+    
+    It was based on the the base array, not the actual elements in the
+    array.
+
+commit 5541b85383a479fc69f013d424ba085c3f825094
+Merge: 1edd850772f b0a5f56d66b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Dec 12 07:47:28 2018 +0000
+
+    Merge pull request #775 from iguessthislldo/igtd/android
+    
+    Update ACE-INSTALL.html
+
+commit b0a5f56d66bf00204c5b73adcd5c2a079b903443
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Dec 11 16:58:31 2018 -0600
+
+    Update ACE-INSTALL.html
+    
+    Remove statement about semun that turned out only to apply to OpenDDS.
+
+commit 6ba0c55d8c99a8bd8a91cc0a717a267c1d3ddc18
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Dec 5 16:19:48 2018 +0100
+
+    Doxygen change
+
+commit 9947f5abc8035487ee810fd56c63ec312dbe291f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Dec 5 13:17:42 2018 +0100
+
+    Doxygen change
+    
+        * ACE/ace/SString.h:
+
+commit 2d69fdc296b9b3eb1410c4759527f292d8d8fdc2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Dec 3 14:12:24 2018 +0100
+
+    Doxygen enhancements
+    
+        * ACE/ace/Dev_Poll_Reactor.h:
+        * ACE/ace/Reactor_Impl.h:
+        * ACE/ace/Select_Reactor_T.h:
+        * ACE/ace/WFMO_Reactor.h:
+
+commit 20b898b5b40a1b3e9f137fe045153d0727db7664
+Merge: 60d114824f5 9bc2d68ce78
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Nov 28 17:00:26 2018 +0100
+
+    Merge pull request #757 from jwillemsen/jwi-androidversioned
+    
+    Only set versioned_so to 0 when it is not set, it is possible to use …
+
+commit 9bc2d68ce78e25c118cf0f6e48b3e50e6c3abc3d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Nov 28 15:23:36 2018 +0100
+
+    Only set versioned_so to 0 when it is not set, it is possible to use this so let the user enable it when necessary
+    
+        * ACE/include/makeinclude/platform_android.GNU:
+
+commit a228d9286d033695fb4fd68d738c6d54b3520e3f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Nov 22 09:04:19 2018 +0100
+
+    Should modify compile_flags to remove /Gm
+    
+        * ACE/bin/MakeProjectCreator/config/vs2017nmake.mpb:
+
+commit 05dd8913aa5e3e78e7c5d76f91601eece4142b7c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Nov 21 08:02:29 2018 +0100
+
+    Visual Studio 2017 marks now /Gm (enable minimal rebuild) as deprecated so we remove it from the compiler flags
+    
+        * ACE/bin/MakeProjectCreator/config/vs2017nmake.mpb:
+
+commit 99f16383bdc9851c2b4d1c98e5f5bb953a7eedd0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Nov 19 21:02:34 2018 +0100
+
+    Should assign CXX and CC unconditionally
+    
+        * ACE/include/makeinclude/platform_linux_clang.GNU:
+
+commit d2ee56620d75abe4733978c145929f01cf999525
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Nov 19 20:47:37 2018 +0100
+
+    Move CXX check inside the insure=0 block
+    
+        * ACE/include/makeinclude/platform_linux_clang.GNU:
+
+commit 5f1ec6c104b2dbf6aa5a105e6683a1bf84c783d4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Nov 19 16:46:56 2018 +0100
+
+    CXX is set by default to g++, in that case we set CXX to clang++ and CC to clang
+    
+        * ACE/include/makeinclude/platform_linux_clang.GNU:
+
+commit a56bb23d78658d5a99f8c9fadbe245a283a3c85b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Nov 19 11:25:05 2018 +0100
+
+    Make x.5.3 public and prepare for the next release
+    
+        * ACE/bin/copy-local-script.sh:
+          Added.
+    
+        * 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 3f83fa6bb73..78a0cf9f573 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.3
+    ACE VERSION: 6.5.4
 
     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 dd5359ba80b..a5b4cecf72b 100644
--- a/ACE/VERSION
+++ b/ACE/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 6.5.3, released Mon Nov 19 10:44:23 CET 2018
+This is ACE version 6.5.4, released Thu Jan 24 08:53:17 CET 2019
 
 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 910d84df986..45925b888f0 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 3
-#define ACE_BETA_VERSION 3
-#define ACE_VERSION "6.5.3"
-#define ACE_VERSION_CODE 394499
+#define ACE_MICRO_VERSION 4
+#define ACE_BETA_VERSION 4
+#define ACE_VERSION "6.5.4"
+#define ACE_VERSION_CODE 394500
 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 
diff --git a/ACE/debian/control b/ACE/debian/control
index 4b81b6dbdea..01b7055c87d 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.3
+Package: libace-6.5.4
 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.3 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.5.4 (= ${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.3
+Package: libace-ssl-6.5.4
 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.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
+Depends: libace-ssl-6.5.4 (= ${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.3
+Package: libace-rmcast-6.5.4
 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.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.5.4 (= ${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.3
+Package: libace-tmcast-6.5.4
 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.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.5.4 (= ${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.3
+Package: libace-htbp-6.5.4
 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.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.5.4 (= ${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.3
+Package: libace-inet-6.5.4
 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.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.5.4 (= ${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.3
+Package: libace-inet-ssl-6.5.4
 Architecture: any
 Section: libs
-Depends: libace-inet-6.5.3, libace-ssl-6.5.3, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.5.4, libace-ssl-6.5.4, ${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.3 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.5.4 (= ${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.3
+Package: libacexml-6.5.4
 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.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.5.4 (= ${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.3
+Package: libace-xml-utils-6.5.4
 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.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-6.5.4 (= ${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.3
+Package: libkokyu-6.5.4
 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.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.5.4 (= ${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.3
+Package: libace-xtreactor-6.5.4
 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.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
+Depends: libace-xtreactor-6.5.4 (= ${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.3
+Package: libace-tkreactor-6.5.4
 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.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.5.4 (= ${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.3
+Package: libace-flreactor-6.5.4
 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.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
+Depends: libace-flreactor-6.5.4 (= ${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.3
+Package: libace-foxreactor-6.5.4
 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.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.5.4 (= ${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.3
+Package: libnetsvcs-6.5.4
 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.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libnetsvcs-6.5.4 (= ${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.3.lintian-overrides b/ACE/debian/libace-6.5.3.lintian-overrides
deleted file mode 100644
index f6271121c15..00000000000
--- a/ACE/debian/libace-6.5.3.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-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-6.5.3.docs b/ACE/debian/libace-6.5.4.docs
index 3bdab5b0089..3bdab5b0089 100644
--- a/ACE/debian/libace-6.5.3.docs
+++ b/ACE/debian/libace-6.5.4.docs
diff --git a/ACE/debian/libace-6.5.3.install b/ACE/debian/libace-6.5.4.install
index 182a5eda411..182a5eda411 100644
--- a/ACE/debian/libace-6.5.3.install
+++ b/ACE/debian/libace-6.5.4.install
diff --git a/ACE/debian/libace-6.5.4.lintian-overrides b/ACE/debian/libace-6.5.4.lintian-overrides
new file mode 100644
index 00000000000..44bd53359eb
--- /dev/null
+++ b/ACE/debian/libace-6.5.4.lintian-overrides
@@ -0,0 +1,6 @@
+libace-6.5.4: no-symbols-control-file usr/lib/libACE-6.5.4.so
+libace-6.5.4: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.5.4.so
+libace-6.5.4: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.5.4.so
+libace-6.5.4: no-symbols-control-file usr/lib/libACE_ETCL-6.5.4.so
+libace-6.5.4: no-symbols-control-file usr/lib/libACE_RLECompression-6.5.4.so
+libace-6.5.4: no-symbols-control-file usr/lib/libACE_Compression-6.5.4.so
diff --git a/ACE/debian/libace-flreactor-6.5.3.lintian-overrides b/ACE/debian/libace-flreactor-6.5.3.lintian-overrides
deleted file mode 100644
index cef17d2cbdb..00000000000
--- a/ACE/debian/libace-flreactor-6.5.3.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-flreactor-6.5.3: no-symbols-control-file usr/lib/libACE_FlReactor-6.5.3.so
diff --git a/ACE/debian/libace-flreactor-6.5.3.install b/ACE/debian/libace-flreactor-6.5.4.install
index 528836aacee..528836aacee 100644
--- a/ACE/debian/libace-flreactor-6.5.3.install
+++ b/ACE/debian/libace-flreactor-6.5.4.install
diff --git a/ACE/debian/libace-flreactor-6.5.4.lintian-overrides b/ACE/debian/libace-flreactor-6.5.4.lintian-overrides
new file mode 100644
index 00000000000..d7661c19d40
--- /dev/null
+++ b/ACE/debian/libace-flreactor-6.5.4.lintian-overrides
@@ -0,0 +1 @@
+libace-flreactor-6.5.4: no-symbols-control-file usr/lib/libACE_FlReactor-6.5.4.so
diff --git a/ACE/debian/libace-foxreactor-6.5.3.lintian-overrides b/ACE/debian/libace-foxreactor-6.5.3.lintian-overrides
deleted file mode 100644
index 863f086953e..00000000000
--- a/ACE/debian/libace-foxreactor-6.5.3.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-foxreactor-6.5.3: no-symbols-control-file usr/lib/libACE_FoxReactor-6.5.3.so
diff --git a/ACE/debian/libace-foxreactor-6.5.3.install b/ACE/debian/libace-foxreactor-6.5.4.install
index e360f29f5af..e360f29f5af 100644
--- a/ACE/debian/libace-foxreactor-6.5.3.install
+++ b/ACE/debian/libace-foxreactor-6.5.4.install
diff --git a/ACE/debian/libace-foxreactor-6.5.4.lintian-overrides b/ACE/debian/libace-foxreactor-6.5.4.lintian-overrides
new file mode 100644
index 00000000000..b6e3dfeff8f
--- /dev/null
+++ b/ACE/debian/libace-foxreactor-6.5.4.lintian-overrides
@@ -0,0 +1 @@
+libace-foxreactor-6.5.4: no-symbols-control-file usr/lib/libACE_FoxReactor-6.5.4.so
diff --git a/ACE/debian/libace-htbp-6.5.3.lintian-overrides b/ACE/debian/libace-htbp-6.5.3.lintian-overrides
deleted file mode 100644
index b6715089b19..00000000000
--- a/ACE/debian/libace-htbp-6.5.3.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-htbp-6.5.3: no-symbols-control-file usr/lib/libACE_HTBP-6.5.3.so
diff --git a/ACE/debian/libace-htbp-6.5.3.install b/ACE/debian/libace-htbp-6.5.4.install
index 08103fd5cad..08103fd5cad 100644
--- a/ACE/debian/libace-htbp-6.5.3.install
+++ b/ACE/debian/libace-htbp-6.5.4.install
diff --git a/ACE/debian/libace-htbp-6.5.4.lintian-overrides b/ACE/debian/libace-htbp-6.5.4.lintian-overrides
new file mode 100644
index 00000000000..68f4cd5264e
--- /dev/null
+++ b/ACE/debian/libace-htbp-6.5.4.lintian-overrides
@@ -0,0 +1 @@
+libace-htbp-6.5.4: no-symbols-control-file usr/lib/libACE_HTBP-6.5.4.so
diff --git a/ACE/debian/libace-inet-6.5.3.lintian-overrides b/ACE/debian/libace-inet-6.5.3.lintian-overrides
deleted file mode 100644
index fc60f5c3130..00000000000
--- a/ACE/debian/libace-inet-6.5.3.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-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-6.5.3.install b/ACE/debian/libace-inet-6.5.4.install
index 59a73a509d0..59a73a509d0 100644
--- a/ACE/debian/libace-inet-6.5.3.install
+++ b/ACE/debian/libace-inet-6.5.4.install
diff --git a/ACE/debian/libace-inet-6.5.4.lintian-overrides b/ACE/debian/libace-inet-6.5.4.lintian-overrides
new file mode 100644
index 00000000000..c53f22a1b35
--- /dev/null
+++ b/ACE/debian/libace-inet-6.5.4.lintian-overrides
@@ -0,0 +1,2 @@
+libace-inet-6.5.4: extended-description-is-probably-too-short
+libace-inet-6.5.4: no-symbols-control-file usr/lib/libACE_INet-6.5.4.so
diff --git a/ACE/debian/libace-inet-ssl-6.5.3.lintian-overrides b/ACE/debian/libace-inet-ssl-6.5.3.lintian-overrides
deleted file mode 100644
index 81624536bcf..00000000000
--- a/ACE/debian/libace-inet-ssl-6.5.3.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-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-inet-ssl-6.5.3.install b/ACE/debian/libace-inet-ssl-6.5.4.install
index b9b8b9045f7..b9b8b9045f7 100644
--- a/ACE/debian/libace-inet-ssl-6.5.3.install
+++ b/ACE/debian/libace-inet-ssl-6.5.4.install
diff --git a/ACE/debian/libace-inet-ssl-6.5.4.lintian-overrides b/ACE/debian/libace-inet-ssl-6.5.4.lintian-overrides
new file mode 100644
index 00000000000..4c403d692c2
--- /dev/null
+++ b/ACE/debian/libace-inet-ssl-6.5.4.lintian-overrides
@@ -0,0 +1,4 @@
+libace-inet-ssl-6.5.4: no-symbols-control-file usr/lib/libACE_INet_SSL-6.5.4.so
+
+# It's Bison-generate code covered by the GNU Bison GPL-exception
+libace-inet-ssl-6.5.4: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-rmcast-6.5.3.lintian-overrides b/ACE/debian/libace-rmcast-6.5.3.lintian-overrides
deleted file mode 100644
index 88acc1b27ed..00000000000
--- a/ACE/debian/libace-rmcast-6.5.3.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-rmcast-6.5.3: no-symbols-control-file usr/lib/libACE_RMCast-6.5.3.so
diff --git a/ACE/debian/libace-rmcast-6.5.3.install b/ACE/debian/libace-rmcast-6.5.4.install
index 86e78259853..86e78259853 100644
--- a/ACE/debian/libace-rmcast-6.5.3.install
+++ b/ACE/debian/libace-rmcast-6.5.4.install
diff --git a/ACE/debian/libace-rmcast-6.5.4.lintian-overrides b/ACE/debian/libace-rmcast-6.5.4.lintian-overrides
new file mode 100644
index 00000000000..414eabd0196
--- /dev/null
+++ b/ACE/debian/libace-rmcast-6.5.4.lintian-overrides
@@ -0,0 +1 @@
+libace-rmcast-6.5.4: no-symbols-control-file usr/lib/libACE_RMCast-6.5.4.so
diff --git a/ACE/debian/libace-ssl-6.5.3.lintian-overrides b/ACE/debian/libace-ssl-6.5.3.lintian-overrides
deleted file mode 100644
index d57e65e1158..00000000000
--- a/ACE/debian/libace-ssl-6.5.3.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-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-ssl-6.5.3.NEWS b/ACE/debian/libace-ssl-6.5.4.NEWS
index e5bd0e4aa10..e5bd0e4aa10 100644
--- a/ACE/debian/libace-ssl-6.5.3.NEWS
+++ b/ACE/debian/libace-ssl-6.5.4.NEWS
diff --git a/ACE/debian/libace-ssl-6.5.3.install b/ACE/debian/libace-ssl-6.5.4.install
index 8df45a6d55f..8df45a6d55f 100644
--- a/ACE/debian/libace-ssl-6.5.3.install
+++ b/ACE/debian/libace-ssl-6.5.4.install
diff --git a/ACE/debian/libace-ssl-6.5.4.lintian-overrides b/ACE/debian/libace-ssl-6.5.4.lintian-overrides
new file mode 100644
index 00000000000..5ecfb25a115
--- /dev/null
+++ b/ACE/debian/libace-ssl-6.5.4.lintian-overrides
@@ -0,0 +1,5 @@
+libace-ssl-6.5.4: extended-description-is-probably-too-short
+libace-ssl-6.5.4: no-symbols-control-file usr/lib/libACE_SSL-6.5.4.so
+
+# It's Bison-generate code covered by the GNU Bison GPL-exception
+libace-ssl-6.5.4: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-tkreactor-6.5.3.lintian-overrides b/ACE/debian/libace-tkreactor-6.5.3.lintian-overrides
deleted file mode 100644
index 97a42b1b136..00000000000
--- a/ACE/debian/libace-tkreactor-6.5.3.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-tkreactor-6.5.3: no-symbols-control-file usr/lib/libACE_TkReactor-6.5.3.so
diff --git a/ACE/debian/libace-tkreactor-6.5.3.install b/ACE/debian/libace-tkreactor-6.5.4.install
index 12ab35062d2..12ab35062d2 100644
--- a/ACE/debian/libace-tkreactor-6.5.3.install
+++ b/ACE/debian/libace-tkreactor-6.5.4.install
diff --git a/ACE/debian/libace-tkreactor-6.5.4.lintian-overrides b/ACE/debian/libace-tkreactor-6.5.4.lintian-overrides
new file mode 100644
index 00000000000..23804837b60
--- /dev/null
+++ b/ACE/debian/libace-tkreactor-6.5.4.lintian-overrides
@@ -0,0 +1 @@
+libace-tkreactor-6.5.4: no-symbols-control-file usr/lib/libACE_TkReactor-6.5.4.so
diff --git a/ACE/debian/libace-tmcast-6.5.3.lintian-overrides b/ACE/debian/libace-tmcast-6.5.3.lintian-overrides
deleted file mode 100644
index d830c04851a..00000000000
--- a/ACE/debian/libace-tmcast-6.5.3.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-tmcast-6.5.3: no-symbols-control-file usr/lib/libACE_TMCast-6.5.3.so
diff --git a/ACE/debian/libace-tmcast-6.5.3.install b/ACE/debian/libace-tmcast-6.5.4.install
index e066131dea0..e066131dea0 100644
--- a/ACE/debian/libace-tmcast-6.5.3.install
+++ b/ACE/debian/libace-tmcast-6.5.4.install
diff --git a/ACE/debian/libace-tmcast-6.5.4.lintian-overrides b/ACE/debian/libace-tmcast-6.5.4.lintian-overrides
new file mode 100644
index 00000000000..dbc9236a08f
--- /dev/null
+++ b/ACE/debian/libace-tmcast-6.5.4.lintian-overrides
@@ -0,0 +1 @@
+libace-tmcast-6.5.4: no-symbols-control-file usr/lib/libACE_TMCast-6.5.4.so
diff --git a/ACE/debian/libace-xml-utils-6.5.3.lintian-overrides b/ACE/debian/libace-xml-utils-6.5.3.lintian-overrides
deleted file mode 100644
index 41a55a73dce..00000000000
--- a/ACE/debian/libace-xml-utils-6.5.3.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-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-xml-utils-6.5.3.install b/ACE/debian/libace-xml-utils-6.5.4.install
index 2428ec9f109..2428ec9f109 100644
--- a/ACE/debian/libace-xml-utils-6.5.3.install
+++ b/ACE/debian/libace-xml-utils-6.5.4.install
diff --git a/ACE/debian/libace-xml-utils-6.5.4.lintian-overrides b/ACE/debian/libace-xml-utils-6.5.4.lintian-overrides
new file mode 100644
index 00000000000..ae06ec203ab
--- /dev/null
+++ b/ACE/debian/libace-xml-utils-6.5.4.lintian-overrides
@@ -0,0 +1 @@
+libace-xml-utils-6.5.4: no-symbols-control-file usr/lib/libACE_XML_Utils-6.5.4.so
diff --git a/ACE/debian/libace-xtreactor-6.5.3.lintian-overrides b/ACE/debian/libace-xtreactor-6.5.3.lintian-overrides
deleted file mode 100644
index 327db86d2a5..00000000000
--- a/ACE/debian/libace-xtreactor-6.5.3.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-xtreactor-6.5.3: no-symbols-control-file usr/lib/libACE_XtReactor-6.5.3.so
diff --git a/ACE/debian/libace-xtreactor-6.5.3.install b/ACE/debian/libace-xtreactor-6.5.4.install
index c53614c7208..c53614c7208 100644
--- a/ACE/debian/libace-xtreactor-6.5.3.install
+++ b/ACE/debian/libace-xtreactor-6.5.4.install
diff --git a/ACE/debian/libace-xtreactor-6.5.4.lintian-overrides b/ACE/debian/libace-xtreactor-6.5.4.lintian-overrides
new file mode 100644
index 00000000000..5b706380af5
--- /dev/null
+++ b/ACE/debian/libace-xtreactor-6.5.4.lintian-overrides
@@ -0,0 +1 @@
+libace-xtreactor-6.5.4: no-symbols-control-file usr/lib/libACE_XtReactor-6.5.4.so
diff --git a/ACE/debian/libacexml-6.5.3.lintian-overrides b/ACE/debian/libacexml-6.5.3.lintian-overrides
deleted file mode 100644
index f2083dbd3f3..00000000000
--- a/ACE/debian/libacexml-6.5.3.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-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/libacexml-6.5.3.docs b/ACE/debian/libacexml-6.5.4.docs
index 002855d7915..002855d7915 100644
--- a/ACE/debian/libacexml-6.5.3.docs
+++ b/ACE/debian/libacexml-6.5.4.docs
diff --git a/ACE/debian/libacexml-6.5.3.install b/ACE/debian/libacexml-6.5.4.install
index d3e912ffa51..d3e912ffa51 100644
--- a/ACE/debian/libacexml-6.5.3.install
+++ b/ACE/debian/libacexml-6.5.4.install
diff --git a/ACE/debian/libacexml-6.5.4.lintian-overrides b/ACE/debian/libacexml-6.5.4.lintian-overrides
new file mode 100644
index 00000000000..3e1df6fc096
--- /dev/null
+++ b/ACE/debian/libacexml-6.5.4.lintian-overrides
@@ -0,0 +1,3 @@
+libacexml-6.5.4: no-symbols-control-file usr/lib/libACEXML_Parser-6.5.4.so
+libacexml-6.5.4: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.5.4.so
+libacexml-6.5.4: no-symbols-control-file usr/lib/libACEXML-6.5.4.so
diff --git a/ACE/debian/libkokyu-6.5.3.lintian-overrides b/ACE/debian/libkokyu-6.5.3.lintian-overrides
deleted file mode 100644
index 562551daf17..00000000000
--- a/ACE/debian/libkokyu-6.5.3.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkokyu-6.5.3: no-symbols-control-file usr/lib/libKokyu-6.5.3.so
diff --git a/ACE/debian/libkokyu-6.5.3.docs b/ACE/debian/libkokyu-6.5.4.docs
index e8869c513b2..e8869c513b2 100644
--- a/ACE/debian/libkokyu-6.5.3.docs
+++ b/ACE/debian/libkokyu-6.5.4.docs
diff --git a/ACE/debian/libkokyu-6.5.3.install b/ACE/debian/libkokyu-6.5.4.install
index 62854308f96..62854308f96 100644
--- a/ACE/debian/libkokyu-6.5.3.install
+++ b/ACE/debian/libkokyu-6.5.4.install
diff --git a/ACE/debian/libkokyu-6.5.4.lintian-overrides b/ACE/debian/libkokyu-6.5.4.lintian-overrides
new file mode 100644
index 00000000000..d7b9a3213bb
--- /dev/null
+++ b/ACE/debian/libkokyu-6.5.4.lintian-overrides
@@ -0,0 +1 @@
+libkokyu-6.5.4: no-symbols-control-file usr/lib/libKokyu-6.5.4.so
diff --git a/ACE/debian/libnetsvcs-6.5.3.lintian-overrides b/ACE/debian/libnetsvcs-6.5.3.lintian-overrides
deleted file mode 100644
index 28dd22e1d8d..00000000000
--- a/ACE/debian/libnetsvcs-6.5.3.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libnetsvcs-6.5.3: no-symbols-control-file usr/lib/libnetsvcs-6.5.3.so
diff --git a/ACE/debian/libnetsvcs-6.5.3.docs b/ACE/debian/libnetsvcs-6.5.4.docs
index 0b03c55b91f..0b03c55b91f 100644
--- a/ACE/debian/libnetsvcs-6.5.3.docs
+++ b/ACE/debian/libnetsvcs-6.5.4.docs
diff --git a/ACE/debian/libnetsvcs-6.5.3.install b/ACE/debian/libnetsvcs-6.5.4.install
index c7a04b16213..c7a04b16213 100644
--- a/ACE/debian/libnetsvcs-6.5.3.install
+++ b/ACE/debian/libnetsvcs-6.5.4.install
diff --git a/ACE/debian/libnetsvcs-6.5.4.lintian-overrides b/ACE/debian/libnetsvcs-6.5.4.lintian-overrides
new file mode 100644
index 00000000000..171e01a7c0c
--- /dev/null
+++ b/ACE/debian/libnetsvcs-6.5.4.lintian-overrides
@@ -0,0 +1 @@
+libnetsvcs-6.5.4: no-symbols-control-file usr/lib/libnetsvcs-6.5.4.so
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index 081aedb603e..21a3c36bc73 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.3
-%define TAOVER  2.5.3
+%define ACEVER  6.5.4
+%define TAOVER  2.5.4
 
 # Conditional build
 # Default values are