aboutsummaryrefslogtreecommitdiff
path: root/puppet/files/patches
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2020-10-01 15:02:47 -0300
committerSilvio Rhatto <rhatto@riseup.net>2020-10-01 15:02:47 -0300
commit765ca2bd25384c3d33d243a5b2f0aa419edcd8fa (patch)
treeb59aa15319607ea45ba83516628539b420d8841b /puppet/files/patches
parentb0d7b1d90860f858578455c5cf695c062c0ade07 (diff)
parentc212514035cffd38acbfac1413064937b28685b6 (diff)
downloadsemanticscuttle-765ca2bd25384c3d33d243a5b2f0aa419edcd8fa.tar.gz
semanticscuttle-765ca2bd25384c3d33d243a5b2f0aa419edcd8fa.tar.bz2
Merge commit 'c212514035cffd38acbfac1413064937b28685b6' as 'puppet'
Diffstat (limited to 'puppet/files/patches')
-rw-r--r--puppet/files/patches/trusty/puppet-stack-level.md3
-rw-r--r--puppet/files/patches/trusty/puppet-stack-level.patch15
-rw-r--r--puppet/files/patches/wheezy/collected-resources.md3
3 files changed, 21 insertions, 0 deletions
diff --git a/puppet/files/patches/trusty/puppet-stack-level.md b/puppet/files/patches/trusty/puppet-stack-level.md
new file mode 100644
index 0000000..9a3f4d7
--- /dev/null
+++ b/puppet/files/patches/trusty/puppet-stack-level.md
@@ -0,0 +1,3 @@
+# Puppet stack level patch
+
+* [Puppet master fails with 'stack level too deep' error when storeconfigs = true](https://bugs.launchpad.net/ubuntu/+source/puppet/+bug/1313595).
diff --git a/puppet/files/patches/trusty/puppet-stack-level.patch b/puppet/files/patches/trusty/puppet-stack-level.patch
new file mode 100644
index 0000000..1d112f7
--- /dev/null
+++ b/puppet/files/patches/trusty/puppet-stack-level.patch
@@ -0,0 +1,15 @@
+--- /usr/lib/ruby/vendor_ruby/puppet/rails/resource.rb.orig 2015-10-19 17:19:13.500193213 -0200
++++ /usr/lib/ruby/vendor_ruby/puppet/rails/resource.rb 2015-10-19 17:19:58.972194943 -0200
+@@ -84,7 +84,11 @@
+ end
+
+ def [](param)
+- super || parameter(param)
++ if param == 'id'
++ super
++ else
++ super || parameter(param)
++ end
+ end
+
+ # Make sure this resource is equivalent to the provided Parser resource.
diff --git a/puppet/files/patches/wheezy/collected-resources.md b/puppet/files/patches/wheezy/collected-resources.md
new file mode 100644
index 0000000..b2ce77d
--- /dev/null
+++ b/puppet/files/patches/wheezy/collected-resources.md
@@ -0,0 +1,3 @@
+# Collected resources patch
+
+* [Bug #10963: Collected resources with a puppet master fail on Ruby 1.9.x - Puppet - Puppet Labs](https://projects.puppetlabs.com/issues/10963).