ports/115236: update port: sysutils/puppet

Russell Jackson raj at csub.edu
Mon Aug 6 07:30:02 UTC 2007 

>Number:         115236
>Category:       ports
>Synopsis:       update port: sysutils/puppet
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 06 07:30:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Russell Jackson
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
CSU, Bakersfield
>Environment:
System: FreeBSD cserv65.csub.edu 6.2-STABLE FreeBSD 6.2-STABLE #0: Wed Feb 28 14:41:14 PST 2007 raj at cserv65.csub.edu:/usr/src/sys/i386/compile/CSERV65 i386
>Description:
Update port from puppet 0.22.4 to 0.23.0
>How-To-Repeat:
>Fix:

New files:
	puppet/files/patch-provider_ports

Removed files:
	puppet/files/patch-define_batch
	puppet/files/patch-package-name-with-dash

diff -ruN puppet/Makefile puppet-new/Makefile
--- puppet/Makefile	Sun May 27 04:31:25 2007
+++ puppet-new/Makefile	Sun Aug  5 23:35:34 2007
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	puppet
-PORTVERSION=	0.22.4
+PORTVERSION=	0.23.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.reductivelabs.com/downloads/puppet/
 EXTRACT_SUFX=	.tgz
@@ -21,12 +21,13 @@
 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
 
 do-install:
 	cd ${WRKSRC} && \
@@ -52,6 +53,6 @@
 		--rundir=/var/run \
 		--genconfig | \
 		${SED} -e 's/genconfig = true/# genconfig = false/' \
-		> ${PREFIX}/etc/${PORTNAME}/puppetmasterd.conf-dist
+		> ${PREFIX}/etc/${PORTNAME}/puppet.conf-dist
 
 .include <bsd.port.post.mk>
diff -ruN puppet/distinfo puppet-new/distinfo
--- puppet/distinfo	Sun May 27 04:31:25 2007
+++ puppet-new/distinfo	Sun Aug  5 21:18:19 2007
@@ -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.23.0.tgz) = c43342d7d24f1fe881ec97b59e7ea02d
+SHA256 (puppet-0.23.0.tgz) = cd6959815e08ebc5e24cc49acefa4d4c5f4b277a0e75498d0ec48a4229c8ee4a
+SIZE (puppet-0.23.0.tgz) = 670293
diff -ruN puppet/files/patch-define_batch puppet-new/files/patch-define_batch
--- puppet/files/patch-define_batch	Sun May 27 04:31:25 2007
+++ puppet-new/files/patch-define_batch	Wed Dec 31 16:00:00 1969
@@ -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 puppet/files/patch-package-name-with-dash puppet-new/files/patch-package-name-with-dash
--- puppet/files/patch-package-name-with-dash	Sun May 27 04:31:25 2007
+++ puppet-new/files/patch-package-name-with-dash	Wed Dec 31 16:00:00 1969
@@ -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 puppet/files/patch-provider_ports puppet-new/files/patch-provider_ports
--- puppet/files/patch-provider_ports	Wed Dec 31 16:00:00 1969
+++ puppet-new/files/patch-provider_ports	Sun Aug  5 23:13:02 2007
@@ -0,0 +1,15 @@
+--- lib/puppet/provider/package/ports.rb.orig	Tue Jun 19 16:07:35 2007
++++ lib/puppet/provider/package/ports.rb	Sun Aug  5 23:10:36 2007
+@@ -17,11 +17,10 @@
+     end
+ 
+     def install
+-        # -p: create a package
+         # -N: install if the package is missing, otherwise upgrade
+         # -P: prefer binary packages
+         # -M: yes, we're a batch, so don't ask any questions
+-        cmd = %w{-p -N -P  -M BATCH=yes} << @resource[:name]
++        cmd = %w{-N -P  -M BATCH=yes} << @resource[:name]
+ 
+         output = portupgrade(*cmd)
+         if output =~ /\*\* No such /
diff -ruN puppet/pkg-plist puppet-new/pkg-plist
--- puppet/pkg-plist	Sun Aug  5 21:49:53 2007
+++ puppet-new/pkg-plist	Sun Aug  5 23:40:09 2007
@@ -1,13 +1,14 @@
+bin/filebucket
 bin/puppet
 bin/puppetca
 bin/puppetd
 bin/puppetdoc
 bin/puppetmasterd
 bin/puppetrun
-etc/puppet/puppetmasterd.conf-dist
-etc/rc.d/puppetd
-etc/rc.d/puppetmasterd
+bin/ralsh
+etc/puppet/puppet.conf-dist
 lib/ruby/site_ruby/1.8/puppet.rb
