update to 3.0.1

sysutils/ruby-puppet/Makefile

@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.46 2012/10/08 08:52:49 jasper Exp $
+# $OpenBSD: Makefile,v 1.47 2012/10/28 18:48:45 robert Exp $
 
 COMMENT=	centralised configuration management for networks
 
-VERSION=	2.7.19
+VERSION=	3.0.1
 DISTNAME=	puppet-${VERSION}
 PKGNAME=	ruby-${DISTNAME}
-REVISION=	2
 CATEGORIES=	sysutils net
 
 HOMEPAGE=	http://reductivelabs.com/projects/puppet/

sysutils/ruby-puppet/distinfo

@@ -1,2 +1,2 @@
-SHA256 (puppet-2.7.19.tar.gz) = E7EDUTJTrlr0Zsj88l82y8QSkPgk+nWABB8HANI6PDo=
-SIZE (puppet-2.7.19.tar.gz) = 1936300
+SHA256 (puppet-3.0.1.tar.gz) = Xk0M/daYn69PbFx2wNO8+gNk44BUm+Gi98Or0isLVis=
+SIZE (puppet-3.0.1.tar.gz) = 1505102

sysutils/ruby-puppet/patches/patch-install_rb

@@ -1,10 +1,10 @@
-$OpenBSD: patch-install_rb,v 1.5 2012/09/19 09:56:01 robert Exp $
+$OpenBSD: patch-install_rb,v 1.6 2012/10/28 18:48:45 robert Exp $
 
 Don't gzip(1) the manual pages.
 
---- install.rb.orig	Tue Aug 21 23:41:17 2012
-+++ install.rb	Wed Sep 19 11:53:07 2012
-@@ -148,9 +148,6 @@ def do_man(man, strip = 'man/')
+--- install.rb.orig	Sat Oct 20 06:57:50 2012
++++ install.rb	Sun Oct 28 19:09:31 2012
+@@ -146,9 +146,6 @@ def do_man(man, strip = 'man/')
        FileUtils.chmod(0755, om)
        FileUtils.install(mf, omf, {:mode => 0644, :verbose => true})
      end

sysutils/ruby-puppet/patches/patch-lib_puppet_defaults_rb

@@ -1,23 +1,26 @@
-$OpenBSD: patch-lib_puppet_defaults_rb,v 1.7 2012/10/01 09:26:18 jasper Exp $
---- lib/puppet/defaults.rb.orig	Tue Aug 21 23:41:17 2012
-+++ lib/puppet/defaults.rb	Mon Oct  1 11:03:48 2012
-@@ -466,8 +466,8 @@ EOT
-   )
+$OpenBSD: patch-lib_puppet_defaults_rb,v 1.8 2012/10/28 18:48:45 robert Exp $
+--- lib/puppet/defaults.rb.orig	Sun Oct 28 19:09:38 2012
++++ lib/puppet/defaults.rb	Sun Oct 28 19:10:05 2012
+@@ -729,11 +729,11 @@ EOT
  
