Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
17318366 Update Puppet to 3.2.4
authorVirginia Wray <virginia.wray@oracle.com>
Tue, 17 Sep 2013 14:20:36 -0600
changeset 1474 97927b6c1ece
parent 1473 087706a66676
child 1475 b2bc79e6c145
17318366 Update Puppet to 3.2.4 17318398 problem in UTILITY/PUPPET
components/puppet/Makefile file | annotate | diff | comparison | revisions
components/puppet/files/puppet.xml file | annotate | diff | comparison | revisions
components/puppet/patches/puppet-00-s12pkg.patch file | annotate | diff | comparison | revisions
components/puppet/patches/puppet-01-installrb-nogzip-manpage.patch file | annotate | diff | comparison | revisions
components/puppet/patches/puppet-02-zone-type.patch file | annotate | diff | comparison | revisions
components/puppet/patches/puppet-03-zone-provider.patch file | annotate | diff | comparison | revisions
components/puppet/patches/puppet-04-agent-auditing.patch file | annotate | diff | comparison | revisions
components/puppet/patches/puppet-05-apply-auditing.patch file | annotate | diff | comparison | revisions
components/puppet/patches/puppet-06-provider-smf.patch file | annotate | diff | comparison | revisions
components/puppet/puppet.p5m file | annotate | diff | comparison | revisions 
--- a/components/puppet/Makefile	Tue Sep 17 13:02:41 2013 -0700
+++ b/components/puppet/Makefile	Tue Sep 17 14:20:36 2013 -0600
@@ -23,12 +23,12 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		puppet
-COMPONENT_VERSION=	3.2.2
+COMPONENT_VERSION=	3.2.4
 COMPONENT_PROJECT_URL=	http://puppetlabs.com/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:c47745aa73912b2cb1a20b07e8741b8af37a920b9bc8dc8afb14b23d8df7d13d
+    sha256:8b38f4adee6237b8dd7b1956d90af97f2d0091245d6e30b708bbc8e333001358
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)downloads/puppet/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/puppet
 
--- a/components/puppet/files/puppet.xml	Tue Sep 17 13:02:41 2013 -0700
+++ b/components/puppet/files/puppet.xml	Tue Sep 17 14:20:36 2013 -0600
@@ -104,7 +104,7 @@
     <template>
         <common_name>
             <loctext xml:lang='C'>
-            Puppet version 3.2.2
+            Puppet version 3.2.4
             </loctext>
         </common_name>
         <documentation>
--- a/components/puppet/patches/puppet-00-s12pkg.patch	Tue Sep 17 13:02:41 2013 -0700
+++ b/components/puppet/patches/puppet-00-s12pkg.patch	Tue Sep 17 14:20:36 2013 -0600
@@ -1,7 +1,7 @@
 Add Solaris 12 to the pkg(5) pkg provider
 
---- puppet-3.2.2/lib/puppet/provider/package/pkg.rb.orig	2012-10-19 22:57:51.000000000 -0600
-+++ puppet-3.2.2/lib/puppet/provider/package/pkg.rb	2012-10-24 15:55:23.203830708 -0600
+--- puppet-3.2.4/lib/puppet/provider/package/pkg.rb.orig	2012-10-19 22:57:51.000000000 -0600
++++ puppet-3.2.4/lib/puppet/provider/package/pkg.rb	2012-10-24 15:55:23.203830708 -0600
 @@ -23,7 +23,7 @@
  
    confine :osfamily => :solaris
--- a/components/puppet/patches/puppet-01-installrb-nogzip-manpage.patch	Tue Sep 17 13:02:41 2013 -0700
+++ b/components/puppet/patches/puppet-01-installrb-nogzip-manpage.patch	Tue Sep 17 14:20:36 2013 -0600
@@ -1,8 +1,8 @@
 Prevent puppet's build script from gzipping the manpages.  Our version
 of man doesn't understand manpages with a .gz extension
 
