Attachment #111609 for bug #152910




--- 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




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

Lines 1-3 Link Here

(-)sysutils/puppet/distinfo (-3 / +2 lines)
1	MD5 (puppet-2.6.2.tar.gz) = 959f11e6ce82a4235998e5cef0f55095	1	SHA256 (puppet-2.6.4.tar.gz) = 349f9b320330a3546619d4236fa30dd52af327f17767d9762f6f70465bcdaa1f
2	SHA256 (puppet-2.6.2.tar.gz) = 78522e17cde0bc2b518ae3443e61c0b604aa612ad9291b53a1e66132252d2472	2	SIZE (puppet-2.6.4.tar.gz) = 1500339
3	SIZE (puppet-2.6.2.tar.gz) = 1498352

Lines 6-12 Link Here

(-)sysutils/puppet/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= puppet	8	PORTNAME= puppet
9	PORTVERSION= 2.6.2	9	PORTVERSION= 2.6.4
10	CATEGORIES= sysutils	10	CATEGORIES= sysutils
11	MASTER_SITES= http://www.puppetlabs.com/downloads/puppet/	11	MASTER_SITES= http://www.puppetlabs.com/downloads/puppet/

Return to bug 152910

Lines 1-19 Link Here

(-)sysutils/puppet/files/patch-redmine-4383 (-19 lines)
1	--- lib/puppet/provider/service/freebsd.rb.orig 2010-07-29 06:51:38.000000000 +0000
2	+++ lib/puppet/provider/service/freebsd.rb 2010-07-29 06:50:46.000000000 +0000
3	@@ -18,6 +18,7 @@
4	def rcvar
5	rcvar = execute([self.initscript, :rcvar], :failonfail => true, :squelch => false)
6	rcvar = rcvar.split("\n")
7	+ rcvar.delete_if {\|str\| str !~ /^(#\s\S+\|\w+enable=.*)$/ }
8	end
9
10	# Extract service name
11	@@ -44,7 +45,7 @@
12	def rcvar_value
13	value = self.rcvar[1]
14	self.error("No rcvar value found in rcvar") if value.nil?
15	- value = value.gsub!(/(.)_enable=\"?(.)\"?/, '\2')
16	+ value = value.gsub!(/(.*)_enable=\"?(\w+)\"?/, '\2')
17	self.error("rcvar value is empty") if value.nil?
18	self.debug("rcvar value is #{value}")
19	value

Lines 1-23 Link Here

(-)sysutils/puppet/files/patch-redmine-4573 (-23 lines)
1	diff --git a/lib/puppet/provider/service/freebsd.rb b/lib/puppet/provider/service/freebsd.rb
2	index c75c3c9..f8c7134 100644
3	--- lib/puppet/provider/service/freebsd.rb
4	+++ lib/puppet/provider/service/freebsd.rb
5	@@ -18,6 +18,9 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
6	def rcvar
7	rcvar = execute([self.initscript, :rcvar], :failonfail => true, :squelch => false)
8	rcvar = rcvar.split("\n")
9	+ rcvar.delete_if {\|str\| str =~ /^#\s*$/}
10	+ rcvar[1] = rcvar[1].gsub(/^\$/, '')
11	+ rcvar
12	end
13
14	# Extract service name
15	@@ -44,7 +47,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
16	def rcvar_value
17	value = self.rcvar[1]
18	self.error("No rcvar value found in rcvar") if value.nil?
19	- value = value.gsub!(/(.)_enable=\"?(.)\"?/, '\2')
20	+ value = value.gsub!(/(.*)_enable="?(\w+)"?/, '\2')
21	self.error("rcvar value is empty") if value.nil?
22	self.debug("rcvar value is #{value}")
23	value