ACE+TAO-6_5_14ACE+TAO-6_5_14

6 files changed, 154 insertions, 39 deletions

diff --git a/ACE/ChangeLogs/ACE-6_5_14 b/ACE/ChangeLogs/ACE-6_5_14
new file mode 100644
index 00000000000..2d7a41a1bbb
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-6_5_14
@@ -0,0 +1,115 @@
+commit 144e40f32a682e4729fb8b1ed773dfed94dd8e12
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Aug 2 16:56:40 2021 -0500
+
+    make_multicast_ifaddr: prevent buffer overrun from net_if
+    
+    fixes #1637
+    also removed a preprocessor conditional that was redundant
+    
+    (cherry picked from commit 06e2a14d2d98b2a18b50615f4c048cffd49b3bfd)
+
+commit b2763e7efaacc05dea0190d737644bcf0df61033
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 2 16:00:14 2021 +0200
+
+    Update NEWS
+
+commit 985ff7c0791b4f79d2625c56a58ed225ab884c65
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 14 16:15:11 2021 +0200
+
+    Removed news item, Embarcadero classic compiler is not working
+
+commit 9604a4a75c1c3bb41b9f420b957b28b69c327b66
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Jul 11 19:24:20 2021 +0200
+
+    Add news item
+    
+        * ACE/NEWS:
+
+commit 27718b5ac6bd219a4cf0ebdc1182c396ee40eb17
+Merge: 8dafd144835 b23362324e9
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Jul 9 14:41:27 2021 -0500
+
+    Merge pull request #1593 from mitza-oci/install-relative
+    
+    [ACE 6] make install: use relative links in prefix/share
+
+commit 860746a594bf7bd04ee2501a8d8b5c7d678934c7
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Thu Jul 8 17:26:09 2021 -0500
+
+    Attempt to Fix Coverity Issues from #840
+    
+    https://github.com/DOCGroup/ACE_TAO/pull/840
+    
+    Because the main set of issues in `coerce_value` was caused by applying
+    the existing pattern, the issues caused by the existing code should also
+    be fixed.
+
+commit 2cbdf73f5418ef30639750f25ca5a1362f943a24
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Thu Jul 8 19:22:31 2021 -0500
+
+    IDLv4 Explicitly-named Integer Types
+    
+    Ported from https://github.com/DOCGroup/ACE_TAO/pull/840 to ACE6/TAO2.
+    Also regenerated with Bison 3.7.6 at the same time like in
+    d5819180d02d76ed3c14c421f02ad69c4d0bab9e in
+    https://github.com/DOCGroup/ACE_TAO/pull/1594
+
+commit b23362324e929b731f3908c2f1d458d16c524f49
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jul 8 14:04:25 2021 -0500
+
+    make install: use relative links in prefix/share
+
+commit 2063860a36b5b235cf681b74e8c3ef4909e2032d
+Merge: eff39881ad4 40feeb36f0b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jun 21 15:51:42 2021 +0200
+
+    Merge pull request #1566 from jwillemsen/jwi-bcc32fix-ace6tao2
+    
+    [ace6] Updated bcc32 version check
+
+commit 40feeb36f0b550019f2830238d64a521675ea8c4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jun 21 08:42:22 2021 +0200
+
+    Updated bcc32 version check
+    
+        * ACE/ace/post.h:
+        * ACE/ace/pre.h:
+
+commit 84438e5c0dfa16596fae1f9247d42e05b95db3c6
+Merge: 705b8d95eb5 bd42ac334e9
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon May 24 09:47:58 2021 -0500
+
+    Merge pull request #1508 from simpsont-oci/ace6tao2_ip_check_fix_v2
+    
+    [ACE6] Fix SocketConnect::ip_check() Concurrency and Too-Early Request Issues for Windows
+
+commit bd42ac334e90816ed0a8778b9e45c1cc9d1b2447
+Author: Timothy Simpson <simpsont@objectcomputing.com>
+Date:   Fri May 14 09:00:59 2021 -0500
+
+    since we're not returning the value of recursing, switch to bool
+
+commit eef33151c45ae1826b346c0acbb03fca2f843cf6
+Author: Timothy Simpson <simpsont@objectcomputing.com>
+Date:   Thu May 13 14:29:01 2021 -0500
+
+    Apply suggestions from code review
+    
+    Co-authored-by: Adam Mitz <mitza@objectcomputing.com>
+
+commit 04d70c6c157074e053e4040d2d869c972be39eff
+Author: Timothy Simpson <simpsont@objectcomputing.com>
+Date:   Thu May 13 13:51:58 2021 -0500
+
+    fix concurrency and too-early-request issues for windows ip_check
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index b2185061816..286fb97431e 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.13
+    ACE VERSION: 6.5.14
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/ACE/VERSION.txt b/ACE/VERSION.txt
index 62e8c74e470..fd935229cfd 100644
--- a/ACE/VERSION.txt
+++ b/ACE/VERSION.txt
@@ -1,4 +1,4 @@
-This is ACE version 6.5.13, released Fri May 14 09:39:28 CEST 2021
+This is ACE version 6.5.14, released Wed Aug 04 08:36:34 CEST 2021
 
 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 ec0848ca684..b9e677ec2f3 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -4,8 +4,8 @@
 
 #define ACE_MAJOR_VERSION 6
 #define ACE_MINOR_VERSION 5
-#define ACE_MICRO_VERSION 13
-#define ACE_BETA_VERSION 13
-#define ACE_VERSION "6.5.13"
-#define ACE_VERSION_CODE 0x6050d
+#define ACE_MICRO_VERSION 14
+#define ACE_BETA_VERSION 14
+#define ACE_VERSION "6.5.14"
+#define ACE_VERSION_CODE 0x6050e
 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git a/ACE/debian/control b/ACE/debian/control
index 12d6d3e763c..05b868d7ff5 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.13
+Package: libace-6.5.14
 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.13 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.5.14 (= ${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.13
+Package: libace-ssl-6.5.14
 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
+Depends: libace-ssl-6.5.14 (= ${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.13
+Package: libace-rmcast-6.5.14
 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.5.14 (= ${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.13
+Package: libace-tmcast-6.5.14
 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.5.14 (= ${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.13
+Package: libace-htbp-6.5.14
 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.5.14 (= ${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.13
+Package: libace-inet-6.5.14
 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.5.14 (= ${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.13
+Package: libace-inet-ssl-6.5.14
 Architecture: any
 Section: libs
-Depends: libace-inet-6.5.13, libace-ssl-6.5.13, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.5.14, libace-ssl-6.5.14, ${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.13 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.5.14 (= ${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.13
+Package: libacexml-6.5.14
 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.5.14 (= ${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.13
+Package: libace-xml-utils-6.5.14
 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-6.5.14 (= ${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.13
+Package: libkokyu-6.5.14
 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.5.14 (= ${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.13
+Package: libace-xtreactor-6.5.14
 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
+Depends: libace-xtreactor-6.5.14 (= ${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.13
+Package: libace-tkreactor-6.5.14
 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.5.14 (= ${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.13
+Package: libace-flreactor-6.5.14
 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
+Depends: libace-flreactor-6.5.14 (= ${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.13
+Package: libace-foxreactor-6.5.14
 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.5.14 (= ${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.13
+Package: libnetsvcs-6.5.14
 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.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libnetsvcs-6.5.14 (= ${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/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index b0306707f07..9be97599e61 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.13
-%define TAOVER  2.5.13
+%define ACEVER  6.5.14
+%define TAOVER  2.5.14
 
 # Conditional build
 # Default values are