ports/159801: [maintainer-update] sysutils/puppet: update to 2.7.3 et al
Russell Jackson
raj at csub.edu
Mon Aug 15 21:40:06 UTC 2011
>Number: 159801
>Category: ports
>Synopsis: [maintainer-update] sysutils/puppet: update to 2.7.3 et al
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Aug 15 21:40:04 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Russell Jackson
>Release:
>Organization:
California State University, Bakersfield
>Environment:
>Description:
* Update port to release version of 2.7.3
* Fix issue with deprecated command use in puppetmaster rc script
* Fix issue with puppetmaster startup bug triggered by "factdest" being
defined in dist config.
>How-To-Repeat:
>Fix:
diff --git puppet/Makefile puppet/Makefile
index 747e4f0..6fadb19 100644
--- puppet/Makefile
+++ puppet/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= puppet
-DISTVERSION= 2.7.3rc1
+PORTVERSION= 2.7.3
CATEGORIES= sysutils
MASTER_SITES= http://downloads.puppetlabs.com/puppet/
@@ -87,11 +87,11 @@ do-install:
post-install:
${INSTALL} -d ${ETCDIR}
${INSTALL} -m 0644 ${WRKSRC}/conf/auth.conf ${ETCDIR}/auth.conf-dist
- ${RUBY} -I ${RUBY_SITELIBDIR} ${PREFIX}/sbin/puppetmasterd \
+ ${RUBY} -I ${RUBY_SITELIBDIR} ${PREFIX}/bin/puppet --genconfig \
--confdir=${ETCDIR} \
- --rundir=${PUPPET_RUNDIR} \
- --genconfig | \
- ${SED} -e 's/genconfig = true/# genconfig = false/' \
+ --rundir=${PUPPET_RUNDIR} | \
+ ${SED} -e 's/genconfig = true/# genconfig = false/' | \
+ ${SED} -e 's/factdest =/# factdest =/' \
> ${ETCDIR}/puppet.conf-dist
@${ECHO} ${RUBY_SITELIBDIR}/puppet.rb | \
${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
diff --git puppet/distinfo puppet/distinfo
index 424ccaf..b052150 100644
--- puppet/distinfo
+++ puppet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (puppet-2.7.3rc1.tar.gz) = c1d0a08114f94b727b33d18cec60232ae7b48f107fd23495706e0444c5377036
-SIZE (puppet-2.7.3rc1.tar.gz) = 1710547
+SHA256 (puppet-2.7.3.tar.gz) = 39df9b1ffe06c1331f4eba6d21e632acffb7859e4f4b9e2faeddd9b8b685cb09
+SIZE (puppet-2.7.3.tar.gz) = 1710562
diff --git puppet/files/puppetmaster.in puppet/files/puppetmaster.in
index e889844..b10308d 100644
--- puppet/files/puppetmaster.in
+++ puppet/files/puppetmaster.in
@@ -28,19 +28,19 @@ command_args="master ${puppetmaster_flags}"
unset puppetmaster_flags
pidfile="${puppetmaster_rundir}/master.pid"
+puppet_manifestdir="$($command config print manifestdir)"
start_precmd="puppetmaster_checkconfig"
restart_precmd="puppetmaster_checkconfig"
puppetmaster_checkconfig() {
echo -n "Performing sanity check of ${name} configuration: "
- ${command} ${command_args} --parseonly >/dev/null 2>&1
- rv=$?
- if [ $rv != 0 ]; then
- echo "FAILED, ${name} exited with status ${rv}"
- ${command} ${command_args} --parseonly
+ if ! ${command} parser validate "${puppet_manifestdir}/site.pp"
+ then
+ echo "FAILED"
return 1
else
echo "OK"
+ return 0
fi
}
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list