diff --git a/configs/components/augeas.rb b/configs/components/augeas.rb index 72cffa9bc..67e22d8d8 100644 --- a/configs/components/augeas.rb +++ b/configs/components/augeas.rb @@ -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' @@ -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' diff --git a/configs/projects/bolt-runtime.rb b/configs/projects/bolt-runtime.rb index d9eedf6c9..3d517147c 100644 --- a/configs/projects/bolt-runtime.rb +++ b/configs/projects/bolt-runtime.rb @@ -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') diff --git a/resources/patches/augeas/augeas-1.11.0-gnulib-pthread-in-use.patch b/resources/patches/augeas/augeas-1.11.0-gnulib-pthread-in-use.patch deleted file mode 100644 index 8988b7727..000000000 --- a/resources/patches/augeas/augeas-1.11.0-gnulib-pthread-in-use.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- gnulib/lib/glthread/lock.h 2019-01-16 11:48:44.000000000 +0200 -+++ lock.h 2019-01-16 11:49:34.000000000 +0200 -@@ -148,20 +148,7 @@ - # pragma weak pthread_self - # endif - --# if !PTHREAD_IN_USE_DETECTION_HARD -- /* On most platforms, pthread_cancel or pthread_kill can be used to -- determine whether libpthread is in use. -- On newer versions of FreeBSD, however, this is no longer possible, -- because pthread_cancel and pthread_kill got added to libc. Therefore -- use pthread_create to test whether libpthread is in use. */ --# if defined __FreeBSD__ || defined __DragonFly__ /* FreeBSD */ --# pragma weak pthread_create --# define pthread_in_use() (pthread_create != NULL) --# else /* glibc, NetBSD, OpenBSD, IRIX, OSF/1, Solaris */ --# pragma weak pthread_cancel --# define pthread_in_use() (pthread_cancel != NULL) --# endif --# endif -+# define pthread_in_use() 1 - - # else diff --git a/resources/patches/augeas/augeas-1.13.0-patch_security_context-t_out.patch b/resources/patches/augeas/augeas-1.13.0-patch_security_context-t_out.patch deleted file mode 100644 index 39253be01..000000000 --- a/resources/patches/augeas/augeas-1.13.0-patch_security_context-t_out.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/transform.c b/src/transform.c -index 176482b9..d46f2c49 100644 ---- a/src/transform.c -+++ b/src/transform.c -@@ -918,7 +918,7 @@ static int transfer_file_attrs(FILE *from, FILE *to, - struct stat st; - int ret = 0; - int selinux_enabled = (is_selinux_enabled() > 0); -- security_context_t con = NULL; -+ char *con = NULL; - - int from_fd; - int to_fd = fileno(to);