Date: Mon, 22 Oct 2012 13:39:41 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306274 - in head/sysutils: puppet puppet/files puppet27 Message-ID: <201210221339.q9MDdfQo020995@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Mon Oct 22 13:39:41 2012 New Revision: 306274 URL: http://svn.freebsd.org/changeset/ports/306274 Log: - Update puppet to 3.0.1 - Add sysutils/puppet27 for those who will still need the older version Feature safe: yes Added: head/sysutils/puppet27/ - copied from r306206, head/sysutils/puppet/ Modified: head/sysutils/puppet/Makefile head/sysutils/puppet/distinfo (contents, props changed) head/sysutils/puppet/files/optpatch-package_origin (contents, props changed) head/sysutils/puppet/files/optpatch-package_root (contents, props changed) head/sysutils/puppet/pkg-plist (contents, props changed) head/sysutils/puppet27/Makefile Modified: head/sysutils/puppet/Makefile ============================================================================== --- head/sysutils/puppet/Makefile Mon Oct 22 13:12:11 2012 (r306273) +++ head/sysutils/puppet/Makefile Mon Oct 22 13:39:41 2012 (r306274) @@ -1,10 +1,8 @@ # Created by: Tomoyuki Sakurai <cherry@trombik.mine.nu> # $FreeBSD$ -# PORTNAME= puppet -PORTVERSION= 2.7.19 -PORTREVISION= 1 +PORTVERSION= 3.0.1 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ @@ -14,12 +12,12 @@ COMMENT= A configuration management fram RUN_DEPENDS= facter>=0:${PORTSDIR}/sysutils/facter \ rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-augeas -CONFLICTS= puppet-2.6* +CONFLICTS= puppet-2* rubygem-hiera-puppet-[0-9]* NO_BUILD= yes USE_RUBY= yes USE_RUBY_FEATURES= iconv USE_RC_SUBR= puppet puppetmaster -PORTDOCS= CHANGELOG LICENSE README.md +PORTDOCS= LICENSE README.md PORTEXAMPLES= * USERS= puppet GROUPS= puppet @@ -27,7 +25,7 @@ SUB_FILES+= pkg-message MANCOMPRESSED= yes MAN5= puppet.conf.5 -MAN8= filebucket.8 pi.8 puppet-agent.8 puppet-apply.8 puppet-ca.8 \ +MAN8= puppet-agent.8 puppet-apply.8 puppet-ca.8 \ puppet-catalog.8 puppet-cert.8 puppet-certificate.8 \ puppet-certificate_request.8 puppet-certificate_revocation_list.8 \ puppet-config.8 puppet-describe.8 puppet-device.8 puppet-doc.8 \ @@ -38,8 +36,7 @@ MAN8= filebucket.8 pi.8 puppet-agent.8 p puppet-module.8 puppet-node.8 puppet-parser.8 puppet-plugin.8 \ puppet-queue.8 puppet-report.8 puppet-resource.8 \ puppet-resource_type.8 puppet-secret_agent.8 puppet-status.8 \ - puppet.8 puppetca.8 puppetd.8 puppetdoc.8 puppetmasterd.8 \ - puppetqd.8 puppetrun.8 ralsh.8 + puppet.8 OPTIONS_DEFINE= MONGREL PACKAGE_ORIGIN PACKAGE_ROOT OPTIONS_DEFAULT= PACKAGE_ORIGIN Modified: head/sysutils/puppet/distinfo ============================================================================== --- head/sysutils/puppet/distinfo Mon Oct 22 13:12:11 2012 (r306273) +++ head/sysutils/puppet/distinfo Mon Oct 22 13:39:41 2012 (r306274) @@ -1,2 +1,2 @@ -SHA256 (puppet-2.7.19.tar.gz) = 13b103513253ae5af466c8fcf25f36cbc41290f824fa7580041f0700d23a3c3a -SIZE (puppet-2.7.19.tar.gz) = 1936300 +SHA256 (puppet-3.0.1.tar.gz) = 5e4d0cfdd6989faf4f6c5c76c0d3bcfa0364e380549be1a2f7c3abd22b0b562b +SIZE (puppet-3.0.1.tar.gz) = 1505102 Modified: head/sysutils/puppet/files/optpatch-package_origin ============================================================================== --- head/sysutils/puppet/files/optpatch-package_origin Mon Oct 22 13:12:11 2012 (r306273) +++ head/sysutils/puppet/files/optpatch-package_origin Mon Oct 22 13:39:41 2012 (r306274) @@ -1,8 +1,5 @@ - -$FreeBSD$ - ---- lib/puppet/provider/package/freebsd.rb.orig -+++ lib/puppet/provider/package/freebsd.rb +--- lib/puppet/provider/package/freebsd.rb.orig 2012-10-20 00:57:51.000000000 -0400 ++++ lib/puppet/provider/package/freebsd.rb 2012-10-21 14:53:41.054105583 -0400 @@ -1,37 +1,163 @@ -Puppet::Type.type(:package).provide :freebsd, :parent => :openbsd do - desc "The specific form of package management on FreeBSD. This is an @@ -10,13 +7,14 @@ $FreeBSD$ - ports and packages. Apparently all of the tools are written in Ruby, - so there are plans to rewrite this support to directly use those - libraries." -+require 'open-uri' -+require 'net/ftp' -+require 'bzip2' - +- - commands :pkginfo => "/usr/sbin/pkg_info", - :pkgadd => "/usr/sbin/pkg_add", - :pkgdelete => "/usr/sbin/pkg_delete" ++require 'open-uri' ++require 'net/ftp' ++require 'bzip2' ++ +Puppet::Type.type(:package).provide :freebsd, :parent => Puppet::Provider::Package do + include Puppet::Util::Execution + @@ -55,11 +53,7 @@ $FreeBSD$ + :pkg_version => pkg_string.split("-")[-1], + } + end - -- if @resource[:source] =~ /\/$/ -- if @resource[:source] =~ /^(ftp|https?):/ -- Puppet::Util::Execution::withenv :PACKAGESITE => @resource[:source] do -- pkgadd "-r", @resource[:name] ++ + def self.unparse_pkg_info(pkg_info) + [:pkg_name, :pkg_version].map { |key| pkg_info[key] }.join("-") + end @@ -91,7 +85,11 @@ $FreeBSD$ + end + packages + end -+ + +- if @resource[:source] =~ /\/$/ +- if @resource[:source] =~ /^(ftp|https?):/ +- Puppet::Util.withenv :PACKAGESITE => @resource[:source] do +- pkgadd "-r", @resource[:name] + def ports_index + @@lock.synchronize do + if @@ports_index.nil? @@ -112,7 +110,7 @@ $FreeBSD$ + raise Puppet::Error.new "Could not fetch ports INDEX: #{$!}" end - else -- Puppet::Util::Execution::withenv :PKG_PATH => @resource[:source] do +- Puppet::Util.withenv :PKG_PATH => @resource[:source] do - pkgadd @resource[:name] + end + end Modified: head/sysutils/puppet/files/optpatch-package_root ============================================================================== --- head/sysutils/puppet/files/optpatch-package_root Mon Oct 22 13:12:11 2012 (r306273) +++ head/sysutils/puppet/files/optpatch-package_root Mon Oct 22 13:39:41 2012 (r306274) @@ -1,11 +1,11 @@ ---- lib/puppet/provider/package/freebsd.rb-orig 2011-04-21 19:36:17.000000000 -0500 -+++ lib/puppet/provider/package/freebsd.rb 2011-04-21 20:09:50.000000000 -0500 +--- lib/puppet/provider/package/freebsd.rb.orig 2012-10-21 14:45:57.110106541 -0400 ++++ lib/puppet/provider/package/freebsd.rb 2012-10-21 14:47:41.281104749 -0400 @@ -20,7 +20,7 @@ if @resource[:source] =~ /\/$/ if @resource[:source] =~ /^(ftp|https?):/ -- Puppet::Util::Execution::withenv :PACKAGESITE => @resource[:source] do -+ Puppet::Util::Execution::withenv :PACKAGEROOT => @resource[:source] do +- Puppet::Util.withenv :PACKAGESITE => @resource[:source] do ++ Puppet::Util.withenv :PACKAGEROOT => @resource[:source] do pkgadd "-r", @resource[:name] end else Modified: head/sysutils/puppet/pkg-plist ============================================================================== --- head/sysutils/puppet/pkg-plist Mon Oct 22 13:12:11 2012 (r306273) +++ head/sysutils/puppet/pkg-plist Mon Oct 22 13:39:41 2012 (r306274) @@ -1,13 +1,8 @@ -bin/filebucket -bin/pi +bin/extlookup2hiera bin/puppet -bin/puppetdoc -bin/ralsh -sbin/puppetca -sbin/puppetd -sbin/puppetmasterd -sbin/puppetqd -sbin/puppetrun +%%RUBY_SITELIBDIR%%/hiera/backend/puppet_backend.rb +%%RUBY_SITELIBDIR%%/hiera/scope.rb +%%RUBY_SITELIBDIR%%/hiera_puppet.rb %%ETCDIR%%/puppet.conf-dist %%ETCDIR%%/auth.conf-dist @dirrmtry etc/puppet @@ -17,3 +12,5 @@ sbin/puppetrun @exec /usr/sbin/chown -Rh puppet:puppet /var/run/puppet @exec /bin/mkdir -p /var/puppet @exec /usr/sbin/chown -Rh puppet:puppet /var/puppet +@dirrm %%RUBY_SITELIBDIR%%/hiera/backend +@dirrm %%RUBY_SITELIBDIR%%/hiera Modified: head/sysutils/puppet27/Makefile ============================================================================== --- head/sysutils/puppet/Makefile Sat Oct 20 17:00:35 2012 (r306206) +++ head/sysutils/puppet27/Makefile Mon Oct 22 13:39:41 2012 (r306274) @@ -1,6 +1,5 @@ # Created by: Tomoyuki Sakurai <cherry@trombik.mine.nu> # $FreeBSD$ -# PORTNAME= puppet PORTVERSION= 2.7.19 @@ -14,7 +13,8 @@ COMMENT= A configuration management fram RUN_DEPENDS= facter>=0:${PORTSDIR}/sysutils/facter \ rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-augeas -CONFLICTS= puppet-2.6* +LATEST_LINK= puppet27 +CONFLICTS= puppet-2.6* puppet-3* NO_BUILD= yes USE_RUBY= yes USE_RUBY_FEATURES= iconv
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210221339.q9MDdfQo020995>