---- puppet-3.2.2/install.rb.orig	2013-01-04 14:05:09.892870020 -0700
-+++ puppet-3.2.2/install.rb	2013-01-04 14:05:40.466062888 -0700
+--- puppet-3.2.4/install.rb.orig	2013-01-04 14:05:09.892870020 -0700
++++ puppet-3.2.4/install.rb	2013-01-04 14:05:40.466062888 -0700
 @@ -146,9 +146,6 @@
        FileUtils.chmod(0755, om)
        FileUtils.install(mf, omf, {:mode => 0644, :verbose => true})
--- a/components/puppet/patches/puppet-02-zone-type.patch	Tue Sep 17 13:02:41 2013 -0700
+++ b/components/puppet/patches/puppet-02-zone-type.patch	Tue Sep 17 14:20:36 2013 -0600
@@ -1,8 +1,8 @@
 Enhance the zone type to configure zones using a zonecfg export file format.
 Enhance the output of the puppet resource zone.
 
---- puppet-3.2.2/lib/puppet/type/zone.rb.orig	2013-07-16 16:44:01.005467245 -0600
-+++ puppet-3.2.2/lib/puppet/type/zone.rb	2013-07-16 16:45:04.216692249 -0600
+--- puppet-3.2.4/lib/puppet/type/zone.rb.orig	2013-07-16 16:44:01.005467245 -0600
++++ puppet-3.2.4/lib/puppet/type/zone.rb	2013-07-16 16:45:04.216692249 -0600
 @@ -1,10 +1,5 @@
 -require 'puppet/property/list'
  Puppet::Type.newtype(:zone) do
--- a/components/puppet/patches/puppet-03-zone-provider.patch	Tue Sep 17 13:02:41 2013 -0700
+++ b/components/puppet/patches/puppet-03-zone-provider.patch	Tue Sep 17 14:20:36 2013 -0600
@@ -1,7 +1,7 @@
 Enhance the zone provider to configure zones using a zonecfg export file format.
 Enhance the output of puppet resource zone, and fix zone clone functionality.
---- puppet-3.2.2/lib/puppet/provider/zone/solaris.rb.orig	2013-07-29 15:48:58.118553584 -0600
-+++ puppet-3.2.2/lib/puppet/provider/zone/solaris.rb	2013-07-29 15:49:21.053204412 -0600
+--- puppet-3.2.4/lib/puppet/provider/zone/solaris.rb.orig	2013-07-29 15:48:58.118553584 -0600
++++ puppet-3.2.4/lib/puppet/provider/zone/solaris.rb	2013-07-29 15:49:21.053204412 -0600
 @@ -1,5 +1,5 @@
  Puppet::Type.type(:zone).provide(:solaris) do
 -  desc "Provider for Solaris Zones."
--- a/components/puppet/patches/puppet-04-agent-auditing.patch	Tue Sep 17 13:02:41 2013 -0700
+++ b/components/puppet/patches/puppet-04-agent-auditing.patch	Tue Sep 17 14:20:36 2013 -0600
@@ -1,7 +1,7 @@
 Add auditing support to agent execution
 
---- puppet-3.2.2/lib/puppet/agent.rb.orig	2013-03-08 16:03:45.000000000 -0700
-+++ puppet-3.2.2/lib/puppet/agent.rb	2013-03-08 16:03:45.000000000 -0700
+--- puppet-3.2.4/lib/puppet/agent.rb.orig	2013-03-08 16:03:45.000000000 -0700
++++ puppet-3.2.4/lib/puppet/agent.rb	2013-03-08 16:03:45.000000000 -0700
 @@ -1,5 +1,8 @@
  require 'sync'
  require 'puppet/application'
--- a/components/puppet/patches/puppet-05-apply-auditing.patch	Tue Sep 17 13:02:41 2013 -0700
+++ b/components/puppet/patches/puppet-05-apply-auditing.patch	Tue Sep 17 14:20:36 2013 -0600
@@ -1,6 +1,6 @@
 Add auditing hooks for puppet apply
