Date: Fri, 10 Dec 2010 00:26:48 -0800 From: Russell Jackson <raj@csub.edu> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Cc: pgollucci@FreeBSD.org Subject: Re: ports/152910: [maintainer-update] sysutils/puppet: Update to 2.6.4. Fixes security flaw in previous versions. Message-ID: <4D01E448.8060100@csub.edu> In-Reply-To: <201012080530.oB85UA3v043320@freefall.freebsd.org> References: <201012080530.oB85UA3v043320@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------070106040207000300070002
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
I gone goofed. I forgot to merge the file delete with my upstream branch. Here's the
correct patch.
--------------070106040207000300070002
Content-Type: text/x-patch;
name="ports-sysutils-puppet.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="ports-sysutils-puppet.patch"
Deletes files/patch-redmin-4573
Index: sysutils/puppet/files/patch-redmine-4573
===================================================================
--- sysutils/puppet/files/patch-redmine-4573 (.../upstream) (revision 139)
+++ sysutils/puppet/files/patch-redmine-4573 (.../puppet-security-update) (revision 139)
@@ -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 139)
+++ sysutils/puppet/distinfo (.../puppet-security-update) (revision 139)
@@ -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 139)
+++ sysutils/puppet/Makefile (.../puppet-security-update) (revision 139)
@@ -6,7 +6,7 @@
#
PORTNAME= puppet
-PORTVERSION= 2.6.2
+PORTVERSION= 2.6.4
CATEGORIES= sysutils
MASTER_SITES= http://www.puppetlabs.com/downloads/puppet/
--------------070106040207000300070002--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4D01E448.8060100>