Skip to content

Commit 6e193cb

Browse files
authored
Update OpenSSL version (including default) to 3.4.0 (#615)
1 parent baf2e93 commit 6e193cb

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

containers/buildUbuntuDevel.docker/Dockerfile.arm64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ COPY --from=openmp /opt/omp /opt/omp
123123

124124
COPY ./tools/* /tools/
125125

126-
RUN [ "/tools/install.sh", "3.3", "2" ]
126+
RUN [ "/tools/install.sh", "3.4", "0" ]
127127

128128
COPY ./scripts /scripts
129129

containers/buildUbuntuDevel.docker/Dockerfile.x86-64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ COPY --from=openmp /opt/omp /opt/omp
126126

127127
COPY ./tools/* /tools/
128128

129-
RUN [ "/tools/install.sh", "3.3", "2" ]
129+
RUN [ "/tools/install.sh", "3.4", "0" ]
130130

131131
COPY ./scripts /scripts
132132

helper.linux.fish

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ else
2222
end
2323

2424
set -gx UBUNTUBUILDIMAGE_312_NAME arangodb/ubuntubuildarangodb-devel
25-
set -gx UBUNTUBUILDIMAGE_312_TAG 8
25+
set -gx UBUNTUBUILDIMAGE_312_TAG 9
2626
set -gx UBUNTUBUILDIMAGE_312 $UBUNTUBUILDIMAGE_312_NAME:$UBUNTUBUILDIMAGE_312_TAG-$UBUNTUBUILDIMAGE_TAG_ARCH
2727

2828
set -gx UBUNTUBUILDIMAGE_311_NAME $UBUNTUBUILDIMAGE_312_NAME
@@ -192,8 +192,8 @@ function findRequiredOpenSSL
192192
set -l v (fgrep OPENSSL_LINUX $f | awk '{print $2}' | tr -d '"' | tr -d "'" | grep -o '^[0-2]\.[0-2]\.[0-2]\|^[3-9]\.[0-9]')
193193

194194
if test "$v" = ""
195-
echo "$f: no OPENSSL_LINUX specified, using 3.3"
196-
opensslVersion 3.3
195+
echo "$f: no OPENSSL_LINUX specified, using 3.4"
196+
opensslVersion 3.4
197197
else
198198
echo "Using OpenSSL version '$v' from '$f'"
199199
opensslVersion $v

helper.mac.fish

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,8 @@ function findRequiredOpenSSL
291291
set -l v (fgrep OPENSSL_MACOS $f | awk '{print $2}' | tr -d '"' | tr -d "'" | grep -E -o "[0-9]\.[0-9]\.[0-9]*[a-z]?")
292292

293293
if test "$v" = ""
294-
echo "$f: no OPENSSL_MACOS specified, using 3.0.13"
295-
opensslVersion 3.0.13
294+
echo "$f: no OPENSSL_MACOS specified, using 3.4.0"
295+
opensslVersion 3.4.0
296296
else
297297
echo "Using OpenSSL version '$v' from '$f'"
298298
opensslVersion $v

helper.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ Function configureWER($executable, $path)
280280
New-ItemProperty "$regPath" -Name DumpType -PropertyType DWord -Value 2 -Force | Out-Null
281281
}
282282

283-
$global:OPENSSL_DEFAULT_VERSION = "1.1.0l"
283+
$global:OPENSSL_DEFAULT_VERSION = "3.4.0"
284284
$global:OPENSSL_VERSION = $global:OPENSSL_DEFAULT_VERSION
285285

286286
$global:OPENSSL_MODES = "release", "debug"

scripts/buildArangoDB311.fish

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ else
2929
end
3030

3131
if test "$OPENSSL_VERSION" = ""
32-
set -xg OPENSSL_VERSION 3.3
32+
set -xg OPENSSL_VERSION 3.4
3333
end
3434
echo "Using openssl version $OPENSSL_VERSION"
3535

scripts/buildArangoDB312.fish

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ else
2929
end
3030

3131
if test "$OPENSSL_VERSION" = ""
32-
set -xg OPENSSL_VERSION 3.3
32+
set -xg OPENSSL_VERSION 3.4
3333
end
3434
echo "Using openssl version $OPENSSL_VERSION"
3535

scripts/buildArangoDBDevel.fish

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ else
2929
end
3030

3131
if test "$OPENSSL_VERSION" = ""
32-
set -xg OPENSSL_VERSION 3.3
32+
set -xg OPENSSL_VERSION 3.4
3333
end
3434
echo "Using openssl version $OPENSSL_VERSION"
3535

0 commit comments

Comments
 (0)