From 061e22fc7b83209c55b102b176828bda7ccb08fa Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 16 Jan 2024 11:25:52 +0100 Subject: [PATCH] ACE+TAO-7_1_3 --- ACE/ChangeLogs/ACE-7_1_3 | 154 ++++++++++++++++++++++++++++++++++++++ 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_3 | 11 +++ TAO/PROBLEM-REPORT-FORM | 4 +- TAO/VERSION.txt | 2 +- TAO/tao/Version.h | 6 +- 10 files changed, 209 insertions(+), 44 deletions(-) create mode 100644 ACE/ChangeLogs/ACE-7_1_3 create mode 100644 TAO/ChangeLogs/TAO-3_1_3 diff --git a/ACE/ChangeLogs/ACE-7_1_3 b/ACE/ChangeLogs/ACE-7_1_3 new file mode 100644 index 0000000000000..59e774dcd2452 --- /dev/null +++ b/ACE/ChangeLogs/ACE-7_1_3 @@ -0,0 +1,154 @@ +commit 06c65e4ec63d867b08b28524e65d404397c15d98 +Author: Johnny Willemsen +Date: Mon Jan 15 11:07:27 2024 +0100 + + List changes + + * ACE/NEWS: + +commit 56d5db9cd27ab6fb7aa88809f097daf94f8ef232 +Author: Johnny Willemsen +Date: Mon Jan 15 09:44:35 2024 +0100 + + Some modernization, use default, nullptr, const + + * ACE/ace/Barrier.cpp: + * ACE/ace/Future.cpp: + * ACE/ace/Future.h: + * ACE/ace/Future_Set.cpp: + +commit 0af46b720336d28f2b248d781d98f6a5ddf22158 +Author: Johnny Willemsen +Date: Sun Jan 14 13:03:11 2024 +0100 + + Add include for std::atomic + + * ACE/ace/Future.h: + +commit 6695073ad566bbcb5a4e8dd186308dd7e2911af3 +Merge: b94f1dc4f62 8c49e7b9d4c +Author: Johnny Willemsen +Date: Sun Jan 14 13:01:17 2024 +0100 + + Merge branch 'master' into #2163-Race-condition-in-ACE_Future-double-checked-locking-pattern-code + +commit 4689fd055bff2c4280c6f0b8d81856b7e0bba666 +Merge: 4939d6b7232 7efcd5faa4d +Author: Steve Huston +Date: Fri Jan 12 16:18:47 2024 -0500 + + Merge branch 'master' into barrier_concurrency_fail + +commit b94f1dc4f622111ede7d06f0af70d39ff35056d7 +Author: Frank Hilliger +Date: Wed Jan 10 11:31:12 2024 +0100 + + Fixed failed quality gates: C-style pointer casting + +commit 8ff73f4b883da21c5de3c53a0d9ef943e3757edd +Author: Frank Hilliger +Date: Wed Jan 10 08:38:47 2024 +0100 + + fixed findings of trailing_whitespaces check + +commit 13cafcfb76ed29d6687b5c8a7211e40dd142e944 +Author: Frank Hilliger +Date: Tue Jan 9 18:08:47 2024 +0100 + + #2179: Fixed a race condition caused by the double checked locking pattern + - test case + +commit 30ab3c0586b7413490e98f181f4db0528c3f2119 +Author: nfrmtkr +Date: Mon Jan 8 10:03:39 2024 +0100 + + Update Future.h + + Fixed a race condition caused by the double checked locking pattern by using an std::atomic that ensures correct and deterministic create and assignment logic. + +commit 58ea863f3a2e50b6a3045b59c7f1f060a8b7b5ae +Merge: 587a7279b17 4df4192f41c +Author: Justin Wilson +Date: Wed Dec 13 13:17:38 2023 -0600 + + Merge pull request #2171 from mitza-oci/install_proj + + Added a script install_proj.sh that can be used to run make install + +commit ee67b0516f51c3d722989e4b0e735dc1ae5596c6 +Author: Sudip Mukherjee +Date: Wed Dec 13 14:15:40 2023 +0000 + + Sync debian/* files for ACE + + Signed-off-by: Sudip Mukherjee + +commit 4df4192f41c078099fddbbad68d212263137184f +Author: Adam Mitz +Date: Fri Dec 8 12:18:25 2023 -0600 + + Added a script install_proj.sh that can be used to run make install + +commit 4939d6b723293824d970788a7726b222cdf8ca2b +Author: Steve Huston +Date: Fri Dec 1 22:04:44 2023 +0000 + + Change to C++ std::atomic + +commit 7e06ab1addf4df12d774fbb1a4fdf44b1d03ae39 +Author: Steve Huston +Date: Fri Dec 1 17:59:11 2023 +0000 + + Change running_count_ to atomic to ensure accurate values across cores/CPUs. + +commit 160a687e5c78f0d83099c068e3cd051af7e25824 +Author: Marcin Cieślak +Date: Sat Nov 25 03:06:02 2023 +0100 + + Build on FreeBSD 15.0 + + ACE builds now with __FreeBSD_version 1500001 + +commit f2bfbf8ce64ec3d34aa9ad369f9515be3b33ae59 +Author: Johnny Willemsen +Date: Wed Nov 22 11:16:44 2023 +0100 + + Identation change + + * ACE/ace/Future.cpp: + +commit c80d23d1123788cc4497376fb2a26b6dffb48d7c +Merge: bd35628db2f 527ba7711f6 +Author: Johnny Willemsen +Date: Thu Nov 9 09:07:04 2023 +0100 + + Merge branch 'master' into jwi-nonconstcmsgspace + +commit bd35628db2ff60209d947222f4c1adaac412a841 +Author: Johnny Willemsen +Date: Thu Nov 9 09:05:58 2023 +0100 + + Add support for a non const CMSG_SPACE macro, some code is disabled at that moment + + * ACE/ace/SOCK_Dgram.cpp: + * ACE/ace/config-qnx.h: + +commit 1b2a86a2057f96fff3d72e8d2269d6b68c3a8da5 +Author: Johnny Willemsen +Date: Mon Oct 30 08:23:58 2023 +0100 + + Next release + + * ACE/bin/copy-local-script.sh: + +commit c9c19d844a1ca78ab287023c48ffa2e740c8bfc2 +Author: Johnny Willemsen +Date: Mon Oct 30 08:22:34 2023 +0100 + + Make x.1.2 publicly 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 6d753ec3bbe4a..fb236bfa7a87b 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.2 + ACE VERSION: 7.1.3 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 4750de3b01afe..c50ee4f5c1c87 100644 --- a/ACE/VERSION.txt +++ b/ACE/VERSION.txt @@ -1,4 +1,4 @@ -This is ACE version 7.1.2, released Mon Oct 30 07:57:01 CET 2023 +This is ACE version 7.1.3, released Tue Jan 16 11:25:51 CET 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 6d049177827ce..2bcd867427a29 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 2 -#define ACE_VERSION "7.1.2" -#define ACE_VERSION_CODE 0x70102 +#define ACE_MICRO_VERSION 3 +#define ACE_VERSION "7.1.3" +#define ACE_VERSION_CODE 0x70103 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c)) diff --git a/ACE/debian/control b/ACE/debian/control index e7dd2a1e359e3..eebb5aedc94b8 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.2 +Package: libace-7.1.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-7.1.2 (= ${binary:Version}), ${misc:Depends} +Depends: libace-7.1.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-7.1.2 +Package: libace-ssl-7.1.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-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends} +Depends: libace-ssl-7.1.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-7.1.2 +Package: libace-rmcast-7.1.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-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-rmcast-7.1.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-7.1.2 +Package: libace-tmcast-7.1.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-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-tmcast-7.1.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-7.1.2 +Package: libace-htbp-7.1.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-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-htbp-7.1.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-7.1.2 +Package: libace-inet-7.1.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-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-7.1.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-7.1.2 +Package: libace-inet-ssl-7.1.3 Architecture: any Section: libs -Depends: libace-inet-7.1.2, libace-ssl-7.1.2, ${shlibs:Depends}, ${misc:Depends} +Depends: libace-inet-7.1.3, libace-ssl-7.1.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-7.1.2 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-ssl-7.1.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-7.1.2 +Package: libacexml-7.1.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-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libacexml-7.1.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-7.1.2 +Package: libace-xml-utils-7.1.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-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev +Depends: libace-xml-utils-7.1.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-7.1.2 +Package: libkokyu-7.1.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-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libkokyu-7.1.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-7.1.2 +Package: libace-xtreactor-7.1.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-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends} +Depends: libace-xtreactor-7.1.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-7.1.2 +Package: libace-tkreactor-7.1.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-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} +Depends: libace-tkreactor-7.1.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-7.1.2 +Package: libace-flreactor-7.1.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-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.3-dev, ${misc:Depends} +Depends: libace-flreactor-7.1.3 (= ${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.2 +Package: libace-foxreactor-7.1.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-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} +Depends: libace-foxreactor-7.1.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-7.1.2 +Package: libnetsvcs-7.1.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-7.1.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libnetsvcs-7.1.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/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec index 800db42180305..59a7704e74f45 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.2 -%define TAOVER 3.1.2 +%define ACEVER 7.1.3 +%define TAOVER 3.1.3 # Conditional build # Default values are diff --git a/TAO/ChangeLogs/TAO-3_1_3 b/TAO/ChangeLogs/TAO-3_1_3 new file mode 100644 index 0000000000000..f6d395e0d9bb5 --- /dev/null +++ b/TAO/ChangeLogs/TAO-3_1_3 @@ -0,0 +1,11 @@ +commit c9c19d844a1ca78ab287023c48ffa2e740c8bfc2 +Author: Johnny Willemsen +Date: Mon Oct 30 08:22:34 2023 +0100 + + Make x.1.2 publicly 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 9a0692f43c55e..449f4f7ba25fd 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.2 - ACE VERSION: 7.1.2 + TAO VERSION: 3.1.3 + ACE VERSION: 7.1.3 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 1e995b9382e7e..c8be2091d87e4 100644 --- a/TAO/VERSION.txt +++ b/TAO/VERSION.txt @@ -1,4 +1,4 @@ -This is TAO version 3.1.2, released Mon Oct 30 07:57:01 CET 2023 +This is TAO version 3.1.3, released Tue Jan 16 11:25:51 CET 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 8798813d30f0c..fe48396ea3f70 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 2 -#define TAO_VERSION "3.1.2" -#define TAO_VERSION_CODE 0x30102 +#define TAO_MICRO_VERSION 3 +#define TAO_VERSION "3.1.3" +#define TAO_VERSION_CODE 0x30103 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))