From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Nov 8 18:20:02 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E9DAE3EB for ; Fri, 8 Nov 2013 18:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C5AB62949 for ; Fri, 8 Nov 2013 18:20:01 +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 rA8IK1Jb035379 for ; Fri, 8 Nov 2013 18:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rA8IK12P035378; Fri, 8 Nov 2013 18:20:01 GMT (envelope-from gnats) Resent-Date: Fri, 8 Nov 2013 18:20:01 GMT Resent-Message-Id: <201311081820.rA8IK12P035378@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, Tim Bishop Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C62A42AA; Fri, 8 Nov 2013 18:13:50 +0000 (UTC) (envelope-from tdb@aberfal.kent.ac.uk) Received: from mx1.kent.ac.uk (mx1.kent.ac.uk [129.12.21.39]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 87CED2915; Fri, 8 Nov 2013 18:13:49 +0000 (UTC) Received: from hathor.ukc.ac.uk ([129.12.4.12]) by mx1.kent.ac.uk with esmtps (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1VeqYw-0002jO-GX; Fri, 08 Nov 2013 18:13:42 +0000 Received: from aberfal.kent.ac.uk ([129.12.41.25]) by hathor.ukc.ac.uk with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1VeqYv-0002KU-UO; Fri, 08 Nov 2013 18:13:41 +0000 Received: from aberfal.kent.ac.uk (localhost [127.0.0.1]) by aberfal.kent.ac.uk (8.14.7/8.14.7) with ESMTP id rA8IDev8009463; Fri, 8 Nov 2013 18:13:40 GMT (envelope-from tdb@aberfal.kent.ac.uk) Received: (from tdb@localhost) by aberfal.kent.ac.uk (8.14.7/8.14.7/Submit) id rA8IDePV009462; Fri, 8 Nov 2013 18:13:40 GMT (envelope-from tdb) Message-Id: <201311081813.rA8IDePV009462@aberfal.kent.ac.uk> Date: Fri, 8 Nov 2013 18:13:40 GMT From: Tim Bishop To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/183794: [PATCH] sysutils/puppet: Apply fix for Puppet issue #9290 Cc: swills@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Nov 2013 18:20:02 -0000 >Number: 183794 >Category: ports >Synopsis: [PATCH] sysutils/puppet: Apply fix for Puppet issue #9290 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Nov 08 18:20:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Tim Bishop >Release: FreeBSD 9.2-PRERELEASE amd64 >Organization: >Environment: System: FreeBSD aberfal.kent.ac.uk 9.2-PRERELEASE FreeBSD 9.2-PRERELEASE #40 r255457: Wed Sep 11 01:32:58 BST >Description: Apply the resource-fix.diff from the Puppet issue #9290. https://projects.puppetlabs.com/issues/9290 I've been using this patch locally on Puppet for a long time, and have been testing it with this latest version for a couple of weeks. Port maintainer (swills@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_9 (mode: change, diff: SVN) >How-To-Repeat: >Fix: --- puppet-3.3.1_3.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 333251) +++ Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= puppet PORTVERSION= 3.3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ Index: files/patch-lib__puppet__rails__resource.rb =================================================================== --- files/patch-lib__puppet__rails__resource.rb (revision 0) +++ files/patch-lib__puppet__rails__resource.rb (working copy) @@ -0,0 +1,15 @@ +--- ./lib/puppet/rails/resource.rb.orig 2013-11-08 17:42:16.417643102 +0000 ++++ ./lib/puppet/rails/resource.rb 2013-11-08 17:42:33.016312322 +0000 +@@ -84,7 +84,11 @@ + end + + def [](param) +- super || parameter(param) ++ if param == 'id' ++ super ++ else ++ super || parameter(param) ++ end + end + + # Make sure this resource is equivalent to the provided Parser resource. --- puppet-3.3.1_3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: