From 143b06dc251a862287877fed90e8f2393a263d2f Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 28 Jun 2023 11:39:15 +0200 Subject: [PATCH] ACE+TAO-7_1_1 --- ACE/ChangeLogs/ACE-7_1_1 | 352 ++++++++++++++++++++++++++++++++++++++ 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_1 | 73 ++++++++ TAO/PROBLEM-REPORT-FORM | 4 +- TAO/VERSION.txt | 2 +- TAO/tao/Version.h | 6 +- 10 files changed, 469 insertions(+), 44 deletions(-) create mode 100644 ACE/ChangeLogs/ACE-7_1_1 create mode 100644 TAO/ChangeLogs/TAO-3_1_1 diff --git a/ACE/ChangeLogs/ACE-7_1_1 b/ACE/ChangeLogs/ACE-7_1_1 new file mode 100644 index 0000000000000..e8f3d9e80b69d --- /dev/null +++ b/ACE/ChangeLogs/ACE-7_1_1 @@ -0,0 +1,352 @@ +commit ce3d80c7193755025f34d5b20e608517b5e84664 +Author: Johnny Willemsen +Date: Wed Jun 28 09:20:42 2023 +0200 + + Update NEWS + +commit a65d91cdc463e7cf6cf509138956b2d38c5e5727 +Merge: 90c46e2c3be 395f5e53709 +Author: Justin Wilson +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 + +commit 3579743a175b284e56d12064e8437f1f51f3a9a5 +Author: Johnny Willemsen +Date: Fri Jun 23 08:16:13 2023 +0200 + + Make more members const + + * ACE/ace/Shared_Memory_Pool.cpp: + * ACE/ace/Shared_Memory_Pool.h: + +commit 77d104dfe850c53aa4395cedad65fe635bf1d13e +Author: Adam Mitz +Date: Thu Jun 22 21:32:51 2023 -0500 + + shm_addr_table_ needs to be initialized after max_segments_ is known + +commit 395f5e53709aa2bee45de13d66e5a0706cf82dad +Author: Justin R. Wilson +Date: Wed Jun 21 11:28:26 2023 -0500 + + `ACE_INET_Addr::set` errantly succeeds when ACE_LACKS_GETSERVBYNAME + + Problem + ------- + + Calling `set("1.2.3.4")` on an ACE_INET_Addr eventually tries to part + it as a port name. When `ACE_LACKS_GETSERVBYNAME`, this succeeds + returning port number 0 with the reset address. + + When port names are not expected, this breaks a useful idiom of + parsing addresses that may or may not contain port numbers: + + ACE_INET_Addr addr; + if (addr.set(x) == 0) { + // Success, address contained a port number + } else if (addr.set(u_short(0), x) == 0) { + // Success, address did not contain a port number. + } else { + // Fail + } + + Solution + -------- + + Return -1 for the port number when `ACE_LACKS_GETSERVBYNAME`. + +commit 3b4af688618b118f84a6e6e63630415668fe80aa +Author: Johnny Willemsen +Date: Tue Jun 20 13:01:41 2023 +0200 + + Add fix to ACE_Shared_Memory_Pool + + * ACE/NEWS: + +commit 49fe3a9ff8e07ba85f6a87179a48f6b4651850e7 +Merge: d971b4b29ea 32ea782b6cf +Author: Johnny Willemsen +Date: Tue Jun 20 08:06:02 2023 +0200 + + Merge branch 'master' into jwi-shmem + +commit d971b4b29eaadcd6cb65e1f0665ea174c0df4b4b +Author: Johnny Willemsen +Date: Tue Jun 20 08:05:44 2023 +0200 + + Update ACE/ace/Shared_Memory_Pool.cpp + + Co-authored-by: Adam Mitz + +commit 9821bb3bb8bcb78ced6fab55aaff9501b0ad9157 +Author: Johnny Willemsen +Date: Mon Jun 19 16:20:36 2023 +0200 + + Doxygen fix + + * ACE/ace/Malloc_T.h: + +commit 62ef18910774b1fac1d61a93752b6209ebb22674 +Author: Johnny Willemsen +Date: Mon Jun 19 16:11:00 2023 +0200 + + Layout change + + * ACE/ace/Malloc_T.cpp: + +commit 117bcac2bf19155a7bf535a7ee20fc67042fa364 +Author: Johnny Willemsen +Date: Mon Jun 19 16:07:05 2023 +0200 + + No need for a base_shm_id when we change the cleanup + * ACE/ace/Shared_Memory_Pool.cpp: + * ACE/ace/Shared_Memory_Pool.h: + +commit ec7265778d3c83f28171a92a720452e70a155f65 +Author: Johnny Willemsen +Date: Mon Jun 19 14:43:28 2023 +0200 + + Use std::strcmp + + * ACE/ace/Malloc_T.cpp: + +commit a2566cf5e0cc39ec85231f26c39447d70ccff2f6 +Author: Johnny Willemsen +Date: Mon Jun 19 14:43:17 2023 +0200 + + Document return values + + * ACE/ace/Malloc_T.h: + +commit 22cf00e2a6cebbad7587ab85b873b02388bac82d +Author: Johnny Willemsen +Date: Sat Jun 17 19:25:39 2023 +0200 + + Use as egrep is obsolescent + +commit d7c2886ae5c93e52f787e7b2758112353d5c45c1 +Merge: 63cb68e694e 9b773291b4c +Author: Johnny Willemsen +Date: Fri Jun 16 10:22:37 2023 +0200 + + Merge branch 'jwi-shmem' of https://github.com/DOCGroup/ACE_TAO into jwi-shmem + +commit 63cb68e694e9b942516c8480c5241574485d5500 +Author: Johnny Willemsen +Date: Fri Jun 16 10:22:17 2023 +0200 + + Make used_ again an int, not cause some unexpected interoperability with older ACE versions + + * ACE/ace/Shared_Memory_Pool.cpp: + * ACE/ace/Shared_Memory_Pool.h: + +commit 9b773291b4c1ed20b2783f8e0b4af9da7a9bf68a +Author: Johnny Willemsen +Date: Thu Jun 15 14:11:35 2023 +0200 + + Removed empty lines + + * ACE/tests/SV_Shared_Memory_Test.cpp: + +commit 680dcb6dc233f5e9d807de2f0e2421a702c958ac +Author: Johnny Willemsen +Date: Thu Jun 15 14:11:25 2023 +0200 + + Fixed typo + + * ACE/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp: + +commit 1e43fa6691d8b12ca12f58a2f54f972dd796fa11 +Author: Johnny Willemsen +Date: Thu Jun 15 13:28:29 2023 +0200 + + Removed debug lines + + * ACE/ace/Shared_Memory_Pool.cpp: + +commit c2c58f6805ee69ab70912d4b6463c466bc502ac2 +Author: Johnny Willemsen +Date: Thu Jun 15 13:24:29 2023 +0200 + + Reworked the shared memory pool implementation in order to detach from shared memory segments when we don't use them anymore. At the moment the memory pool is destroyed also let the OS release all resources + + * ACE/ace/Shared_Memory_Pool.cpp: + * ACE/ace/Shared_Memory_Pool.h: + +commit 6c593fc0986a8398b1c2fa1bb9069986a962dd5d +Author: Johnny Willemsen +Date: Thu Jun 15 11:24:12 2023 +0200 + + Call shmdt when we only need to release the shared memory + + * ACE/ace/Malloc_T.cpp: + * ACE/ace/Malloc_T.inl: + * ACE/ace/Mem_Map.cpp: + * ACE/ace/Shared_Memory.h: + * ACE/ace/Shared_Memory_MM.h: + * ACE/ace/Shared_Memory_Pool.cpp: + * ACE/ace/Shared_Memory_Pool.h: + +commit 483414737903481da9cf63b58ed3eb6c57f4d0f9 +Author: Johnny Willemsen +Date: Thu Jun 15 11:23:39 2023 +0200 + + Use nullptr + + * ACE/ace/MMAP_Memory_Pool.cpp: + +commit 1b6da609c0e15725dba3aa70ac097117f9d5769f +Author: Johnny Willemsen +Date: Thu Jun 15 08:14:42 2023 +0200 + + Layout changes + + * ACE/ace/SV_Shared_Memory.h: + +commit ab3b192fcda5715a0c92e5627acdeb4e8f71911c +Merge: 874ceda869d 2d267693fc0 +Author: Johnny Willemsen +Date: Fri Apr 7 12:37:51 2023 +0200 + + Merge pull request #2069 from jwillemsen/jwi-mqtest + + Test simplifications + +commit 2d267693fc0c39c56fac87d7f2b6ce00885942a9 +Merge: aef8140bea1 9729442488f +Author: Johnny Willemsen +Date: Fri Apr 7 08:27:27 2023 +0200 + + Merge branch 'master' into jwi-mqtest + +commit d1eab7db50121338cf719a4a4fddce59414487b4 +Author: Johnny Willemsen +Date: Fri Apr 7 08:27:03 2023 +0200 + + Fixed trailing whitespace + + * ACE/tests/Message_Queue_Test_Ex.cpp: + +commit aef8140bea1a6fc2d58631e2ad16f81a5f447018 +Author: Johnny Willemsen +Date: Fri Apr 7 08:26:23 2023 +0200 + + Test changes + + * ACE/tests/Message_Queue_Test_Ex.cpp: + * ACE/tests/Message_Queue_Test_Ex.h: + +commit a78936549748c2dbb9e751d4d21baa532228f1df +Author: Johnny Willemsen +Date: Fri Apr 7 08:23:22 2023 +0200 + + Update Message_Queue_Test_Ex.cpp + +commit a3a7c2a50383ebf00534c28014704ce57e092821 +Merge: 5625244fd7b b50aba0fdce +Author: Erik Sohns +Date: Thu Apr 6 11:09:11 2023 +0200 + + Merge branch 'master' into message_queue_ex_get_queue + +commit 5625244fd7bb77bafabce28fdec790f51ef50080 +Author: Erik Sohns +Date: Thu Apr 6 11:08:34 2023 +0200 + + more review comments + +commit 761e24b54d7fda41ed58a6e2f41ba905e43bf3d9 +Merge: 3e44fb91cf7 9e18d338ec5 +Author: Erik Sohns +Date: Wed Apr 5 17:37:54 2023 +0200 + + Merge branch 'message_queue_ex_get_queue' of https://github.com/esohns/ACE_TAO into message_queue_ex_get_queue + +commit 3e44fb91cf724aeb48b38169482a4878de316afc +Author: Erik Sohns +Date: Wed Apr 5 17:37:23 2023 +0200 + + integrated review comments + +commit e1432d22fcf52f941e587e8e8b5f291d5a08ff9c +Author: Johnny Willemsen +Date: Wed Mar 29 15:55:22 2023 +0200 + + Mention that nullptr should be used + + * ACE/bin/fuzz.pl: + +commit a1480384cc3233889d1f043fcd428c627843d272 +Author: Johnny Willemsen +Date: Fri Mar 3 11:05:30 2023 +0100 + + Add space to resolve compiler warnings on condaforge + + * ACE/ace/OS_NS_Thread.inl: + * ACE/ace/OS_NS_unistd.inl: + +commit ed1a2e35ca124c5697f32527ad286e22e9f5877b +Author: Johnny Willemsen +Date: Fri Mar 3 09:38:39 2023 +0100 + + Make ACE 7.1.0 and TAO 3.1.0 public available + + * ACE/NEWS: + * ACE/bin/copy-local-script.sh: + * ACE/bin/diff-builds-and-group-fixed-tests-only.sh: + * ACE/docs/Download.html: + * ACE/etc/index.html: + +commit 9e18d338ec598e1a8da6d32a0fba5a20c76978f7 +Merge: 8b6ad82dc91 8ab31e3e5bb +Author: Erik Sohns +Date: Sun Jan 22 17:38:34 2023 +0100 + + Merge branch 'master' into message_queue_ex_get_queue + +commit 8b6ad82dc91f728cea2c9e86a17e5969a3338fcc +Author: Erik Sohns +Date: Mon Jan 9 19:38:43 2023 +0100 + + 0 --> NULL --> nullptr + +commit e24acc256b9af44bda969d392ec46ddfec28c5a5 +Merge: 22be043fb46 a667874d6a6 +Author: Erik Sohns +Date: Mon Jan 9 19:13:15 2023 +0100 + + Merge branch 'message_queue_ex_get_queue' of https://github.com/esohns/ACE_TAO into message_queue_ex_get_queue + +commit 22be043fb46aff505eea86e66fe19bf5249f1ad3 +Author: Erik Sohns +Date: Mon Jan 9 19:12:43 2023 +0100 + + address some static code analysis issues + +commit a667874d6a61052c898deeb6f393ac33973af68f +Merge: a905022c2d5 1d0c1af12a5 +Author: Erik Sohns +Date: Mon Jan 9 18:13:08 2023 +0100 + + Merge branch 'master' into message_queue_ex_get_queue + +commit a905022c2d552261e6d60c497140b5ff7669dd4d +Author: Erik Sohns +Date: Mon Jan 9 18:02:05 2023 +0100 + + added API comments and unit test case as requested + +commit e4bf4867d9a36e7b155cd9358c97811ce599f16c +Author: Erik Sohns +Date: Sat Jan 7 19:52:20 2023 +0100 + + removed constness + +commit 65a391a415e559663c43077b90b70de225b1d7ea +Author: Erik Sohns +Date: Sat Jan 7 16:43:24 2023 +0100 + + support accessing the underlying queue (e.g. for iteration) diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM index 8afc475100eff..6dd9c57d3c108 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.0 + ACE VERSION: 7.1.1 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 f3a2b95ce7261..fc4b7daaccccc 100644 --- a/ACE/VERSION.txt +++ b/ACE/VERSION.txt @@ -1,4 +1,4 @@ -This is ACE version 7.1.0, released Fri Mar 03 09:14:01 CET 2023 +This is ACE version 7.1.1, released Wed Jun 28 11:39:14 CEST 2023 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 59cc14bdfc22e..3af2e82cd021b 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 0 -#define ACE_VERSION "7.1.0" -#define ACE_VERSION_CODE 0x70100 +#define ACE_MICRO_VERSION 1 +#define ACE_VERSION "7.1.1" +#define ACE_VERSION_CODE 0x70101 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c)) diff --git a/ACE/debian/control b/ACE/debian/control index 04828b116d55e..1848732d186df 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.0 +Package: libace-7.1.1 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.0 (= ${binary:Version}), ${misc:Depends} +Depends: libace-7.1.1 (= ${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.0 +Package: libace-ssl-7.1.1 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.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends} +Depends: libace-ssl-7.1.1 (= ${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.0 +Package: libace-rmcast-7.1.1 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.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-rmcast-7.1.1 (= ${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.0 +Package: libace-tmcast-7.1.1 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.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-tmcast-7.1.1 (= ${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.0 +Package: libace-htbp-7.1.1 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.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-htbp-7.1.1 (= ${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.0 +Package: libace-inet-7.1.1 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.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-7.1.1 (= ${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.0 +Package: libace-inet-ssl-7.1.1 Architecture: any Section: libs -Depends: libace-inet-7.1.0, libace-ssl-7.1.0, ${shlibs:Depends}, ${misc:Depends} +Depends: libace-inet-7.1.1, libace-ssl-7.1.1, ${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.0 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-ssl-7.1.1 (= ${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.0 +Package: libacexml-7.1.1 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.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libacexml-7.1.1 (= ${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.0 +Package: libace-xml-utils-7.1.1 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.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev +Depends: libace-xml-utils-7.1.1 (= ${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.0 +Package: libkokyu-7.1.1 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.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libkokyu-7.1.1 (= ${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.0 +Package: libace-xtreactor-7.1.1 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.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends} +Depends: libace-xtreactor-7.1.1 (= ${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.0 +Package: libace-tkreactor-7.1.1 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.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} +Depends: libace-tkreactor-7.1.1 (= ${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.0 +Package: libace-flreactor-7.1.1 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.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.3-dev, ${misc:Depends} +Depends: libace-flreactor-7.1.1 (= ${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.0 +Package: libace-foxreactor-7.1.1 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.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} +Depends: libace-foxreactor-7.1.1 (= ${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.0 +Package: libnetsvcs-7.1.1 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.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libnetsvcs-7.1.1 (= ${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 fdcdbb4491d47..9236c10c38a38 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.0 -%define TAOVER 3.1.0 +%define ACEVER 7.1.1 +%define TAOVER 3.1.1 # Conditional build # Default values are diff --git a/TAO/ChangeLogs/TAO-3_1_1 b/TAO/ChangeLogs/TAO-3_1_1 new file mode 100644 index 0000000000000..b36fa5008368e --- /dev/null +++ b/TAO/ChangeLogs/TAO-3_1_1 @@ -0,0 +1,73 @@ +commit 90c46e2c3bee9494dd6b9082720ef29ca2cacc55 +Merge: a5c5e60e6cf 8640c0bc3e6 +Author: Johnny Willemsen +Date: Fri Jun 23 12:40:29 2023 +0200 + + Merge pull request #2084 from jwillemsen/jwi-taoidlcast + + Removed redundant c-style cast + +commit 8640c0bc3e68c56b1e06b0691a4971256dc25af2 +Author: Johnny Willemsen +Date: Fri Jun 23 11:58:33 2023 +0200 + + Removed redundant c-style cast + + * TAO/TAO_IDL/be/be_scope.cpp: + +commit ab6ab4798afb654de5fea605334a0436742c9ec7 +Author: Johnny Willemsen +Date: Wed Jun 21 09:15:54 2023 +0200 + + Update NEWS + +commit ab8e94dd74ad29a9f927fc177f99a2e0b6497ad7 +Merge: 09e9d76103a 1369b3773ff +Author: Johnny Willemsen +Date: Tue Mar 14 13:54:00 2023 +0100 + + Merge pull request #2063 from jwillemsen/jwi-amiargtypo + + Fixed typo in comment + +commit 1369b3773ffa4e9b2acdacb68c27050f359f0b8e +Author: Johnny Willemsen +Date: Tue Mar 14 11:10:20 2023 +0100 + + Fixed typo in comment + + * TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp: + +commit 09e9d76103a637f8ce9ee49b24292317e33e2d77 +Merge: 1de7aa9a7e1 71bf5816be5 +Author: Johnny Willemsen +Date: Mon Mar 13 18:44:05 2023 +0100 + + Merge pull request #2062 from jwillemsen/jwi-orbresources + + Removed deprecated -ORBResources + +commit 71bf5816be5e2a83653887648f9cff03eef0655d +Author: Johnny Willemsen +Date: Mon Mar 13 10:47:11 2023 +0100 + + Removed redundant whitespace + + * TAO/tao/operation_details.h: + +commit 1ceebf2e295dfd342b8d9e725057350c894e230d +Author: Johnny Willemsen +Date: Mon Mar 13 10:46:59 2023 +0100 + + Removed deprecated -ORBResources + + * TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf: + * TAO/tao/ORB_Core.cpp: + +commit 5f7f5729b3123c2f1c2874c6d560fba46a1749f1 +Author: Johnny Willemsen +Date: Fri Mar 3 16:12:20 2023 +0100 + + Prepare news file for next release + + * TAO/NEWS: diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM index 9ed630e1ac152..f1604a85b5be9 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.0 - ACE VERSION: 7.1.0 + TAO VERSION: 3.1.1 + ACE VERSION: 7.1.1 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 c76a2bc2d6b95..cc1bd85a604d4 100644 --- a/TAO/VERSION.txt +++ b/TAO/VERSION.txt @@ -1,4 +1,4 @@ -This is TAO version 3.1.0, released Fri Mar 03 09:14:01 CET 2023 +This is TAO version 3.1.1, released Wed Jun 28 11:39:14 CEST 2023 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 6a79f24d0eba3..fe55f21e64ad6 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 0 -#define TAO_VERSION "3.1.0" -#define TAO_VERSION_CODE 0x30100 +#define TAO_MICRO_VERSION 1 +#define TAO_VERSION "3.1.1" +#define TAO_VERSION_CODE 0x30101 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))