+lib/ruby/site_ruby/1.8/puppet/config_stores/rest.rb
 lib/ruby/site_ruby/1.8/puppet/configuration.rb
 lib/ruby/site_ruby/1.8/puppet/daemon.rb
 lib/ruby/site_ruby/1.8/puppet/dsl.rb
@@ -40,6 +41,7 @@
 lib/ruby/site_ruby/1.8/puppet/external/gratr/strong_components.rb
 lib/ruby/site_ruby/1.8/puppet/external/gratr/undirected_graph.rb
 lib/ruby/site_ruby/1.8/puppet/external/lock.rb
+lib/ruby/site_ruby/1.8/puppet/fact_stores/yaml.rb
 lib/ruby/site_ruby/1.8/puppet/feature/base.rb
 lib/ruby/site_ruby/1.8/puppet/feature/rails.rb
 lib/ruby/site_ruby/1.8/puppet/metatype/attributes.rb
@@ -61,7 +63,6 @@
 lib/ruby/site_ruby/1.8/puppet/network/client/ca.rb
 lib/ruby/site_ruby/1.8/puppet/network/client/dipper.rb
 lib/ruby/site_ruby/1.8/puppet/network/client/file.rb
-lib/ruby/site_ruby/1.8/puppet/network/client/logger.rb
 lib/ruby/site_ruby/1.8/puppet/network/client/master.rb
 lib/ruby/site_ruby/1.8/puppet/network/client/proxy.rb
 lib/ruby/site_ruby/1.8/puppet/network/client/report.rb
@@ -71,9 +72,9 @@
 lib/ruby/site_ruby/1.8/puppet/network/client_request.rb
 lib/ruby/site_ruby/1.8/puppet/network/handler.rb
 lib/ruby/site_ruby/1.8/puppet/network/handler/ca.rb
+lib/ruby/site_ruby/1.8/puppet/network/handler/facts.rb
 lib/ruby/site_ruby/1.8/puppet/network/handler/filebucket.rb
 lib/ruby/site_ruby/1.8/puppet/network/handler/fileserver.rb
-lib/ruby/site_ruby/1.8/puppet/network/handler/logger.rb
 lib/ruby/site_ruby/1.8/puppet/network/handler/master.rb
 lib/ruby/site_ruby/1.8/puppet/network/handler/report.rb
 lib/ruby/site_ruby/1.8/puppet/network/handler/resource.rb
@@ -136,6 +137,8 @@
 lib/ruby/site_ruby/1.8/puppet/provider/nameservice/netinfo.rb
 lib/ruby/site_ruby/1.8/puppet/provider/nameservice/objectadd.rb
 lib/ruby/site_ruby/1.8/puppet/provider/nameservice/pw.rb
+lib/ruby/site_ruby/1.8/puppet/provider/package.rb
+lib/ruby/site_ruby/1.8/puppet/provider/package/appdmg.rb
 lib/ruby/site_ruby/1.8/puppet/provider/package/apple.rb
 lib/ruby/site_ruby/1.8/puppet/provider/package/apt.rb
 lib/ruby/site_ruby/1.8/puppet/provider/package/aptitude.rb
@@ -143,6 +146,7 @@
 lib/ruby/site_ruby/1.8/puppet/provider/package/blastwave.rb
 lib/ruby/site_ruby/1.8/puppet/provider/package/darwinport.rb
 lib/ruby/site_ruby/1.8/puppet/provider/package/dpkg.rb
+lib/ruby/site_ruby/1.8/puppet/provider/package/fink.rb
 lib/ruby/site_ruby/1.8/puppet/provider/package/freebsd.rb
 lib/ruby/site_ruby/1.8/puppet/provider/package/gem.rb
 lib/ruby/site_ruby/1.8/puppet/provider/package/openbsd.rb
@@ -154,6 +158,7 @@
 lib/ruby/site_ruby/1.8/puppet/provider/package/sun.rb
 lib/ruby/site_ruby/1.8/puppet/provider/package/sunfreeware.rb
 lib/ruby/site_ruby/1.8/puppet/provider/package/up2date.rb
+lib/ruby/site_ruby/1.8/puppet/provider/package/urpmi.rb
 lib/ruby/site_ruby/1.8/puppet/provider/package/yum.rb
 lib/ruby/site_ruby/1.8/puppet/provider/parsedfile.rb
 lib/ruby/site_ruby/1.8/puppet/provider/port/parsed.rb
