Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Apr 2007 20:29:44 +0900 (JST)
From:      Tomoyuki Sakurai <cherry@trombik.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/111764: [MAINTAINER] sysutils/puppet: update to 0.22.3
Message-ID:  <200704171129.l3HBTiL9055165@spica.trombik.org>
Resent-Message-ID: <200704171130.l3HBU5T5058549@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         111764
>Category:       ports
>Synopsis:       [MAINTAINER] sysutils/puppet: update to 0.22.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 17 11:30:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Tomoyuki Sakurai
>Release:        FreeBSD 6.0-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD spica.trombik.org 6.0-RELEASE-p2 FreeBSD 6.0-RELEASE-p2 #4: Tue Jan 24 21:43:50 JST 2006
>Description:
- Update to 0.22.3
- fix invalid variable and typos in rc.d script
- add a patch which fixes external command to hang
- support old style rc.d scripts (rc.d/foo and rc.d/foo.sh)

Added file(s):
- files/patch-2385
- files/patch-old_rcd_support

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- puppet-0.22.3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/puppet/Makefile /usr/home/cherry/svn/ports/sysutils/puppet/Makefile
--- /usr/ports/sysutils/puppet/Makefile	Sat Apr 14 07:39:30 2007
+++ /usr/home/cherry/svn/ports/sysutils/puppet/Makefile	Wed Apr  4 16:37:52 2007
@@ -2,12 +2,11 @@
 # Date created:		2007-03-03
 # Whom:			Tomoyuki Sakurai <cherry@trombik.mine.nu>
 #
-# $FreeBSD: ports/sysutils/puppet/Makefile,v 1.2 2007/04/13 13:37:08 lwhsu Exp $
+# $FreeBSD: ports/sysutils/puppet/Makefile,v 1.1 2007/03/06 20:13:56 miwi Exp $
 #
 
 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 @@
 .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 -ruN --exclude=CVS /usr/ports/sysutils/puppet/distinfo /usr/home/cherry/svn/ports/sysutils/puppet/distinfo
--- /usr/ports/sysutils/puppet/distinfo	Wed Mar  7 05:13:56 2007
+++ /usr/home/cherry/svn/ports/sysutils/puppet/distinfo	Fri Mar 30 07:18:40 2007
@@ -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 -ruN --exclude=CVS /usr/ports/sysutils/puppet/files/patch-2385 /usr/home/cherry/svn/ports/sysutils/puppet/files/patch-2385
--- /usr/ports/sysutils/puppet/files/patch-2385	Thu Jan  1 09:00:00 1970
+++ /usr/home/cherry/svn/ports/sysutils/puppet/files/patch-2385	Wed Apr  4 16:47:23 2007
@@ -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 -ruN --exclude=CVS /usr/ports/sysutils/puppet/files/patch-old_rcd_support /usr/home/cherry/svn/ports/sysutils/puppet/files/patch-old_rcd_support
--- /usr/ports/sysutils/puppet/files/patch-old_rcd_support	Thu Jan  1 09:00:00 1970
+++ /usr/home/cherry/svn/ports/sysutils/puppet/files/patch-old_rcd_support	Wed Apr  4 16:46:27 2007
@@ -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 -ruN --exclude=CVS /usr/ports/sysutils/puppet/files/puppetd.in /usr/home/cherry/svn/ports/sysutils/puppet/files/puppetd.in
--- /usr/ports/sysutils/puppet/files/puppetd.in	Fri Apr 13 22:37:08 2007
+++ /usr/home/cherry/svn/ports/sysutils/puppet/files/puppetd.in	Wed Mar 28 22:05:58 2007
@@ -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 @@
 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 -ruN --exclude=CVS /usr/ports/sysutils/puppet/files/puppetmasterd.in /usr/home/cherry/svn/ports/sysutils/puppet/files/puppetmasterd.in
--- /usr/ports/sysutils/puppet/files/puppetmasterd.in	Fri Apr 13 22:37:08 2007
+++ /usr/home/cherry/svn/ports/sysutils/puppet/files/puppetmasterd.in	Wed Apr  4 16:44:50 2007
@@ -1,6 +1,7 @@
-:#!/bin/sh
+#!/bin/sh
+#
+# $FreeBSD$
 #
-
 # PROVIDE: puppetmasterd
 # REQUIRE: NETWORK
 
@@ -14,14 +15,13 @@
 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 -ruN --exclude=CVS /usr/ports/sysutils/puppet/pkg-plist /usr/home/cherry/svn/ports/sysutils/puppet/pkg-plist
--- /usr/ports/sysutils/puppet/pkg-plist	Sat Apr 14 07:39:30 2007
+++ /usr/home/cherry/svn/ports/sysutils/puppet/pkg-plist	Fri Mar 30 07:24:06 2007
@@ -1,4 +1,4 @@
-@comment $FreeBSD: ports/sysutils/puppet/pkg-plist,v 1.2 2007/04/13 13:37:08 lwhsu Exp $
+@comment $FreeBSD: ports/sysutils/puppet/pkg-plist,v 1.1 2007/03/06 20:13:56 miwi Exp $
 bin/puppetd
 bin/puppetca
 bin/puppet
@@ -6,39 +6,28 @@
 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 @@
 %%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 @@
 %%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 @@
 %%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 @@
 %%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 @@
 %%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 @@
 @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 @@
 @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 @@
 %%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
--- puppet-0.22.3.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200704171129.l3HBTiL9055165>