Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(PA-5943) Remove unneeded augeas versions & default to augeas 1.14.1 #840

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions configs/components/augeas.rb
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
component 'augeas' do |pkg, settings, platform|
# Projects may define an :augeas_version setting, or we use 1.8.1 by default:
version = settings[:augeas_version] || '1.8.1'
version = settings[:augeas_version] || '1.14.1'
pkg.version version

case version
when '1.14.1'
pkg.md5sum 'ac31216268b4b64809afd3a25f2515e5'
when '1.13.0'
pkg.md5sum '909b9934190f32ffcbc2c5a92efaf9d2'
pkg.apply_patch 'resources/patches/augeas/augeas-1.13.0-patch_security_context-t_out.patch'
when '1.8.1'
pkg.md5sum '623ff89d71a42fab9263365145efdbfa'
when '1.11.0'
pkg.md5sum 'abf51f4c0cf3901d167f23687f60434a'
when '1.12.0'
pkg.md5sum '74f1c7b8550f4e728486091f6b907175'

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

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

if ['1.11.0', '1.12.0', '1.13.0', '1.14.1'].include?(version)
if ['1.12.0', '1.14.1'].include?(version)
if platform.is_el? || platform.is_fedora?
# Augeas 1.11.0 needs a libselinux pkgconfig file on these platforms:
pkg.build_requires 'ruby-selinux'
Expand Down
2 changes: 1 addition & 1 deletion configs/projects/bolt-runtime.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
proj.setting(:ruby_version, '2.7.8')
proj.setting(:openssl_version, '1.1.1')
proj.setting(:rubygem_net_ssh_version, '6.1.0')
proj.setting(:augeas_version, '1.11.0')
proj.setting(:augeas_version, '1.14.1')
# TODO: Can runtime projects use these updated versions?
proj.setting(:rubygem_deep_merge_version, '1.2.2')
proj.setting(:rubygem_puppet_version, '7.30.0')
Expand Down
23 changes: 0 additions & 23 deletions resources/patches/augeas/augeas-1.11.0-gnulib-pthread-in-use.patch

This file was deleted.

This file was deleted.

Loading