@@ -169,7 +174,6 @@
 lib/ruby/site_ruby/1.8/puppet/provider/user/useradd.rb
 lib/ruby/site_ruby/1.8/puppet/provider/zone/solaris.rb
 lib/ruby/site_ruby/1.8/puppet/rails.rb
-lib/ruby/site_ruby/1.8/puppet/rails/database/001_add_indexes.rb
 lib/ruby/site_ruby/1.8/puppet/rails/database/schema.rb
 lib/ruby/site_ruby/1.8/puppet/rails/external/tagging/acts_as_taggable.rb
 lib/ruby/site_ruby/1.8/puppet/rails/external/tagging/init.rb
@@ -181,8 +185,16 @@
 lib/ruby/site_ruby/1.8/puppet/rails/param_name.rb
 lib/ruby/site_ruby/1.8/puppet/rails/param_value.rb
 lib/ruby/site_ruby/1.8/puppet/rails/puppet_class.rb
+lib/ruby/site_ruby/1.8/puppet/rails/puppet_tag.rb
 lib/ruby/site_ruby/1.8/puppet/rails/resource.rb
+lib/ruby/site_ruby/1.8/puppet/rails/resource_tag.rb
 lib/ruby/site_ruby/1.8/puppet/rails/source_file.rb
+lib/ruby/site_ruby/1.8/puppet/reference/configuration.rb
+lib/ruby/site_ruby/1.8/puppet/reference/function.rb
+lib/ruby/site_ruby/1.8/puppet/reference/network.rb
+lib/ruby/site_ruby/1.8/puppet/reference/providers.rb
+lib/ruby/site_ruby/1.8/puppet/reference/report.rb
+lib/ruby/site_ruby/1.8/puppet/reference/type.rb
 lib/ruby/site_ruby/1.8/puppet/relationship.rb
 lib/ruby/site_ruby/1.8/puppet/reports/log.rb
 lib/ruby/site_ruby/1.8/puppet/reports/rrdgraph.rb
@@ -205,7 +217,6 @@
 lib/ruby/site_ruby/1.8/puppet/type/mount.rb
 lib/ruby/site_ruby/1.8/puppet/type/notify.rb
 lib/ruby/site_ruby/1.8/puppet/type/package.rb
-lib/ruby/site_ruby/1.8/puppet/type/parsedtype.rb
 lib/ruby/site_ruby/1.8/puppet/type/pfile.rb
 lib/ruby/site_ruby/1.8/puppet/type/pfile/checksum.rb
 lib/ruby/site_ruby/1.8/puppet/type/pfile/content.rb
@@ -231,14 +242,17 @@
 lib/ruby/site_ruby/1.8/puppet/util/autoload.rb
 lib/ruby/site_ruby/1.8/puppet/util/classgen.rb
 lib/ruby/site_ruby/1.8/puppet/util/config.rb
+lib/ruby/site_ruby/1.8/puppet/util/config_store.rb
 lib/ruby/site_ruby/1.8/puppet/util/docs.rb
 lib/ruby/site_ruby/1.8/puppet/util/errors.rb
 lib/ruby/site_ruby/1.8/puppet/util/execution.rb
+lib/ruby/site_ruby/1.8/puppet/util/fact_store.rb
 lib/ruby/site_ruby/1.8/puppet/util/feature.rb
 lib/ruby/site_ruby/1.8/puppet/util/fileparsing.rb
 lib/ruby/site_ruby/1.8/puppet/util/filetype.rb
 lib/ruby/site_ruby/1.8/puppet/util/graph.rb
 lib/ruby/site_ruby/1.8/puppet/util/inifile.rb
+lib/ruby/site_ruby/1.8/puppet/util/instance_loader.rb
 lib/ruby/site_ruby/1.8/puppet/util/loadedfile.rb
 lib/ruby/site_ruby/1.8/puppet/util/log.rb
 lib/ruby/site_ruby/1.8/puppet/util/logging.rb
@@ -253,6 +267,7 @@
 lib/ruby/site_ruby/1.8/puppet/util/posix.rb
 lib/ruby/site_ruby/1.8/puppet/util/provider_features.rb
 lib/ruby/site_ruby/1.8/puppet/util/rails/collection_merger.rb
+lib/ruby/site_ruby/1.8/puppet/util/reference.rb
 lib/ruby/site_ruby/1.8/puppet/util/storage.rb
 lib/ruby/site_ruby/1.8/puppet/util/subclass_loader.rb
 lib/ruby/site_ruby/1.8/puppet/util/suidmanager.rb
