From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Apr 10 16:50:02 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E98BDA11 for ; Thu, 10 Apr 2014 16:50:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 C426918AB for ; Thu, 10 Apr 2014 16:50:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s3AGo1Dn047957 for ; Thu, 10 Apr 2014 16:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s3AGo1Ed047956; Thu, 10 Apr 2014 16:50:01 GMT (envelope-from gnats) Resent-Date: Thu, 10 Apr 2014 16:50:01 GMT Resent-Message-Id: <201404101650.s3AGo1Ed047956@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Bartek Rutkowski Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9F7C090A; Thu, 10 Apr 2014 16:42:57 +0000 (UTC) Received: from poudriere.ithil.palantiri.org (ithil.palantiri.org [144.76.36.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "0254-fbsd-10-amd64", Issuer "0254-fbsd-10-amd64" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 31F4C1869; Thu, 10 Apr 2014 16:42:56 +0000 (UTC) Received: from poudriere.ithil.palantiri.org (localhost [127.0.0.1]) by poudriere.ithil.palantiri.org (8.14.8/8.14.8) with ESMTP id s3AGgsva082345 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 10 Apr 2014 18:42:54 +0200 (CEST) (envelope-from root@poudriere.ithil.palantiri.org) Received: (from root@localhost) by poudriere.ithil.palantiri.org (8.14.8/8.14.8/Submit) id s3AGgr7Y082344; Thu, 10 Apr 2014 18:42:53 +0200 (CEST) (envelope-from root) Message-Id: <201404101642.s3AGgr7Y082344@poudriere.ithil.palantiri.org> Date: Thu, 10 Apr 2014 18:42:53 +0200 (CEST) From: Bartek Rutkowski To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/188435: [PATCH] sysutils/puppet27: update to 2.7.25 Cc: swills@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2014 16:50:02 -0000 >Number: 188435 >Category: ports >Synopsis: [PATCH] sysutils/puppet27: update to 2.7.25 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Apr 10 16:50:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Bartek Rutkowski >Release: FreeBSD 11.0-CURRENT amd64 >Organization: Pixeware LTD >Environment: System: FreeBSD poudriere.ithil.palantiri.org 11.0-CURRENT FreeBSD 11.0-CURRENT #0 r264126: Fri Apr 4 21:33:01 >Description: - Update to 2.7.25 - Added LICENSE - Pet portlint - Added staging support Port maintainer (swills@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 1.00.2014.03.23 (mode: update, diff: SVN) >How-To-Repeat: >Fix: --- puppet27-2.7.25.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 350820) +++ Makefile (working copy) @@ -2,19 +2,21 @@ # $FreeBSD$ PORTNAME= puppet -PORTVERSION= 2.7.23 -PORTREVISION= 1 +PORTVERSION= 2.7.25 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ +PKGNAMESUFFIX= 27 MAINTAINER= swills@FreeBSD.org -COMMENT= A configuration management framework written in Ruby +COMMENT= Configuration management framework written in Ruby +LICENSE= APACHE20 + RUN_DEPENDS= rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \ rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-augeas LATEST_LINK= puppet27 -CONFLICTS= puppet-2.6* puppet-3* +CONFLICTS= puppet-2.6* puppet-3* NO_BUILD= yes USE_RUBY= yes USE_RUBY_FEATURES= iconv @@ -24,11 +26,10 @@ USERS= puppet GROUPS= puppet SUB_FILES+= pkg-message +PLIST_SUB+= RESETPREFIX=${PREFIX} PORTSCOUT= limit:^2\.7\. -PKGNAMESUFFIX= 27 - MANCOMPRESSED= yes MAN5= puppet.conf.5 MAN8= filebucket.8 pi.8 puppet-agent.8 puppet-apply.8 puppet-ca.8 \ @@ -52,8 +53,6 @@ PACKAGE_ROOT_DESC= Use PACKAGEROOT insted of PACKAGESITE PATCHES_DESC= Optional exclusive patches -NO_STAGE= yes - OPTIONS_DEFINE= DOCS EXAMPLES .include @@ -88,33 +87,33 @@ ${WRKSRC}/lib/puppet/defaults.rb do-install: - @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs + @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} post-install: - ${INSTALL} -d ${ETCDIR} - ${INSTALL} -m 0755 -o puppet -g puppet -d /var/puppet - ${INSTALL} -m 0755 -o puppet -g puppet -d /var/run/puppet - ${INSTALL} -m 0644 ${WRKSRC}/conf/auth.conf ${ETCDIR}/auth.conf-dist - ${RUBY} -I ${RUBY_SITELIBDIR} ${PREFIX}/bin/puppet --genconfig \ + ${INSTALL} -d ${STAGEDIR}${ETCDIR} + ${MKDIR} ${STAGEDIR}/var/puppet + ${MKDIR} ${STAGEDIR}/var/run/puppet + ${INSTALL} -m 0644 ${WRKSRC}/conf/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf-dist + ${RUBY} -I ${STAGEDIR}${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet --genconfig \ --confdir=${ETCDIR} \ --rundir=/var/run/puppet | \ ${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} - @${ECHO} ${RUBY_SITELIBDIR}/semver.rb | \ - ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} - @${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type f | \ - ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} - @${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type d | ${SORT} -r | \ - ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} + > ${STAGEDIR}${ETCDIR}/puppet.conf-dist + @${ECHO} ${STAGEDIR}${RUBY_SITELIBDIR}/puppet.rb | \ + ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} + @${ECHO} ${STAGEDIR}${RUBY_SITELIBDIR}/semver.rb | \ + ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} + @${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type f | \ + ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} + @${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type d | ${SORT} -r | \ + ${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST} .if ${PORT_OPTIONS:MDOCS} - ${INSTALL} -d ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif .if ${PORT_OPTIONS:MEXAMPLES} - cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR} + cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .endif @${CAT} ${PKGMESSAGE} Index: distinfo =================================================================== --- distinfo (revision 350820) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (puppet-2.7.23.tar.gz) = 73bc0d5a2334dc484148141a32274703b65b78bf87ca41f7e2da1c38518ba490 -SIZE (puppet-2.7.23.tar.gz) = 2025639 +SHA256 (puppet-2.7.25.tar.gz) = daf6eb2e05cab13f40c520ca6777038f052082ace7d69708ec7fd97ab53cb13c +SIZE (puppet-2.7.25.tar.gz) = 2020161 Index: pkg-descr =================================================================== --- pkg-descr (revision 350820) +++ pkg-descr (working copy) @@ -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 Index: pkg-plist =================================================================== --- pkg-plist (revision 350820) +++ pkg-plist (working copy) @@ -8,12 +8,55 @@ sbin/puppetmasterd sbin/puppetqd sbin/puppetrun +man/man5/puppet.conf.5.gz +man/man8/filebucket.8.gz +man/man8/pi.8.gz +man/man8/puppet-agent.8.gz +man/man8/puppet-apply.8.gz +man/man8/puppet-ca.8.gz +man/man8/puppet-catalog.8.gz +man/man8/puppet-cert.8.gz +man/man8/puppet-certificate.8.gz +man/man8/puppet-certificate_request.8.gz +man/man8/puppet-certificate_revocation_list.8.gz +man/man8/puppet-config.8.gz +man/man8/puppet-describe.8.gz +man/man8/puppet-device.8.gz +man/man8/puppet-doc.8.gz +man/man8/puppet-facts.8.gz +man/man8/puppet-file.8.gz +man/man8/puppet-filebucket.8.gz +man/man8/puppet-help.8.gz +man/man8/puppet-inspect.8.gz +man/man8/puppet-instrumentation_data.8.gz +man/man8/puppet-instrumentation_listener.8.gz +man/man8/puppet-instrumentation_probe.8.gz +man/man8/puppet-key.8.gz +man/man8/puppet-kick.8.gz +man/man8/puppet-man.8.gz +man/man8/puppet-master.8.gz +man/man8/puppet-module.8.gz +man/man8/puppet-node.8.gz +man/man8/puppet-parser.8.gz +man/man8/puppet-plugin.8.gz +man/man8/puppet-queue.8.gz +man/man8/puppet-report.8.gz +man/man8/puppet-resource.8.gz +man/man8/puppet-resource_type.8.gz +man/man8/puppet-secret_agent.8.gz +man/man8/puppet-status.8.gz +man/man8/puppet.8.gz +man/man8/puppetca.8.gz +man/man8/puppetd.8.gz +man/man8/puppetdoc.8.gz +man/man8/puppetmasterd.8.gz +man/man8/puppetqd.8.gz +man/man8/puppetrun.8.gz +man/man8/ralsh.8.gz %%ETCDIR%%/puppet.conf-dist %%ETCDIR%%/auth.conf-dist @dirrmtry etc/puppet -@unexec rmdir /var/puppet 2>/dev/null || true -@unexec rmdir /var/run/puppet 2>/dev/null || true -@exec /bin/mkdir -p /var/run/puppet -@exec /usr/sbin/chown -Rh puppet:puppet /var/run/puppet -@exec /bin/mkdir -p /var/puppet -@exec /usr/sbin/chown -Rh puppet:puppet /var/puppet +@cwd / +@dirrm var/puppet +@dirrm var/run/puppet +@cwd %%RESETPREFIX%% --- puppet27-2.7.25.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: