ACE+TAO-6_5_20

DOCGroup · Jun 28, 2023 · 7837f85 · 7837f85
1 parent d36fb4b
commit 7837f85
Show file tree

Hide file tree

Showing 10 changed files with 141 additions and 46 deletions.
diff --git a/ACE/ChangeLogs/ACE-6_5_20 b/ACE/ChangeLogs/ACE-6_5_20
@@ -0,0 +1,70 @@
+commit eefe601e29b1664c3f600cf92e2d4125ca054b0a
+Author: Johnny Willemsen <[email protected]>
+Date:   Wed Jun 28 09:21:16 2023 +0200
+
+    Update NEWS
+
+commit 6995956534aabbb26ef7abf1807dd33bc9e37f0b
+Author: Justin Wilson <[email protected]>
+Date:   Tue Jun 27 09:21:17 2023 -0500
+
+    Merge pull request #2080 from jrw972/port0-ace-lacks-getservbyname
+
+    `ACE_INET_Addr::set` errantly succeeds when ACE_LACKS_GETSERVBYNAME
+
+    (cherry picked from commit a65d91cdc463e7cf6cf509138956b2d38c5e5727)
+
+commit d11fbb2a8ab5d3b9bb87339c7b26588308376c20
+Author: Johnny Willemsen <[email protected]>
+Date:   Fri Jun 23 11:30:33 2023 +0200
+
+    Merge pull request #2083 from jwillemsen/jwi-shmmem
+
+    Make more members of ACE_Shared_Memory_Pool const
+
+    (cherry picked from commit a5c5e60e6cf72ed056038b7c0307f14b06130f82)
+
+    # Conflicts:
+    #       ACE/ace/Shared_Memory_Pool.cpp
+
+commit a6271864578cd207c59ff764d220a2a8d4997e0b
+Author: Adam Mitz <[email protected]>
+Date:   Thu Jun 22 21:24:30 2023 -0500
+
+    Adapted change to Shared_Memory_Pool from PR 2077
+
+commit 4a8be40863006b69f545a3f0c52e581faf51ef44
+Author: Adam Mitz <[email protected]>
+Date:   Thu Jun 22 17:26:37 2023 -0500
+
+    Merge pull request #2077 from DOCGroup/jwi-shmem
+
+    Fix ACE_Shared_Memory_Pool
+
+    (cherry picked from commit 7ee08390b66dd92fcd9b30aeccad70e31379be7e)
+
+    # Conflicts:
+    #       ACE/NEWS
+    #       ACE/ace/SV_Shared_Memory.h
+    #       ACE/ace/Shared_Memory_Pool.cpp
+    #       ACE/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp
+    #       ACE/tests/SV_Shared_Memory_Test.cpp
+
+commit 2e70d6aa938d04bb800aea99301a1aceb9a3af03
+Author: Adam Mitz <[email protected]>
+Date:   Thu Jun 22 17:06:49 2023 -0500
+
+    Replaced egrep with grep -E
+
+commit 909039b840cb1c6ff4bc58d1ba15357bae2af7ce
+Author: Adam Mitz <[email protected]>
+Date:   Thu Jun 22 17:04:45 2023 -0500
+
+    Merge pull request #2078 from jwillemsen/jwi-egrep
+
+    Use ‘grep -E’ as egrep is obsolescent
+
+    (cherry picked from commit 5ea3ce0f676f3ae3d9347cf43b762d09c32745fd)
+
+    # Conflicts:
+    #       ACE/include/makeinclude/platform_gcc_clang_common.GNU
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
@@ -40,7 +40,7 @@
 To: [email protected]
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 6.5.19
+    ACE VERSION: 6.5.20
 
     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
@@ -1,4 +1,4 @@
-This is ACE version 6.5.19, released Mon Dec 19 11:44:26 CET 2022
+This is ACE version 6.5.20, released Wed Jun 28 11:17:08 CEST 2023
 
 If you have any problems with or questions about ACE, please send
 e-mail to the ACE mailing list ([email protected]),

