aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sysutils/puppet-devel/Makefile6
-rw-r--r--sysutils/puppet-devel/distinfo6
-rw-r--r--sysutils/puppet-devel/files/patch-2385203
-rw-r--r--sysutils/puppet-devel/files/patch-old_rcd_support25
-rw-r--r--sysutils/puppet-devel/files/puppetd.in12
-rw-r--r--sysutils/puppet-devel/files/puppetmasterd.in12
-rw-r--r--sysutils/puppet-devel/pkg-plist98
-rw-r--r--sysutils/puppet/Makefile6
-rw-r--r--sysutils/puppet/distinfo6
-rw-r--r--sysutils/puppet/files/patch-2385203
-rw-r--r--sysutils/puppet/files/patch-old_rcd_support25
-rw-r--r--sysutils/puppet/files/puppetd.in12
-rw-r--r--sysutils/puppet/files/puppetmasterd.in12
-rw-r--r--sysutils/puppet/pkg-plist98
14 files changed, 608 insertions, 116 deletions
diff --git a/sysutils/puppet-devel/Makefile b/sysutils/puppet-devel/Makefile
index 90832f92877b..e3b1b1c0f8cd 100644
--- a/sysutils/puppet-devel/Makefile
+++ b/sysutils/puppet-devel/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= puppet
-PORTVERSION= 0.22.1
-PORTREVISION= 1
+PORTVERSION= 0.22.3
CATEGORIES= sysutils
MASTER_SITES= http://www.reductivelabs.com/downloads/puppet/
EXTRACT_SUFX= .tgz
@@ -47,8 +46,9 @@ post-install:
.endfor
${RUBY} ${PREFIX}/bin/puppetmasterd \
--confdir=${PREFIX}/etc/${PORTNAME} \
+ --rundir=/var/run \
--genconfig | \
${SED} -e 's/genconfig = true/# genconfig = false/' \
- > ${PREFIX}/etc/${PORTNAME}/${PORTNAME}.conf-dist
+ > ${PREFIX}/etc/${PORTNAME}/puppetmasterd.conf-dist
.include <bsd.port.post.mk>
diff --git a/sysutils/puppet-devel/distinfo b/sysutils/puppet-devel/distinfo
index e794b240c031..e6c5a7906520 100644
--- a/sysutils/puppet-devel/distinfo
+++ b/sysutils/puppet-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (puppet-0.22.1.tgz) = ce1ce40b5dda8c2068aa8c804f0617bf
-SHA256 (puppet-0.22.1.tgz) = c107c3e99b0371f67803c63f9b7c77947fed4fe74782494c9d392ae01fd5bcfe
-SIZE (puppet-0.22.1.tgz) = 543926
+MD5 (puppet-0.22.3.tgz) = da40886077c500c0bac980e7b755b836
+SHA256 (puppet-0.22.3.tgz) = 39ecaca8466f5402e84cb2ce392def6d5d903fa33201de0d2e4816288d860e8a
+SIZE (puppet-0.22.3.tgz) = 629126
diff --git a/sysutils/puppet-devel/files/patch-2385 b/sysutils/puppet-devel/files/patch-2385
new file mode 100644
index 000000000000..7d33b2c1704a
--- /dev/null
+++ b/sysutils/puppet-devel/files/patch-2385
@@ -0,0 +1,203 @@
+http://reductivelabs.com/trac/puppet/changeset/2385
+http://reductivelabs.com/trac/puppet/ticket/565
+Index: test/util/utiltest.rb
+===================================================================
+--- test/util/utiltest.rb (revision 2377)
++++ test/util/utiltest.rb (revision 2385)
+@@ -277,11 +277,15 @@
+ # Now try it with a single quote
+ assert_nothing_raised do
+ output = Puppet::Util.execute([command, "yay'test", "funtest"])
+- # output = Puppet::Util.execute(command)
+-
+ end
+ assert_equal("yay'test\nfuntest\n", output)
+
++ # Now make sure we can squelch output (#565)
++ assert_nothing_raised do
++ output = Puppet::Util.execute([command, "yay'test", "funtest"], :squelch => true)
++ end
++ assert_equal(nil, output)
++
+ # Now test that we correctly fail if the command returns non-zero
+ assert_raise(Puppet::ExecutionFailure) do
+ out = Puppet::Util.execute(["touch", "/no/such/file/could/exist"])
+@@ -289,7 +293,7 @@
+
+ # And that we can tell it not to fail
+ assert_nothing_raised() do
+- out = Puppet::Util.execute(["touch", "/no/such/file/could/exist"], false)
++ out = Puppet::Util.execute(["touch", "/no/such/file/could/exist"], :failonfail => false)
+ end
+
+ if Process.uid == 0
+@@ -298,7 +302,7 @@
+ group = nonrootgroup
+ file = tempfile()
+ assert_nothing_raised do
+- Puppet::Util.execute(["touch", file], true, user.name, group.name)
++ Puppet::Util.execute(["touch", file], :uid => user.name, :gid => group.name)
+ end
+ assert(FileTest.exists?(file), "file was not created")
+ assert_equal(user.uid, File.stat(file).uid, "uid was not set correctly")
+@@ -308,6 +312,24 @@
+ # assert_equal(group.gid, File.stat(file).gid,
+ # "gid was not set correctly")
+ end
++
++ # (#565) Test the case of patricide.
++ patricidecommand = tempfile()
++ File.open(patricidecommand, "w") { |f|
++ f.puts %{#!/bin/bash\n/bin/bash -c 'kill -TERM \$PPID' &;\n while [ 1 ]; do echo -n ''; done;\n}
++ }
++ File.chmod(0755, patricidecommand)
++ assert_nothing_raised do
++ output = Puppet::Util.execute([patricidecommand], :squelch => true)
++ end
++ assert_equal(nil, output)
++ # See what happens if we try and read the pipe to the command...
++ assert_raise(Puppet::ExecutionFailure) do
++ output = Puppet::Util.execute([patricidecommand])
++ end
++ assert_nothing_raised do
++ output = Puppet::Util.execute([patricidecommand], :failonfail => false)
++ end
+ end
+
+ # Check whether execute() accepts strings in addition to arrays.
+Index: lib/puppet/util.rb
+===================================================================
+--- lib/puppet/util.rb (revision 2377)
++++ lib/puppet/util.rb (revision 2385)
+@@ -267,7 +267,8 @@
+ end
+
+ # Execute the desired command, and return the status and output.
+- def execute(command, failonfail = true, uid = nil, gid = nil)
++ # def execute(command, failonfail = true, uid = nil, gid = nil)
++ def execute(command, arguments = {:failonfail => true})
+ if command.is_a?(Array)
+ command = command.flatten.collect { |i| i.to_s }
+ str = command.join(" ")
+@@ -284,30 +285,35 @@
+ Puppet.debug "Executing '%s'" % str
+ end
+
+- if uid
+- uid = Puppet::Util::SUIDManager.convert_xid(:uid, uid)
++ if arguments[:uid]
++ arguments[:uid] = Puppet::Util::SUIDManager.convert_xid(:uid, arguments[:uid])
+ end
+- if gid
+- gid = Puppet::Util::SUIDManager.convert_xid(:gid, gid)
++ if arguments[:gid]
++ arguments[:gid] = Puppet::Util::SUIDManager.convert_xid(:gid, arguments[:gid])
+ end
+
+ @@os ||= Facter.value(:operatingsystem)
+ output = nil
+- IO.popen("-") do |f|
+- if f
+- output = f.read
++ child_pid, child_status = nil
++ # The idea here is to avoid IO#read whenever possible.
++ if arguments[:squelch]
++ child_pid = Kernel.fork
++ if child_pid
++ # Parent process executes this
++ child_status = Process.waitpid2(child_pid)[1]
+ else
++ # Child process executes this
+ begin
+ $stdin.reopen("/dev/null")
+- $stderr.close
+- $stderr = $stdout.dup
+- if gid
+- Process.egid = gid
+- Process.gid = gid unless @@os == "Darwin"
++ $stdout.reopen("/dev/null")
++ $stderr.reopen("/dev/null")
++ if arguments[:gid]
++ Process.egid = arguments[:gid]
++ Process.gid = arguments[:gid] unless @@os == "Darwin"
+ end
+- if uid
+- Process.euid = uid
+- Process.uid = uid unless @@os == "Darwin"
++ if arguments[:uid]
++ Process.euid = arguments[:uid]
++ Process.uid = arguments[:uid] unless @@os == "Darwin"
+ end
+ if command.is_a?(Array)
+ Kernel.exec(*command)
+@@ -317,13 +323,44 @@
+ rescue => detail
+ puts detail.to_s
+ exit!(1)
+- end
+- end
+- end
++ end # begin; rescue
++ end # if child_pid; else
++ else
++ IO.popen("-") do |f|
++ if f
++ # Parent process executes this
++ output = f.read
++ else
++ # Parent process executes this
++ begin
++ $stdin.reopen("/dev/null")
++ $stderr.close
++ $stderr = $stdout.dup
++ if arguments[:gid]
++ Process.egid = arguments[:gid]
++ Process.gid = arguments[:gid] unless @@os == "Darwin"
++ end
++ if arguments[:uid]
++ Process.euid = arguments[:uid]
++ Process.uid = arguments[:uid] unless @@os == "Darwin"
++ end
++ if command.is_a?(Array)
++ Kernel.exec(*command)
++ else
++ Kernel.exec(command)
++ end
++ rescue => detail
++ puts detail.to_s
++ exit!(1)
++ end # begin; rescue
++ end # if f; else
++ end # IO.popen do |f|
++ child_status = $?
++ end # if arguments[:squelch]; else
+
+- if failonfail
+- unless $? == 0
+- raise ExecutionFailure, "Execution of '%s' returned %s: %s" % [str, $?.exitstatus, output]
++ if arguments[:failonfail]
++ unless child_status == 0
++ raise ExecutionFailure, "Execution of '%s' returned %s: %s" % [str, child_status.inspect, output]
+ end
+ end
+
+Index: lib/puppet/provider/service/base.rb
+===================================================================
+--- lib/puppet/provider/service/base.rb (revision 2377)
++++ lib/puppet/provider/service/base.rb (revision 2385)
+@@ -114,12 +114,12 @@
+ # A simple wrapper so execution failures are a bit more informative.
+ def texecute(type, command, fof = true)
+ begin
+- output = execute(command, fof)
++ # #565: Services generally produce no output, so squelch them.
++ execute(command, :failonfail => fof, :squelch => true)
+ rescue Puppet::ExecutionFailure => detail
+ @model.fail "Could not %s %s: %s" % [type, @model.ref, detail]
+ end
+-
+- return output
++ return nil
+ end
+
+ # Use either a specified command or the default for our provider.
diff --git a/sysutils/puppet-devel/files/patch-old_rcd_support b/sysutils/puppet-devel/files/patch-old_rcd_support
new file mode 100644
index 000000000000..fb8d928d2f7e
--- /dev/null
+++ b/sysutils/puppet-devel/files/patch-old_rcd_support
@@ -0,0 +1,25 @@
+Support both /etc/rc.d/daemon and /etc/rc.d/daemon.sh
+http://reductivelabs.com/trac/puppet/ticket/572
+
+--- lib/puppet/provider/service/init.rb.orig Mon Apr 2 17:52:00 2007
++++ lib/puppet/provider/service/init.rb Mon Apr 2 18:01:50 2007
+@@ -114,6 +114,19 @@
+ # if we've gotten this far, we found a valid script
+ return fqname
+ }
++ @model[:path].each { |path|
++ fqname_sh = File.join(path,"#{name}.sh")
++ begin
++ stat = File.stat(fqname_sh)
++ rescue
++ # should probably rescue specific errors...
++ self.debug("Could not find %s.sh in %s" % [name,path])
++ next
++ end
++
++ # if we've gotten this far, we found a valid script
++ return fqname_sh
++ }
+ raise Puppet::Error, "Could not find init script for '%s'" % name
+ end
+
diff --git a/sysutils/puppet-devel/files/puppetd.in b/sysutils/puppet-devel/files/puppetd.in
index 8ad8440cd67c..897da3ccf415 100644
--- a/sysutils/puppet-devel/files/puppetd.in
+++ b/sysutils/puppet-devel/files/puppetd.in
@@ -1,12 +1,13 @@
#!/bin/sh
#
-
+# $FreeBSD$
+#
# PROVIDE: puppetd
# REQUIRE: NETWORK
# Add the following lines to /etc/rc.conf to enable puppetd:
#
-# puppetmasterd_enable="YES"
+# puppetd_enable="YES"
. %%RC_SUBR%%
@@ -14,14 +15,13 @@ name="puppetd"
rcvar=`set_rcvar`
command="%%PREFIX%%/bin/${name}"
-command_interpreter="${prefix}/bin/ruby18"
+command_interpreter="%%PREFIX%%/bin/ruby18"
load_rc_config "$name"
: ${puppetd_enable="NO"}
: ${puppetd_confdir="%%PREFIX%%/etc/puppet"}
-: ${puppetd_pid="/var/run/puppet/${name}.pid"}
-: ${puppetd_flags="--confdir $puppetd_confdir "}
-command_args="$puppetd_flags"
+: ${puppetd_pid="/var/run/${name}.pid"}
+: ${puppetd_flags="--confdir $puppetd_confdir --rundir /var/run"}
pidfile="$puppetd_pid"
run_rc_command "$1"
diff --git a/sysutils/puppet-devel/files/puppetmasterd.in b/sysutils/puppet-devel/files/puppetmasterd.in
index f97dcab3335b..bb8e7370c28f 100644
--- a/sysutils/puppet-devel/files/puppetmasterd.in
+++ b/sysutils/puppet-devel/files/puppetmasterd.in
@@ -1,6 +1,7 @@
-:#!/bin/sh
+#!/bin/sh
+#
+# $FreeBSD$
#
-
# PROVIDE: puppetmasterd
# REQUIRE: NETWORK
@@ -14,14 +15,13 @@ name="puppetmasterd"
rcvar=`set_rcvar`
command="%%PREFIX%%/bin/${name}"
-command_interpreter="${prefix}/bin/ruby18"
+command_interpreter="%%PREFIX%%/bin/ruby18"
load_rc_config "$name"
: ${puppetmasterd_enable="NO"}
: ${puppetmasterd_confdir="%%PREFIX%%/etc/puppet"}
-: ${puppetmasterd_pid="/var/run/puppet/${name}.pid"}
-: ${puppetmasterd_flags="--confdir $puppetmasterd_confdir "}
-command_args="$puppetmasterd_flags"
+: ${puppetmasterd_pid="/var/run/${name}.pid"}
+: ${puppetmasterd_flags="--confdir $puppetmasterd_confdir --rundir /var/run"}
pidfile="$puppetmasterd_pid"
run_rc_command "$1"
diff --git a/sysutils/puppet-devel/pkg-plist b/sysutils/puppet-devel/pkg-plist
index d336aa9679a7..eec32447eede 100644
--- a/sysutils/puppet-devel/pkg-plist
+++ b/sysutils/puppet-devel/pkg-plist
@@ -6,39 +6,28 @@ bin/puppetdoc
bin/puppetrun
bin/puppetmasterd
%%RUBY_SITELIBDIR%%/puppet.rb
+%%RUBY_SITELIBDIR%%/puppet/propertychange.rb
%%RUBY_SITELIBDIR%%/puppet/transportable.rb
%%RUBY_SITELIBDIR%%/puppet/provider.rb
-%%RUBY_SITELIBDIR%%/puppet/statechange.rb
%%RUBY_SITELIBDIR%%/puppet/configuration.rb
-%%RUBY_SITELIBDIR%%/puppet/autoload.rb
+%%RUBY_SITELIBDIR%%/puppet/modules.rb
%%RUBY_SITELIBDIR%%/puppet/error.rb
%%RUBY_SITELIBDIR%%/puppet/parameter.rb
-%%RUBY_SITELIBDIR%%/puppet/config.rb
%%RUBY_SITELIBDIR%%/puppet/daemon.rb
-%%RUBY_SITELIBDIR%%/puppet/server.rb
%%RUBY_SITELIBDIR%%/puppet/transaction.rb
-%%RUBY_SITELIBDIR%%/puppet/loadedfile.rb
-%%RUBY_SITELIBDIR%%/puppet/inifile.rb
%%RUBY_SITELIBDIR%%/puppet/rails.rb
%%RUBY_SITELIBDIR%%/puppet/pgraph.rb
%%RUBY_SITELIBDIR%%/puppet/dsl.rb
-%%RUBY_SITELIBDIR%%/puppet/filetype.rb
%%RUBY_SITELIBDIR%%/puppet/relationship.rb
-%%RUBY_SITELIBDIR%%/puppet/log.rb
%%RUBY_SITELIBDIR%%/puppet/event.rb
-%%RUBY_SITELIBDIR%%/puppet/networkclient.rb
%%RUBY_SITELIBDIR%%/puppet/sslcertificates.rb
%%RUBY_SITELIBDIR%%/puppet/type.rb
-%%RUBY_SITELIBDIR%%/puppet/storage.rb
-%%RUBY_SITELIBDIR%%/puppet/client.rb
%%RUBY_SITELIBDIR%%/puppet/util.rb
%%RUBY_SITELIBDIR%%/puppet/element.rb
-%%RUBY_SITELIBDIR%%/puppet/feature.rb
-%%RUBY_SITELIBDIR%%/puppet/metric.rb
-%%RUBY_SITELIBDIR%%/puppet/suidmanager.rb
%%RUBY_SITELIBDIR%%/puppet/type/parsedtype.rb
%%RUBY_SITELIBDIR%%/puppet/type/cron.rb
%%RUBY_SITELIBDIR%%/puppet/type/sshkey.rb
+%%RUBY_SITELIBDIR%%/puppet/type/property.rb
%%RUBY_SITELIBDIR%%/puppet/type/resources.rb
%%RUBY_SITELIBDIR%%/puppet/type/component.rb
%%RUBY_SITELIBDIR%%/puppet/type/pfilebucket.rb
@@ -50,7 +39,6 @@ bin/puppetmasterd
%%RUBY_SITELIBDIR%%/puppet/type/mount.rb
%%RUBY_SITELIBDIR%%/puppet/type/yumrepo.rb
%%RUBY_SITELIBDIR%%/puppet/type/service.rb
-%%RUBY_SITELIBDIR%%/puppet/type/state.rb
%%RUBY_SITELIBDIR%%/puppet/type/user.rb
%%RUBY_SITELIBDIR%%/puppet/type/host.rb
%%RUBY_SITELIBDIR%%/puppet/type/schedule.rb
@@ -69,18 +57,30 @@ bin/puppetmasterd
%%RUBY_SITELIBDIR%%/puppet/util/warnings.rb
%%RUBY_SITELIBDIR%%/puppet/util/execution.rb
%%RUBY_SITELIBDIR%%/puppet/util/graph.rb
+%%RUBY_SITELIBDIR%%/puppet/util/autoload.rb
%%RUBY_SITELIBDIR%%/puppet/util/docs.rb
+%%RUBY_SITELIBDIR%%/puppet/util/config.rb
+%%RUBY_SITELIBDIR%%/puppet/util/loadedfile.rb
%%RUBY_SITELIBDIR%%/puppet/util/pidlock.rb
+%%RUBY_SITELIBDIR%%/puppet/util/inifile.rb
%%RUBY_SITELIBDIR%%/puppet/util/posix.rb
+%%RUBY_SITELIBDIR%%/puppet/util/filetype.rb
+%%RUBY_SITELIBDIR%%/puppet/util/log.rb
%%RUBY_SITELIBDIR%%/puppet/util/methodhelper.rb
%%RUBY_SITELIBDIR%%/puppet/util/logging.rb
+%%RUBY_SITELIBDIR%%/puppet/util/storage.rb
%%RUBY_SITELIBDIR%%/puppet/util/fileparsing.rb
+%%RUBY_SITELIBDIR%%/puppet/util/subclass_loader.rb
%%RUBY_SITELIBDIR%%/puppet/util/variables.rb
%%RUBY_SITELIBDIR%%/puppet/util/metaid.rb
%%RUBY_SITELIBDIR%%/puppet/util/package.rb
%%RUBY_SITELIBDIR%%/puppet/util/classgen.rb
%%RUBY_SITELIBDIR%%/puppet/util/plist.rb
+%%RUBY_SITELIBDIR%%/puppet/util/feature.rb
%%RUBY_SITELIBDIR%%/puppet/util/errors.rb
+%%RUBY_SITELIBDIR%%/puppet/util/metric.rb
+%%RUBY_SITELIBDIR%%/puppet/util/provider_features.rb
+%%RUBY_SITELIBDIR%%/puppet/util/suidmanager.rb
%%RUBY_SITELIBDIR%%/puppet/util/plist/parser.rb
%%RUBY_SITELIBDIR%%/puppet/util/plist/generator.rb
%%RUBY_SITELIBDIR%%/puppet/util/rails/collection_merger.rb
@@ -138,22 +138,47 @@ bin/puppetmasterd
%%RUBY_SITELIBDIR%%/puppet/rails/external/tagging/acts_as_taggable.rb
%%RUBY_SITELIBDIR%%/puppet/rails/external/tagging/init.rb
%%RUBY_SITELIBDIR%%/puppet/rails/database/schema.rb
+%%RUBY_SITELIBDIR%%/puppet/rails/database/001_add_indexes.rb
%%RUBY_SITELIBDIR%%/puppet/feature/ldap.rb
%%RUBY_SITELIBDIR%%/puppet/feature/rails.rb
%%RUBY_SITELIBDIR%%/puppet/feature/usage.rb
-%%RUBY_SITELIBDIR%%/puppet/client/ca.rb
-%%RUBY_SITELIBDIR%%/puppet/client/reporter.rb
-%%RUBY_SITELIBDIR%%/puppet/client/resource.rb
-%%RUBY_SITELIBDIR%%/puppet/client/file.rb
-%%RUBY_SITELIBDIR%%/puppet/client/master.rb
-%%RUBY_SITELIBDIR%%/puppet/client/log.rb
-%%RUBY_SITELIBDIR%%/puppet/client/runner.rb
-%%RUBY_SITELIBDIR%%/puppet/client/dipper.rb
-%%RUBY_SITELIBDIR%%/puppet/client/status.rb
-%%RUBY_SITELIBDIR%%/puppet/client/proxy.rb
+%%RUBY_SITELIBDIR%%/puppet/network/authconfig.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client_request.rb
+%%RUBY_SITELIBDIR%%/puppet/network/authorization.rb
+%%RUBY_SITELIBDIR%%/puppet/network/server.rb
+%%RUBY_SITELIBDIR%%/puppet/network/rights.rb
+%%RUBY_SITELIBDIR%%/puppet/network/handler.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client.rb
+%%RUBY_SITELIBDIR%%/puppet/network/authstore.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client/ca.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client/resource.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client/report.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client/logger.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client/file.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client/master.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client/runner.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client/dipper.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client/status.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client/proxy.rb
+%%RUBY_SITELIBDIR%%/puppet/network/handler/fileserver.rb
+%%RUBY_SITELIBDIR%%/puppet/network/handler/ca.rb
+%%RUBY_SITELIBDIR%%/puppet/network/handler/resource.rb
+%%RUBY_SITELIBDIR%%/puppet/network/handler/report.rb
+%%RUBY_SITELIBDIR%%/puppet/network/handler/logger.rb
+%%RUBY_SITELIBDIR%%/puppet/network/handler/master.rb
+%%RUBY_SITELIBDIR%%/puppet/network/handler/filebucket.rb
+%%RUBY_SITELIBDIR%%/puppet/network/handler/runner.rb
+%%RUBY_SITELIBDIR%%/puppet/network/handler/status.rb
+%%RUBY_SITELIBDIR%%/puppet/network/server/mongrel.rb
+%%RUBY_SITELIBDIR%%/puppet/network/server/webrick.rb
+%%RUBY_SITELIBDIR%%/puppet/network/xmlrpc/processor.rb
+%%RUBY_SITELIBDIR%%/puppet/network/xmlrpc/server.rb
+%%RUBY_SITELIBDIR%%/puppet/network/xmlrpc/webrick_servlet.rb
+%%RUBY_SITELIBDIR%%/puppet/network/xmlrpc/client.rb
%%RUBY_SITELIBDIR%%/puppet/sslcertificates/ca.rb
%%RUBY_SITELIBDIR%%/puppet/sslcertificates/inventory.rb
%%RUBY_SITELIBDIR%%/puppet/sslcertificates/certificate.rb
+%%RUBY_SITELIBDIR%%/puppet/sslcertificates/support.rb
%%RUBY_SITELIBDIR%%/puppet/parser/parser.rb
%%RUBY_SITELIBDIR%%/puppet/parser/functions.rb
%%RUBY_SITELIBDIR%%/puppet/parser/collector.rb
@@ -187,21 +212,10 @@ bin/puppetmasterd
%%RUBY_SITELIBDIR%%/puppet/parser/resource/param.rb
%%RUBY_SITELIBDIR%%/puppet/parser/resource/reference.rb
%%RUBY_SITELIBDIR%%/puppet/transaction/report.rb
-%%RUBY_SITELIBDIR%%/puppet/server/fileserver.rb
-%%RUBY_SITELIBDIR%%/puppet/server/authconfig.rb
-%%RUBY_SITELIBDIR%%/puppet/server/ca.rb
-%%RUBY_SITELIBDIR%%/puppet/server/rights.rb
-%%RUBY_SITELIBDIR%%/puppet/server/resource.rb
-%%RUBY_SITELIBDIR%%/puppet/server/report.rb
-%%RUBY_SITELIBDIR%%/puppet/server/logger.rb
-%%RUBY_SITELIBDIR%%/puppet/server/master.rb
-%%RUBY_SITELIBDIR%%/puppet/server/filebucket.rb
-%%RUBY_SITELIBDIR%%/puppet/server/runner.rb
-%%RUBY_SITELIBDIR%%/puppet/server/servlet.rb
-%%RUBY_SITELIBDIR%%/puppet/server/authstore.rb
%%RUBY_SITELIBDIR%%/puppet/provider/nameservice.rb
%%RUBY_SITELIBDIR%%/puppet/provider/mount.rb
%%RUBY_SITELIBDIR%%/puppet/provider/parsedfile.rb
+%%RUBY_SITELIBDIR%%/puppet/provider/cron/crontab.rb
%%RUBY_SITELIBDIR%%/puppet/provider/host/parsed.rb
%%RUBY_SITELIBDIR%%/puppet/provider/host/netinfo.rb
%%RUBY_SITELIBDIR%%/puppet/provider/port/parsed.rb
@@ -241,6 +255,12 @@ bin/puppetmasterd
%%RUBY_SITELIBDIR%%/puppet/provider/package/yum.rb
%%RUBY_SITELIBDIR%%/puppet/provider/package/openbsd.rb
%%RUBY_SITELIBDIR%%/puppet/provider/package/blastwave.rb
+@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/cron
+@dirrmtry %%RUBY_SITELIBDIR%%/puppet/network/xmlrpc
+@dirrmtry %%RUBY_SITELIBDIR%%/puppet/network/server
+@dirrmtry %%RUBY_SITELIBDIR%%/puppet/network/handler
+@dirrmtry %%RUBY_SITELIBDIR%%/puppet/network/client
+@dirrmtry %%RUBY_SITELIBDIR%%/puppet/network
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/util/rails
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/util/plist
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/util
@@ -248,7 +268,6 @@ bin/puppetmasterd
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/type
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/transaction
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/sslcertificates
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/server
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/reports
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/rails/external/tagging
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/rails/external
@@ -273,7 +292,6 @@ bin/puppetmasterd
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/external/gratr
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/external/event-loop
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/external
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/client
@dirrmtry %%RUBY_SITELIBDIR%%/puppet
%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
%%PORTDOCS%%%%DOCSDIR%%/TODO
@@ -317,7 +335,7 @@ bin/puppetmasterd
%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/root
%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/code
%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%
-etc/puppet/puppet.conf-dist
+etc/puppet/puppetmasterd.conf-dist
@dirrmtry etc/puppet/ssl
@dirrmtry etc/puppet/manifests
@dirrmtry etc/puppet
diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile
index 90832f92877b..e3b1b1c0f8cd 100644
--- a/sysutils/puppet/Makefile
+++ b/sysutils/puppet/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= puppet
-PORTVERSION= 0.22.1
-PORTREVISION= 1
+PORTVERSION= 0.22.3
CATEGORIES= sysutils
MASTER_SITES= http://www.reductivelabs.com/downloads/puppet/
EXTRACT_SUFX= .tgz
@@ -47,8 +46,9 @@ post-install:
.endfor
${RUBY} ${PREFIX}/bin/puppetmasterd \
--confdir=${PREFIX}/etc/${PORTNAME} \
+ --rundir=/var/run \
--genconfig | \
${SED} -e 's/genconfig = true/# genconfig = false/' \
- > ${PREFIX}/etc/${PORTNAME}/${PORTNAME}.conf-dist
+ > ${PREFIX}/etc/${PORTNAME}/puppetmasterd.conf-dist
.include <bsd.port.post.mk>
diff --git a/sysutils/puppet/distinfo b/sysutils/puppet/distinfo
index e794b240c031..e6c5a7906520 100644
--- a/sysutils/puppet/distinfo
+++ b/sysutils/puppet/distinfo
@@ -1,3 +1,3 @@
-MD5 (puppet-0.22.1.tgz) = ce1ce40b5dda8c2068aa8c804f0617bf
-SHA256 (puppet-0.22.1.tgz) = c107c3e99b0371f67803c63f9b7c77947fed4fe74782494c9d392ae01fd5bcfe
-SIZE (puppet-0.22.1.tgz) = 543926
+MD5 (puppet-0.22.3.tgz) = da40886077c500c0bac980e7b755b836
+SHA256 (puppet-0.22.3.tgz) = 39ecaca8466f5402e84cb2ce392def6d5d903fa33201de0d2e4816288d860e8a
+SIZE (puppet-0.22.3.tgz) = 629126
diff --git a/sysutils/puppet/files/patch-2385 b/sysutils/puppet/files/patch-2385
new file mode 100644
index 000000000000..7d33b2c1704a
--- /dev/null
+++ b/sysutils/puppet/files/patch-2385
@@ -0,0 +1,203 @@
+http://reductivelabs.com/trac/puppet/changeset/2385
+http://reductivelabs.com/trac/puppet/ticket/565
+Index: test/util/utiltest.rb
+===================================================================
+--- test/util/utiltest.rb (revision 2377)
++++ test/util/utiltest.rb (revision 2385)
+@@ -277,11 +277,15 @@
+ # Now try it with a single quote
+ assert_nothing_raised do
+ output = Puppet::Util.execute([command, "yay'test", "funtest"])
+- # output = Puppet::Util.execute(command)
+-
+ end
+ assert_equal("yay'test\nfuntest\n", output)
+
++ # Now make sure we can squelch output (#565)
++ assert_nothing_raised do
++ output = Puppet::Util.execute([command, "yay'test", "funtest"], :squelch => true)
++ end
++ assert_equal(nil, output)
++
+ # Now test that we correctly fail if the command returns non-zero
+ assert_raise(Puppet::ExecutionFailure) do
+ out = Puppet::Util.execute(["touch", "/no/such/file/could/exist"])
+@@ -289,7 +293,7 @@
+
+ # And that we can tell it not to fail
+ assert_nothing_raised() do
+- out = Puppet::Util.execute(["touch", "/no/such/file/could/exist"], false)
++ out = Puppet::Util.execute(["touch", "/no/such/file/could/exist"], :failonfail => false)
+ end
+
+ if Process.uid == 0
+@@ -298,7 +302,7 @@
+ group = nonrootgroup
+ file = tempfile()
+ assert_nothing_raised do
+- Puppet::Util.execute(["touch", file], true, user.name, group.name)
++ Puppet::Util.execute(["touch", file], :uid => user.name, :gid => group.name)
+ end
+ assert(FileTest.exists?(file), "file was not created")
+ assert_equal(user.uid, File.stat(file).uid, "uid was not set correctly")
+@@ -308,6 +312,24 @@
+ # assert_equal(group.gid, File.stat(file).gid,
+ # "gid was not set correctly")
+ end
++
++ # (#565) Test the case of patricide.
++ patricidecommand = tempfile()
++ File.open(patricidecommand, "w") { |f|
++ f.puts %{#!/bin/bash\n/bin/bash -c 'kill -TERM \$PPID' &;\n while [ 1 ]; do echo -n ''; done;\n}
++ }
++ File.chmod(0755, patricidecommand)
++ assert_nothing_raised do
++ output = Puppet::Util.execute([patricidecommand], :squelch => true)
++ end
++ assert_equal(nil, output)
++ # See what happens if we try and read the pipe to the command...
++ assert_raise(Puppet::ExecutionFailure) do
++ output = Puppet::Util.execute([patricidecommand])
++ end
++ assert_nothing_raised do
++ output = Puppet::Util.execute([patricidecommand], :failonfail => false)
++ end
+ end
+
+ # Check whether execute() accepts strings in addition to arrays.
+Index: lib/puppet/util.rb
+===================================================================
+--- lib/puppet/util.rb (revision 2377)
++++ lib/puppet/util.rb (revision 2385)
+@@ -267,7 +267,8 @@
+ end
+
+ # Execute the desired command, and return the status and output.
+- def execute(command, failonfail = true, uid = nil, gid = nil)
++ # def execute(command, failonfail = true, uid = nil, gid = nil)
++ def execute(command, arguments = {:failonfail => true})
+ if command.is_a?(Array)
+ command = command.flatten.collect { |i| i.to_s }
+ str = command.join(" ")
+@@ -284,30 +285,35 @@
+ Puppet.debug "Executing '%s'" % str
+ end
+
+- if uid
+- uid = Puppet::Util::SUIDManager.convert_xid(:uid, uid)
++ if arguments[:uid]
++ arguments[:uid] = Puppet::Util::SUIDManager.convert_xid(:uid, arguments[:uid])
+ end
+- if gid
+- gid = Puppet::Util::SUIDManager.convert_xid(:gid, gid)
++ if arguments[:gid]
++ arguments[:gid] = Puppet::Util::SUIDManager.convert_xid(:gid, arguments[:gid])
+ end
+
+ @@os ||= Facter.value(:operatingsystem)
+ output = nil
+- IO.popen("-") do |f|
+- if f
+- output = f.read
++ child_pid, child_status = nil
++ # The idea here is to avoid IO#read whenever possible.
++ if arguments[:squelch]
++ child_pid = Kernel.fork
++ if child_pid
++ # Parent process executes this
++ child_status = Process.waitpid2(child_pid)[1]
+ else
++ # Child process executes this
+ begin
+ $stdin.reopen("/dev/null")
+- $stderr.close
+- $stderr = $stdout.dup
+- if gid
+- Process.egid = gid
+- Process.gid = gid unless @@os == "Darwin"
++ $stdout.reopen("/dev/null")
++ $stderr.reopen("/dev/null")
++ if arguments[:gid]
++ Process.egid = arguments[:gid]
++ Process.gid = arguments[:gid] unless @@os == "Darwin"
+ end
+- if uid
+- Process.euid = uid
+- Process.uid = uid unless @@os == "Darwin"
++ if arguments[:uid]
++ Process.euid = arguments[:uid]
++ Process.uid = arguments[:uid] unless @@os == "Darwin"
+ end
+ if command.is_a?(Array)
+ Kernel.exec(*command)
+@@ -317,13 +323,44 @@
+ rescue => detail
+ puts detail.to_s
+ exit!(1)
+- end
+- end
+- end
++ end # begin; rescue
++ end # if child_pid; else
++ else
++ IO.popen("-") do |f|
++ if f
++ # Parent process executes this
++ output = f.read
++ else
++ # Parent process executes this
++ begin
++ $stdin.reopen("/dev/null")
++ $stderr.close
++ $stderr = $stdout.dup
++ if arguments[:gid]
++ Process.egid = arguments[:gid]
++ Process.gid = arguments[:gid] unless @@os == "Darwin"
++ end
++ if arguments[:uid]
++ Process.euid = arguments[:uid]
++ Process.uid = arguments[:uid] unless @@os == "Darwin"
++ end
++ if command.is_a?(Array)
++ Kernel.exec(*command)
++ else
++ Kernel.exec(command)
++ end
++ rescue => detail
++ puts detail.to_s
++ exit!(1)
++ end # begin; rescue
++ end # if f; else
++ end # IO.popen do |f|
++ child_status = $?
++ end # if arguments[:squelch]; else
+
+- if failonfail
+- unless $? == 0
+- raise ExecutionFailure, "Execution of '%s' returned %s: %s" % [str, $?.exitstatus, output]
++ if arguments[:failonfail]
++ unless child_status == 0
++ raise ExecutionFailure, "Execution of '%s' returned %s: %s" % [str, child_status.inspect, output]
+ end
+ end
+
+Index: lib/puppet/provider/service/base.rb
+===================================================================
+--- lib/puppet/provider/service/base.rb (revision 2377)
++++ lib/puppet/provider/service/base.rb (revision 2385)
+@@ -114,12 +114,12 @@
+ # A simple wrapper so execution failures are a bit more informative.
+ def texecute(type, command, fof = true)
+ begin
+- output = execute(command, fof)
++ # #565: Services generally produce no output, so squelch them.
++ execute(command, :failonfail => fof, :squelch => true)
+ rescue Puppet::ExecutionFailure => detail
+ @model.fail "Could not %s %s: %s" % [type, @model.ref, detail]
+ end
+-
+- return output
++ return nil
+ end
+
+ # Use either a specified command or the default for our provider.
diff --git a/sysutils/puppet/files/patch-old_rcd_support b/sysutils/puppet/files/patch-old_rcd_support
new file mode 100644
index 000000000000..fb8d928d2f7e
--- /dev/null
+++ b/sysutils/puppet/files/patch-old_rcd_support
@@ -0,0 +1,25 @@
+Support both /etc/rc.d/daemon and /etc/rc.d/daemon.sh
+http://reductivelabs.com/trac/puppet/ticket/572
+
+--- lib/puppet/provider/service/init.rb.orig Mon Apr 2 17:52:00 2007
++++ lib/puppet/provider/service/init.rb Mon Apr 2 18:01:50 2007
+@@ -114,6 +114,19 @@
+ # if we've gotten this far, we found a valid script
+ return fqname
+ }
++ @model[:path].each { |path|
++ fqname_sh = File.join(path,"#{name}.sh")
++ begin
++ stat = File.stat(fqname_sh)
++ rescue
++ # should probably rescue specific errors...
++ self.debug("Could not find %s.sh in %s" % [name,path])
++ next
++ end
++
++ # if we've gotten this far, we found a valid script
++ return fqname_sh
++ }
+ raise Puppet::Error, "Could not find init script for '%s'" % name
+ end
+
diff --git a/sysutils/puppet/files/puppetd.in b/sysutils/puppet/files/puppetd.in
index 8ad8440cd67c..897da3ccf415 100644
--- a/sysutils/puppet/files/puppetd.in
+++ b/sysutils/puppet/files/puppetd.in
@@ -1,12 +1,13 @@
#!/bin/sh
#
-
+# $FreeBSD$
+#
# PROVIDE: puppetd
# REQUIRE: NETWORK
# Add the following lines to /etc/rc.conf to enable puppetd:
#
-# puppetmasterd_enable="YES"
+# puppetd_enable="YES"
. %%RC_SUBR%%
@@ -14,14 +15,13 @@ name="puppetd"
rcvar=`set_rcvar`
command="%%PREFIX%%/bin/${name}"
-command_interpreter="${prefix}/bin/ruby18"
+command_interpreter="%%PREFIX%%/bin/ruby18"
load_rc_config "$name"
: ${puppetd_enable="NO"}
: ${puppetd_confdir="%%PREFIX%%/etc/puppet"}
-: ${puppetd_pid="/var/run/puppet/${name}.pid"}
-: ${puppetd_flags="--confdir $puppetd_confdir "}
-command_args="$puppetd_flags"
+: ${puppetd_pid="/var/run/${name}.pid"}
+: ${puppetd_flags="--confdir $puppetd_confdir --rundir /var/run"}
pidfile="$puppetd_pid"
run_rc_command "$1"
diff --git a/sysutils/puppet/files/puppetmasterd.in b/sysutils/puppet/files/puppetmasterd.in
index f97dcab3335b..bb8e7370c28f 100644
--- a/sysutils/puppet/files/puppetmasterd.in
+++ b/sysutils/puppet/files/puppetmasterd.in
@@ -1,6 +1,7 @@
-:#!/bin/sh
+#!/bin/sh
+#
+# $FreeBSD$
#
-
# PROVIDE: puppetmasterd
# REQUIRE: NETWORK
@@ -14,14 +15,13 @@ name="puppetmasterd"
rcvar=`set_rcvar`
command="%%PREFIX%%/bin/${name}"
-command_interpreter="${prefix}/bin/ruby18"
+command_interpreter="%%PREFIX%%/bin/ruby18"
load_rc_config "$name"
: ${puppetmasterd_enable="NO"}
: ${puppetmasterd_confdir="%%PREFIX%%/etc/puppet"}
-: ${puppetmasterd_pid="/var/run/puppet/${name}.pid"}
-: ${puppetmasterd_flags="--confdir $puppetmasterd_confdir "}
-command_args="$puppetmasterd_flags"
+: ${puppetmasterd_pid="/var/run/${name}.pid"}
+: ${puppetmasterd_flags="--confdir $puppetmasterd_confdir --rundir /var/run"}
pidfile="$puppetmasterd_pid"
run_rc_command "$1"
diff --git a/sysutils/puppet/pkg-plist b/sysutils/puppet/pkg-plist
index d336aa9679a7..eec32447eede 100644
--- a/sysutils/puppet/pkg-plist
+++ b/sysutils/puppet/pkg-plist
@@ -6,39 +6,28 @@ bin/puppetdoc
bin/puppetrun
bin/puppetmasterd
%%RUBY_SITELIBDIR%%/puppet.rb
+%%RUBY_SITELIBDIR%%/puppet/propertychange.rb
%%RUBY_SITELIBDIR%%/puppet/transportable.rb
%%RUBY_SITELIBDIR%%/puppet/provider.rb
-%%RUBY_SITELIBDIR%%/puppet/statechange.rb
%%RUBY_SITELIBDIR%%/puppet/configuration.rb
-%%RUBY_SITELIBDIR%%/puppet/autoload.rb
+%%RUBY_SITELIBDIR%%/puppet/modules.rb
%%RUBY_SITELIBDIR%%/puppet/error.rb
%%RUBY_SITELIBDIR%%/puppet/parameter.rb
-%%RUBY_SITELIBDIR%%/puppet/config.rb
%%RUBY_SITELIBDIR%%/puppet/daemon.rb
-%%RUBY_SITELIBDIR%%/puppet/server.rb
%%RUBY_SITELIBDIR%%/puppet/transaction.rb
-%%RUBY_SITELIBDIR%%/puppet/loadedfile.rb
-%%RUBY_SITELIBDIR%%/puppet/inifile.rb
%%RUBY_SITELIBDIR%%/puppet/rails.rb
%%RUBY_SITELIBDIR%%/puppet/pgraph.rb
%%RUBY_SITELIBDIR%%/puppet/dsl.rb
-%%RUBY_SITELIBDIR%%/puppet/filetype.rb
%%RUBY_SITELIBDIR%%/puppet/relationship.rb
-%%RUBY_SITELIBDIR%%/puppet/log.rb
%%RUBY_SITELIBDIR%%/puppet/event.rb
-%%RUBY_SITELIBDIR%%/puppet/networkclient.rb
%%RUBY_SITELIBDIR%%/puppet/sslcertificates.rb
%%RUBY_SITELIBDIR%%/puppet/type.rb
-%%RUBY_SITELIBDIR%%/puppet/storage.rb
-%%RUBY_SITELIBDIR%%/puppet/client.rb
%%RUBY_SITELIBDIR%%/puppet/util.rb
%%RUBY_SITELIBDIR%%/puppet/element.rb
-%%RUBY_SITELIBDIR%%/puppet/feature.rb
-%%RUBY_SITELIBDIR%%/puppet/metric.rb
-%%RUBY_SITELIBDIR%%/puppet/suidmanager.rb
%%RUBY_SITELIBDIR%%/puppet/type/parsedtype.rb
%%RUBY_SITELIBDIR%%/puppet/type/cron.rb
%%RUBY_SITELIBDIR%%/puppet/type/sshkey.rb
+%%RUBY_SITELIBDIR%%/puppet/type/property.rb
%%RUBY_SITELIBDIR%%/puppet/type/resources.rb
%%RUBY_SITELIBDIR%%/puppet/type/component.rb
%%RUBY_SITELIBDIR%%/puppet/type/pfilebucket.rb
@@ -50,7 +39,6 @@ bin/puppetmasterd
%%RUBY_SITELIBDIR%%/puppet/type/mount.rb
%%RUBY_SITELIBDIR%%/puppet/type/yumrepo.rb
%%RUBY_SITELIBDIR%%/puppet/type/service.rb
-%%RUBY_SITELIBDIR%%/puppet/type/state.rb
%%RUBY_SITELIBDIR%%/puppet/type/user.rb
%%RUBY_SITELIBDIR%%/puppet/type/host.rb
%%RUBY_SITELIBDIR%%/puppet/type/schedule.rb
@@ -69,18 +57,30 @@ bin/puppetmasterd
%%RUBY_SITELIBDIR%%/puppet/util/warnings.rb
%%RUBY_SITELIBDIR%%/puppet/util/execution.rb
%%RUBY_SITELIBDIR%%/puppet/util/graph.rb
+%%RUBY_SITELIBDIR%%/puppet/util/autoload.rb
%%RUBY_SITELIBDIR%%/puppet/util/docs.rb
+%%RUBY_SITELIBDIR%%/puppet/util/config.rb
+%%RUBY_SITELIBDIR%%/puppet/util/loadedfile.rb
%%RUBY_SITELIBDIR%%/puppet/util/pidlock.rb
+%%RUBY_SITELIBDIR%%/puppet/util/inifile.rb
%%RUBY_SITELIBDIR%%/puppet/util/posix.rb
+%%RUBY_SITELIBDIR%%/puppet/util/filetype.rb
+%%RUBY_SITELIBDIR%%/puppet/util/log.rb
%%RUBY_SITELIBDIR%%/puppet/util/methodhelper.rb
%%RUBY_SITELIBDIR%%/puppet/util/logging.rb
+%%RUBY_SITELIBDIR%%/puppet/util/storage.rb
%%RUBY_SITELIBDIR%%/puppet/util/fileparsing.rb
+%%RUBY_SITELIBDIR%%/puppet/util/subclass_loader.rb
%%RUBY_SITELIBDIR%%/puppet/util/variables.rb
%%RUBY_SITELIBDIR%%/puppet/util/metaid.rb
%%RUBY_SITELIBDIR%%/puppet/util/package.rb
%%RUBY_SITELIBDIR%%/puppet/util/classgen.rb
%%RUBY_SITELIBDIR%%/puppet/util/plist.rb
+%%RUBY_SITELIBDIR%%/puppet/util/feature.rb
%%RUBY_SITELIBDIR%%/puppet/util/errors.rb
+%%RUBY_SITELIBDIR%%/puppet/util/metric.rb
+%%RUBY_SITELIBDIR%%/puppet/util/provider_features.rb
+%%RUBY_SITELIBDIR%%/puppet/util/suidmanager.rb
%%RUBY_SITELIBDIR%%/puppet/util/plist/parser.rb
%%RUBY_SITELIBDIR%%/puppet/util/plist/generator.rb
%%RUBY_SITELIBDIR%%/puppet/util/rails/collection_merger.rb
@@ -138,22 +138,47 @@ bin/puppetmasterd
%%RUBY_SITELIBDIR%%/puppet/rails/external/tagging/acts_as_taggable.rb
%%RUBY_SITELIBDIR%%/puppet/rails/external/tagging/init.rb
%%RUBY_SITELIBDIR%%/puppet/rails/database/schema.rb
+%%RUBY_SITELIBDIR%%/puppet/rails/database/001_add_indexes.rb
%%RUBY_SITELIBDIR%%/puppet/feature/ldap.rb
%%RUBY_SITELIBDIR%%/puppet/feature/rails.rb
%%RUBY_SITELIBDIR%%/puppet/feature/usage.rb
-%%RUBY_SITELIBDIR%%/puppet/client/ca.rb
-%%RUBY_SITELIBDIR%%/puppet/client/reporter.rb
-%%RUBY_SITELIBDIR%%/puppet/client/resource.rb
-%%RUBY_SITELIBDIR%%/puppet/client/file.rb
-%%RUBY_SITELIBDIR%%/puppet/client/master.rb
-%%RUBY_SITELIBDIR%%/puppet/client/log.rb
-%%RUBY_SITELIBDIR%%/puppet/client/runner.rb
-%%RUBY_SITELIBDIR%%/puppet/client/dipper.rb
-%%RUBY_SITELIBDIR%%/puppet/client/status.rb
-%%RUBY_SITELIBDIR%%/puppet/client/proxy.rb
+%%RUBY_SITELIBDIR%%/puppet/network/authconfig.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client_request.rb
+%%RUBY_SITELIBDIR%%/puppet/network/authorization.rb
+%%RUBY_SITELIBDIR%%/puppet/network/server.rb
+%%RUBY_SITELIBDIR%%/puppet/network/rights.rb
+%%RUBY_SITELIBDIR%%/puppet/network/handler.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client.rb
+%%RUBY_SITELIBDIR%%/puppet/network/authstore.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client/ca.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client/resource.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client/report.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client/logger.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client/file.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client/master.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client/runner.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client/dipper.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client/status.rb
+%%RUBY_SITELIBDIR%%/puppet/network/client/proxy.rb
+%%RUBY_SITELIBDIR%%/puppet/network/handler/fileserver.rb
+%%RUBY_SITELIBDIR%%/puppet/network/handler/ca.rb
+%%RUBY_SITELIBDIR%%/puppet/network/handler/resource.rb
+%%RUBY_SITELIBDIR%%/puppet/network/handler/report.rb
+%%RUBY_SITELIBDIR%%/puppet/network/handler/logger.rb
+%%RUBY_SITELIBDIR%%/puppet/network/handler/master.rb
+%%RUBY_SITELIBDIR%%/puppet/network/handler/filebucket.rb
+%%RUBY_SITELIBDIR%%/puppet/network/handler/runner.rb
+%%RUBY_SITELIBDIR%%/puppet/network/handler/status.rb
+%%RUBY_SITELIBDIR%%/puppet/network/server/mongrel.rb
+%%RUBY_SITELIBDIR%%/puppet/network/server/webrick.rb
+%%RUBY_SITELIBDIR%%/puppet/network/xmlrpc/processor.rb
+%%RUBY_SITELIBDIR%%/puppet/network/xmlrpc/server.rb
+%%RUBY_SITELIBDIR%%/puppet/network/xmlrpc/webrick_servlet.rb
+%%RUBY_SITELIBDIR%%/puppet/network/xmlrpc/client.rb
%%RUBY_SITELIBDIR%%/puppet/sslcertificates/ca.rb
%%RUBY_SITELIBDIR%%/puppet/sslcertificates/inventory.rb
%%RUBY_SITELIBDIR%%/puppet/sslcertificates/certificate.rb
+%%RUBY_SITELIBDIR%%/puppet/sslcertificates/support.rb
%%RUBY_SITELIBDIR%%/puppet/parser/parser.rb
%%RUBY_SITELIBDIR%%/puppet/parser/functions.rb
%%RUBY_SITELIBDIR%%/puppet/parser/collector.rb
@@ -187,21 +212,10 @@ bin/puppetmasterd
%%RUBY_SITELIBDIR%%/puppet/parser/resource/param.rb
%%RUBY_SITELIBDIR%%/puppet/parser/resource/reference.rb
%%RUBY_SITELIBDIR%%/puppet/transaction/report.rb
-%%RUBY_SITELIBDIR%%/puppet/server/fileserver.rb
-%%RUBY_SITELIBDIR%%/puppet/server/authconfig.rb
-%%RUBY_SITELIBDIR%%/puppet/server/ca.rb
-%%RUBY_SITELIBDIR%%/puppet/server/rights.rb
-%%RUBY_SITELIBDIR%%/puppet/server/resource.rb
-%%RUBY_SITELIBDIR%%/puppet/server/report.rb
-%%RUBY_SITELIBDIR%%/puppet/server/logger.rb
-%%RUBY_SITELIBDIR%%/puppet/server/master.rb
-%%RUBY_SITELIBDIR%%/puppet/server/filebucket.rb
-%%RUBY_SITELIBDIR%%/puppet/server/runner.rb
-%%RUBY_SITELIBDIR%%/puppet/server/servlet.rb
-%%RUBY_SITELIBDIR%%/puppet/server/authstore.rb
%%RUBY_SITELIBDIR%%/puppet/provider/nameservice.rb
%%RUBY_SITELIBDIR%%/puppet/provider/mount.rb
%%RUBY_SITELIBDIR%%/puppet/provider/parsedfile.rb
+%%RUBY_SITELIBDIR%%/puppet/provider/cron/crontab.rb
%%RUBY_SITELIBDIR%%/puppet/provider/host/parsed.rb
%%RUBY_SITELIBDIR%%/puppet/provider/host/netinfo.rb
%%RUBY_SITELIBDIR%%/puppet/provider/port/parsed.rb
@@ -241,6 +255,12 @@ bin/puppetmasterd
%%RUBY_SITELIBDIR%%/puppet/provider/package/yum.rb
%%RUBY_SITELIBDIR%%/puppet/provider/package/openbsd.rb
%%RUBY_SITELIBDIR%%/puppet/provider/package/blastwave.rb
+@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/cron
+@dirrmtry %%RUBY_SITELIBDIR%%/puppet/network/xmlrpc
+@dirrmtry %%RUBY_SITELIBDIR%%/puppet/network/server
+@dirrmtry %%RUBY_SITELIBDIR%%/puppet/network/handler
+@dirrmtry %%RUBY_SITELIBDIR%%/puppet/network/client
+@dirrmtry %%RUBY_SITELIBDIR%%/puppet/network
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/util/rails
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/util/plist
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/util
@@ -248,7 +268,6 @@ bin/puppetmasterd
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/type
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/transaction
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/sslcertificates
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/server
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/reports
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/rails/external/tagging
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/rails/external
@@ -273,7 +292,6 @@ bin/puppetmasterd
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/external/gratr
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/external/event-loop
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/external
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/client
@dirrmtry %%RUBY_SITELIBDIR%%/puppet
%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
%%PORTDOCS%%%%DOCSDIR%%/TODO
@@ -317,7 +335,7 @@ bin/puppetmasterd
%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/root
%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/code
%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%
-etc/puppet/puppet.conf-dist
+etc/puppet/puppetmasterd.conf-dist
@dirrmtry etc/puppet/ssl
@dirrmtry etc/puppet/manifests
@dirrmtry etc/puppet
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 20:44:02 +0000