diff -r 6358358b4186 -r 5c5af6e58474 components/ruby/puppet/patches/puppet-00-s12pkg.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/ruby/puppet/patches/puppet-00-s12pkg.patch Fri Nov 07 12:43:50 2014 -0800 @@ -0,0 +1,14 @@ +Oracle customization - non upstream patch +Add Solaris 12 to the pkg(5) pkg provider + +--- puppet-3.6.2/lib/puppet/provider/package/pkg.rb.orig 2012-10-19 22:57:51.000000000 -0600 ++++ puppet-3.6.2/lib/puppet/provider/package/pkg.rb 2012-10-24 15:55:23.203830708 -0600 +@@ -23,7 +23,7 @@ + + confine :osfamily => :solaris + +- defaultfor :osfamily => :solaris, :kernelrelease => '5.11' ++ defaultfor :osfamily => :solaris, :kernelrelease => ['5.11', '5.12'] + + def self.instances + pkg(:list, '-H').split("\n").map{|l| new(parse_line(l))}