From owner-svn-ports-all@freebsd.org Fri Dec 4 20:16:13 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9FC384AB07A; Fri, 4 Dec 2020 20:16:13 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CnkVj3zlvz3kGP; Fri, 4 Dec 2020 20:16:13 +0000 (UTC) (envelope-from romain@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7AC7C11D03; Fri, 4 Dec 2020 20:16:13 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0B4KGD6A031300; Fri, 4 Dec 2020 20:16:13 GMT (envelope-from romain@FreeBSD.org) Received: (from romain@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B4KGBTC031291; Fri, 4 Dec 2020 20:16:11 GMT (envelope-from romain@FreeBSD.org) Message-Id: <202012042016.0B4KGBTC031291@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: romain set sender to romain@FreeBSD.org using -f From: =?UTF-8?Q?Romain_Tarti=c3=a8re?= Date: Fri, 4 Dec 2020 20:16:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r557015 - in head/sysutils: . puppet5 puppet6 puppet7 X-SVN-Group: ports-head X-SVN-Commit-Author: romain X-SVN-Commit-Paths: in head/sysutils: . puppet5 puppet6 puppet7 X-SVN-Commit-Revision: 557015 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Dec 2020 20:16:13 -0000 Author: romain Date: Fri Dec 4 20:16:11 2020 New Revision: 557015 URL: https://svnweb.freebsd.org/changeset/ports/557015 Log: Hello Puppet 7! Add sysutils/puppet7 from a copy of sysutils/puppet6 and a few minor tweaks. With hat: puppet Added: head/sysutils/puppet7/ - copied from r557013, head/sysutils/puppet6/ Modified: head/sysutils/Makefile head/sysutils/puppet5/Makefile head/sysutils/puppet5/pkg-descr head/sysutils/puppet6/Makefile head/sysutils/puppet6/pkg-descr head/sysutils/puppet7/Makefile head/sysutils/puppet7/distinfo head/sysutils/puppet7/pkg-descr head/sysutils/puppet7/pkg-plist Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Fri Dec 4 20:14:53 2020 (r557014) +++ head/sysutils/Makefile Fri Dec 4 20:16:11 2020 (r557015) @@ -966,6 +966,7 @@ SUBDIR += puppet-mode.el SUBDIR += puppet5 SUBDIR += puppet6 + SUBDIR += puppet7 SUBDIR += puppetserver5 SUBDIR += puppetserver6 SUBDIR += pv Modified: head/sysutils/puppet5/Makefile ============================================================================== --- head/sysutils/puppet5/Makefile Fri Dec 4 20:14:53 2020 (r557014) +++ head/sysutils/puppet5/Makefile Fri Dec 4 20:16:11 2020 (r557015) @@ -25,7 +25,7 @@ RUN_DEPENDS= rubygem-gettext-setup>=0:devel/rubygem-ge USES= cpe CPE_VENDOR= puppetlabs -CONFLICTS_INSTALL= puppet4-* puppet6-* +CONFLICTS_INSTALL= puppet6-* puppet7-* NO_ARCH= yes NO_BUILD= yes USE_RUBY= yes Modified: head/sysutils/puppet5/pkg-descr ============================================================================== --- head/sysutils/puppet5/pkg-descr Fri Dec 4 20:14:53 2020 (r557014) +++ head/sysutils/puppet5/pkg-descr Fri Dec 4 20:16:11 2020 (r557015) @@ -4,4 +4,4 @@ elements normally aggregated in different files, like hosts, along with obviously discrete elements like packages, services, and files. -WWW: https://puppetlabs.com/puppet/puppet-open-source +WWW: https://puppet.com/docs/puppet/latest/puppet_index.html Modified: head/sysutils/puppet6/Makefile ============================================================================== --- head/sysutils/puppet6/Makefile Fri Dec 4 20:14:53 2020 (r557014) +++ head/sysutils/puppet6/Makefile Fri Dec 4 20:16:11 2020 (r557015) @@ -30,7 +30,7 @@ CPE_VENDOR= puppetlabs USE_GITHUB= yes GH_ACCOUNT= puppetlabs -CONFLICTS_INSTALL= puppet4-* puppet5-* +CONFLICTS_INSTALL= puppet5-* puppet7-* PLIST_SUB= PORTVERSION="${PORTVERSION}" NO_ARCH= yes NO_BUILD= yes Modified: head/sysutils/puppet6/pkg-descr ============================================================================== --- head/sysutils/puppet6/pkg-descr Fri Dec 4 20:14:53 2020 (r557014) +++ head/sysutils/puppet6/pkg-descr Fri Dec 4 20:16:11 2020 (r557015) @@ -4,4 +4,4 @@ elements normally aggregated in different files, like hosts, along with obviously discrete elements like packages, services, and files. -WWW: https://puppetlabs.com/puppet/puppet-open-source +WWW: https://puppet.com/docs/puppet/latest/puppet_index.html Modified: head/sysutils/puppet7/Makefile ============================================================================== --- head/sysutils/puppet6/Makefile Fri Dec 4 20:05:36 2020 (r557013) +++ head/sysutils/puppet7/Makefile Fri Dec 4 20:16:11 2020 (r557015) @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= puppet -PORTVERSION= 6.19.1 +PORTVERSION= 7.0.0 CATEGORIES= sysutils -PKGNAMESUFFIX= 6 +PKGNAMESUFFIX= 7 MAINTAINER= puppet@FreeBSD.org COMMENT= Configuration management framework written in Ruby @@ -11,8 +11,7 @@ COMMENT= Configuration management framework written in LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= rubygem-concurrent-ruby>0:devel/rubygem-concurrent-ruby \ - rubygem-deep_merge>=1.0:devel/rubygem-deep_merge \ +BUILD_DEPENDS= rubygem-deep_merge>=1.0:devel/rubygem-deep_merge \ rubygem-hiera>=2.0:sysutils/rubygem-hiera \ rubygem-json_pure>=0:devel/rubygem-json_pure \ rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet @@ -30,7 +29,7 @@ CPE_VENDOR= puppetlabs USE_GITHUB= yes GH_ACCOUNT= puppetlabs -CONFLICTS_INSTALL= puppet4-* puppet5-* +CONFLICTS_INSTALL= puppet5-* puppet6-* PLIST_SUB= PORTVERSION="${PORTVERSION}" NO_ARCH= yes NO_BUILD= yes @@ -44,7 +43,7 @@ SUB_FILES+= pkg-message SUB_LIST= RUBY=${RUBY} OPTIONS_DEFINE= DOCS EXAMPLES -OPTIONS_DEFAULT= CFACTER +OPTIONS_DEFAULT= RFACTER OPTIONS_RADIO= FACTER OPTIONS_RADIO_FACTER= CFACTER RFACTER @@ -76,7 +75,12 @@ post-patch: @${REINPLACE_CMD} -e "s|/var/log/puppetlabs/puppet|/var/log/puppet|" \ ${WRKSRC}/install.rb \ ${WRKSRC}/lib/puppet/util/run_mode.rb + @${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/public|/var/puppet/state|" \ + ${WRKSRC}/install.rb \ + ${WRKSRC}/lib/puppet/util/run_mode.rb @${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/modules|${ETCDIR}/modules|" \ + -e "s|/etc/puppetlabs/puppetserver/ca|/var/puppetserver/ca|" \ + -e "s|/opt/puppetlabs/puppet/vendor_modules|${ETCDIR}/vendor_modules|" \ ${WRKSRC}/lib/puppet/defaults.rb @${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/bin/gem|${LOCALBASE}/bin/gem|" \ ${WRKSRC}/lib/puppet/provider/package/puppet_gem.rb @@ -87,13 +91,12 @@ post-patch: do-install: @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} LC_ALL=C.UTF-8 ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} \ - --localedir=${RUBY_SITELIBDIR}/puppet/locales + --localedir=${RUBY_SITELIBDIR}/puppet/locales --publicdir=/var/puppet/state/ post-install: ${MKDIR} ${STAGEDIR}${ETCDIR}/manifests ${MKDIR} ${STAGEDIR}${ETCDIR}/modules ${MKDIR} ${STAGEDIR}/var/puppet - ${INSTALL_DATA} ${WRKSRC}/conf/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf-dist ${SETENV} LC_ALL=C.UTF-8 ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \ --confdir=${ETCDIR} \ --rundir=/var/run/puppet \ Modified: head/sysutils/puppet7/distinfo ============================================================================== --- head/sysutils/puppet6/distinfo Fri Dec 4 20:05:36 2020 (r557013) +++ head/sysutils/puppet7/distinfo Fri Dec 4 20:16:11 2020 (r557015) @@ -1,3 +1,3 @@ -TIMESTAMP = 1603410625 -SHA256 (puppetlabs-puppet-6.19.1_GH0.tar.gz) = 95b47ce04f714b1db5fd3327b83d161f0e72c8e34ed22b74114ad2af515ffeb9 -SIZE (puppetlabs-puppet-6.19.1_GH0.tar.gz) = 3376097 +TIMESTAMP = 1605749781 +SHA256 (puppetlabs-puppet-7.0.0_GH0.tar.gz) = 0943956958570c029c6d63f0aefd04260344554cfcf5903370978351329107fe +SIZE (puppetlabs-puppet-7.0.0_GH0.tar.gz) = 3278067 Modified: head/sysutils/puppet7/pkg-descr ============================================================================== --- head/sysutils/puppet6/pkg-descr Fri Dec 4 20:05:36 2020 (r557013) +++ head/sysutils/puppet7/pkg-descr Fri Dec 4 20:16:11 2020 (r557015) @@ -4,4 +4,4 @@ elements normally aggregated in different files, like hosts, along with obviously discrete elements like packages, services, and files. -WWW: https://puppetlabs.com/puppet/puppet-open-source +WWW: https://puppet.com/docs/puppet/latest/puppet_index.html Modified: head/sysutils/puppet7/pkg-plist ============================================================================== --- head/sysutils/puppet6/pkg-plist Fri Dec 4 20:05:36 2020 (r557013) +++ head/sysutils/puppet7/pkg-plist Fri Dec 4 20:16:11 2020 (r557015) @@ -1,5 +1,4 @@ bin/puppet -%%ETCDIR%%/auth.conf-dist %%ETCDIR%%/puppet.conf-dist lib/ruby/gems/%%RUBY_VER%%/specifications/puppet-%%PORTVERSION%%.gemspec %%RUBY_SITELIBDIR%%/hiera/puppet_function.rb @@ -20,9 +19,7 @@ man/man8/puppet-facts.8.gz man/man8/puppet-filebucket.8.gz man/man8/puppet-generate.8.gz man/man8/puppet-help.8.gz -man/man8/puppet-key.8.gz man/man8/puppet-lookup.8.gz -man/man8/puppet-man.8.gz man/man8/puppet-module.8.gz man/man8/puppet-node.8.gz man/man8/puppet-parser.8.gz @@ -31,10 +28,10 @@ man/man8/puppet-report.8.gz man/man8/puppet-resource.8.gz man/man8/puppet-script.8.gz man/man8/puppet-ssl.8.gz -man/man8/puppet-status.8.gz man/man8/puppet.8.gz @dir(puppet,puppet,) %%ETCDIR%%/manifests @dir(puppet,puppet,) %%ETCDIR%%/modules @dir(puppet,puppet,) /var/puppet +@dir(puppet,puppet,) /var/puppet/state @dir(puppet,puppet,) /var/log/puppet @dir /var/run/puppet