-   setdefaults(:master,
--    :user => ["puppet", "The user puppet master should run as."],
--    :group => ["puppet", "The group puppet master should run as."],
-+    :user => ["_puppet", "The user puppet master should run as."],
-+    :group => ["_puppet", "The group puppet master should run as."],
-     :manifestdir => ["$confdir/manifests", "Where puppet master looks for its manifests."],
-     :manifest => ["$manifestdir/site.pp", "The entry-point manifest for puppet master."],
-     :code => ["", "Code to parse directly.  This is essentially only used
-@@ -508,7 +508,7 @@ EOT
-     ],
-     :ca => [true, "Whether the master should function as a certificate authority."],
+   define_settings(:master,
+     :user => {
+-      :default    => "puppet",
++      :default    => "_puppet",
+       :desc       => "The user puppet master should run as.",
+     },
+     :group => {
+-      :default    => "puppet",
++      :default    => "_puppet",
+       :desc       => "The group puppet master should run as.",
+     },
+     :manifestdir => {
+@@ -804,7 +804,7 @@ EOT
+       :desc       => "Whether the master should function as a certificate authority.",
+     },
      :modulepath => {
 -      :default => "$confdir/modules#{File::PATH_SEPARATOR}/usr/share/puppet/modules",
 +      :default => "$confdir/modules#{File::PATH_SEPARATOR}${SYSCONFDIR}/puppet/modules",
-       :desc => "The search path for modules, as a list of directories separated by the system path separator character. (The POSIX path separator is ':', and the Windows path separator is ';'.)",
-       :type => :setting # We don't want this to be considered a file, since it's multiple files.
-     },
+       :type => :path,
+       :desc => "The search path for modules, as a list of directories separated by the system path separator character. " +
+           "(The POSIX path separator is ':', and the Windows path separator is ';'.)",

sysutils/ruby-puppet/patches/patch-lib_puppet_indirector_node_ldap_rb

@@ -1,6 +1,6 @@
-$OpenBSD: patch-lib_puppet_indirector_node_ldap_rb,v 1.2 2010/11/17 13:07:17 robert Exp $
---- lib/puppet/indirector/node/ldap.rb.orig	Thu Sep 23 01:17:21 2010
-+++ lib/puppet/indirector/node/ldap.rb	Fri Nov 12 11:15:22 2010
+$OpenBSD: patch-lib_puppet_indirector_node_ldap_rb,v 1.3 2012/10/28 18:48:45 robert Exp $
+--- lib/puppet/indirector/node/ldap.rb.orig	Sat Oct 20 06:57:51 2012
++++ lib/puppet/indirector/node/ldap.rb	Sun Oct 28 19:09:31 2012
 @@ -1,3 +1,4 @@
 +require 'facter'
  require 'puppet/node'
@@ -16,7 +16,7 @@ $OpenBSD: patch-lib_puppet_indirector_node_ldap_rb,v 1.2 2010/11/17 13:07:17 rob
      names << "default"
  
      node = nil
-@@ -174,6 +178,14 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
+@@ -179,6 +183,14 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
      parent_info = name2hash(parent) || raise(Puppet::Error.new("Could not find parent node '#{parent}'"))
      information[:classes] += parent_info[:classes]
      parent_info[:parameters].each do |param, value|

sysutils/ruby-puppet/patches/patch-lib_puppet_indirector_yaml_rb

@@ -1,40 +0,0 @@
-$OpenBSD: patch-lib_puppet_indirector_yaml_rb,v 1.1 2010/11/04 07:20:57 robert Exp $
---- lib/puppet/indirector/yaml.rb.orig	Fri Oct 29 00:16:42 2010
-+++ lib/puppet/indirector/yaml.rb	Fri Oct 29 00:17:30 2010
-@@ -1,26 +1,17 @@
- require 'puppet/indirector/terminus'
--require 'puppet/util/file_locking'
- 
- # The base class for YAML indirection termini.
- class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
--  include Puppet::Util::FileLocking
--
-   # Read a given name's file in and convert it from YAML.
-   def find(request)
-     file = path(request.key)
-     return nil unless FileTest.exist?(file)
- 
--    yaml = nil
-     begin
--      readlock(file) { |fh| yaml = fh.read }
-+      return from_yaml(File.read(file))
-     rescue => detail
-       raise Puppet::Error, "Could not read YAML data for #{indirection.name} #{request.key}: #{detail}"
-     end
--    begin
--      return from_yaml(yaml)
--    rescue => detail
--      raise Puppet::Error, "Could not parse YAML data for #{indirection.name} #{request.key}: #{detail}"
--    end
-   end
- 
-   # Convert our object to YAML and store it to the disk.
-@@ -35,7 +26,7 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::T
-     Dir.mkdir(basedir) unless FileTest.exist?(basedir)
- 
-     begin
--      writelock(file, 0660) { |f| f.print to_yaml(request.instance) }
-+      File.open(file, "w", 0660) { |f| f.print to_yaml(request.instance) }
-     rescue TypeError => detail
-       Puppet.err "Could not save #{self.name} #{request.key}: #{detail}"
-     end

sysutils/ruby-puppet/patches/patch-lib_puppet_reference_configuration_rb

@@ -1,7 +1,7 @@
-$OpenBSD: patch-lib_puppet_reference_configuration_rb,v 1.4 2012/04/13 08:18:30 jasper Exp $
---- lib/puppet/reference/configuration.rb.orig	Tue Apr 10 20:23:16 2012
-+++ lib/puppet/reference/configuration.rb	Fri Apr 13 09:29:03 2012
-@@ -25,7 +25,7 @@ config = Puppet::Util::Reference.newreference(:configu
+$OpenBSD: patch-lib_puppet_reference_configuration_rb,v 1.5 2012/10/28 18:48:45 robert Exp $
+--- lib/puppet/reference/configuration.rb.orig	Sat Oct 20 06:57:51 2012
++++ lib/puppet/reference/configuration.rb	Sun Oct 28 19:09:31 2012
+@@ -24,7 +24,7 @@ config = Puppet::Util::Reference.newreference(:configu
      str << ""
      val = object.default
      if name.to_s == "vardir"

sysutils/ruby-puppet/patches/patch-lib_puppet_util_run_mode_rb

@@ -1,12 +1,12 @@
-$OpenBSD: patch-lib_puppet_util_run_mode_rb,v 1.3 2012/09/19 09:56:01 robert Exp $
---- lib/puppet/util/run_mode.rb.orig	Tue Aug 21 23:41:17 2012
-+++ lib/puppet/util/run_mode.rb	Wed Sep 19 11:53:07 2012
-@@ -36,7 +36,7 @@ module Puppet
+$OpenBSD: patch-lib_puppet_util_run_mode_rb,v 1.4 2012/10/28 18:48:45 robert Exp $
+--- lib/puppet/util/run_mode.rb.orig	Sun Oct 28 19:10:34 2012
++++ lib/puppet/util/run_mode.rb	Sun Oct 28 19:10:42 2012
+@@ -59,7 +59,7 @@ module Puppet
+       end
  
        def var_dir
-         which_dir(
--          (Puppet.features.microsoft_windows? ? File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "var") : "/var/lib/puppet"),
-+          (Puppet.features.microsoft_windows? ? File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "var") : "/var/puppet"),
-           "~/.puppet/var"
-         )
+-        which_dir("/var/lib/puppet", "~/.puppet/var")
++        which_dir("/var/puppet", "~/.puppet/var")
        end
+     end
+ 

sysutils/ruby-puppet/pkg/PLIST

@@ -1,17 +1,20 @@
-@comment $OpenBSD: PLIST,v 1.23 2012/10/01 09:26:18 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.24 2012/10/28 18:48:45 robert Exp $
 @newgroup _puppet:580
 @newuser _puppet:580:580:daemon:Puppet user:/var/empty:/sbin/nologin
 @extraunexec rm -rf ${SYSCONFDIR}/puppet/*
 @extraunexec rm -rf /var/puppet/*
-bin/filebucket
-bin/pi
+bin/extlookup2hiera
 bin/puppet
-bin/puppetdoc
-bin/ralsh
+${MODRUBY_SITEDIR}/hiera/
+${MODRUBY_SITEDIR}/hiera/backend/
+${MODRUBY_SITEDIR}/hiera/backend/puppet_backend.rb
+${MODRUBY_SITEDIR}/hiera/scope.rb
+${MODRUBY_SITEDIR}/hiera_puppet.rb
 ${MODRUBY_SITEDIR}/puppet/
 ${MODRUBY_SITEDIR}/puppet.rb
 ${MODRUBY_SITEDIR}/puppet/agent/
 ${MODRUBY_SITEDIR}/puppet/agent.rb
+${MODRUBY_SITEDIR}/puppet/agent/disabler.rb
 ${MODRUBY_SITEDIR}/puppet/agent/locker.rb
 ${MODRUBY_SITEDIR}/puppet/application/
 ${MODRUBY_SITEDIR}/puppet/application.rb
@@ -57,6 +60,7 @@ ${MODRUBY_SITEDIR}/puppet/configurer/downloader.rb
 ${MODRUBY_SITEDIR}/puppet/configurer/fact_handler.rb
 ${MODRUBY_SITEDIR}/puppet/configurer/plugin_handler.rb
 ${MODRUBY_SITEDIR}/puppet/daemon.rb
+${MODRUBY_SITEDIR}/puppet/data_binding.rb
 ${MODRUBY_SITEDIR}/puppet/defaults.rb
 ${MODRUBY_SITEDIR}/puppet/dsl/
 ${MODRUBY_SITEDIR}/puppet/dsl.rb
@@ -130,6 +134,7 @@ ${MODRUBY_SITEDIR}/puppet/feature/eventlog.rb
 ${MODRUBY_SITEDIR}/puppet/feature/pson.rb
 ${MODRUBY_SITEDIR}/puppet/feature/rack.rb
 ${MODRUBY_SITEDIR}/puppet/feature/rails.rb
+${MODRUBY_SITEDIR}/puppet/feature/rdoc1.rb
 ${MODRUBY_SITEDIR}/puppet/feature/rubygems.rb
 ${MODRUBY_SITEDIR}/puppet/feature/selinux.rb
 ${MODRUBY_SITEDIR}/puppet/feature/ssh.rb
@@ -161,6 +166,7 @@ ${MODRUBY_SITEDIR}/puppet/file_serving/terminus_selector.rb
 ${MODRUBY_SITEDIR}/puppet/forge/
 ${MODRUBY_SITEDIR}/puppet/forge.rb
 ${MODRUBY_SITEDIR}/puppet/forge/cache.rb
+${MODRUBY_SITEDIR}/puppet/forge/errors.rb
 ${MODRUBY_SITEDIR}/puppet/forge/repository.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/
 ${MODRUBY_SITEDIR}/puppet/indirector.rb
@@ -168,6 +174,7 @@ ${MODRUBY_SITEDIR}/puppet/indirector/active_record.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/catalog/
 ${MODRUBY_SITEDIR}/puppet/indirector/catalog/active_record.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/catalog/compiler.rb
+${MODRUBY_SITEDIR}/puppet/indirector/catalog/json.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/catalog/queue.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/catalog/rest.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/catalog/static_compiler.rb
@@ -175,14 +182,17 @@ ${MODRUBY_SITEDIR}/puppet/indirector/catalog/store_configs.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/catalog/yaml.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/certificate/
 ${MODRUBY_SITEDIR}/puppet/indirector/certificate/ca.rb
+${MODRUBY_SITEDIR}/puppet/indirector/certificate/disabled_ca.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/certificate/file.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/certificate/rest.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/certificate_request/
 ${MODRUBY_SITEDIR}/puppet/indirector/certificate_request/ca.rb
+${MODRUBY_SITEDIR}/puppet/indirector/certificate_request/disabled_ca.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/certificate_request/file.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/certificate_request/rest.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/certificate_revocation_list/
 ${MODRUBY_SITEDIR}/puppet/indirector/certificate_revocation_list/ca.rb
+${MODRUBY_SITEDIR}/puppet/indirector/certificate_revocation_list/disabled_ca.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/certificate_revocation_list/file.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/certificate_revocation_list/rest.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/certificate_status/
@@ -191,6 +201,9 @@ ${MODRUBY_SITEDIR}/puppet/indirector/certificate_status/file.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/certificate_status/rest.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/code.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/couch.rb
+${MODRUBY_SITEDIR}/puppet/indirector/data_binding/
+${MODRUBY_SITEDIR}/puppet/indirector/data_binding/hiera.rb
+${MODRUBY_SITEDIR}/puppet/indirector/data_binding/none.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/direct_file_server.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/envelope.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/exec.rb
@@ -223,6 +236,7 @@ ${MODRUBY_SITEDIR}/puppet/indirector/file_metadata/file_server.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/file_metadata/rest.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/file_metadata/selector.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/file_server.rb
+${MODRUBY_SITEDIR}/puppet/indirector/hiera.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/indirection.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/instrumentation_data/
 ${MODRUBY_SITEDIR}/puppet/indirector/instrumentation_data.rb
@@ -236,10 +250,10 @@ ${MODRUBY_SITEDIR}/puppet/indirector/instrumentation_probe/
 ${MODRUBY_SITEDIR}/puppet/indirector/instrumentation_probe.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/instrumentation_probe/local.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/instrumentation_probe/rest.rb
-${MODRUBY_SITEDIR}/puppet/indirector/inventory/
-${MODRUBY_SITEDIR}/puppet/indirector/inventory/yaml.rb
+${MODRUBY_SITEDIR}/puppet/indirector/json.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/key/
 ${MODRUBY_SITEDIR}/puppet/indirector/key/ca.rb
+${MODRUBY_SITEDIR}/puppet/indirector/key/disabled_ca.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/key/file.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/ldap.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/memory.rb
@@ -252,6 +266,7 @@ ${MODRUBY_SITEDIR}/puppet/indirector/node/plain.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/node/rest.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/node/store_configs.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/node/yaml.rb
+${MODRUBY_SITEDIR}/puppet/indirector/none.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/plain.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/queue.rb
 ${MODRUBY_SITEDIR}/puppet/indirector/report/
@@ -316,6 +331,7 @@ ${MODRUBY_SITEDIR}/puppet/module_tool/errors/installer.rb
 ${MODRUBY_SITEDIR}/puppet/module_tool/errors/shared.rb
 ${MODRUBY_SITEDIR}/puppet/module_tool/errors/uninstaller.rb
 ${MODRUBY_SITEDIR}/puppet/module_tool/errors/upgrader.rb
+${MODRUBY_SITEDIR}/puppet/module_tool/install_directory.rb
 ${MODRUBY_SITEDIR}/puppet/module_tool/metadata.rb
 ${MODRUBY_SITEDIR}/puppet/module_tool/modulefile.rb
 ${MODRUBY_SITEDIR}/puppet/module_tool/shared_behaviors.rb
@@ -333,60 +349,42 @@ ${MODRUBY_SITEDIR}/puppet/module_tool/skeleton/templates/generator/tests/
 ${MODRUBY_SITEDIR}/puppet/module_tool/skeleton/templates/generator/tests/init.pp.erb
 ${MODRUBY_SITEDIR}/puppet/network/
 ${MODRUBY_SITEDIR}/puppet/network.rb
+${MODRUBY_SITEDIR}/puppet/network/auth_config_parser.rb
 ${MODRUBY_SITEDIR}/puppet/network/authconfig.rb
+${MODRUBY_SITEDIR}/puppet/network/authentication.rb
 ${MODRUBY_SITEDIR}/puppet/network/authorization.rb
 ${MODRUBY_SITEDIR}/puppet/network/authstore.rb
 ${MODRUBY_SITEDIR}/puppet/network/client_request.rb
 ${MODRUBY_SITEDIR}/puppet/network/format.rb
 ${MODRUBY_SITEDIR}/puppet/network/format_handler.rb
 ${MODRUBY_SITEDIR}/puppet/network/formats.rb
-${MODRUBY_SITEDIR}/puppet/network/handler/
-${MODRUBY_SITEDIR}/puppet/network/handler.rb
-${MODRUBY_SITEDIR}/puppet/network/handler/ca.rb
-${MODRUBY_SITEDIR}/puppet/network/handler/filebucket.rb
-${MODRUBY_SITEDIR}/puppet/network/handler/fileserver.rb
-${MODRUBY_SITEDIR}/puppet/network/handler/master.rb
-${MODRUBY_SITEDIR}/puppet/network/handler/report.rb
-${MODRUBY_SITEDIR}/puppet/network/handler/runner.rb
-${MODRUBY_SITEDIR}/puppet/network/handler/status.rb
 ${MODRUBY_SITEDIR}/puppet/network/http/
 ${MODRUBY_SITEDIR}/puppet/network/http.rb
 ${MODRUBY_SITEDIR}/puppet/network/http/api/
 ${MODRUBY_SITEDIR}/puppet/network/http/api.rb
 ${MODRUBY_SITEDIR}/puppet/network/http/api/v1.rb
 ${MODRUBY_SITEDIR}/puppet/network/http/compression.rb
+${MODRUBY_SITEDIR}/puppet/network/http/connection.rb
 ${MODRUBY_SITEDIR}/puppet/network/http/handler.rb
-${MODRUBY_SITEDIR}/puppet/network/http/mongrel/
-${MODRUBY_SITEDIR}/puppet/network/http/mongrel.rb
-${MODRUBY_SITEDIR}/puppet/network/http/mongrel/rest.rb
 ${MODRUBY_SITEDIR}/puppet/network/http/rack/
 ${MODRUBY_SITEDIR}/puppet/network/http/rack.rb
 ${MODRUBY_SITEDIR}/puppet/network/http/rack/httphandler.rb
 ${MODRUBY_SITEDIR}/puppet/network/http/rack/rest.rb
-${MODRUBY_SITEDIR}/puppet/network/http/rack/xmlrpc.rb
 ${MODRUBY_SITEDIR}/puppet/network/http/webrick/
 ${MODRUBY_SITEDIR}/puppet/network/http/webrick.rb
 ${MODRUBY_SITEDIR}/puppet/network/http/webrick/rest.rb
 ${MODRUBY_SITEDIR}/puppet/network/http_pool.rb
-${MODRUBY_SITEDIR}/puppet/network/http_server/
-${MODRUBY_SITEDIR}/puppet/network/http_server.rb
-${MODRUBY_SITEDIR}/puppet/network/http_server/mongrel.rb
-${MODRUBY_SITEDIR}/puppet/network/rest_authconfig.rb
-${MODRUBY_SITEDIR}/puppet/network/rest_authorization.rb
+${MODRUBY_SITEDIR}/puppet/network/resolver.rb
 ${MODRUBY_SITEDIR}/puppet/network/rest_controller.rb
 ${MODRUBY_SITEDIR}/puppet/network/rights.rb
 ${MODRUBY_SITEDIR}/puppet/network/server.rb
-${MODRUBY_SITEDIR}/puppet/network/xmlrpc/
-${MODRUBY_SITEDIR}/puppet/network/xmlrpc/processor.rb
-${MODRUBY_SITEDIR}/puppet/network/xmlrpc/server.rb
-${MODRUBY_SITEDIR}/puppet/network/xmlrpc/webrick_servlet.rb
 ${MODRUBY_SITEDIR}/puppet/node/
 ${MODRUBY_SITEDIR}/puppet/node.rb
 ${MODRUBY_SITEDIR}/puppet/node/environment.rb
 ${MODRUBY_SITEDIR}/puppet/node/facts.rb
-${MODRUBY_SITEDIR}/puppet/node/inventory.rb
 ${MODRUBY_SITEDIR}/puppet/parameter/
 ${MODRUBY_SITEDIR}/puppet/parameter.rb
+${MODRUBY_SITEDIR}/puppet/parameter/package_options.rb
 ${MODRUBY_SITEDIR}/puppet/parameter/path.rb
 ${MODRUBY_SITEDIR}/puppet/parameter/value.rb
 ${MODRUBY_SITEDIR}/puppet/parameter/value_collection.rb
@@ -439,6 +437,10 @@ ${MODRUBY_SITEDIR}/puppet/parser/functions/fail.rb
 ${MODRUBY_SITEDIR}/puppet/parser/functions/file.rb
 ${MODRUBY_SITEDIR}/puppet/parser/functions/fqdn_rand.rb
 ${MODRUBY_SITEDIR}/puppet/parser/functions/generate.rb
+${MODRUBY_SITEDIR}/puppet/parser/functions/hiera.rb
+${MODRUBY_SITEDIR}/puppet/parser/functions/hiera_array.rb
+${MODRUBY_SITEDIR}/puppet/parser/functions/hiera_hash.rb
+${MODRUBY_SITEDIR}/puppet/parser/functions/hiera_include.rb
 ${MODRUBY_SITEDIR}/puppet/parser/functions/include.rb
 ${MODRUBY_SITEDIR}/puppet/parser/functions/inline_template.rb
 ${MODRUBY_SITEDIR}/puppet/parser/functions/md5.rb
@@ -477,6 +479,7 @@ ${MODRUBY_SITEDIR}/puppet/provider/aixobject.rb
 ${MODRUBY_SITEDIR}/puppet/provider/augeas/
 ${MODRUBY_SITEDIR}/puppet/provider/augeas/augeas.rb
 ${MODRUBY_SITEDIR}/puppet/provider/cisco.rb
+${MODRUBY_SITEDIR}/puppet/provider/command.rb
 ${MODRUBY_SITEDIR}/puppet/provider/computer/
 ${MODRUBY_SITEDIR}/puppet/provider/computer/computer.rb
 ${MODRUBY_SITEDIR}/puppet/provider/confine/
@@ -551,6 +554,7 @@ ${MODRUBY_SITEDIR}/puppet/provider/package/pacman.rb
 ${MODRUBY_SITEDIR}/puppet/provider/package/pip.rb
 ${MODRUBY_SITEDIR}/puppet/provider/package/pkg.rb
 ${MODRUBY_SITEDIR}/puppet/provider/package/pkgdmg.rb
+${MODRUBY_SITEDIR}/puppet/provider/package/pkgin.rb
 ${MODRUBY_SITEDIR}/puppet/provider/package/pkgutil.rb
 ${MODRUBY_SITEDIR}/puppet/provider/package/portage.rb
 ${MODRUBY_SITEDIR}/puppet/provider/package/ports.rb
@@ -561,6 +565,11 @@ ${MODRUBY_SITEDIR}/puppet/provider/package/sun.rb
 ${MODRUBY_SITEDIR}/puppet/provider/package/sunfreeware.rb
 ${MODRUBY_SITEDIR}/puppet/provider/package/up2date.rb
 ${MODRUBY_SITEDIR}/puppet/provider/package/urpmi.rb
+${MODRUBY_SITEDIR}/puppet/provider/package/windows/
+${MODRUBY_SITEDIR}/puppet/provider/package/windows.rb
+${MODRUBY_SITEDIR}/puppet/provider/package/windows/exe_package.rb
+${MODRUBY_SITEDIR}/puppet/provider/package/windows/msi_package.rb
+${MODRUBY_SITEDIR}/puppet/provider/package/windows/package.rb
 ${MODRUBY_SITEDIR}/puppet/provider/package/yum.rb
 ${MODRUBY_SITEDIR}/puppet/provider/package/yumhelper.py
 ${MODRUBY_SITEDIR}/puppet/provider/package/zypper.rb
@@ -586,6 +595,7 @@ ${MODRUBY_SITEDIR}/puppet/provider/service/openbsd.rb
 ${MODRUBY_SITEDIR}/puppet/provider/service/openrc.rb
 ${MODRUBY_SITEDIR}/puppet/provider/service/redhat.rb
 ${MODRUBY_SITEDIR}/puppet/provider/service/runit.rb
+${MODRUBY_SITEDIR}/puppet/provider/service/service.rb
 ${MODRUBY_SITEDIR}/puppet/provider/service/smf.rb
 ${MODRUBY_SITEDIR}/puppet/provider/service/src.rb
 ${MODRUBY_SITEDIR}/puppet/provider/service/systemd.rb
@@ -607,11 +617,11 @@ ${MODRUBY_SITEDIR}/puppet/provider/user/windows_adsi.rb
 ${MODRUBY_SITEDIR}/puppet/provider/vlan/
 ${MODRUBY_SITEDIR}/puppet/provider/vlan/cisco.rb
 ${MODRUBY_SITEDIR}/puppet/provider/zfs/
-${MODRUBY_SITEDIR}/puppet/provider/zfs/solaris.rb
+${MODRUBY_SITEDIR}/puppet/provider/zfs/zfs.rb
 ${MODRUBY_SITEDIR}/puppet/provider/zone/
 ${MODRUBY_SITEDIR}/puppet/provider/zone/solaris.rb
 ${MODRUBY_SITEDIR}/puppet/provider/zpool/
-${MODRUBY_SITEDIR}/puppet/provider/zpool/solaris.rb
+${MODRUBY_SITEDIR}/puppet/provider/zpool/zpool.rb
 ${MODRUBY_SITEDIR}/puppet/rails/
 ${MODRUBY_SITEDIR}/puppet/rails.rb
 ${MODRUBY_SITEDIR}/puppet/rails/benchmark.rb
@@ -638,7 +648,6 @@ ${MODRUBY_SITEDIR}/puppet/reference/configuration.rb
 ${MODRUBY_SITEDIR}/puppet/reference/function.rb
 ${MODRUBY_SITEDIR}/puppet/reference/indirection.rb
 ${MODRUBY_SITEDIR}/puppet/reference/metaparameter.rb
-${MODRUBY_SITEDIR}/puppet/reference/network.rb
 ${MODRUBY_SITEDIR}/puppet/reference/providers.rb
 ${MODRUBY_SITEDIR}/puppet/reference/report.rb
 ${MODRUBY_SITEDIR}/puppet/reference/type.rb
@@ -658,6 +667,17 @@ ${MODRUBY_SITEDIR}/puppet/resource/type.rb
 ${MODRUBY_SITEDIR}/puppet/resource/type_collection.rb
 ${MODRUBY_SITEDIR}/puppet/resource/type_collection_helper.rb
 ${MODRUBY_SITEDIR}/puppet/run.rb
+${MODRUBY_SITEDIR}/puppet/settings/
+${MODRUBY_SITEDIR}/puppet/settings.rb
+${MODRUBY_SITEDIR}/puppet/settings/base_setting.rb
+${MODRUBY_SITEDIR}/puppet/settings/boolean_setting.rb
+${MODRUBY_SITEDIR}/puppet/settings/directory_setting.rb
+${MODRUBY_SITEDIR}/puppet/settings/duration_setting.rb
+${MODRUBY_SITEDIR}/puppet/settings/errors.rb
+${MODRUBY_SITEDIR}/puppet/settings/file_setting.rb
+${MODRUBY_SITEDIR}/puppet/settings/path_setting.rb
+${MODRUBY_SITEDIR}/puppet/settings/string_setting.rb
+${MODRUBY_SITEDIR}/puppet/settings/terminus_setting.rb
 ${MODRUBY_SITEDIR}/puppet/simple_graph.rb
 ${MODRUBY_SITEDIR}/puppet/ssl/
 ${MODRUBY_SITEDIR}/puppet/ssl.rb
@@ -669,6 +689,8 @@ ${MODRUBY_SITEDIR}/puppet/ssl/certificate_authority/interface.rb
 ${MODRUBY_SITEDIR}/puppet/ssl/certificate_factory.rb
 ${MODRUBY_SITEDIR}/puppet/ssl/certificate_request.rb
 ${MODRUBY_SITEDIR}/puppet/ssl/certificate_revocation_list.rb
+${MODRUBY_SITEDIR}/puppet/ssl/configuration.rb
+${MODRUBY_SITEDIR}/puppet/ssl/digest.rb
 ${MODRUBY_SITEDIR}/puppet/ssl/host.rb
 ${MODRUBY_SITEDIR}/puppet/ssl/inventory.rb
 ${MODRUBY_SITEDIR}/puppet/ssl/key.rb
@@ -681,7 +703,6 @@ ${MODRUBY_SITEDIR}/puppet/transaction/event.rb
 ${MODRUBY_SITEDIR}/puppet/transaction/event_manager.rb
 ${MODRUBY_SITEDIR}/puppet/transaction/report.rb
 ${MODRUBY_SITEDIR}/puppet/transaction/resource_harness.rb
-${MODRUBY_SITEDIR}/puppet/transportable.rb
 ${MODRUBY_SITEDIR}/puppet/type/
 ${MODRUBY_SITEDIR}/puppet/type.rb
 ${MODRUBY_SITEDIR}/puppet/type/augeas.rb
@@ -751,15 +772,16 @@ ${MODRUBY_SITEDIR}/puppet/type/zpool.rb
 ${MODRUBY_SITEDIR}/puppet/util/
 ${MODRUBY_SITEDIR}/puppet/util.rb
 ${MODRUBY_SITEDIR}/puppet/util/adsi.rb
-${MODRUBY_SITEDIR}/puppet/util/autoload/
 ${MODRUBY_SITEDIR}/puppet/util/autoload.rb
-${MODRUBY_SITEDIR}/puppet/util/autoload/file_cache.rb
 ${MODRUBY_SITEDIR}/puppet/util/backups.rb
 ${MODRUBY_SITEDIR}/puppet/util/cacher.rb
 ${MODRUBY_SITEDIR}/puppet/util/checksums.rb
 ${MODRUBY_SITEDIR}/puppet/util/classgen.rb
 ${MODRUBY_SITEDIR}/puppet/util/colors.rb
+${MODRUBY_SITEDIR}/puppet/util/command_line/
 ${MODRUBY_SITEDIR}/puppet/util/command_line.rb
+${MODRUBY_SITEDIR}/puppet/util/command_line/puppet_option_parser.rb
+${MODRUBY_SITEDIR}/puppet/util/command_line/trollop.rb
 ${MODRUBY_SITEDIR}/puppet/util/constant_inflector.rb
 ${MODRUBY_SITEDIR}/puppet/util/diff.rb
 ${MODRUBY_SITEDIR}/puppet/util/docs.rb
@@ -767,7 +789,6 @@ ${MODRUBY_SITEDIR}/puppet/util/errors.rb
 ${MODRUBY_SITEDIR}/puppet/util/execution.rb
 ${MODRUBY_SITEDIR}/puppet/util/execution_stub.rb
 ${MODRUBY_SITEDIR}/puppet/util/feature.rb
-${MODRUBY_SITEDIR}/puppet/util/file_locking.rb
 ${MODRUBY_SITEDIR}/puppet/util/fileparsing.rb
 ${MODRUBY_SITEDIR}/puppet/util/filetype.rb
 ${MODRUBY_SITEDIR}/puppet/util/graph.rb
@@ -783,22 +804,27 @@ ${MODRUBY_SITEDIR}/puppet/util/instrumentation/listener.rb
 ${MODRUBY_SITEDIR}/puppet/util/instrumentation/listeners/
 ${MODRUBY_SITEDIR}/puppet/util/instrumentation/listeners/log.rb
 ${MODRUBY_SITEDIR}/puppet/util/instrumentation/listeners/performance.rb
+${MODRUBY_SITEDIR}/puppet/util/json_lockfile.rb
 ${MODRUBY_SITEDIR}/puppet/util/ldap/
 ${MODRUBY_SITEDIR}/puppet/util/ldap.rb
 ${MODRUBY_SITEDIR}/puppet/util/ldap/connection.rb
 ${MODRUBY_SITEDIR}/puppet/util/ldap/generator.rb
 ${MODRUBY_SITEDIR}/puppet/util/ldap/manager.rb
 ${MODRUBY_SITEDIR}/puppet/util/loadedfile.rb
+${MODRUBY_SITEDIR}/puppet/util/lockfile.rb
 ${MODRUBY_SITEDIR}/puppet/util/log/
 ${MODRUBY_SITEDIR}/puppet/util/log.rb
 ${MODRUBY_SITEDIR}/puppet/util/log/destination.rb
 ${MODRUBY_SITEDIR}/puppet/util/log/destinations.rb
+${MODRUBY_SITEDIR}/puppet/util/log/rate_limited_logger.rb
 ${MODRUBY_SITEDIR}/puppet/util/log_paths.rb
 ${MODRUBY_SITEDIR}/puppet/util/logging.rb
 ${MODRUBY_SITEDIR}/puppet/util/metaid.rb
 ${MODRUBY_SITEDIR}/puppet/util/methodhelper.rb
 ${MODRUBY_SITEDIR}/puppet/util/metric.rb
+${MODRUBY_SITEDIR}/puppet/util/monkey_patches/
 ${MODRUBY_SITEDIR}/puppet/util/monkey_patches.rb
+${MODRUBY_SITEDIR}/puppet/util/monkey_patches/lines.rb
 ${MODRUBY_SITEDIR}/puppet/util/nagios_maker.rb
 ${MODRUBY_SITEDIR}/puppet/util/network_device/
 ${MODRUBY_SITEDIR}/puppet/util/network_device.rb
@@ -841,13 +867,9 @@ ${MODRUBY_SITEDIR}/puppet/util/rdoc/parser.rb
 ${MODRUBY_SITEDIR}/puppet/util/reference.rb
 ${MODRUBY_SITEDIR}/puppet/util/resource_template.rb
 ${MODRUBY_SITEDIR}/puppet/util/retryaction.rb
+${MODRUBY_SITEDIR}/puppet/util/rubygems.rb
 ${MODRUBY_SITEDIR}/puppet/util/run_mode.rb
 ${MODRUBY_SITEDIR}/puppet/util/selinux.rb
-${MODRUBY_SITEDIR}/puppet/util/settings/
-${MODRUBY_SITEDIR}/puppet/util/settings.rb
-${MODRUBY_SITEDIR}/puppet/util/settings/boolean_setting.rb
-${MODRUBY_SITEDIR}/puppet/util/settings/file_setting.rb
-${MODRUBY_SITEDIR}/puppet/util/settings/setting.rb
 ${MODRUBY_SITEDIR}/puppet/util/storage.rb
 ${MODRUBY_SITEDIR}/puppet/util/subclass_loader.rb
 ${MODRUBY_SITEDIR}/puppet/util/suidmanager.rb
@@ -861,13 +883,13 @@ ${MODRUBY_SITEDIR}/puppet/util/windows.rb
 ${MODRUBY_SITEDIR}/puppet/util/windows/error.rb
 ${MODRUBY_SITEDIR}/puppet/util/windows/file.rb
 ${MODRUBY_SITEDIR}/puppet/util/windows/process.rb
+${MODRUBY_SITEDIR}/puppet/util/windows/registry.rb
 ${MODRUBY_SITEDIR}/puppet/util/windows/security.rb
 ${MODRUBY_SITEDIR}/puppet/util/windows/user.rb
 ${MODRUBY_SITEDIR}/puppet/util/zaml.rb
+${MODRUBY_SITEDIR}/puppet/version.rb
 ${MODRUBY_SITEDIR}/semver.rb
 @man man/man5/puppet.conf.5
-@man man/man8/filebucket.8
-@man man/man8/pi.8
 @man man/man8/puppet-agent.8
 @man man/man8/puppet-apply.8
 @man man/man8/puppet-ca.8
@@ -903,18 +925,6 @@ ${MODRUBY_SITEDIR}/semver.rb
 @man man/man8/puppet-secret_agent.8
 @man man/man8/puppet-status.8
 @man man/man8/puppet.8
-@man man/man8/puppetca.8
-@man man/man8/puppetd.8
-@man man/man8/puppetdoc.8
-@man man/man8/puppetmasterd.8
-@man man/man8/puppetqd.8
-@man man/man8/puppetrun.8
-@man man/man8/ralsh.8
-sbin/puppetca
-sbin/puppetd
-sbin/puppetmasterd
-sbin/puppetqd
-sbin/puppetrun
 ${MODRUBY_RELEXAMPLEDIR}/puppet/
 @sample ${SYSCONFDIR}/puppet/
 @sample ${SYSCONFDIR}/puppet/modules/

sysutils/ruby-puppet/pkg/puppetd.rc

@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $OpenBSD: puppetd.rc,v 1.2 2012/01/18 14:47:05 ajacoutot Exp $
+# $OpenBSD: puppetd.rc,v 1.3 2012/10/28 18:48:45 robert Exp $
 
-daemon="${TRUEPREFIX}/sbin/puppetd"
+daemon="/usr/local/bin/puppet agent"
 
 . /etc/rc.d/rc.subr
 

sysutils/ruby-puppet/pkg/puppetmasterd.rc

@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $OpenBSD: puppetmasterd.rc,v 1.1 2011/03/20 15:46:34 ajacoutot Exp $
+# $OpenBSD: puppetmasterd.rc,v 1.2 2012/10/28 18:48:45 robert Exp $
 
-daemon="${TRUEPREFIX}/sbin/puppetmasterd"
+daemon="/usr/local/bin/puppet master"
 
 . /etc/rc.d/rc.subr