From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Sep 14 00:50:03 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B6E9106564A for ; Tue, 14 Sep 2010 00:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id E97508FC14 for ; Tue, 14 Sep 2010 00:50:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o8E0o1gp049855 for ; Tue, 14 Sep 2010 00:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o8E0o1Ol049854; Tue, 14 Sep 2010 00:50:01 GMT (envelope-from gnats) Resent-Date: Tue, 14 Sep 2010 00:50:01 GMT Resent-Message-Id: <201009140050.o8E0o1Ol049854@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Russell Jackson Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 808A6106566B for ; Tue, 14 Sep 2010 00:40:21 +0000 (UTC) (envelope-from raj@fbsd.csub.edu) Received: from mh0.csub.edu (mh0.csub.edu [136.168.1.94]) by mx1.freebsd.org (Postfix) with ESMTP id 5D91E8FC0C for ; Tue, 14 Sep 2010 00:40:21 +0000 (UTC) Received: from fbsd.csub.edu (fbsd.csub.edu [136.168.1.204]) by mh0.csub.edu (8.14.3/8.13.8) with ESMTP id o8E0eKLE026044 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 13 Sep 2010 17:40:20 -0700 (PDT) (envelope-from raj@fbsd.csub.edu) Received: from fbsd.csub.edu (localhost [127.0.0.1]) by fbsd.csub.edu (8.14.3/8.14.3) with ESMTP id o8E0eKjS076366 for ; Mon, 13 Sep 2010 17:40:20 -0700 (PDT) (envelope-from raj@fbsd.csub.edu) Received: (from raj@localhost) by fbsd.csub.edu (8.14.3/8.14.3/Submit) id o8E0eK3X076365; Mon, 13 Sep 2010 17:40:20 -0700 (PDT) (envelope-from raj) Message-Id: <201009140040.o8E0eK3X076365@fbsd.csub.edu> Date: Mon, 13 Sep 2010 17:40:20 -0700 (PDT) From: Russell Jackson To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/150545: [maintainer-update] update sysutils/puppet to 2.6.1rc4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Russell Jackson List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Sep 2010 00:50:03 -0000 >Number: 150545 >Category: ports >Synopsis: [maintainer-update] update sysutils/puppet to 2.6.1rc4 >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: Tue Sep 14 00:50:00 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Russell Jackson >Release: >Organization: California State University, Bakersfield >Environment: >Description: Update port to 2.6.1rc4 and fix some rc script issues. >How-To-Repeat: >Fix: Index: distinfo =================================================================== --- distinfo (.../branches/vendor/sysutils/puppet) (revision 15784) +++ distinfo (.../trunk/sysutils/puppet) (revision 15784) @@ -1,3 +1,3 @@ -MD5 (puppet-2.6.1rc3.tar.gz) = c41ac126ba05c77bcd25752c158c7ab5 -SHA256 (puppet-2.6.1rc3.tar.gz) = 7c5d96ec33b5111bb9e040aac51a6e8e9c34fd2b280f1b8e814950e4fa75d5d2 -SIZE (puppet-2.6.1rc3.tar.gz) = 1491489 +MD5 (puppet-2.6.1rc4.tar.gz) = 3e46f99165d92707ae2e745866481808 +SHA256 (puppet-2.6.1rc4.tar.gz) = 04ba510befcda407d50d8c8719e0cbe59151580daeca43dbb29a08a93d371218 +SIZE (puppet-2.6.1rc4.tar.gz) = 1491877 Index: files/patch-redmine-4573 =================================================================== --- files/patch-redmine-4573 (.../branches/vendor/sysutils/puppet) (revision 0) +++ files/patch-redmine-4573 (.../trunk/sysutils/puppet) (revision 15784) @@ -0,0 +1,13 @@ +--- 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 @@ + 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 + end + + # Extract service name Index: files/puppet.in =================================================================== --- files/puppet.in (.../branches/vendor/sysutils/puppet) (revision 15784) +++ files/puppet.in (.../trunk/sysutils/puppet) (revision 15784) @@ -20,7 +20,7 @@ : ${puppet_enable="NO"} : ${puppet_rundir="%%PUPPET_RUNDIR%%"} -: ${puppet_flags=""} +: ${puppet_flags="--rundir=${puppet_rundir}"} command_interpreter="%%PREFIX%%/bin/ruby18" command="%%PREFIX%%/bin/puppet" Index: files/puppetmaster.in =================================================================== --- files/puppetmaster.in (.../branches/vendor/sysutils/puppet) (revision 15784) +++ files/puppetmaster.in (.../trunk/sysutils/puppet) (revision 15784) @@ -20,7 +20,7 @@ : ${puppetmaster_enable="NO"} : ${puppetmaster_rundir="%%PUPPET_RUNDIR%%"} -: ${puppetmaster_flags=""} +: ${puppetmaster_flags="--rundir=${puppetmaster_rundir}"} : ${puppetmaster_mongrel_ports=""} command_interpreter="%%PREFIX%%/bin/ruby18" Index: Makefile =================================================================== --- Makefile (.../branches/vendor/sysutils/puppet) (revision 15784) +++ Makefile (.../trunk/sysutils/puppet) (revision 15784) @@ -2,11 +2,12 @@ # Date created: 2007-03-03 # Whom: Tomoyuki Sakurai # -# $FreeBSD: ports/sysutils/puppet/Makefile,v 1.16 2010/09/10 04:35:45 pgollucci Exp $ +# $FreeBSD: ports/sysutils/puppet/Makefile,v 1.14 2010/08/04 17:06:24 lwhsu Exp $ # PORTNAME= puppet -DISTVERSION= 2.6.1rc3 +DISTVERSION= 2.6.1rc4 +PORTREVISION= 0 CATEGORIES= sysutils MASTER_SITES= http://www.puppetlabs.com/downloads/puppet/ >Release-Note: >Audit-Trail: >Unformatted: