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)
Responsible Changed From-To: freebsd-ports-bugs->swills Over to maintainer (via the GNATS Auto Assign Tool)
Author: swills Date: Fri Dec 20 18:47:43 2013 New Revision: 337069 URL: http://svnweb.freebsd.org/changeset/ports/337069 Log: - 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] Added: head/sysutils/puppet/files/patch-ext__rack__files__config.ru (contents, props changed) head/sysutils/puppet/files/patch-lib__puppet__rails__resource.rb (contents, props changed) Modified: head/sysutils/puppet/Makefile Modified: head/sysutils/puppet/Makefile ============================================================================== --- head/sysutils/puppet/Makefile Fri Dec 20 18:43:17 2013 (r337068) +++ head/sysutils/puppet/Makefile Fri Dec 20 18:47:43 2013 (r337069) @@ -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} Added: head/sysutils/puppet/files/patch-ext__rack__files__config.ru ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/puppet/files/patch-ext__rack__files__config.ru Fri Dec 20 18:47:43 2013 (r337069) @@ -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 Added: head/sysutils/puppet/files/patch-lib__puppet__rails__resource.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/puppet/files/patch-lib__puppet__rails__resource.rb Fri Dec 20 18:47:43 2013 (r337069) @@ -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. _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!
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. _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"