From d8000d11b22a5f7c872c5e293a9c71e0732a0b67 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 10 Apr 2024 09:54:14 +0200 Subject: [PATCH] ACE+TAO-7_1_4 --- ACE/ChangeLogs/ACE-7_1_4 | 138 ++++++++++++++++++++++++++++++++++++++ ACE/PROBLEM-REPORT-FORM | 2 +- ACE/VERSION.txt | 2 +- ACE/ace/Version.h | 6 +- ACE/debian/control | 62 ++++++++--------- ACE/rpmbuild/ace-tao.spec | 4 +- TAO/ChangeLogs/TAO-3_1_4 | 26 +++++++ TAO/PROBLEM-REPORT-FORM | 4 +- TAO/VERSION.txt | 2 +- TAO/tao/Version.h | 6 +- 10 files changed, 208 insertions(+), 44 deletions(-) create mode 100644 ACE/ChangeLogs/ACE-7_1_4 create mode 100644 TAO/ChangeLogs/TAO-3_1_4 diff --git a/ACE/ChangeLogs/ACE-7_1_4 b/ACE/ChangeLogs/ACE-7_1_4 new file mode 100644 index 0000000000000..dbdc3dba60609 --- /dev/null +++ b/ACE/ChangeLogs/ACE-7_1_4 @@ -0,0 +1,138 @@ +commit eb7dd3b658e923c0d3eda9551fd487b514261098 +Merge: 7f67b2c581f 5346abce57e +Author: Johnny Willemsen +Date: Fri Apr 5 13:27:50 2024 +0200 + + Merge branch 'jwi-defaultcpp17' of https://github.com/jwillemsen/ATCD into jwi-defaultcpp17 + +commit 7f67b2c581f39cdb88f8f18587fa0d49cfd82cd1 +Author: Johnny Willemsen +Date: Fri Apr 5 13:27:40 2024 +0200 + + Add news + + * ACE/NEWS: + +commit 5346abce57e2c202a54b5dd96261e8aed182ac23 +Merge: 33d1703e35b 7add19fb5e6 +Author: Johnny Willemsen +Date: Fri Apr 5 13:26:29 2024 +0200 + + Merge branch 'master' into jwi-defaultcpp17 + +commit 33d1703e35bb65f9585109e674dbd25c9ca16879 +Author: Johnny Willemsen +Date: Fri Apr 5 13:25:07 2024 +0200 + + Changed the default to C++17 for QNX and g++ versions older as 11 (11 has C++17 as default) + + * ACE/include/makeinclude/platform_g++_common.GNU: + * ACE/include/makeinclude/platform_qnx_gcc.GNU: + +commit 7add19fb5e62a1264a337e82af3ef9671d81d26e +Merge: 28b43699c5f ac2dff71e56 +Author: Johnny Willemsen +Date: Tue Apr 2 21:10:47 2024 +0200 + + Merge pull request #2211 from jwillemsen/jwi-sockdgram2 + + Const/layout changes + +commit 28b43699c5f37ac829882193bd9160dc08f1fe6a +Merge: f58af0a99d0 06a2c704908 +Author: Johnny Willemsen +Date: Tue Apr 2 21:10:04 2024 +0200 + + Merge pull request #2210 from jwillemsen/jwi-noaceroot + + Don't add ACE_ROOT implicitly to the compiler flags + +commit ac2dff71e56e828f86399d7acddc29290d3dade7 +Author: Johnny Willemsen +Date: Tue Apr 2 17:22:47 2024 +0200 + + Const/layout changes + + * ACE/ace/SOCK_Dgram_Mcast.cpp: + +commit 06a2c704908f4578afa97efe164f598d62ad47c3 +Author: Johnny Willemsen +Date: Tue Apr 2 17:22:20 2024 +0200 + + Don't add ACE_ROOT implicitly to the compiler flags + +commit 621e8ead430bd8e0831146c71870c92b1f6c7959 +Merge: 40d6732cf4b 681b02679eb +Author: Johnny Willemsen +Date: Wed Feb 28 18:55:18 2024 +0100 + + Merge pull request #2204 from jwillemsen/jwi-sendfileqnx + + Enable Sendfile_Test for QNX + +commit 681b02679eb9dd489be1b5f4a418a20fbbeb52d9 +Author: Johnny Willemsen +Date: Wed Feb 28 11:39:42 2024 +0100 + + Enable Sendfile_Test for QNX + + * ACE/tests/run_test.lst: + +commit 1617445fab75aa81d07a0b1e42a99df4dfaf7724 +Author: Like Ma +Date: Tue Feb 27 01:08:36 2024 +0800 + + Reset ACE_Process_Options std handles after closed + + When calling ACE_Process_Options::release_handles after + ACE_Process::spawn, std handles must be reset after closed to avoid + closing again in ACE_Process_Options dtor. + +commit 9ac320c9a8e6b5f412e8eefb7f2870b3bf225918 +Author: Johnny Willemsen +Date: Wed Feb 21 11:01:05 2024 +0100 + + Fixed typos + + * ACE/ace/Configuration.h: + * ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h: + * ACE/tests/Test_Output.cpp: + * TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp: + * TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp: + * TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp: + * TAO/tao/PI/PICurrent_Impl.cpp: + * TAO/tests/POA/FindPOA/FindPOA.cpp: + +commit e3d49b919d2958af6b3286c01de87e73c638fb50 +Author: Adam Mitz +Date: Fri Feb 9 15:06:03 2024 +0000 + + Avoid potential out-of-bounds read in ACE_CDR::Fixed::from_string + + (cherry picked from commit 90258afc7c510ead3ace1e30382bb5ba877610b3) + +commit 0c991b2a36431b2129dd3cab6f112b8ec60932bf +Author: Iulian Serbanoiu +Date: Mon Jan 29 10:15:01 2024 +0200 + + don't use invalid references of temporary objects - scan-build report + +commit d18b19bc55dcb6d773405c94c7ef221d6afb8aa9 +Author: Johnny Willemsen +Date: Tue Jan 16 13:27:05 2024 +0100 + + Remove workaround for obsolete compiler + + * ACE/tests/Compiler_Features_27_Test.cpp: + +commit 1b193af01d5289f17269896566aba5acbd8eb145 +Author: Johnny Willemsen +Date: Tue Jan 16 11:41:47 2024 +0100 + + Make 7.1.3 public available + + * ACE/NEWS: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/etc/index.html: + * TAO/NEWS: diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM index fb236bfa7a87b..518b29f2b87b7 100644 --- a/ACE/PROBLEM-REPORT-FORM +++ b/ACE/PROBLEM-REPORT-FORM @@ -25,7 +25,7 @@ include an entire platform-specific configuration file in the form. 8<----------8<----------8<----------8<----------8<----------8<----------8<---- - ACE VERSION: 7.1.3 + ACE VERSION: 7.1.4 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 c50ee4f5c1c87..5cfd157ad22ac 100644 --- a/ACE/VERSION.txt +++ b/ACE/VERSION.txt @@ -1,4 +1,4 @@ -This is ACE version 7.1.3, released Tue Jan 16 11:25:51 CET 2024 +This is ACE version 7.1.4, released Wed Apr 10 09:54:13 CEST 2024 If you have any problems with or questions about ACE, please open a issue or discussion on the ACE_TAO github project at diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h index 2bcd867427a29..6850be34046b0 100644 --- a/ACE/ace/Version.h +++ b/ACE/ace/Version.h @@ -4,7 +4,7 @@ #define ACE_MAJOR_VERSION 7 #define ACE_MINOR_VERSION 1 -#define ACE_MICRO_VERSION 3 -#define ACE_VERSION "7.1.3" -#define ACE_VERSION_CODE 0x70103 +#define ACE_MICRO_VERSION 4 +#define ACE_VERSION "7.1.4" +#define ACE_VERSION_CODE 0x70104 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c)) diff --git a/ACE/debian/control b/ACE/debian/control index eebb5aedc94b8..79519f7de2d28 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-7.1.3 +Package: libace-7.1.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-7.1.3 (= ${binary:Version}), ${misc:Depends} +Depends: libace-7.1.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-7.1.3 +Package: libace-ssl-7.1.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-7.1.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends} +Depends: libace-ssl-7.1.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-7.1.3 +Package: libace-rmcast-7.1.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-7.1.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-rmcast-7.1.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-7.1.3 +Package: libace-tmcast-7.1.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-7.1.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-tmcast-7.1.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-7.1.3 +Package: libace-htbp-7.1.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-7.1.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-htbp-7.1.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-7.1.3 +Package: libace-inet-7.1.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-7.1.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-7.1.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-7.1.3 +Package: libace-inet-ssl-7.1.4 Architecture: any Section: libs -Depends: libace-inet-7.1.3, libace-ssl-7.1.3, ${shlibs:Depends}, ${misc:Depends} +Depends: libace-inet-7.1.4, libace-ssl-7.1.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-7.1.3 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-ssl-7.1.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-7.1.3 +Package: libacexml-7.1.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-7.1.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libacexml-7.1.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-7.1.3 +Package: libace-xml-utils-7.1.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-7.1.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev +Depends: libace-xml-utils-7.1.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-7.1.3 +Package: libkokyu-7.1.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-7.1.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libkokyu-7.1.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-7.1.3 +Package: libace-xtreactor-7.1.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-7.1.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends} +Depends: libace-xtreactor-7.1.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-7.1.3 +Package: libace-tkreactor-7.1.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-7.1.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} +Depends: libace-tkreactor-7.1.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-7.1.3 +Package: libace-flreactor-7.1.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-7.1.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.3-dev, ${misc:Depends} +Depends: libace-flreactor-7.1.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.3-dev, ${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-7.1.3 +Package: libace-foxreactor-7.1.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-7.1.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} +Depends: libace-foxreactor-7.1.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-7.1.3 +Package: libnetsvcs-7.1.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-7.1.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libnetsvcs-7.1.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/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec index 59a7704e74f45..501a633b8967c 100644 --- a/ACE/rpmbuild/ace-tao.spec +++ b/ACE/rpmbuild/ace-tao.spec @@ -1,6 +1,6 @@ # Set the version number here. -%define ACEVER 7.1.3 -%define TAOVER 3.1.3 +%define ACEVER 7.1.4 +%define TAOVER 3.1.4 # Conditional build # Default values are diff --git a/TAO/ChangeLogs/TAO-3_1_4 b/TAO/ChangeLogs/TAO-3_1_4 new file mode 100644 index 0000000000000..4fbd42b797e5d --- /dev/null +++ b/TAO/ChangeLogs/TAO-3_1_4 @@ -0,0 +1,26 @@ +commit 9ac320c9a8e6b5f412e8eefb7f2870b3bf225918 +Author: Johnny Willemsen +Date: Wed Feb 21 11:01:05 2024 +0100 + + Fixed typos + + * ACE/ace/Configuration.h: + * ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h: + * ACE/tests/Test_Output.cpp: + * TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp: + * TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp: + * TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp: + * TAO/tao/PI/PICurrent_Impl.cpp: + * TAO/tests/POA/FindPOA/FindPOA.cpp: + +commit 1b193af01d5289f17269896566aba5acbd8eb145 +Author: Johnny Willemsen +Date: Tue Jan 16 11:41:47 2024 +0100 + + Make 7.1.3 public available + + * ACE/NEWS: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/etc/index.html: + * TAO/NEWS: diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM index 449f4f7ba25fd..1a9eeb16be5e6 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: 3.1.3 - ACE VERSION: 7.1.3 + TAO VERSION: 3.1.4 + ACE VERSION: 7.1.4 HOST MACHINE and OPERATING SYSTEM: If on Windows based OS's, which version of WINSOCK do you diff --git a/TAO/VERSION.txt b/TAO/VERSION.txt index c8be2091d87e4..da8f662f78e8c 100644 --- a/TAO/VERSION.txt +++ b/TAO/VERSION.txt @@ -1,4 +1,4 @@ -This is TAO version 3.1.3, released Tue Jan 16 11:25:51 CET 2024 +This is TAO version 3.1.4, released Wed Apr 10 09:54:13 CEST 2024 If you have any problems with or questions about TAO, please open a issue or discussion on the ACE_TAO github project at diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h index fe48396ea3f70..9d28907b8f5f1 100644 --- a/TAO/tao/Version.h +++ b/TAO/tao/Version.h @@ -4,7 +4,7 @@ #define TAO_MAJOR_VERSION 3 #define TAO_MINOR_VERSION 1 -#define TAO_MICRO_VERSION 3 -#define TAO_VERSION "3.1.3" -#define TAO_VERSION_CODE 0x30103 +#define TAO_MICRO_VERSION 4 +#define TAO_VERSION "3.1.4" +#define TAO_VERSION_CODE 0x30104 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))