From owner-svn-ports-head@freebsd.org Tue May 24 10:40:10 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E9AE4B46909; Tue, 24 May 2016 10:40:10 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C4FD411DC; Tue, 24 May 2016 10:40:10 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4OAeAg8038726; Tue, 24 May 2016 10:40:10 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4OAe9h2038722; Tue, 24 May 2016 10:40:09 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201605241040.u4OAe9h2038722@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 24 May 2016 10:40:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415776 - in head/sysutils/puppetserver: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 May 2016 10:40:11 -0000 Author: amdmi3 Date: Tue May 24 10:40:09 2016 New Revision: 415776 URL: https://svnweb.freebsd.org/changeset/ports/415776 Log: - Update to 2.3.1 - Fix config file handling - Include extra missing 'app' files PR: 208363 Submitted by: freebsd@zleslie.info Approved by: maintainer timeout (xaque208@gmail.com, 2 months) Modified: head/sysutils/puppetserver/Makefile head/sysutils/puppetserver/distinfo head/sysutils/puppetserver/files/patch-ext__config__conf.d__webserver.conf head/sysutils/puppetserver/pkg-plist Modified: head/sysutils/puppetserver/Makefile ============================================================================== --- head/sysutils/puppetserver/Makefile Tue May 24 09:44:05 2016 (r415775) +++ head/sysutils/puppetserver/Makefile Tue May 24 10:40:09 2016 (r415776) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= puppetserver -PORTVERSION= 2.2.1 +PORTVERSION= 2.3.1 CATEGORIES= sysutils java MASTER_SITES= http://downloads.puppetlabs.com/puppet/ @@ -55,19 +55,25 @@ post-patch: .endfor do-install: - ${MKDIR} ${STAGEDIR}${DATADIR} - ${MKDIR} ${STAGEDIR}${ETCDIR} - ${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppet/code - ${MKDIR} ${STAGEDIR}/var/log/puppetserver + @${MKDIR} ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR}/cli + @${MKDIR} ${STAGEDIR}${DATADIR}/cli/apps + @${MKDIR} ${STAGEDIR}${ETCDIR} + @${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppet/code + @${MKDIR} ${STAGEDIR}/var/log/puppetserver ${INSTALL_DATA} ${WRKSRC}/puppet-server-release.jar ${STAGEDIR}${DATADIR}/puppetserver.jar - ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/global.conf ${STAGEDIR}${ETCDIR}/conf.d/global.conf - ${INSTALL_DATA} ${WRKSRC}/ext/config/logback.xml ${STAGEDIR}${ETCDIR}/logback.xml - ${INSTALL_DATA} ${WRKSRC}/ext/config/bootstrap.cfg ${STAGEDIR}${ETCDIR}/bootstrap.cfg - ${INSTALL_DATA} ${WRKSRC}/ext/config/request-logging.xml ${STAGEDIR}${ETCDIR}/request-logging.xml - ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/puppetserver.conf ${STAGEDIR}${ETCDIR}/conf.d/puppetserver.conf - ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/web-routes.conf ${STAGEDIR}${ETCDIR}/conf.d/web-routes.conf - ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/webserver.conf ${STAGEDIR}${ETCDIR}/conf.d/webserver.conf - ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/auth.conf ${STAGEDIR}${ETCDIR}/conf.d/auth.conf + ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/global.conf ${STAGEDIR}${ETCDIR}/conf.d/global.conf.sample + ${INSTALL_DATA} ${WRKSRC}/ext/config/logback.xml ${STAGEDIR}${ETCDIR}/logback.xml.sample + ${INSTALL_DATA} ${WRKSRC}/ext/config/bootstrap.cfg ${STAGEDIR}${ETCDIR}/bootstrap.cfg.sample + ${INSTALL_DATA} ${WRKSRC}/ext/config/request-logging.xml ${STAGEDIR}${ETCDIR}/request-logging.xml.sample + ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/puppetserver.conf ${STAGEDIR}${ETCDIR}/conf.d/puppetserver.conf.sample + ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/web-routes.conf ${STAGEDIR}${ETCDIR}/conf.d/web-routes.conf.sample + ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/webserver.conf ${STAGEDIR}${ETCDIR}/conf.d/webserver.conf.sample + ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/auth.conf ${STAGEDIR}${ETCDIR}/conf.d/auth.conf.sample + ${INSTALL_DATA} ${WRKSRC}/ext/cli/foreground ${STAGEDIR}${DATADIR}/cli/apps/foreground + ${INSTALL_DATA} ${WRKSRC}/ext/cli/gem ${STAGEDIR}${DATADIR}/cli/apps/gem + ${INSTALL_DATA} ${WRKSRC}/ext/cli/irb ${STAGEDIR}${DATADIR}/cli/apps/irb + ${INSTALL_DATA} ${WRKSRC}/ext/cli/ruby ${STAGEDIR}${DATADIR}/cli/apps/ruby .include Modified: head/sysutils/puppetserver/distinfo ============================================================================== --- head/sysutils/puppetserver/distinfo Tue May 24 09:44:05 2016 (r415775) +++ head/sysutils/puppetserver/distinfo Tue May 24 10:40:09 2016 (r415776) @@ -1,2 +1,2 @@ -SHA256 (puppetserver-2.2.1.tar.gz) = 583662380b161fc35e0f0c5e7e2964892ec4b7e0cb848cadcd76b29684a85843 -SIZE (puppetserver-2.2.1.tar.gz) = 42665674 +SHA256 (puppetserver-2.3.1.tar.gz) = 25e0d27339c2e8313cb083503e5790e4f7f1c5c3b29a67b73a35a3aca2f513d9 +SIZE (puppetserver-2.3.1.tar.gz) = 33667638 Modified: head/sysutils/puppetserver/files/patch-ext__config__conf.d__webserver.conf ============================================================================== --- head/sysutils/puppetserver/files/patch-ext__config__conf.d__webserver.conf Tue May 24 09:44:05 2016 (r415775) +++ head/sysutils/puppetserver/files/patch-ext__config__conf.d__webserver.conf Tue May 24 10:40:09 2016 (r415776) @@ -1,9 +1,9 @@ ---- ext/config/conf.d/webserver.conf.orig 2015-10-27 16:26:17 UTC +--- ext/config/conf.d/webserver.conf.orig 2016-03-28 10:32:26.000000000 -0700 +++ ext/config/conf.d/webserver.conf @@ -1,5 +1,5 @@ webserver: { -- access-log-config = /etc/puppetlabs/puppetserver/request-logging.xml -+ access-log-config = %%PREFIX%%/etc/puppetserver/request-logging.xml - client-auth = want - ssl-host = 0.0.0.0 - ssl-port = 8140 +- access-log-config: /etc/puppetlabs/puppetserver/request-logging.xml ++ access-log-config: %%PREFIX%%/etc/puppetserver/request-logging.xml + client-auth: want + ssl-host: 0.0.0.0 + ssl-port: 8140 Modified: head/sysutils/puppetserver/pkg-plist ============================================================================== --- head/sysutils/puppetserver/pkg-plist Tue May 24 09:44:05 2016 (r415775) +++ head/sysutils/puppetserver/pkg-plist Tue May 24 10:40:09 2016 (r415776) @@ -1,14 +1,15 @@ -%%ETCDIR%%/logback.xml -%%ETCDIR%%/bootstrap.cfg -%%ETCDIR%%/request-logging.xml -%%ETCDIR%%/conf.d/global.conf -%%ETCDIR%%/conf.d/puppetserver.conf -%%ETCDIR%%/conf.d/web-routes.conf -%%ETCDIR%%/conf.d/webserver.conf -%%ETCDIR%%/conf.d/auth.conf +@sample %%ETCDIR%%/logback.xml.sample +@sample %%ETCDIR%%/bootstrap.cfg.sample +@sample %%ETCDIR%%/request-logging.xml.sample +@sample %%ETCDIR%%/conf.d/auth.conf.sample +@sample %%ETCDIR%%/conf.d/global.conf.sample +@sample %%ETCDIR%%/conf.d/puppetserver.conf.sample +@sample %%ETCDIR%%/conf.d/web-routes.conf.sample +@sample %%ETCDIR%%/conf.d/webserver.conf.sample +@dir(,puppet,750) etc/puppet/code %%DATADIR%%/puppetserver.jar -@mode 0750 -@group puppet -@dir etc/puppet/code -@owner puppet -@dir /var/log/puppetserver +%%DATADIR%%/cli/apps/foreground +%%DATADIR%%/cli/apps/gem +%%DATADIR%%/cli/apps/irb +%%DATADIR%%/cli/apps/ruby +@dir(puppet,puppet,750) /var/log/puppetserver