Skip to content

Commit 471aad7

Browse files
committed
ACE+TAO-6_5_21
1 parent cfaae51 commit 471aad7

File tree

10 files changed

+755
-46
lines changed

10 files changed

+755
-46
lines changed

ACE/ChangeLogs/ACE-6_5_21

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
commit 90258afc7c510ead3ace1e30382bb5ba877610b3
2+
Author: Adam Mitz <mitza@objectcomputing.com>
3+
Date: Fri Feb 9 15:06:03 2024 +0000
4+
5+
Avoid potential out-of-bounds read in ACE_CDR::Fixed::from_string
6+
7+
commit 7d824f7c3230c55a7594626f4e8e439ff85fd527
8+
Author: Justin Wilson <wilsonj@unityfoundation.io>
9+
Date: Wed Dec 13 13:17:38 2023 -0600
10+
11+
Merge pull request #2171 from mitza-oci/install_proj
12+
13+
Added a script install_proj.sh that can be used to run make install
14+
15+
(cherry picked from commit 58ea863f3a2e50b6a3045b59c7f1f060a8b7b5ae)
16+
17+
# Conflicts:
18+
# ACE/ACE-INSTALL.html
19+
20+
commit c7d61bcaa7ebe73a75011d6823315f1f409a8243
21+
Author: Johnny Willemsen <jwillemsen@remedy.nl>
22+
Date: Mon Oct 23 17:07:39 2023 +0200
23+
24+
Fixed incorrect preprocessor define check
25+
26+
* ACE/examples/APG/Timers/Timers.cpp:
27+
28+
(cherry picked from commit 2c1fa440731455b69c4fe4cda641062b790572c8)
29+
30+
commit c63f996d0b04005f9d3d2096f5121b707487f14f
31+
Author: Adam Mitz <mitza@objectcomputing.com>
32+
Date: Fri Oct 6 08:34:10 2023 -0500
33+
34+
Merge pull request #2142 from mitza-oci/macos-long-double
35+
36+
macOS: sizeof long double is different on ARM64
37+
(cherry picked from commit 1affc2bd31c38b55cd0b11a5665055821890c541)
38+
39+
# Conflicts:
40+
# ACE/ace/config-macosx-leopard.h
41+
# ACE/ace/config-macosx-tiger.h
42+
43+
commit ce7e6113808504e40b18e6c29e2f826e9a816ced
44+
Author: Adam Mitz <mitza@objectcomputing.com>
45+
Date: Thu Oct 5 07:47:30 2023 -0500
46+
47+
Merge pull request #2139 from mitza-oci/tcltk
48+
49+
platform_linux: avoid errors when tcl/tk packages are not installed
50+
51+
(cherry picked from commit 854bfeeb364bdad54ac3c600437392ca823274ce)
52+
53+
commit 20215d5a619275c1a80babf4d671b2b2302676fd
54+
Author: Johnny Willemsen <jwillemsen@remedy.nl>
55+
Date: Mon Sep 11 09:10:10 2023 +0200
56+
57+
Updated documentation for new Embarcadero C++ Builder compiler selection
58+
59+
* ACE/ACE-INSTALL.html:

ACE/PROBLEM-REPORT-FORM

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
To: ace-bugs@list.isis.vanderbilt.edu
4141
Subject: [area]: [synopsis]
4242

43-
ACE VERSION: 6.5.20
43+
ACE VERSION: 6.5.21
4444

4545
HOST MACHINE and OPERATING SYSTEM:
4646
If on Windows based OS's, which version of WINSOCK do you

ACE/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This is ACE version 6.5.20, released Wed Jun 28 11:17:08 CEST 2023
1+
This is ACE version 6.5.21, released Thu May 16 12:00:35 CEST 2024
22

33
If you have any problems with or questions about ACE, please send
44
e-mail to the ACE mailing list (ace-bugs@list.isis.vanderbilt.edu),

ACE/ace/Version.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
#define ACE_MAJOR_VERSION 6
66
#define ACE_MINOR_VERSION 5
7-
#define ACE_MICRO_VERSION 20
8-
#define ACE_BETA_VERSION 20
9-
#define ACE_VERSION "6.5.20"
10-
#define ACE_VERSION_CODE 0x60514
7+
#define ACE_MICRO_VERSION 21
8+
#define ACE_BETA_VERSION 21
9+
#define ACE_VERSION "6.5.21"
10+
#define ACE_VERSION_CODE 0x60515
1111
#define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))

ACE/debian/control

+31-31
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Description: makefile, project, and workspace creator
2727
* mpc-ace: generates project files for a single target
2828
* mwc-ace: generates workspace files for a set of projects
2929