---- puppet-3.2.2/lib/puppet/application/apply.rb.orig	2013-06-13 12:15:55.000000000 -0600
-+++ puppet-3.2.2/lib/puppet/application/apply.rb	2013-07-01 14:02:10.263603171 -0600
+--- puppet-3.2.4/lib/puppet/application/apply.rb.orig	2013-06-13 12:15:55.000000000 -0600
++++ puppet-3.2.4/lib/puppet/application/apply.rb	2013-07-01 14:02:10.263603171 -0600
 @@ -1,5 +1,8 @@
  require 'puppet/application'
  require 'puppet/configurer'
--- a/components/puppet/patches/puppet-06-provider-smf.patch	Tue Sep 17 13:02:41 2013 -0700
+++ b/components/puppet/patches/puppet-06-provider-smf.patch	Tue Sep 17 14:20:36 2013 -0600
@@ -1,6 +1,6 @@
 Add check for existence of smf service
---- puppet-3.2.2/lib/puppet/provider/service/smf.rb.orig	2013-07-15 09:23:24.667341073 -0600
-+++ puppet-3.2.2/lib/puppet/provider/service/smf.rb	2013-07-15 10:13:03.196178924 -0600
+--- puppet-3.2.4/lib/puppet/provider/service/smf.rb.orig	2013-07-15 09:23:24.667341073 -0600
++++ puppet-3.2.4/lib/puppet/provider/service/smf.rb	2013-07-15 10:13:03.196178924 -0600
 @@ -80,9 +80,18 @@
        return
      end
--- a/components/puppet/puppet.p5m	Tue Sep 17 13:02:41 2013 -0700
+++ b/components/puppet/puppet.p5m	Tue Sep 17 14:20:36 2013 -0600
@@ -33,12 +33,13 @@
     value='Puppet is a flexible, customizable framework designed to help system administrators automate the many repetitive tasks they regularly perform. As a declarative, model-based approach to IT automation, it lets you define the desired state - or the "what" - of your infrastructure using the Puppet configuration language. Once these configurations are deployed, Puppet automatically installs the necessary packages and starts the related services, and then regularly enforces the desired state.'
 set name=com.oracle.info.description \
     value="Puppet, a configuration management toolkit"
-set name=com.oracle.info.tpno value=13858
+set name=com.oracle.info.tpno value=14695
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Administration and Configuration"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2013/005 value=PSARC/2013/221
+set name=org.opensolaris.arc-caseid value=PSARC/2013/005 value=PSARC/2013/221 \
+    value=PSARC/2013/288
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir  path=etc/puppet owner=puppet group=puppet mode=0755
 file path=etc/puppet/auth.conf owner=puppet group=bin mode=0444
@@ -306,6 +307,8 @@
 file path=usr/ruby/1.8/lib/ruby/vendor_ruby/1.8/puppet/file_serving/mount/plugins.rb
 file path=usr/ruby/1.8/lib/ruby/vendor_ruby/1.8/puppet/file_serving/terminus_helper.rb
 file path=usr/ruby/1.8/lib/ruby/vendor_ruby/1.8/puppet/file_serving/terminus_selector.rb
+file path=usr/ruby/1.8/lib/ruby/vendor_ruby/1.8/puppet/file_system.rb
+file path=usr/ruby/1.8/lib/ruby/vendor_ruby/1.8/puppet/file_system/path_pattern.rb
 file path=usr/ruby/1.8/lib/ruby/vendor_ruby/1.8/puppet/forge.rb
 file path=usr/ruby/1.8/lib/ruby/vendor_ruby/1.8/puppet/forge/cache.rb
 file path=usr/ruby/1.8/lib/ruby/vendor_ruby/1.8/puppet/forge/errors.rb
upstream/oracle/userland-gate