Date: Tue, 7 Jan 2014 12:29:28 GMT From: Bartek Rutkowski <ports@robakdesign.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/185549: [port-update] sysutils/puppet updated to latest 3.4.2 version with various bug fixes Message-ID: <201401071229.s07CTSl3035076@oldred.freebsd.org> Resent-Message-ID: <201401071230.s07CU0fN020857@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185549 >Category: ports >Synopsis: [port-update] sysutils/puppet updated to latest 3.4.2 version with various bug fixes >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: Tue Jan 07 12:30:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Bartek Rutkowski >Release: 10.0-RC4 >Organization: Pixeware LTD >Environment: FreeBSD brukselka 10.0-RC4 FreeBSD 10.0-RC4 #0 r260130: Tue Dec 31 17:10:01 UTC 2013 root@snap.freebsd.org:/usr/obj/usr/src/sys/BRUKSELKA amd64 >Description: This is update to sysutils/puppet port with latest version full of improvements anf bug fixes. >How-To-Repeat: Apply the patch, build the port and package, install, test. >Fix: Patch applied. Patch attached with submission follows: diff -ruN puppet.orig/Makefile puppet/Makefile --- puppet.orig/Makefile 2014-01-07 12:51:51.072953997 +0100 +++ puppet/Makefile 2014-01-07 13:21:53.274976996 +0100 @@ -2,8 +2,7 @@ # $FreeBSD: sysutils/puppet/Makefile 338168 2013-12-30 20:55:18Z ohauer $ PORTNAME= puppet -PORTVERSION= 3.3.1 -PORTREVISION= 6 +PORTVERSION= 3.4.2 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ @@ -69,7 +68,7 @@ @${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 + ${WRKSRC}/ext/rack/config.ru do-install: @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} @@ -93,11 +92,10 @@ @${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type d | ${SORT} -r | \ ${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST} @${MKDIR} ${STAGEDIR}${WWWDIR}/public - ${INSTALL_DATA} ${WRKSRC}/ext/rack/files/config.ru ${STAGEDIR}${WWWDIR} + ${INSTALL_DATA} ${WRKSRC}/ext/rack/config.ru ${STAGEDIR}${WWWDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/ext/rack/files/apache2.conf ${STAGEDIR}${EXAMPLESDIR} .include <bsd.port.post.mk> diff -ruN puppet.orig/distinfo puppet/distinfo --- puppet.orig/distinfo 2014-01-07 12:51:51.072953997 +0100 +++ puppet/distinfo 2014-01-07 13:15:58.322937996 +0100 @@ -1,2 +1,2 @@ -SHA256 (puppet-3.3.1.tar.gz) = 152f9eaa6767c5f6cbd52befff891bd54e074d2f6487a649373da0113c09e284 -SIZE (puppet-3.3.1.tar.gz) = 1896023 +SHA256 (puppet-3.4.2.tar.gz) = 40ad847e7f8f7a2eb2b968280dcc60427de6770710bbdd289b8bd7d1ced69210 +SIZE (puppet-3.4.2.tar.gz) = 1951200 diff -ruN puppet.orig/files/patch-ext__rack__config.ru puppet/files/patch-ext__rack__config.ru --- puppet.orig/files/patch-ext__rack__config.ru 1970-01-01 01:00:00.000000000 +0100 +++ puppet/files/patch-ext__rack__config.ru 2014-01-07 13:15:58.332956996 +0100 @@ -0,0 +1,13 @@ +--- ./ext/rack/config.ru.orig 2014-01-06 12:04:56.000000000 +0100 ++++ ./ext/rack/config.ru 2014-01-06 12:05:33.000000000 +0100 +@@ -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 diff -ruN puppet.orig/files/patch-ext__rack__files__config.ru puppet/files/patch-ext__rack__files__config.ru --- puppet.orig/files/patch-ext__rack__files__config.ru 2014-01-07 12:51:51.072953997 +0100 +++ puppet/files/patch-ext__rack__files__config.ru 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ ---- ./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 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401071229.s07CTSl3035076>