From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jun 21 17:30:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 94DCE85E for ; Fri, 21 Jun 2013 17:30:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 761E41BB6; Fri, 21 Jun 2013 17:30:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r5LHU0qd073730; Fri, 21 Jun 2013 17:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r5LHU0DR073729; Fri, 21 Jun 2013 17:30:00 GMT (envelope-from gnats) Resent-Date: Fri, 21 Jun 2013 17:30:00 GMT Resent-Message-Id: <201306211730.r5LHU0DR073729@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Cc: swills@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Mathieu Arnold Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0CEA94E4 for ; Fri, 21 Jun 2013 17:21:30 +0000 (UTC) (envelope-from mat@aragorn.in.absolight.net) Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25]) by mx1.freebsd.org (Postfix) with ESMTP id 9A60A1B35 for ; Fri, 21 Jun 2013 17:21:29 +0000 (UTC) Received: from prod2.absolight.net (localhost [127.0.0.1]) by prod2.absolight.net (Postfix) with ESMTP id 64C8FBDC4C for ; Fri, 21 Jun 2013 19:21:28 +0200 (CEST) Received: from gw.in.absolight.net (unknown [79.143.241.69]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "gw.in.absolight.net", Issuer "CA Cert Signing Authority" (not verified)) by prod2.absolight.net (Postfix) with ESMTPSA id 2EEF8BDC1D for ; Fri, 21 Jun 2013 19:21:28 +0200 (CEST) Received: from aragorn.in.absolight.net (aragorn.in.absolight.net [79.143.241.225]) by gw.in.absolight.net (Postfix) with ESMTP id 8B1E56113 for ; Fri, 21 Jun 2013 19:21:26 +0200 (CEST) Received: by aragorn.in.absolight.net (Postfix, from userid 1000) id DA45B14269C; Fri, 21 Jun 2013 19:21:25 +0200 (CEST) Message-Id: <20130621172125.DA45B14269C@aragorn.in.absolight.net> Date: Fri, 21 Jun 2013 19:21:25 +0200 (CEST) From: Mathieu Arnold To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 X-GNATS-Notify: swills@FreeBSD.org Subject: ports/179816: Update sysutils/puppet to 3.2.2. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Mathieu Arnold List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Jun 2013 17:30:00 -0000 >Number: 179816 >Category: ports >Synopsis: Update sysutils/puppet to 3.2.2. >Confidential: no >Severity: critical >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Jun 21 17:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Mathieu Arnold >Release: FreeBSD 9.1-RELEASE i386 >Organization: Absolight >Environment: System: FreeBSD aragorn.in.absolight.net 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243826: Tue Dec 4 06:55:39 UTC 2012 root@obrian.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: >How-To-Repeat: >Fix: Was pretty straightforward, I changed the PACKAGE_ORIGIN/PACKAGE_ROOT to be a SINGLE choice as only one can be set. --- puppet-3.2.2.diff begins here --- Index: sysutils/puppet/Makefile =================================================================== --- sysutils/puppet/Makefile (revision 321469) +++ sysutils/puppet/Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= puppet -PORTVERSION= 3.1.1 -PORTREVISION= 2 +PORTVERSION= 3.2.2 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ @@ -41,11 +40,14 @@ puppet-resource_type.8 puppet-secret_agent.8 puppet-status.8 \ puppet.8 -OPTIONS_DEFINE= MONGREL PACKAGE_ORIGIN PACKAGE_ROOT +OPTIONS_DEFINE= MONGREL OPTIONS_DEFAULT= PACKAGE_ORIGIN +OPTIONS_SINGLE= PATCHES +OPTIONS_SINGLE_PATCHES= PACKAGE_ORIGIN PACKAGE_ROOT MONGREL_DESC= Run puppet server as a mongrel service PACKAGE_ORIGIN_DESC= Use port origin as package name PACKAGE_ROOT_DESC= Use PACKAGEROOT insted of PACKAGESITE +PATCHES_DESC= Optional exclusive patches .include Index: sysutils/puppet/distinfo =================================================================== --- sysutils/puppet/distinfo (revision 321469) +++ sysutils/puppet/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (puppet-3.1.1.tar.gz) = 4401f6388bb96b1301a107f247af6fa558127d78467bb5cef1a1e0ff66b4463d -SIZE (puppet-3.1.1.tar.gz) = 1587190 +SHA256 (puppet-3.2.2.tar.gz) = c47745aa73912b2cb1a20b07e8741b8af37a920b9bc8dc8afb14b23d8df7d13d +SIZE (puppet-3.2.2.tar.gz) = 1784340 Index: sysutils/puppet/files/patch-service-freebsd.rb =================================================================== --- sysutils/puppet/files/patch-service-freebsd.rb (revision 321469) +++ sysutils/puppet/files/patch-service-freebsd.rb (working copy) @@ -1,11 +0,0 @@ ---- lib/puppet/provider/service/freebsd.rb.orig 2013-04-28 02:55:36.017584743 +0000 -+++ lib/puppet/provider/service/freebsd.rb 2013-04-28 02:55:52.581583782 +0000 -@@ -41,7 +41,7 @@ - def rcvar_name - name = self.rcvar[1] - self.error("No rcvar name found in rcvar") if name.nil? -- name = name.gsub!(/(.*)(_enable)?=(.*)/, '\1') -+ name = name.gsub!(/(.*?)(_enable)?=(.*)/, '\1') - self.error("rcvar name is empty") if name.nil? - self.debug("rcvar name is #{name}") - name --- puppet-3.2.2.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: