Update to 5.5.20 and add patches to work (somewhat) with ruby 2.7

epel9
Terje Rosten 4 years ago committed by Terje Rosten
parent 558a3731eb
commit 0e3a651935

@ -0,0 +1,17 @@
Description: Fix Ruby 2.7 warning
The '**' operater should be used to pass keyword arguments from now on.
Author: Lucas Kanashiro <lucas.kanashiro@canonical.com>
Last-Updated: 26-03-2020
Forwarded: yes, https://github.com/puppetlabs/puppet/pull/8060
--- a/lib/puppet/file_system/file_impl.rb
+++ b/lib/puppet/file_system/file_impl.rb
@@ -77,7 +77,7 @@
end
def read(path, opts = {})
- path.read(opts)
+ path.read(**opts)
end
def read_preserve_line_endings(path)

@ -0,0 +1,20 @@
diff --git a/lib/puppet/configurer.rb b/lib/puppet/configurer.rb
index 2ccddbe..4c6e33d 100644
--- a/lib/puppet/configurer.rb
+++ b/lib/puppet/configurer.rb
@@ -1,5 +1,4 @@
# The client for interacting with the puppetmaster config server.
-require 'sync'
require 'timeout'
require 'puppet/network/http_pool'
require 'puppet/util'
diff --git a/lib/puppet/util/storage.rb b/lib/puppet/util/storage.rb
index 713f650..b9183ca 100644
--- a/lib/puppet/util/storage.rb
+++ b/lib/puppet/util/storage.rb
@@ -1,5 +1,4 @@
require 'yaml'
-require 'sync'
require 'singleton'
require 'puppet/util/yaml'

@ -30,7 +30,7 @@
%endif %endif
Name: puppet Name: puppet
Version: 5.5.18 Version: 5.5.20
Release: 1%{?dist} Release: 1%{?dist}
Summary: A network tool for managing many disparate systems Summary: A network tool for managing many disparate systems
License: ASL 2.0 License: ASL 2.0
@ -45,6 +45,10 @@ Source4: start-puppet-wrapper
Patch01: 0001-Fix-puppet-paths.patch Patch01: 0001-Fix-puppet-paths.patch
Patch02: 0002-Revert-maint-Remove-puppetmaster.service.patch Patch02: 0002-Revert-maint-Remove-puppetmaster.service.patch
Patch03: 0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch Patch03: 0003-Remove-Fedora-release-restrictions-from-DNF-provider.patch
# https://tickets.puppetlabs.com/browse/PUP-10247
Patch04: puppet-5.5.18-sync.patch
# https://github.com/puppetlabs/puppet/pull/8060
Patch05: puppet-5.5.18-ruby-27.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: git BuildRequires: git
@ -386,6 +390,10 @@ fi
exit 0 exit 0
%changelog %changelog
* Sat May 02 2020 Terje Rosten <terje.rosten@ntnu.no> - 5.5.20-1
- 5.5.20
- Add patches to work (somewhat) with ruby 2.7
* Mon Feb 03 2020 Terje Rosten <terje.rosten@ntnu.no> - 5.5.18-1 * Mon Feb 03 2020 Terje Rosten <terje.rosten@ntnu.no> - 5.5.18-1
- 5.5.18 - 5.5.18

@ -1,2 +1,2 @@
SHA512 (puppet-5.5.18.tar.gz) = 86f210ee783ca36340b22463cd4ac237d8dc1c6a35526530af0696bb3f0373b0b22f690d3e3f8e31655ea182a33eb60b66b5826bd6c4d1b0059a8e46152416e6 SHA512 (puppet-5.5.20.tar.gz) = 83b8f234697e13d6fd8ac16634fff4e4adfece70858c32c1001925c71cc4d9a482da1880c27c08e796facb46d5d17889f9521121a69cb49e160e3c031ad564c4
SHA512 (puppet-5.5.18.tar.gz.asc) = d380e1e10494c4ad164dd65235875bd885a1747671b014633a6e571677e7c87ed6c0125c9e3093caf88fff471d920a553a1862a1d810af34ce60151bd4c35244 SHA512 (puppet-5.5.20.tar.gz.asc) = d862eaf430cbb86112b67a8e0b3da228d3dd2d2dc4d16cd6272c4f1d737e9c8674418e56fd96a47a6be55f699a803e0e889256ad3d2cff66f6eff397c7e719cc

Loading…
Cancel
Save