diff options
| author | Philip M. Gollucci <pgollucci@FreeBSD.org> | 2010-12-10 23:07:24 +0000 |
|---|---|---|
| committer | Philip M. Gollucci <pgollucci@FreeBSD.org> | 2010-12-10 23:07:24 +0000 |
| commit | 760235ba9f0748a2adca14ac104c935406b20719 (patch) | |
| tree | 1a591655348d4a9a7fb71471ffa9ef4c5ebdf5bf /sysutils/puppet | |
| parent | 644eab4e436214d477573dfed80d99d4ade56e70 (diff) | |
| download | ports-760235ba9f0748a2adca14ac104c935406b20719.tar.gz ports-760235ba9f0748a2adca14ac104c935406b20719.zip | |
Notes
Diffstat (limited to 'sysutils/puppet')
| -rw-r--r-- | sysutils/puppet/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/puppet/distinfo | 5 | ||||
| -rw-r--r-- | sysutils/puppet/files/patch-redmine-4573 | 23 | ||||
| -rw-r--r-- | sysutils/puppet/pkg-plist | 1 |
4 files changed, 4 insertions, 27 deletions
diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile index 4621233e3c3d..4a15a24cd5fb 100644 --- a/sysutils/puppet/Makefile +++ b/sysutils/puppet/Makefile @@ -6,7 +6,7 @@ # PORTNAME= puppet -PORTVERSION= 2.6.2 +PORTVERSION= 2.6.4 CATEGORIES= sysutils MASTER_SITES= http://www.puppetlabs.com/downloads/puppet/ diff --git a/sysutils/puppet/distinfo b/sysutils/puppet/distinfo index 9cf28f761d6b..e04f340ed7ba 100644 --- a/sysutils/puppet/distinfo +++ b/sysutils/puppet/distinfo @@ -1,3 +1,2 @@ -MD5 (puppet-2.6.2.tar.gz) = 959f11e6ce82a4235998e5cef0f55095 -SHA256 (puppet-2.6.2.tar.gz) = 78522e17cde0bc2b518ae3443e61c0b604aa612ad9291b53a1e66132252d2472 -SIZE (puppet-2.6.2.tar.gz) = 1498352 +SHA256 (puppet-2.6.4.tar.gz) = 349f9b320330a3546619d4236fa30dd52af327f17767d9762f6f70465bcdaa1f +SIZE (puppet-2.6.4.tar.gz) = 1500339 diff --git a/sysutils/puppet/files/patch-redmine-4573 b/sysutils/puppet/files/patch-redmine-4573 deleted file mode 100644 index 6b3a073ed284..000000000000 --- a/sysutils/puppet/files/patch-redmine-4573 +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/lib/puppet/provider/service/freebsd.rb b/lib/puppet/provider/service/freebsd.rb -index c75c3c9..f8c7134 100644 ---- lib/puppet/provider/service/freebsd.rb -+++ lib/puppet/provider/service/freebsd.rb -@@ -18,6 +18,9 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do - def rcvar - rcvar = execute([self.initscript, :rcvar], :failonfail => true, :squelch => false) - rcvar = rcvar.split("\n") -+ rcvar.delete_if {|str| str =~ /^#\s*$/} -+ rcvar[1] = rcvar[1].gsub(/^\$/, '') -+ rcvar - end - - # Extract service name -@@ -44,7 +47,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do - def rcvar_value - value = self.rcvar[1] - self.error("No rcvar value found in rcvar") if value.nil? -- value = value.gsub!(/(.*)_enable=\"?(.*)\"?/, '\2') -+ value = value.gsub!(/(.*)_enable="?(\w+)"?/, '\2') - self.error("rcvar value is empty") if value.nil? - self.debug("rcvar value is #{value}") - value diff --git a/sysutils/puppet/pkg-plist b/sysutils/puppet/pkg-plist index 788e347cc87e..e4c5cbe5ab93 100644 --- a/sysutils/puppet/pkg-plist +++ b/sysutils/puppet/pkg-plist @@ -10,4 +10,5 @@ sbin/puppetmasterd sbin/puppetqd sbin/puppetrun etc/puppet/puppet.conf-dist +etc/puppet/auth.conf @dirrmtry etc/puppet |