Date: Tue, 18 Mar 2008 02:36:01 +0900 (JST) From: Tomoyuki Sakurai <cherry@trombik.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/121793: [MAINTAINER] sysutils/puppet: update to 0.24.2 Message-ID: <20080317173601.771003C043B@spica.trombik.org> Resent-Message-ID: <200803171800.m2HI01kf091372@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 121793
>Category: ports
>Synopsis: [MAINTAINER] sysutils/puppet: update to 0.24.2
>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: Mon Mar 17 18:00:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Tomoyuki Sakurai
>Release: FreeBSD 6.2-STABLE-200706 i386
>Organization:
>Environment:
System: FreeBSD spica.trombik.org 6.2-STABLE-200706 FreeBSD 6.2-STABLE-200706 #0: Sun Jun 3 13:54:03 UTC
>Description:
- Update to 0.24.2
Added file(s):
- files/patch-category-name
- fix rc.subr scripts
- support 'service { "category/name": }'
- use TMPPLIST
- remove patches already in upstream
sorry for not updating sooner.
Removed file(s):
- files/patch-define_batch
- files/patch-old_rcd_support
- files/patch-package-name-with-dash
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- puppet-0.24.2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/puppet/Makefile /usr/home/cherry/svn/ports/sysutils/puppet-devel/Makefile
--- /usr/ports/sysutils/puppet/Makefile Fri Sep 28 08:19:48 2007
+++ /usr/home/cherry/svn/ports/sysutils/puppet-devel/Makefile Tue Mar 18 02:21:00 2008
@@ -2,11 +2,11 @@
# Date created: 2007-03-03
# Whom: Tomoyuki Sakurai <cherry@trombik.mine.nu>
#
-# $FreeBSD: ports/sysutils/puppet/Makefile,v 1.6 2007/09/27 23:19:48 alepulver Exp $
+# $FreeBSD: ports/sysutils/puppet-devel/Makefile,v 1.5 2007/09/27 23:18:39 alepulver Exp $
#
PORTNAME= puppet
-PORTVERSION= 0.22.4
+PORTVERSION= 0.24.2
CATEGORIES= sysutils
MASTER_SITES= http://www.reductivelabs.com/downloads/puppet/
EXTRACT_SUFX= .tgz
@@ -23,14 +23,14 @@
USE_RUBY= yes
USE_RC_SUBR= puppetmasterd puppetd
-DOCS= CHANGELOG TODO README LICENSE COPYING
+DOCS= CHANGELOG README LICENSE COPYING
.include <bsd.port.pre.mk>
post-patch:
- ${RM} ${WRKSRC}/bin/*.orig || true
${REINPLACE_CMD} -e "s|/etc/puppet|${PREFIX}/etc/puppet|" \
- ${WRKSRC}/lib/puppet/configuration.rb
+ ${WRKSRC}/lib/puppet/reference/configuration.rb \
+ ${WRKSRC}/lib/puppet/defaults.rb
do-install:
cd ${WRKSRC} && \
@@ -51,11 +51,16 @@
.for DIR in ssl manifests
${INSTALL} -d ${PREFIX}/etc/${PORTNAME}/${DIR}
.endfor
- ${RUBY} ${PREFIX}/bin/puppetmasterd \
+ ${RUBY} -I ${RUBY_SITELIBDIR} ${PREFIX}/bin/puppetd \
--confdir=${PREFIX}/etc/${PORTNAME} \
- --rundir=/var/run \
--genconfig | \
${SED} -e 's/genconfig = true/# genconfig = false/' \
- > ${PREFIX}/etc/${PORTNAME}/puppetmasterd.conf-dist
+ > ${PREFIX}/etc/${PORTNAME}/puppet.conf-dist
+ @${ECHO} ${RUBY_SITELIBDIR}/puppet.rb | \
+ ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+ @${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type f | \
+ ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+ @${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type d | ${SORT} -r | \
+ ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/sysutils/puppet/distinfo /usr/home/cherry/svn/ports/sysutils/puppet-devel/distinfo
--- /usr/ports/sysutils/puppet/distinfo Sun May 27 20:31:25 2007
+++ /usr/home/cherry/svn/ports/sysutils/puppet-devel/distinfo Tue Mar 18 02:21:00 2008
@@ -1,3 +1,3 @@
-MD5 (puppet-0.22.4.tgz) = 9bb853104f2616c7f2c8fa4e2f39b537
-SHA256 (puppet-0.22.4.tgz) = 7b26b50711c89ca1e1c12967a363c6f0bc6c04ddcd741358f74c107d04352042
-SIZE (puppet-0.22.4.tgz) = 642077
+MD5 (puppet-0.24.2.tgz) = 8f6533c8cbd1b738089671929db05c66
+SHA256 (puppet-0.24.2.tgz) = 540d339e3ef6cc430ac6e005d011ff08be3662fbd90925e361a78e813452fd4b
+SIZE (puppet-0.24.2.tgz) = 648607
diff -ruN --exclude=CVS /usr/ports/sysutils/puppet/files/patch-category-name /usr/home/cherry/svn/ports/sysutils/puppet-devel/files/patch-category-name
--- /usr/ports/sysutils/puppet/files/patch-category-name Thu Jan 1 09:00:00 1970
+++ /usr/home/cherry/svn/ports/sysutils/puppet-devel/files/patch-category-name Tue Mar 18 02:21:00 2008
@@ -0,0 +1,27 @@
+Allow portorigin_glob in package type.
+
+package { "category/name": foo => bar }
+
+Without it, you cannot install "mail/postfix".
+
+"ports_glob postfix" matches multiple ports
+"ports_glob postfix22" doesn't march any port
+"ports_glob postfix-current" marches "mail/postfix-current"
+
+--- lib/puppet/provider/package/ports.rb-orig 2007-12-11 09:24:53.000000000 +0900
++++ lib/puppet/provider/package/ports.rb 2008-03-18 00:18:12.000000000 +0900
+@@ -73,8 +73,13 @@
+ end
+
+ def query
++ packagename_only = ""
++ if self.name =~ /\/(.*)/
++ # handle "category/name"
++ packagename_only = $1
++ end
+ self.class.instances.each do |instance|
+- if instance.name == self.name
++ if instance.name == self.name || instance.name == packagename_only
+ return instance.properties
+ end
+ end
diff -ruN --exclude=CVS /usr/ports/sysutils/puppet/files/patch-define_batch /usr/home/cherry/svn/ports/sysutils/puppet-devel/files/patch-define_batch
--- /usr/ports/sysutils/puppet/files/patch-define_batch Sun May 27 20:31:25 2007
+++ /usr/home/cherry/svn/ports/sysutils/puppet-devel/files/patch-define_batch Thu Jan 1 09:00:00 1970
@@ -1,13 +0,0 @@
-always define PATCH. without it, puppetd hangs when upgrading INTERACTIVE port.
-http://reductivelabs.com/trac/puppet/ticket/624
---- lib/puppet/provider/package/ports.rb.orig Tue May 8 14:55:34 2007
-+++ lib/puppet/provider/package/ports.rb Tue May 8 14:55:57 2007
-@@ -19,7 +19,7 @@
- # -p: create a package
- # -N: install if the package is missing, otherwise upgrade
- # -P: prefer binary packages
-- cmd = %w{-p -N -P} << @model[:name]
-+ cmd = %w{-p -N -P -M BATCH=yes} << @model[:name]
-
- output = portupgrade(*cmd)
- if output =~ /\*\* No such /
diff -ruN --exclude=CVS /usr/ports/sysutils/puppet/files/patch-old_rcd_support /usr/home/cherry/svn/ports/sysutils/puppet-devel/files/patch-old_rcd_support
--- /usr/ports/sysutils/puppet/files/patch-old_rcd_support Wed Apr 18 04:41:20 2007
+++ /usr/home/cherry/svn/ports/sysutils/puppet-devel/files/patch-old_rcd_support Thu Jan 1 09:00:00 1970
@@ -1,25 +0,0 @@
-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/patch-package-name-with-dash /usr/home/cherry/svn/ports/sysutils/puppet-devel/files/patch-package-name-with-dash
--- /usr/ports/sysutils/puppet/files/patch-package-name-with-dash Sun May 27 20:31:25 2007
+++ /usr/home/cherry/svn/ports/sysutils/puppet-devel/files/patch-package-name-with-dash Thu Jan 1 09:00:00 1970
@@ -1,13 +0,0 @@
-support package that contains '-' in its name, like syslog-ng
-http://reductivelabs.com/trac/puppet/ticket/628
---- lib/puppet/provider/package/ports.rb.orig Wed May 9 17:12:39 2007
-+++ lib/puppet/provider/package/ports.rb Wed May 9 17:13:57 2007
-@@ -47,7 +47,7 @@
- match = $2
- info = $3
-
-- unless pkgstuff =~ /^(\w+)-([0-9].+)$/
-+ unless pkgstuff =~ /^(\S+)-([^-\s]+)$/
- raise Puppet::PackageError,
- "Could not match package info '%s'" % pkgstuff
- end
diff -ruN --exclude=CVS /usr/ports/sysutils/puppet/files/puppetd.in /usr/home/cherry/svn/ports/sysutils/puppet-devel/files/puppetd.in
--- /usr/ports/sysutils/puppet/files/puppetd.in Sun May 27 20:31:25 2007
+++ /usr/home/cherry/svn/ports/sysutils/puppet-devel/files/puppetd.in Tue Mar 18 02:21:00 2008
@@ -19,9 +19,9 @@
load_rc_config "$name"
: ${puppetd_enable="NO"}
-: ${puppetd_confdir="%%PREFIX%%/etc/puppet"}
: ${puppetd_pid="/var/run/${name}.pid"}
-: ${puppetd_flags="--confdir $puppetd_confdir --rundir /var/run"}
+: ${puppetd_config="%%PREFIX%%/etc/puppet.conf"}
+: ${puppetd_flags="--config $puppetd_config"}
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-devel/files/puppetmasterd.in
--- /usr/ports/sysutils/puppet/files/puppetmasterd.in Sun May 27 20:31:25 2007
+++ /usr/home/cherry/svn/ports/sysutils/puppet-devel/files/puppetmasterd.in Tue Mar 18 02:21:00 2008
@@ -37,9 +37,10 @@
load_rc_config "$name"
: ${puppetmasterd_enable="NO"}
-: ${puppetmasterd_confdir="%%PREFIX%%/etc/puppet"}
: ${puppetmasterd_pid="/var/run/${name}.pid"}
-: ${puppetmasterd_flags="--confdir $puppetmasterd_confdir --rundir /var/run"}
+: ${puppetmasterd_config="/usr/local/etc/puppet.conf"}
+: ${puppetmasterd_flags="--config $puppetmasterd_config"}
+
pidfile="$puppetmasterd_pid"
run_rc_command "$1"
diff -ruN --exclude=CVS /usr/ports/sysutils/puppet/pkg-plist /usr/home/cherry/svn/ports/sysutils/puppet-devel/pkg-plist
--- /usr/ports/sysutils/puppet/pkg-plist Sun May 27 20:31:25 2007
+++ /usr/home/cherry/svn/ports/sysutils/puppet-devel/pkg-plist Tue Mar 18 02:21:59 2008
@@ -1,312 +1,23 @@
@comment $FreeBSD: ports/sysutils/puppet/pkg-plist,v 1.4 2007/05/27 11:31:25 miwi Exp $
+bin/filebucket
bin/puppetd
bin/puppetca
bin/puppet
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/configuration.rb
-%%RUBY_SITELIBDIR%%/puppet/modules.rb
-%%RUBY_SITELIBDIR%%/puppet/error.rb
-%%RUBY_SITELIBDIR%%/puppet/parameter.rb
-%%RUBY_SITELIBDIR%%/puppet/daemon.rb
-%%RUBY_SITELIBDIR%%/puppet/transaction.rb
-%%RUBY_SITELIBDIR%%/puppet/rails.rb
-%%RUBY_SITELIBDIR%%/puppet/pgraph.rb
-%%RUBY_SITELIBDIR%%/puppet/dsl.rb
-%%RUBY_SITELIBDIR%%/puppet/relationship.rb
-%%RUBY_SITELIBDIR%%/puppet/event.rb
-%%RUBY_SITELIBDIR%%/puppet/sslcertificates.rb
-%%RUBY_SITELIBDIR%%/puppet/type.rb
-%%RUBY_SITELIBDIR%%/puppet/util.rb
-%%RUBY_SITELIBDIR%%/puppet/element.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
-%%RUBY_SITELIBDIR%%/puppet/type/group.rb
-%%RUBY_SITELIBDIR%%/puppet/type/notify.rb
-%%RUBY_SITELIBDIR%%/puppet/type/zone.rb
-%%RUBY_SITELIBDIR%%/puppet/type/tidy.rb
-%%RUBY_SITELIBDIR%%/puppet/type/exec.rb
-%%RUBY_SITELIBDIR%%/puppet/type/mount.rb
-%%RUBY_SITELIBDIR%%/puppet/type/yumrepo.rb
-%%RUBY_SITELIBDIR%%/puppet/type/service.rb
-%%RUBY_SITELIBDIR%%/puppet/type/user.rb
-%%RUBY_SITELIBDIR%%/puppet/type/host.rb
-%%RUBY_SITELIBDIR%%/puppet/type/schedule.rb
-%%RUBY_SITELIBDIR%%/puppet/type/package.rb
-%%RUBY_SITELIBDIR%%/puppet/type/port.rb
-%%RUBY_SITELIBDIR%%/puppet/type/pfile.rb
-%%RUBY_SITELIBDIR%%/puppet/type/pfile/target.rb
-%%RUBY_SITELIBDIR%%/puppet/type/pfile/group.rb
-%%RUBY_SITELIBDIR%%/puppet/type/pfile/content.rb
-%%RUBY_SITELIBDIR%%/puppet/type/pfile/checksum.rb
-%%RUBY_SITELIBDIR%%/puppet/type/pfile/mode.rb
-%%RUBY_SITELIBDIR%%/puppet/type/pfile/source.rb
-%%RUBY_SITELIBDIR%%/puppet/type/pfile/type.rb
-%%RUBY_SITELIBDIR%%/puppet/type/pfile/ensure.rb
-%%RUBY_SITELIBDIR%%/puppet/type/pfile/owner.rb
-%%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
-%%RUBY_SITELIBDIR%%/puppet/external/gratr.rb
-%%RUBY_SITELIBDIR%%/puppet/external/lock.rb
-%%RUBY_SITELIBDIR%%/puppet/external/event-loop.rb
-%%RUBY_SITELIBDIR%%/puppet/external/base64.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/rdot.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/graph.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/common.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/edge.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/undirected_graph.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/labels.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/comparability.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/graph_api.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/strong_components.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/dot.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/digraph_distance.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/search.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/base.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/digraph.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/maximum_flow.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/biconnected.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/adjacency_graph.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/import.rb
-%%RUBY_SITELIBDIR%%/puppet/external/gratr/chinese_postman.rb
-%%RUBY_SITELIBDIR%%/puppet/external/event-loop/better-definers.rb
-%%RUBY_SITELIBDIR%%/puppet/external/event-loop/event-loop.rb
-%%RUBY_SITELIBDIR%%/puppet/external/event-loop/signal-system.rb
-%%RUBY_SITELIBDIR%%/puppet/metatype/providers.rb
-%%RUBY_SITELIBDIR%%/puppet/metatype/evaluation.rb
-%%RUBY_SITELIBDIR%%/puppet/metatype/manager.rb
-%%RUBY_SITELIBDIR%%/puppet/metatype/tags.rb
-%%RUBY_SITELIBDIR%%/puppet/metatype/attributes.rb
-%%RUBY_SITELIBDIR%%/puppet/metatype/closure.rb
-%%RUBY_SITELIBDIR%%/puppet/metatype/schedules.rb
-%%RUBY_SITELIBDIR%%/puppet/metatype/instances.rb
-%%RUBY_SITELIBDIR%%/puppet/metatype/metaparams.rb
-%%RUBY_SITELIBDIR%%/puppet/metatype/container.rb
-%%RUBY_SITELIBDIR%%/puppet/metatype/relationships.rb
-%%RUBY_SITELIBDIR%%/puppet/reports/tagmail.rb
-%%RUBY_SITELIBDIR%%/puppet/reports/rrdgraph.rb
-%%RUBY_SITELIBDIR%%/puppet/reports/log.rb
-%%RUBY_SITELIBDIR%%/puppet/reports/store.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/source_file.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/resource.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/fact_name.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/fact_value.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/param_name.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/host.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/param_value.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/puppet_class.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/external/tagging/tag.rb
-%%RUBY_SITELIBDIR%%/puppet/rails/external/tagging/tagging.rb
-%%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/base.rb
-%%RUBY_SITELIBDIR%%/puppet/feature/rails.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
-%%RUBY_SITELIBDIR%%/puppet/parser/resource.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/scope.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/lexer.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/interpreter.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/templatewrapper.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/resourceref.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/resourceparam.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/hostclass.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/leaf.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/astarray.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/component.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/resourceoverride.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/function.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/else.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/vardef.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/selector.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/caseopt.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/collection.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/casestatement.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/node.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/ifstatement.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/resourcedefaults.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/tag.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/collexpr.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/branch.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/ast/resourcedef.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/resource/param.rb
-%%RUBY_SITELIBDIR%%/puppet/parser/resource/reference.rb
-%%RUBY_SITELIBDIR%%/puppet/transaction/report.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
-%%RUBY_SITELIBDIR%%/puppet/provider/user/pw.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/user/useradd.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/user/netinfo.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/zone/solaris.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/group/pw.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/group/netinfo.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/group/groupadd.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/mount/parsed.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/mount/netinfo.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/service/debian.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/service/redhat.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/service/smf.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/service/gentoo.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/service/base.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/service/init.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/nameservice/pw.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/nameservice/objectadd.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/nameservice/netinfo.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/sshkey/parsed.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/up2date.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/portage.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/dpkg.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/pkgdmg.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/freebsd.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/sunfreeware.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/ports.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/apt.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/aptrpm.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/apple.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/gem.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/aptitude.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/rpm.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/darwinport.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/sun.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/yum.rb
-%%RUBY_SITELIBDIR%%/puppet/provider/package/rug.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
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/type/pfile
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/type
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/transaction
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/sslcertificates
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/reports
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/rails/external/tagging
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/rails/external
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/rails/database
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/rails
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/zone
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/user
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/sshkey
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/service
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/port
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/package
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/nameservice
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/mount
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/host
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider/group
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/provider
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/parser/resource
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/parser/ast
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/parser
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/metatype
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/feature
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/external/gratr
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/external/event-loop
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet/external
-@dirrmtry %%RUBY_SITELIBDIR%%/puppet
+bin/ralsh
%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTDOCS%%%%EXAMPLESDIR%%/root/bin/sleeper
%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/init.d/sleeper
-%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/puppetd.conf
%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/fileserver.conf
-%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/puppetmasterd.conf
%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/namespaceauth.conf
%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/tagmail.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/puppet.conf
%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/otherfile
%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/configfile
%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/debian-passwd
@@ -330,6 +41,23 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/code/relationships
%%PORTDOCS%%%%EXAMPLESDIR%%/code/importing
%%PORTDOCS%%%%EXAMPLESDIR%%/code/one
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/modules/sample-module/templates/sample.erb
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/modules/sample-module/manifests/init.pp
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/modules/sample-module/README.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/modules/sample-module.pp
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/mac_netinfo.pp
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/mac_pkgdmg.pp
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/mac_dscl_revert.pp
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/mac_dscl.pp
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/code/modules/sample-module/lib/puppet/parser/functions
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/code/modules/sample-module/lib/puppet/parser
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/code/modules/sample-module/lib/puppet
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/code/modules/sample-module/lib
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/code/modules/sample-module/templates
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/code/modules/sample-module/manifests
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/code/modules/sample-module
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/code/modules
%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/root/bin
%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/root/etc/init.d
%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/root/etc/puppet
@@ -337,7 +65,7 @@
%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/root
%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/code
%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%
-etc/puppet/puppetmasterd.conf-dist
+etc/puppet/puppet.conf-dist
@dirrmtry etc/puppet/ssl
@dirrmtry etc/puppet/manifests
@dirrmtry etc/puppet
--- puppet-0.24.2.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?20080317173601.771003C043B>