30-
Package: libace-6.5.20
30+
Package: libace-6.5.21
3131
Architecture: any
3232
Section: libs
3333
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -45,7 +45,7 @@ Description: C++ network programming framework
4545
Package: libace-dev
4646
Architecture: any
4747
Section: libdevel
48-
Depends: libace-6.5.20 (= ${binary:Version}), ${misc:Depends}
48+
Depends: libace-6.5.21 (= ${binary:Version}), ${misc:Depends}
4949
Suggests: libace-doc, pkg-config
5050
Replaces: mpc-ace (<< 5.6.3-4)
5151
Description: C++ network programming framework - development files
@@ -62,7 +62,7 @@ Description: C++ network programming framework - documentation
6262
This package contains the ACE overview documentation, tutorials,
6363
examples, and information regarding upstream development.
6464

65-
Package: libace-ssl-6.5.20
65+
Package: libace-ssl-6.5.21
6666
Architecture: any
6767
Section: libs
6868
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -73,12 +73,12 @@ Description: ACE secure socket layer library
7373
Package: libace-ssl-dev
7474
Architecture: any
7575
Section: libdevel
76-
Depends: libace-ssl-6.5.20 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
76+
Depends: libace-ssl-6.5.21 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
7777
Description: ACE secure socket layer library - development files
7878
This package contains the header files and static library for the ACE
7979
SSL library.
8080

81-
Package: libace-rmcast-6.5.20
81+
Package: libace-rmcast-6.5.21
8282
Architecture: any
8383
Section: libs
8484
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -92,12 +92,12 @@ Description: ACE reliable multicast library
9292
Package: libace-rmcast-dev
9393
Architecture: any
9494
Section: libdevel
95-
Depends: libace-rmcast-6.5.20 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
95+
Depends: libace-rmcast-6.5.21 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
9696
Description: ACE reliable multicast library - development files
9797
This package contains the header files and static library for the ACE
9898
reliable multicast library.
9999

100-
Package: libace-tmcast-6.5.20
100+
Package: libace-tmcast-6.5.21
101101
Architecture: any
102102
Section: libs
103103
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -111,12 +111,12 @@ Description: ACE transactional multicast library
111111
Package: libace-tmcast-dev
112112
Architecture: any
113113
Section: libdevel
114-
Depends: libace-tmcast-6.5.20 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
114+
Depends: libace-tmcast-6.5.21 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
115115
Description: ACE transactional multicast library - development files
116116
This package contains the header files and static library for the ACE
117117
transactional multicast library.
118118

119-
Package: libace-htbp-6.5.20
119+
Package: libace-htbp-6.5.21
120120
Architecture: any
121121
Section: libs
122122
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -130,12 +130,12 @@ Description: ACE protocol over HTTP tunneling library
130130
Package: libace-htbp-dev
131131
Architecture: any
132132
Section: libdevel
133-
Depends: libace-htbp-6.5.20 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
133+
Depends: libace-htbp-6.5.21 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
134134
Description: ACE protocol over HTTP tunneling library - development files
135135
This package contains the header files and static library for the ACE
136136
HTBP library.
137137

138-
Package: libace-inet-6.5.20
138+
Package: libace-inet-6.5.21
139139
Architecture: any
140140
Section: libs
141141
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -146,15 +146,15 @@ Description: ACE Inet protocol library
146146
Package: libace-inet-dev
147147
Architecture: any
148148
Section: libdevel
149-
Depends: libace-inet-6.5.20 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
149+
Depends: libace-inet-6.5.21 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
150150
Description: ACE Inet protocol library - development files
151151
This package contains the header files and static library for the ACE
152152
Inet protocol library.
153153

154-
Package: libace-inet-ssl-6.5.20
154+
Package: libace-inet-ssl-6.5.21
155155
Architecture: any
156156
Section: libs
157-
Depends: libace-inet-6.5.20, libace-ssl-6.5.20, ${shlibs:Depends}, ${misc:Depends}
157+
Depends: libace-inet-6.5.21, libace-ssl-6.5.21, ${shlibs:Depends}, ${misc:Depends}
158158
Description: ACE SSL-enabled Inet protocol library
159159
This package provides an ACE addon library for clients (and possibly
160160
servers at some point) using Inet protocols which support SSL, such as
@@ -163,7 +163,7 @@ Description: ACE SSL-enabled Inet protocol library
163163
Package: libace-inet-ssl-dev
164164
Architecture: any
165165
Section: libdevel
166-
Depends: libace-inet-ssl-6.5.20 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
166+
Depends: libace-inet-ssl-6.5.21 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
167167
Description: ACE SSL-enabled Inet protocol library - development files
168168
This package contains the header files and static library for the ACE
169169
SSL-enabled Inet protocol library.
@@ -180,7 +180,7 @@ Description: ACE perfect hash function generator
180180
basically the same options and functionality. ace_gperf simply takes
181181
advantage of some of the features provided by the ACE library.
182182

183-
Package: libacexml-6.5.20
183+
Package: libacexml-6.5.21
184184
Architecture: any
185185
Section: libs
186186
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -196,12 +196,12 @@ Package: libacexml-dev
196196
Architecture: any
197197
Section: libdevel
198198
Replaces: libace-dev (<< 5.7.7-4)
199-
Depends: libacexml-6.5.20 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
199+
Depends: libacexml-6.5.21 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
200200
Description: ACE SAX based XML parsing library - development files
201201
This package contains the header files and static library for the ACE
202202
XML parsing library.
203203

