Skip to content

Commit 6dd3f4e

Browse files
committed
fix: update default HAProxy source version to 3.2.14 (LTS)
- 3.2 is the current LTS branch (EOL 2030-04-01) - Update source_version default: 2.8.5 -> 3.2.14 - Update source_checksum to match 3.2.14 tarball - Update stub_command version refs in specs - Update test recipe versions and checksums
1 parent 3bbd21d commit 6dd3f4e

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

resources/install.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535

3636
# Source
3737
property :source_version, String,
38-
default: '2.8.5'
38+
default: '3.2.14'
3939

4040
property :source_url, String,
4141
default: lazy { "https://www.haproxy.org/download/#{source_version.to_f}/src/haproxy-#{source_version}.tar.gz" }
4242

4343
property :source_checksum, String,
44-
default: '3f5459c5a58e0b343a32eaef7ed5bed9d3fc29d8aa9e14b36c92c969fc2a60d9'
44+
default: 'b21f50a790aa8cb0cf8dc505f1f8d849799eafe4d31c14b86a34409ccf4ae5e4'
4545

4646
property :source_target_cpu, String,
4747
default: lazy { node['kernel']['machine'] }

spec/unit/resources/install_spec.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
end
2727
end
2828
before(:each) do
29-
stub_command('/usr/sbin/haproxy -v | grep 2.8.5').and_return('2.8.5')
29+
stub_command('/usr/sbin/haproxy -v | grep 3.2.14').and_return('3.2.14')
3030
end
3131

3232
it { is_expected.to install_package(%w(libpcre3-dev libssl-dev zlib1g-dev libsystemd-dev)) }
@@ -40,7 +40,7 @@
4040
haproxy_install 'source'
4141
end
4242
before(:each) do
43-
stub_command('/usr/sbin/haproxy -v | grep 2.8.5').and_return('2.8.5')
43+
stub_command('/usr/sbin/haproxy -v | grep 3.2.14').and_return('3.2.14')
4444
end
4545

4646
it { is_expected.to install_package(%w(pcre-devel openssl-devel zlib-devel systemd-devel tar)) }
@@ -55,7 +55,7 @@
5555
haproxy_install 'source'
5656
end
5757
before(:each) do
58-
stub_command('/usr/sbin/haproxy -v | grep 2.8.5').and_return('2.8.5')
58+
stub_command('/usr/sbin/haproxy -v | grep 3.2.14').and_return('3.2.14')
5959
end
6060

6161
it { is_expected.to install_package(%w(pcre2-devel openssl-devel zlib-devel systemd-devel tar)) }
@@ -69,7 +69,7 @@
6969
haproxy_install 'source'
7070
end
7171
before(:each) do
72-
stub_command('/usr/sbin/haproxy -v | grep 2.8.5').and_return('2.8.5')
72+
stub_command('/usr/sbin/haproxy -v | grep 3.2.14').and_return('3.2.14')
7373
end
7474

7575
it { is_expected.to install_package(%w(pcre-devel openssl-devel zlib-devel systemd-devel tar)) }
@@ -83,7 +83,7 @@
8383
haproxy_install 'source'
8484
end
8585
before(:each) do
86-
stub_command('/usr/sbin/haproxy -v | grep 2.8.5').and_return('2.8.5')
86+
stub_command('/usr/sbin/haproxy -v | grep 3.2.14').and_return('3.2.14')
8787
end
8888

8989
it { is_expected.to install_package(%w(pcre-devel openssl-devel zlib-devel systemd-devel tar)) }
@@ -99,7 +99,7 @@
9999
end
100100
end
101101
before(:each) do
102-
stub_command('/usr/sbin/haproxy -v | grep 2.8.5').and_return(false)
102+
stub_command('/usr/sbin/haproxy -v | grep 3.2.14').and_return(false)
103103
end
104104

105105
# When PCRE is disabled, we still install the package (for dependencies)
@@ -125,7 +125,7 @@
125125
end
126126
end
127127
before(:each) do
128-
stub_command('/usr/sbin/haproxy -v | grep 2.8.5').and_return(false)
128+
stub_command('/usr/sbin/haproxy -v | grep 3.2.14').and_return(false)
129129
end
130130

131131
it 'includes RPATH in the compilation command' do

test/cookbooks/test/recipes/source_28.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# renovate: datasource=endoflife-date depName=haproxy versioning=semver
2-
version = '2.8.5'
2+
version = '3.2.14'
33

44
haproxy_install 'source' do
55
source_url "https://www.haproxy.org/download/#{version.to_f}/src/haproxy-#{version}.tar.gz"
6-
source_checksum '3f5459c5a58e0b343a32eaef7ed5bed9d3fc29d8aa9e14b36c92c969fc2a60d9'
6+
source_checksum 'b21f50a790aa8cb0cf8dc505f1f8d849799eafe4d31c14b86a34409ccf4ae5e4'
77
source_version version
88
use_libcrypt true
99
use_pcre true

test/cookbooks/test/recipes/source_28_pcre2.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
version = '2.8.5'
1+
# renovate: datasource=endoflife-date depName=haproxy versioning=semver
2+
version = '3.2.14'
23

34
# Test recipe for RHEL/CentOS platforms version 10 and above (uses PCRE2)
45
haproxy_install 'source' do
56
source_url "https://www.haproxy.org/download/#{version.to_f}/src/haproxy-#{version}.tar.gz"
6-
source_checksum '3f5459c5a58e0b343a32eaef7ed5bed9d3fc29d8aa9e14b36c92c969fc2a60d9'
7+
source_checksum 'b21f50a790aa8cb0cf8dc505f1f8d849799eafe4d31c14b86a34409ccf4ae5e4'
78
source_version version
89
# Rely on auto-detection for PCRE2 on RHEL >= 10
910
use_libcrypt true

0 commit comments

Comments
 (0)