aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authorpgollucci <pgollucci@FreeBSD.org>2010-12-11 07:07:24 +0800
committerpgollucci <pgollucci@FreeBSD.org>2010-12-11 07:07:24 +0800
commit1cf9de780d41c705c47b4a927d07721a188e2896 (patch)
tree7819deaa31b06d19eb4ad24a867be6790244e72f /sysutils
parentf45fa0969fc0615981b7059d468bdd9f38400a3f (diff)
downloadfreebsd-ports-gnome-1cf9de780d41c705c47b4a927d07721a188e2896.tar.gz
freebsd-ports-gnome-1cf9de780d41c705c47b4a927d07721a188e2896.tar.zst
freebsd-ports-gnome-1cf9de780d41c705c47b4a927d07721a188e2896.zip
- Update to 2.6.4
PR: ports/152910 Submitted by: Russell Jackson <raj@csub.edu> (maintainer)
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/puppet/Makefile2
-rw-r--r--sysutils/puppet/distinfo5
-rw-r--r--sysutils/puppet/files/patch-redmine-457323
-rw-r--r--sysutils/puppet/pkg-plist1
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