- 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.

PR:		ports/159801
Submitted by:	Russell Jackson <raj@csub.edu> (maintainer)

3 files changed, 12 insertions, 12 deletions

diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile
index 7ab22a2829a7..208824da44f6 100644
--- a/sysutils/puppet/Makefile
+++ b/sysutils/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 a/sysutils/puppet/distinfo b/sysutils/puppet/distinfo
index 424ccaf3a734..b052150b8d17 100644
--- a/sysutils/puppet/distinfo
+++ b/sysutils/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 a/sysutils/puppet/files/puppetmaster.in b/sysutils/puppet/files/puppetmaster.in
index 1f48c01e3b73..14dd12c57b3c 100644
--- a/sysutils/puppet/files/puppetmaster.in
+++ b/sysutils/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
 }