Attachment 111609 Details for Bug 152910 – file.diff

[patch] file.diff

file.diff (text/plain), 3.27 KB, created by Russell Jackson on 2010-12-08 05:30:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Russell Jackson

Created: 2010-12-08 05:30:10 UTC

Size: 3.27 KB

patch

obsolete

>Index: sysutils/puppet/files/patch-redmine-4383
>===================================================================
>--- sysutils/puppet/files/patch-redmine-4383	(.../upstream)	(revision 137)
>+++ sysutils/puppet/files/patch-redmine-4383	(.../puppet-security-update)	(revision 137)
>@@ -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
>Index: sysutils/puppet/files/patch-redmine-4573
>===================================================================
>--- sysutils/puppet/files/patch-redmine-4573	(.../upstream)	(revision 137)
>+++ sysutils/puppet/files/patch-redmine-4573	(.../puppet-security-update)	(revision 137)
>@@ -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
>Index: sysutils/puppet/distinfo
>===================================================================
>--- sysutils/puppet/distinfo	(.../upstream)	(revision 137)
>+++ sysutils/puppet/distinfo	(.../puppet-security-update)	(revision 137)
>@@ -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
>Index: sysutils/puppet/Makefile
>===================================================================
>--- sysutils/puppet/Makefile	(.../upstream)	(revision 137)
>+++ sysutils/puppet/Makefile	(.../puppet-security-update)	(revision 137)
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	puppet
>-PORTVERSION=	2.6.2
>+PORTVERSION=	2.6.4
> CATEGORIES=	sysutils
> MASTER_SITES=	http://www.puppetlabs.com/downloads/puppet/

Actions: View | Diff

Attachments on bug 152910: 111609 | 111610