sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 2.6.2

Browse source 
- Replace existing patches with improved official upstream patch.

PR:             ports/151288
Submitted by:   Russell Jackson <raj@csub.edu> (maintainer)
This commit is contained in:
Philip M. Gollucci 2010-10-07 22:06:40 +00:00
parent 05dce5b6a4
commit 2c716b10b1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=262582
4 changed files with 21 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysutils/puppet/Makefile
View file

@ -6,7 +6,7 @@
# #
PORTNAME= puppet PORTNAME= puppet
PORTVERSION= 2.6.1 PORTVERSION= 2.6.2
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= http://www.puppetlabs.com/downloads/puppet/ MASTER_SITES= http://www.puppetlabs.com/downloads/puppet/

6
sysutils/puppet/distinfo
View file

@ -1,3 +1,3 @@
MD5 (puppet-2.6.1.tar.gz) = 5cbdc667722ae60bbc24acca2e3494d6 MD5 (puppet-2.6.2.tar.gz) = 959f11e6ce82a4235998e5cef0f55095
SHA256 (puppet-2.6.1.tar.gz) = b91c133313e595e40da37b1a318bcf061e5f13276934e689347156533c638a3e SHA256 (puppet-2.6.2.tar.gz) = 78522e17cde0bc2b518ae3443e61c0b604aa612ad9291b53a1e66132252d2472
SIZE (puppet-2.6.1.tar.gz) = 1492177 SIZE (puppet-2.6.2.tar.gz) = 1498352

19
sysutils/puppet/files/patch-redmine-4383
View file

@ -1,19 +0,0 @@
--- lib/puppet/provider/service/freebsd.rb.orig 2010-07-29 06:51:38.000000000 +0000
+++ lib/puppet/provider/service/freebsd.rb 2010-07-29 06:50:46.000000000 +0000
@@ -18,6 +18,7 @@
def rcvar
rcvar = execute([self.initscript, :rcvar], :failonfail => true, :squelch => false)
rcvar = rcvar.split("\n")
+ rcvar.delete_if {|str| str !~ /^(#\s\S+|\w+enable=.*)$/ }
end
# Extract service name
@@ -44,7 +45,7 @@
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

22
sysutils/puppet/files/patch-redmine-4573
View file

@ -1,13 +1,23 @@
--- lib/puppet/provider/service/freebsd.rb.orig Wed Aug 18 20:14:42 2010 diff --git a/lib/puppet/provider/service/freebsd.rb b/lib/puppet/provider/service/freebsd.rb
+++ lib/puppet/provider/service/freebsd.rb Wed Aug 18 23:48:08 2010 index c75c3c9..f8c7134 100644
@@ -18,7 +18,9 @@ --- 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 def rcvar
rcvar = execute([self.initscript, :rcvar], :failonfail => true, :squelch => false) rcvar = execute([self.initscript, :rcvar], :failonfail => true, :squelch => false)
rcvar = rcvar.split("\n") rcvar = rcvar.split("\n")
- rcvar.delete_if {|str| str !~ /^(#\s\S+|\w+enable=.*)$/ } + rcvar.delete_if {|str| str =~ /^#\s*$/}
+ rcvar.delete_if {|str| str !~ /^(#\s\S+|\$?\w+enable=.*)$/ } + rcvar[1] = rcvar[1].gsub(/^\$/, '')
+ rcvar[1] = rcvar[1].gsub!(/^\$?(.*)/, '\1')
+ rcvar + rcvar
end end
# Extract service name # 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