Skip to content

Commit 4e6c4c6

Browse files
committed
fix(test): add perl-Time-Piece for OpenSSL 3.5.5 and use bare apt_update
OpenSSL 3.5.5 Makefile.in requires perl-Time-Piece module. Use bare apt_update across all source test recipes.
1 parent 0b6738a commit 4e6c4c6

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed

test/cookbooks/test/recipes/source_28.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apt_update 'update' if platform_family?('debian')
1+
apt_update
22

33
# renovate: datasource=endoflife-date depName=haproxy versioning=semver
44
version = '3.2.14'

test/cookbooks/test/recipes/source_lua.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apt_update 'update' if platform_family?('debian')
1+
apt_update
22

33
build_essential 'compilation tools'
44

test/cookbooks/test/recipes/source_openssl.rb

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
apt_update 'update' if platform_family?('debian')
1+
apt_update
22

33
build_essential 'compilation tools'
44

5-
# package %w(build-essential zlib1g-dev) if platform_family?('debian')
6-
7-
# Install perl modules for OpenSSL configure script on RHEL/CentOS >= 10
8-
package %w(perl-FindBin perl-lib perl-File-Compare perl-File-Copy perl-IPC-Cmd perl-Pod-Html) if platform_family?('rhel', 'fedora') && node['platform_version'].to_i >= 10
9-
10-
# package %w(make gcc perl pcre-devel zlib-devel perl-core) if platform_family?('rhel')
5+
# Install perl modules needed by OpenSSL Configure script
6+
package %w(perl-FindBin perl-lib perl-File-Compare perl-File-Copy perl-IPC-Cmd perl-Pod-Html perl-Time-Piece) if platform_family?('rhel', 'fedora')
117

128
# override environment variable
139
ruby_block 'Pre-load OpenSSL path' do
@@ -16,12 +12,12 @@
1612
end
1713
end
1814

19-
openssl_version = '3.2.1'
15+
openssl_version = '3.5.5'
2016

2117
# download openssl
2218
remote_file "#{Chef::Config[:file_cache_path]}/openssl-#{openssl_version}.tar.gz" do
23-
source "https://www.openssl.org/source/openssl-#{openssl_version}.tar.gz"
24-
checksum '83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39'
19+
source "https://github.com/openssl/openssl/releases/download/openssl-#{openssl_version}/openssl-#{openssl_version}.tar.gz"
20+
checksum 'b28c91532a8b65a1f983b4c28b7488174e4a01008e29ce8e69bd789f28bc2a89'
2521
end
2622

2723
# extract openssl

test/cookbooks/test/recipes/source_pcre2.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apt_update 'update' if platform_family?('debian')
1+
apt_update
22

33
# renovate: datasource=endoflife-date depName=haproxy versioning=semver
44
version = '3.2.14'

0 commit comments

Comments
 (0)