aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-support/puppet/puppet/safe_yaml-syck-isn-t-available-for-Ruby-2.0.0.patch
diff options
context:
space:
mode:
authorPablo Saavedra <psaavedra@igalia.com>2018-02-15 23:33:24 +0100
committerBruce Ashfield <bruce.ashfield@windriver.com>2018-02-20 17:05:27 -0500
commitaae8b860aa07b249ec85cfa6031043950df462c7 (patch)
tree103ae91ea58bbc156f62f881880d8be5cce97f61 /recipes-support/puppet/puppet/safe_yaml-syck-isn-t-available-for-Ruby-2.0.0.patch
parent992463503e844fe40f3bb2a56df5db0cb715942e (diff)
downloadmeta-cloud-services-aae8b860aa07b249ec85cfa6031043950df462c7.tar.gz
meta-cloud-services-aae8b860aa07b249ec85cfa6031043950df462c7.tar.bz2
meta-cloud-services-aae8b860aa07b249ec85cfa6031043950df462c7.zip
Puppet upstream upgrade to 5.4.0
* Upstream to 5.4.0 [1][2][3][4][5] * Puppet 5 recipe is the official Puppet agent version with support for Ruby 2.4 [6] * Updated reference versions in the README file * Hiera isn’t separate from Puppet anymore [7]. * Do not install extlookup2hiera, it has been removed upstream * Hiera began as an independent Ruby library that worked with Puppet. Over time, it became a requirement and was even included in the puppet-agent package, but it was limited by its original design. * Removed puppet_3.7.3.bb recipe * Drop the superseded patches * Added init script * Added systemd script Facter 2.5 upstream release * Puppet 5 relays on Facter 3.10. Facter 3.10 reworks Facter 2.X code [8] in native code instead of Ruby gem. Facter 2.5 is still compatible with 5 series to help with Puppet 5 testing. * facter before 2.4.0 uses a deprecated Puppet settings API making `facter --puppet` no longer work with Puppet 4 or higher [9]. * Community, partner, and some of Puppet's internal testing workflows continue to use (ruby) Facter 2.4 [10], instead of native Facter 3, which is not (yet) available as a gem. * To help with Puppet 5 testing, we need to do a maintenance release in the Facter 2 series. [1] https://docs.puppet.com/puppet/5.0/release_notes.html [2] https://docs.puppet.com/puppet/5.1/release_notes.html [3] https://docs.puppet.com/puppet/5.2/release_notes.html [4] https://docs.puppet.com/puppet/5.3/release_notes.html [5] https://docs.puppet.com/puppet/5.4/release_notes.html [6] https://puppet.com/docs/puppet/4.10/hiera_intro.html [7] https://tickets.puppetlabs.com/browse/PA-1107 [8] https://github.com/puppetlabs/facter/tree/3.10.x [9] http://metadata.ftp-master.debian.org/changelogs/main/p/puppet/puppet_5.1.0-1_changelog [10] https://tickets.puppetlabs.com/browse/FACT-1630 Signed-off-by: Pablo Saavedra <psaavedra@igalia.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-support/puppet/puppet/safe_yaml-syck-isn-t-available-for-Ruby-2.0.0.patch')
-rw-r--r--recipes-support/puppet/puppet/safe_yaml-syck-isn-t-available-for-Ruby-2.0.0.patch35
1 files changed, 0 insertions, 35 deletions
diff --git a/recipes-support/puppet/puppet/safe_yaml-syck-isn-t-available-for-Ruby-2.0.0.patch b/recipes-support/puppet/puppet/safe_yaml-syck-isn-t-available-for-Ruby-2.0.0.patch
deleted file mode 100644
index 1cd5e25..0000000
--- a/recipes-support/puppet/puppet/safe_yaml-syck-isn-t-available-for-Ruby-2.0.0.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From fca1579d62d5b978375511e062b9c18f4413dd5a Mon Sep 17 00:00:00 2001
-From: Mark Asselstine <mark.asselstine@windriver.com>
-Date: Thu, 20 Aug 2015 14:06:32 -0400
-Subject: [PATCH] safe_yaml: syck isn't available for Ruby >= 2.0.0
-
-This change was taken from various puppet forks but does not exist in
-puppet upstream as they drop support for YAML on the network as part
-of work to fix PUP-3272.
-
-https://tickets.puppetlabs.com/browse/PUP-3272
-
-Community versions of this change:
-https://github.com/kylog/puppet/commit/42b2e77ec24dfbbf2317d08615a35127afbc4782
-
-Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
----
- lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb b/lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb
-index 8670ace..722dd3e 100644
---- a/lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb
-+++ b/lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb
-@@ -3,7 +3,7 @@ require "yaml"
- # This needs to be defined up front in case any internal classes need to base
- # their behavior off of this.
- module SafeYAML
-- YAML_ENGINE = defined?(YAML::ENGINE) ? YAML::ENGINE.yamler : "syck"
-+ YAML_ENGINE = defined?(YAML::ENGINE) ? YAML::ENGINE.yamler : (defined?(Psych) && YAML == Psych ? "psych" : "syck")
- end
-
- require "set"
---
-2.1.4
-