@@ -262,7 +277,6 @@
 share/doc/puppet/COPYING
 share/doc/puppet/LICENSE
 share/doc/puppet/README
-share/doc/puppet/TODO
 share/examples/puppet/code/allatonce
 share/examples/puppet/code/assignments
 share/examples/puppet/code/components
@@ -293,3 +307,55 @@
 share/examples/puppet/root/etc/puppet/puppetd.conf
 share/examples/puppet/root/etc/puppet/puppetmasterd.conf
 share/examples/puppet/root/etc/puppet/tagmail.conf
+ at dirrm share/examples/puppet/root/etc/puppet
+ at dirrm share/examples/puppet/root/etc/init.d
+ at dirrm share/examples/puppet/root/etc
+ at dirrm share/examples/puppet/root/bin
+ at dirrm share/examples/puppet/root
+ at dirrm share/examples/puppet/code
+ at dirrm share/examples/puppet
+ at dirrm share/doc/puppet
+ at dirrm lib/ruby/site_ruby/1.8/puppet/util/rails
+ at dirrm lib/ruby/site_ruby/1.8/puppet/util/plist
+ at dirrm lib/ruby/site_ruby/1.8/puppet/util
+ at dirrm lib/ruby/site_ruby/1.8/puppet/type/pfile
+ at dirrm lib/ruby/site_ruby/1.8/puppet/type
+ at dirrm lib/ruby/site_ruby/1.8/puppet/transaction
+ at dirrm lib/ruby/site_ruby/1.8/puppet/sslcertificates
+ at dirrm lib/ruby/site_ruby/1.8/puppet/reports
+ at dirrm lib/ruby/site_ruby/1.8/puppet/reference
+ at dirrm lib/ruby/site_ruby/1.8/puppet/rails/external/tagging
+ at dirrm lib/ruby/site_ruby/1.8/puppet/rails/external
+ at dirrm lib/ruby/site_ruby/1.8/puppet/rails/database
+ at dirrm lib/ruby/site_ruby/1.8/puppet/rails
+ at dirrm lib/ruby/site_ruby/1.8/puppet/provider/zone
+ at dirrm lib/ruby/site_ruby/1.8/puppet/provider/user
+ at dirrm lib/ruby/site_ruby/1.8/puppet/provider/sshkey
+ at dirrm lib/ruby/site_ruby/1.8/puppet/provider/service
+ at dirrm lib/ruby/site_ruby/1.8/puppet/provider/port
+ at dirrm lib/ruby/site_ruby/1.8/puppet/provider/package
+ at dirrm lib/ruby/site_ruby/1.8/puppet/provider/nameservice
+ at dirrm lib/ruby/site_ruby/1.8/puppet/provider/mount
+ at dirrm lib/ruby/site_ruby/1.8/puppet/provider/host
+ at dirrm lib/ruby/site_ruby/1.8/puppet/provider/group
+ at dirrm lib/ruby/site_ruby/1.8/puppet/provider/cron
+ at dirrm lib/ruby/site_ruby/1.8/puppet/provider
+ at dirrm lib/ruby/site_ruby/1.8/puppet/parser/resource
+ at dirrm lib/ruby/site_ruby/1.8/puppet/parser/ast
+ at dirrm lib/ruby/site_ruby/1.8/puppet/parser
+ at dirrm lib/ruby/site_ruby/1.8/puppet/network/xmlrpc
+ at dirrm lib/ruby/site_ruby/1.8/puppet/network/server
+ at dirrm lib/ruby/site_ruby/1.8/puppet/network/handler
+ at dirrm lib/ruby/site_ruby/1.8/puppet/network/client
+ at dirrm lib/ruby/site_ruby/1.8/puppet/network
+ at dirrm lib/ruby/site_ruby/1.8/puppet/metatype
+ at dirrm lib/ruby/site_ruby/1.8/puppet/feature
+ at dirrm lib/ruby/site_ruby/1.8/puppet/fact_stores
+ at dirrm lib/ruby/site_ruby/1.8/puppet/external/gratr
+ at dirrm lib/ruby/site_ruby/1.8/puppet/external/event-loop
+ at dirrm lib/ruby/site_ruby/1.8/puppet/external
+ at dirrm lib/ruby/site_ruby/1.8/puppet/config_stores
+ at dirrm lib/ruby/site_ruby/1.8/puppet
+ at dirrmtry etc/puppet/ssl
+ at dirrmtry etc/puppet/manifests
+ at dirrmtry etc/puppet

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

More information about the freebsd-ports-bugs mailing list