Skip to content

Commit 9c6456a

Browse files
committed
(PA-5943) Remove unneeded augeas versions & default to augeas 1.14.1
This commit: - Remove augeas versions 1.13.0, 1.8.1, 1.11.0 - Remove patches for those removed augeas versions - Default to augeas 1.14.1 instead of 1.8.1 - Update bolt-runtime to use augeas 1.4.1
1 parent b653211 commit 9c6456a

File tree

4 files changed

+4
-52
lines changed

4 files changed

+4
-52
lines changed

configs/components/augeas.rb

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
component 'augeas' do |pkg, settings, platform|
22
# Projects may define an :augeas_version setting, or we use 1.8.1 by default:
3-
version = settings[:augeas_version] || '1.8.1'
3+
version = settings[:augeas_version] || '1.14.1'
44
pkg.version version
55

66
case version
77
when '1.14.1'
88
pkg.md5sum 'ac31216268b4b64809afd3a25f2515e5'
9-
when '1.13.0'
10-
pkg.md5sum '909b9934190f32ffcbc2c5a92efaf9d2'
11-
pkg.apply_patch 'resources/patches/augeas/augeas-1.13.0-patch_security_context-t_out.patch'
12-
when '1.8.1'
13-
pkg.md5sum '623ff89d71a42fab9263365145efdbfa'
14-
when '1.11.0'
15-
pkg.md5sum 'abf51f4c0cf3901d167f23687f60434a'
169
when '1.12.0'
1710
pkg.md5sum '74f1c7b8550f4e728486091f6b907175'
1811

@@ -22,14 +15,9 @@
2215
raise "augeas version #{version} has not been configured; Cannot continue."
2316
end
2417

25-
# Starting with 1.13.0 Augeas started hosting on Github
26-
if Gem::Version.new(version) >= Gem::Version.new('1.13.0')
27-
pkg.url "https://github.com/hercules-team/augeas/releases/download/release-#{version}/augeas-#{version}.tar.gz"
28-
else
29-
pkg.url "http://download.augeas.net/augeas-#{pkg.get_version}.tar.gz"
30-
end
18+
pkg.url "http://download.augeas.net/augeas-#{pkg.get_version}.tar.gz"
3119

32-
if ['1.11.0', '1.12.0', '1.13.0', '1.14.1'].include?(version)
20+
if ['1.12.0', '1.14.1'].include?(version)
3321
if platform.is_el? || platform.is_fedora?
3422
# Augeas 1.11.0 needs a libselinux pkgconfig file on these platforms:
3523
pkg.build_requires 'ruby-selinux'

configs/projects/bolt-runtime.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
proj.setting(:ruby_version, '2.7.8')
55
proj.setting(:openssl_version, '1.1.1')
66
proj.setting(:rubygem_net_ssh_version, '6.1.0')
7-
proj.setting(:augeas_version, '1.11.0')
7+
proj.setting(:augeas_version, '1.14.1')
88
# TODO: Can runtime projects use these updated versions?
99
proj.setting(:rubygem_deep_merge_version, '1.2.2')
1010
proj.setting(:rubygem_puppet_version, '7.30.0')

resources/patches/augeas/augeas-1.11.0-gnulib-pthread-in-use.patch

Lines changed: 0 additions & 23 deletions
This file was deleted.

resources/patches/augeas/augeas-1.13.0-patch_security_context-t_out.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)