204-
Package: libace-xml-utils-6.5.20
204+
Package: libace-xml-utils-6.5.21
205205
Architecture: any
206206
Section: libs
207207
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -215,12 +215,12 @@ Package: libace-xml-utils-dev
215215
Architecture: any
216216
Section: libdevel
217217
Replaces: libace-dev (<< 5.7.7-4)
218-
Depends: libace-xml-utils-6.5.20 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
218+
Depends: libace-xml-utils-6.5.21 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
219219
Description: ACE XML utility classes and methods - development files
220220
This package contains the header files and static library for the ACE XML
221221
Utils library
222222

223-
Package: libkokyu-6.5.20
223+
Package: libkokyu-6.5.21
224224
Architecture: any
225225
Section: libs
226226
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -234,12 +234,12 @@ Description: ACE scheduling and dispatching library
234234
Package: libkokyu-dev
235235
Architecture: any
236236
Section: libdevel
237-
Depends: libkokyu-6.5.20 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
237+
Depends: libkokyu-6.5.21 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
238238
Description: ACE scheduling and dispatching library - development files
239239
This package contains the header files and static library for the ACE
240240
scheduling and dispatching library.
241241

242-
Package: libace-xtreactor-6.5.20
242+
Package: libace-xtreactor-6.5.21
243243
Architecture: any
244244
Section: libs
245245
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -257,12 +257,12 @@ Description: ACE-GUI reactor integration for Xt
257257
Package: libace-xtreactor-dev
258258
Architecture: any
259259
Section: libdevel
260-
Depends: libace-xtreactor-6.5.20 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
260+
Depends: libace-xtreactor-6.5.21 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
261261
Description: ACE-GUI reactor integration for Xt - development files
262262
This package contains header files and static library for the ACE-Xt
263263
reactor integration.
264264

265-
Package: libace-tkreactor-6.5.20
265+
Package: libace-tkreactor-6.5.21
266266
Architecture: any
267267
Section: libs
268268
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -281,12 +281,12 @@ Description: ACE-GUI reactor integration for Tk
281281
Package: libace-tkreactor-dev
282282
Architecture: any
283283
Section: libdevel
284-
Depends: libace-tkreactor-6.5.20 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
284+
Depends: libace-tkreactor-6.5.21 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
285285
Description: ACE-GUI reactor integration for Tk - development files
286286
This package contains header files and static library for the ACE-Tk
287287
reactor integration.
288288

289-
Package: libace-flreactor-6.5.20
289+
Package: libace-flreactor-6.5.21
290290
Architecture: any
291291
Section: libs
292292
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -304,12 +304,12 @@ Description: ACE-GUI reactor integration for FLTK
304304
Package: libace-flreactor-dev
305305
Architecture: any
306306
Section: libdevel
307-
Depends: libace-flreactor-6.5.20 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
307+
Depends: libace-flreactor-6.5.21 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
308308
Description: ACE-GUI reactor integration for FLTK - development files
309309
This package contains header files and static library for the ACE-FLTK
310310
reactor integration.
311311

312-
Package: libace-foxreactor-6.5.20
312+
Package: libace-foxreactor-6.5.21
313313
Architecture: any
314314
Section: libs
315315
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -326,7 +326,7 @@ Description: ACE-GUI reactor integration for FOX
326326
Package: libace-foxreactor-dev
327327
Architecture: any
328328
Section: libdevel
329-
Depends: libace-foxreactor-6.5.20 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
329+
Depends: libace-foxreactor-6.5.21 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
330330
Description: ACE-GUI reactor integration for FOX - development files
331331
This package contains header files and static library for the ACE-FOX
332332
reactor integration.
@@ -343,7 +343,7 @@ Description: ACE network service implementations
343343
files to link the various ACE network services together, either
344344
statically or dynamically, and form complete server programs.
345345

346-
Package: libnetsvcs-6.5.20
346+
Package: libnetsvcs-6.5.21
347347
Architecture: any
348348
Section: libs
349349
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -357,7 +357,7 @@ Description: ACE network service implementations - libraries
357357
Package: libnetsvcs-dev
358358
Architecture: any
359359
Section: libdevel
360-
Depends: libnetsvcs-6.5.20 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
360+
Depends: libnetsvcs-6.5.21 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
361361
Description: ACE network service implementations - development files
362362
ACE network services provide reusable components for common
363363
distributed system tasks such as logging, naming, locking, and time

ACE/rpmbuild/ace-tao.spec

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Set the version number here.
2-
%define ACEVER 6.5.20
3-
%define TAOVER 2.5.20
2+
%define ACEVER 6.5.21
3+
%define TAOVER 2.5.21
44

55
# Conditional build
66
# Default values are

0 commit comments

Comments
 (0)