From owner-svn-ports-all@FreeBSD.ORG Fri Dec 20 19:02:33 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org 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 ESMTPS id 51F0B42E; Fri, 20 Dec 2013 19:02:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (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 3CF7510FD; Fri, 20 Dec 2013 19:02:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKJ2XST092391; Fri, 20 Dec 2013 19:02:33 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKJ2WKC092387; Fri, 20 Dec 2013 19:02:32 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201312201902.rBKJ2WKC092387@svn.freebsd.org> From: Steve Wills Date: Fri, 20 Dec 2013 19:02:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337076 - in branches/2014Q1/sysutils/puppet: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 19:02:33 -0000 Author: swills Date: Fri Dec 20 19:02:32 2013 New Revision: 337076 URL: http://svnweb.freebsd.org/changeset/ports/337076 Log: MFH: r337069 - Apply the resource-fix.diff from the Puppet issue #9290 [1] - Patch config.ru to use the right paths [2] - Bump PORTREVISION for package change PR: ports/183794 [1] Submitted by: tdb [1] Reported by: mat [2] Approved by: portmgr-lurkers (mat) Added: branches/2014Q1/sysutils/puppet/files/patch-ext__rack__files__config.ru - copied unchanged from r337069, head/sysutils/puppet/files/patch-ext__rack__files__config.ru branches/2014Q1/sysutils/puppet/files/patch-lib__puppet__rails__resource.rb - copied unchanged from r337069, head/sysutils/puppet/files/patch-lib__puppet__rails__resource.rb Modified: branches/2014Q1/sysutils/puppet/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/sysutils/puppet/Makefile ============================================================================== --- branches/2014Q1/sysutils/puppet/Makefile Fri Dec 20 19:01:40 2013 (r337075) +++ branches/2014Q1/sysutils/puppet/Makefile Fri Dec 20 19:02:32 2013 (r337076) @@ -3,7 +3,7 @@ PORTNAME= puppet PORTVERSION= 3.3.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ @@ -68,6 +68,8 @@ post-patch: ${WRKSRC}/lib/puppet/util/run_mode.rb @${REINPLACE_CMD} -e "s|\$$confdir/ssl|/var/puppet/ssl|" \ ${WRKSRC}/lib/puppet/defaults.rb + @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" \ + ${WRKSRC}/ext/rack/files/config.ru do-install: @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} Copied: branches/2014Q1/sysutils/puppet/files/patch-ext__rack__files__config.ru (from r337069, head/sysutils/puppet/files/patch-ext__rack__files__config.ru) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/sysutils/puppet/files/patch-ext__rack__files__config.ru Fri Dec 20 19:02:32 2013 (r337076, copy of r337069, head/sysutils/puppet/files/patch-ext__rack__files__config.ru) @@ -0,0 +1,13 @@ +--- ./ext/rack/files/config.ru.orig 2013-12-20 16:47:22.876896492 +0000 ++++ ./ext/rack/files/config.ru 2013-12-20 16:47:33.826895721 +0000 +@@ -14,8 +14,8 @@ + # Rack applications typically don't start as root. Set --confdir and --vardir + # to prevent reading configuration from ~puppet/.puppet/puppet.conf and writing + # to ~puppet/.puppet +-ARGV << "--confdir" << "/etc/puppet" +-ARGV << "--vardir" << "/var/lib/puppet" ++ARGV << "--confdir" << "%%PREFIX%%/etc/puppet" ++ARGV << "--vardir" << "/var/puppet" + + # NOTE: it's unfortunate that we have to use the "CommandLine" class + # here to launch the app, but it contains some initialization logic Copied: branches/2014Q1/sysutils/puppet/files/patch-lib__puppet__rails__resource.rb (from r337069, head/sysutils/puppet/files/patch-lib__puppet__rails__resource.rb) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/sysutils/puppet/files/patch-lib__puppet__rails__resource.rb Fri Dec 20 19:02:32 2013 (r337076, copy of r337069, head/sysutils/puppet/files/patch-lib__puppet__rails__resource.rb) @@ -0,0 +1,15 @@ +--- ./lib/puppet/rails/resource.rb.orig 2013-10-07 18:00:47.000000000 +0000 ++++ ./lib/puppet/rails/resource.rb 2013-12-20 16:47:14.340897154 +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.