diff --git a/sysutils/puppet6/Makefile b/sysutils/puppet6/Makefile index 8b118ef4fe47..e2a28a6c9fea 100644 --- a/sysutils/puppet6/Makefile +++ b/sysutils/puppet6/Makefile @@ -1,143 +1,143 @@ PORTNAME= puppet PORTVERSION= 6.28.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= https://forge.puppet.com/v3/files/:forge PKGNAMESUFFIX= 6 MAINTAINER= puppet@FreeBSD.org COMMENT= Configuration management framework written in Ruby WWW= https://puppet.com/docs/puppet/latest/puppet_index.html LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE DEPRECATED= Puppet 6 has reached EOL EXPIRATION_DATE=2023-06-01 BROKEN_RUBY30= yes BROKEN_RUBY31= yes -RUN_DEPENDS= rubygem-concurrent-ruby>=1.0:devel/rubygem-concurrent-ruby \ +RUN_DEPENDS= rubygem-concurrent-ruby11>=1.0:devel/rubygem-concurrent-ruby11 \ rubygem-deep_merge>=1.0:devel/rubygem-deep_merge \ rubygem-fast_gettext1>=1.1:devel/rubygem-fast_gettext1 \ rubygem-ffi>=1.9.24:devel/rubygem-ffi \ rubygem-hiera>=3.2.1:sysutils/rubygem-hiera \ rubygem-httpclient>=2.8:www/rubygem-httpclient \ rubygem-locale>=2.1:devel/rubygem-locale \ rubygem-multi_json>=1.10:devel/rubygem-multi_json \ rubygem-puppet-resource_api>=0:devel/rubygem-puppet-resource_api \ rubygem-ruby-augeas>=0:textproc/rubygem-ruby-augeas \ rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet USES= cpe ruby USE_GITHUB= yes GH_ACCOUNT= puppetlabs CONFLICTS_INSTALL= puppet7 PLIST_SUB= PORTVERSION="${PORTVERSION}" NO_ARCH= yes NO_BUILD= yes USE_RC_SUBR= puppet PORTDOCS= LICENSE README.md PORTEXAMPLES= * USERS= puppet GROUPS= puppet SUB_FILES+= pkg-message SUB_LIST= RUBY=${RUBY} OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_DEFAULT= CFACTER OPTIONS_RADIO= FACTER OPTIONS_RADIO_FACTER= CFACTER RFACTER RFACTER_DESC= Use facter 4.x (future facter, written in Ruby) CFACTER_DESC= Use facter 3.x (written in C++) RFACTER_BUILD_DEPENDS= rubygem-facter>=4.0:sysutils/rubygem-facter RFACTER_RUN_DEPENDS= rubygem-facter>=4.0:sysutils/rubygem-facter CFACTER_BUILD_DEPENDS= facter>=3.0:sysutils/facter CFACTER_RUN_DEPENDS= facter>=3.0:sysutils/facter # Get versions from # https://github.com/puppetlabs/puppet-agent/tree/6.x/configs/components FORGE_MODULES= augeas_core=1.1.2 \ cron_core=1.0.5 \ host_core=1.0.3 \ mount_core=1.0.4 \ scheduled_task=1.0.0 \ selinux_core=1.1.0 \ sshkeys_core=1.0.3 \ yumrepo_core=1.0.7 \ zfs_core=1.2.0 \ zone_core=1.0.3 .for module in ${FORGE_MODULES} DISTFILES+= puppetlabs-${module:C/=.*//}-${module:C/.*=//}.tar.gz:forge .endfor post-patch: @${REINPLACE_CMD} -e "s|/etc/puppetlabs/puppet|${ETCDIR}|" \ ${WRKSRC}/install.rb \ ${WRKSRC}/lib/puppet/reference/configuration.rb \ ${WRKSRC}/lib/puppet/util/run_mode.rb @${REINPLACE_CMD} -e "s|/etc/puppetlabs/code|${ETCDIR}|" \ ${WRKSRC}/install.rb \ ${WRKSRC}/lib/puppet/reference/configuration.rb \ ${WRKSRC}/lib/puppet/util/run_mode.rb @${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/cache|/var/puppet|" \ ${WRKSRC}/install.rb \ ${WRKSRC}/lib/puppet/reference/configuration.rb \ ${WRKSRC}/lib/puppet/util/run_mode.rb @${REINPLACE_CMD} -e "s|/var/run/puppetlabs|/var/run/puppet|" \ ${WRKSRC}/install.rb \ ${WRKSRC}/lib/puppet/util/run_mode.rb @${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/modules|${ETCDIR}/modules|" \ -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 @${REINPLACE_CMD} -e "s|\$$confdir/ssl|/var/puppet/ssl|" \ ${WRKSRC}/lib/puppet/defaults.rb @${REINPLACE_CMD} -e "s|\.\./\.\./\.\./locales|../locales|" \ ${WRKSRC}/lib/puppet/gettext/config.rb 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 post-install: ${MKDIR} ${STAGEDIR}${ETCDIR}/manifests ${MKDIR} ${STAGEDIR}${ETCDIR}/modules ${MKDIR} ${STAGEDIR}${ETCDIR}/vendor_modules .for module in ${FORGE_MODULES} (cd ${WRKDIR}/puppetlabs-${module:C/=.*//}-${module:C/.*=//} && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/vendor_modules/${module:C/=.*//}) .endfor ${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 \ --vardir=/var/puppet \ --logdir=/var/log/puppet \ --codedir=${ETCDIR} \ > ${STAGEDIR}${ETCDIR}/puppet.conf-dist @${ECHO} ${STAGEDIR}${RUBY_SITELIBDIR}/puppet.rb | \ ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type f | \ ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} ${MKDIR} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/specifications ${INSTALL_DATA} ${WRKSRC}/.gemspec ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/specifications/${PORTNAME}-${PORTVERSION}.gemspec post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/sysutils/puppet6/files/patch-lib_puppet_thread__local.rb b/sysutils/puppet6/files/patch-lib_puppet_thread__local.rb deleted file mode 100644 index 0966f4b86576..000000000000 --- a/sysutils/puppet6/files/patch-lib_puppet_thread__local.rb +++ /dev/null @@ -1,13 +0,0 @@ -Reference: https://github.com/ruby-concurrency/concurrent-ruby/pull/988 - https://github.com/ruby-concurrency/concurrent-ruby/issues/986 - https://github.com/puppetlabs/puppet/commit/9182bc3dd2576f409a6d01fb5c08d392670e90a2 - ---- lib/puppet/thread_local.rb.orig 2022-07-11 22:46:41 UTC -+++ lib/puppet/thread_local.rb -@@ -3,5 +3,5 @@ require 'concurrent' - # We want to use the pure Ruby implementation even on JRuby. If we use the Java - # implementation of ThreadLocal, we end up leaking references to JRuby instances - # and preventing them from being garbage collected. --class Puppet::ThreadLocal < Concurrent::RubyThreadLocalVar -+class Puppet::ThreadLocal < Concurrent::ThreadLocalVar - end