Date: Thu, 7 Oct 2010 14:12:43 -0700 (PDT) From: Russell Jackson <raj@csub.edu> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/151288: [maintainer-update] update sysutils/puppet from 2.6.1 to 2.6.2 et al Message-ID: <201010072112.o97LChAq023916@fbsd.csub.edu> Resent-Message-ID: <201010072120.o97LK4gS034527@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 151288 >Category: ports >Synopsis: [maintainer-update] update sysutils/puppet from 2.6.1 to 2.6.2 et al >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Oct 07 21:20:03 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Russell Jackson >Release: >Organization: California State University Bakersfield >Environment: >Description: Update to 2.6.2. Replace existing patches with improved official upstream patch. >How-To-Repeat: >Fix: Deletes files/patch-redmin-4383 Index: distinfo =================================================================== --- distinfo (.../branches/vendor/sysutils/puppet) (revision 16119) +++ distinfo (.../trunk/sysutils/puppet) (revision 16119) @@ -1,3 +1,3 @@ -MD5 (puppet-2.6.1.tar.gz) = 5cbdc667722ae60bbc24acca2e3494d6 -SHA256 (puppet-2.6.1.tar.gz) = b91c133313e595e40da37b1a318bcf061e5f13276934e689347156533c638a3e -SIZE (puppet-2.6.1.tar.gz) = 1492177 +MD5 (puppet-2.6.2.tar.gz) = 959f11e6ce82a4235998e5cef0f55095 +SHA256 (puppet-2.6.2.tar.gz) = 78522e17cde0bc2b518ae3443e61c0b604aa612ad9291b53a1e66132252d2472 +SIZE (puppet-2.6.2.tar.gz) = 1498352 Index: files/patch-redmine-4383 =================================================================== --- files/patch-redmine-4383 (.../branches/vendor/sysutils/puppet) (revision 16119) +++ files/patch-redmine-4383 (.../trunk/sysutils/puppet) (revision 16119) @@ -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: files/patch-redmine-4573 =================================================================== --- files/patch-redmine-4573 (.../branches/vendor/sysutils/puppet) (revision 16119) +++ files/patch-redmine-4573 (.../trunk/sysutils/puppet) (revision 16119) @@ -1,13 +1,23 @@ ---- lib/puppet/provider/service/freebsd.rb.orig Wed Aug 18 20:14:42 2010 -+++ lib/puppet/provider/service/freebsd.rb Wed Aug 18 23:48:08 2010 -@@ -18,7 +18,9 @@ +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\S+|\w+enable=.*)$/ } -+ rcvar.delete_if {|str| str !~ /^(#\s\S+|\$?\w+enable=.*)$/ } -+ rcvar[1] = rcvar[1].gsub!(/^\$?(.*)/, '\1') ++ 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: Makefile =================================================================== --- Makefile (.../branches/vendor/sysutils/puppet) (revision 16119) +++ Makefile (.../trunk/sysutils/puppet) (revision 16119) @@ -6,7 +6,7 @@ # PORTNAME= puppet -PORTVERSION= 2.6.1 +PORTVERSION= 2.6.2 CATEGORIES= sysutils MASTER_SITES= http://www.puppetlabs.com/downloads/puppet/ >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010072112.o97LChAq023916>