Date: Tue, 18 Mar 2014 16:32:43 GMT From: Bartek Rutkowski <ports@robakdesign.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/187701: [PORT-UPDATE] sysutils/puppet 3.4.2 -> 3.4.3 Message-ID: <201403181632.s2IGWh5o052979@cgiserv.freebsd.org> Resent-Message-ID: <201403181640.s2IGe0p8093614@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187701 >Category: ports >Synopsis: [PORT-UPDATE] sysutils/puppet 3.4.2 -> 3.4.3 >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 Mar 18 16:40:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Bartek Rutkowski >Release: 10.0-RELEASE >Organization: Pixeware LTD >Environment: FreeBSD ports-dev 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Changes: - update to latest 3.4.3 version - fixed pkg-plist for better staging support - corrected few typos accoring to portlint Redports report: https://redports.org/buildarchive/20140318155901-63262/ >How-To-Repeat: Patch, test, commit. >Fix: Patch attached. Patch attached with submission follows: diff -ruN puppet.orig/Makefile puppet/Makefile --- puppet.orig/Makefile 2014-03-18 04:39:07.221611863 +0100 +++ puppet/Makefile 2014-03-18 07:07:14.614759856 +0100 @@ -2,13 +2,12 @@ # $FreeBSD: head/sysutils/puppet/Makefile 347728 2014-03-10 09:20:24Z remko $ PORTNAME= puppet -PORTVERSION= 3.4.2 -PORTREVISION= 2 +PORTVERSION= 3.4.3 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ MAINTAINER= swills@FreeBSD.org -COMMENT= A configuration management framework written in Ruby +COMMENT= Configuration management framework written in Ruby LICENSE= APACHE20 @@ -27,6 +26,7 @@ GROUPS= puppet SUB_FILES+= pkg-message SUB_LIST= RUBY=${RUBY} +PLIST_SUB+= RESETPREFIX=${PREFIX} OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_DEFAULT= PACKAGE_ORIGIN @@ -76,11 +76,11 @@ ${MKDIR} ${STAGEDIR}${ETCDIR}/modules ${MKDIR} ${STAGEDIR}/var/puppet ${INSTALL_DATA} ${WRKSRC}/conf/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf-dist - ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet master --genconfig \ - --confdir=${ETCDIR} \ - --rundir=/var/run/puppet \ - --vardir=/var/puppet \ - --logdir=/var/log/puppet \ + ${RUBY} -I ${STAGEDIR}${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet master --genconfig \ + --confdir=${STAGEDIR}${ETCDIR} \ + --rundir=${STAGEDIR}/var/run/puppet \ + --vardir=${STAGEDIR}/var/puppet \ + --logdir=${STAGEDIR}/var/log/puppet \ > ${STAGEDIR}${ETCDIR}/puppet.conf-dist @${ECHO} ${STAGEDIR}${RUBY_SITELIBDIR}/puppet.rb | \ ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} diff -ruN puppet.orig/distinfo puppet/distinfo --- puppet.orig/distinfo 2014-03-18 04:39:07.221611863 +0100 +++ puppet/distinfo 2014-03-18 04:41:07.221639862 +0100 @@ -1,2 +1,2 @@ -SHA256 (puppet-3.4.2.tar.gz) = 40ad847e7f8f7a2eb2b968280dcc60427de6770710bbdd289b8bd7d1ced69210 -SIZE (puppet-3.4.2.tar.gz) = 1951200 +SHA256 (puppet-3.4.3.tar.gz) = 5f991b54b6a272914f4dda5aaafb86f08855d65adad46941a72192feefe2ba0f +SIZE (puppet-3.4.3.tar.gz) = 1952505 diff -ruN puppet.orig/pkg-descr puppet/pkg-descr --- puppet.orig/pkg-descr 2014-03-18 04:39:07.221611863 +0100 +++ puppet/pkg-descr 2014-03-18 05:25:39.754888860 +0100 @@ -4,4 +4,4 @@ hosts, along with obviously discrete elements like packages, services, and files. -WWW: http://www.puppetlabs.com +WWW: http://www.puppetlabs.com diff -ruN puppet.orig/pkg-plist puppet/pkg-plist --- puppet.orig/pkg-plist 2014-03-18 04:39:07.221611863 +0100 +++ puppet/pkg-plist 2014-03-18 05:25:24.494679861 +0100 @@ -49,15 +49,17 @@ %%ETCDIR%%/auth.conf-dist www/puppet/config.ru @exec /usr/sbin/chown -Rh puppet:puppet %D/%F +@exec /usr/sbin/chown -Rh puppet:puppet /var/puppet @dirrm www/puppet/public @dirrm www/puppet @dirrmtry etc/puppet/modules @dirrmtry etc/puppet -@unexec rmdir /var/puppet 2>/dev/null || : -@exec /usr/sbin/chown -Rh puppet:puppet /var/puppet @dirrm %%RUBY_SITELIBDIR%%/hiera/backend @dirrm %%RUBY_SITELIBDIR%%/hiera @dirrm %%RUBY_SITELIBDIR%%/puppetx/puppetlabs/syntax_checkers @dirrm %%RUBY_SITELIBDIR%%/puppetx/puppetlabs @dirrm %%RUBY_SITELIBDIR%%/puppetx/puppet @dirrm %%RUBY_SITELIBDIR%%/puppetx +@cwd / +@dirrm var/puppet +@cwd %%RESETPREFIX%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403181632.s2IGWh5o052979>