From c26e0dad414423ee3cc5d8bebe5088c4fe7561d8 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Fri, 6 Dec 2019 20:54:00 -0600 Subject: [PATCH] puppet: Fix runtime Added new dependencies that fixes runtime Closes #17162 Signed-off-by: Nathan Owens --- ...-maint-Add-missing-require-singleton.patch | 25 +++++++++++++++++++ srcpkgs/puppet/template | 5 ++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/puppet/patches/0001-maint-Add-missing-require-singleton.patch diff --git a/srcpkgs/puppet/patches/0001-maint-Add-missing-require-singleton.patch b/srcpkgs/puppet/patches/0001-maint-Add-missing-require-singleton.patch new file mode 100644 index 00000000000..1e60d6ca09f --- /dev/null +++ b/srcpkgs/puppet/patches/0001-maint-Add-missing-require-singleton.patch @@ -0,0 +1,25 @@ +From 6ce9bee9e23010893952a5b2f6e8fbeb6c4b3628 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= +Date: Mon, 25 Nov 2019 15:11:45 -1000 +Subject: [PATCH] (maint) Add missing require: singleton + +This file use the Singleton pattern implemented by Ruby's Singleton +class in the singleton module. Require the singleton module before +using the Singleton class. +--- + lib/puppet/runtime.rb | 1 + + 1 file changed, 1 insertion(+) + +diff --git lib/puppet/runtime.rb lib/puppet/runtime.rb +index 1d52cec59b..73bd9eb07f 100644 +--- lib/puppet/runtime.rb ++++ lib/puppet/runtime.rb +@@ -1,4 +1,5 @@ + require 'puppet/http' ++require 'singleton' + + class Puppet::Runtime + include Singleton +-- +2.24.0 + diff --git a/srcpkgs/puppet/template b/srcpkgs/puppet/template index d0392a8e43c..4916eceffee 100644 --- a/srcpkgs/puppet/template +++ b/srcpkgs/puppet/template @@ -1,12 +1,13 @@ # Template file for 'puppet' pkgname=puppet version=6.11.1 -revision=1 +revision=2 archs=noarch build_style=ruby-module hostmakedepends="ruby facter-devel hiera" makedepends="facter-devel" -depends="ruby facter hiera ruby-semantic_puppet" +depends="ruby facter-devel hiera ruby-semantic_puppet + ruby-concurrent-ruby ruby-rubysl-singleton ruby-deep_merge" short_desc="Server automation framework and application" maintainer="Orphaned " license="Apache-2.0"