diff --git 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 19
-#define ACE_BETA_VERSION 19
-#define ACE_VERSION "6.5.19"
-#define ACE_VERSION_CODE 0x60513
+#define ACE_MICRO_VERSION 20
+#define ACE_BETA_VERSION 20
+#define ACE_VERSION "6.5.20"
+#define ACE_VERSION_CODE 0x60514
 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git 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.19
+Package: libace-6.5.20
 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.19 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.5.20 (= ${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.19
+Package: libace-ssl-6.5.20
 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.19 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
+Depends: libace-ssl-6.5.20 (= ${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.19
+Package: libace-rmcast-6.5.20
 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.19 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.5.20 (= ${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.19
+Package: libace-tmcast-6.5.20
 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.19 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.5.20 (= ${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.19
+Package: libace-htbp-6.5.20
 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.19 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.5.20 (= ${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.19
+Package: libace-inet-6.5.20
 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.19 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.5.20 (= ${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.19
+Package: libace-inet-ssl-6.5.20
 Architecture: any
 Section: libs
-Depends: libace-inet-6.5.19, libace-ssl-6.5.19, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.5.20, libace-ssl-6.5.20, ${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.19 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.5.20 (= ${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.19
+Package: libacexml-6.5.20
 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.19 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.5.20 (= ${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.19
+Package: libace-xml-utils-6.5.20
 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.19 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-6.5.20 (= ${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.19
+Package: libkokyu-6.5.20
 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.19 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.5.20 (= ${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.19
+Package: libace-xtreactor-6.5.20
 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.19 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
+Depends: libace-xtreactor-6.5.20 (= ${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.19
+Package: libace-tkreactor-6.5.20
 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.19 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.5.20 (= ${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.19
+Package: libace-flreactor-6.5.20
 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.19 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
+Depends: libace-flreactor-6.5.20 (= ${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.19
+Package: libace-foxreactor-6.5.20
 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.19 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.5.20 (= ${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.19
+Package: libnetsvcs-6.5.20
 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.19 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libnetsvcs-6.5.20 (= ${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
@@ -1,6 +1,6 @@
 # Set the version number here.
-%define ACEVER  6.5.19
-%define TAOVER  2.5.19
+%define ACEVER  6.5.20
+%define TAOVER  2.5.20
 
 # Conditional build
 # Default values are

diff --git a/TAO/ChangeLogs/TAO-2_5_20 b/TAO/ChangeLogs/TAO-2_5_20
@@ -0,0 +1,25 @@
+commit d36fb4bbd400cd321adda13f32685a2abb4ec4c3
+Author: Johnny Willemsen <[email protected]>
+Date:   Wed Jun 28 09:22:38 2023 +0200
+
+    Update NEWS
+
+commit 74264f1b59f08d84fb77f8bc5449da497b592776
+Author: ocielliottc <[email protected]>
+Date:   Fri Jan 6 10:22:42 2023 -0600
+
+    Merge pull request #2010 from ocielliottc/correct_tao_idl_includes
+
+    Removed unnecessary includes and added necessary ones.
+
+    (cherry picked from commit 74d6be186ce2584855e99df9ba08f54c1e2e18b2)
+
+commit 4f202621e35527251de866d0d0bd985e885f7f9b
+Author: ocielliottc <[email protected]>
+Date:   Thu Jan 5 10:37:37 2023 -0600
+
+    Merge pull request #2008 from ocielliottc/correcting_includes
+
+    Corrected #include's
+
+    (cherry picked from commit c6c1d9fb31c534a27fe492ad35fc71ccc7fb655c)
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
@@ -40,8 +40,8 @@
 To: [email protected]
 Subject: [area]: [synopsis]
 
-    TAO VERSION: 2.5.19
-    ACE VERSION: 6.5.19
+    TAO VERSION: 2.5.20
+    ACE VERSION: 6.5.20
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you

diff --git a/TAO/VERSION.txt b/TAO/VERSION.txt
@@ -1,4 +1,4 @@
-This is TAO version 2.5.19, released Mon Dec 19 11:44:26 CET 2022
+This is TAO version 2.5.20, released Wed Jun 28 11:17:08 CEST 2023
 
 If you have any problems with or questions about TAO, please send
 e-mail to the TAO mailing list ([email protected]),