Date: Mon, 31 Aug 2020 20:05:25 +0000 (UTC) From: =?UTF-8?Q?Romain_Tarti=c3=a8re?= <romain@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547212 - in head/sysutils/puppetserver5: . files Message-ID: <202008312005.07VK5PX9083953@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: romain Date: Mon Aug 31 20:05:24 2020 New Revision: 547212 URL: https://svnweb.freebsd.org/changeset/ports/547212 Log: Update to support Facter 4.x Now that we ship sysutils/rubygem-facter, minor adjustments are needed on the PuppetServer side. The dependency on facter is managed by sysutils/puppet5, so no need for options here. Bump PORTREVISION. With hat: puppet Modified: head/sysutils/puppetserver5/Makefile head/sysutils/puppetserver5/distinfo head/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf Modified: head/sysutils/puppetserver5/Makefile ============================================================================== --- head/sysutils/puppetserver5/Makefile Mon Aug 31 20:02:27 2020 (r547211) +++ head/sysutils/puppetserver5/Makefile Mon Aug 31 20:05:24 2020 (r547212) @@ -2,6 +2,7 @@ PORTNAME= puppetserver PORTVERSION= 5.3.14 +PORTREVISION= 1 CATEGORIES= sysutils java MASTER_SITES= https://downloads.puppetlabs.com/puppet/ PKGNAMESUFFIX= 5 @@ -35,17 +36,6 @@ GROUPS= puppet SUB_LIST= JAVA_HOME=${JAVA_HOME} SUB_FILES= pkg-message - -OPTIONS_DEFAULT= CFACTER -OPTIONS_RADIO= FACTER -OPTIONS_RADIO_FACTER= CFACTER RFACTER - -RFACTER_DESC= Use facter 2.x (written in Ruby) -CFACTER_DESC= Use facter 3.x (experimental rewrite in C++) - -RFACTER_RUN_DEPENDS= rubygem-facter>=2.0:sysutils/rubygem-facter - -CFACTER_RUN_DEPENDS= facter>=3.0:sysutils/facter post-patch: .for file in ext/config/logback.xml ext/config/request-logging.xml \ Modified: head/sysutils/puppetserver5/distinfo ============================================================================== --- head/sysutils/puppetserver5/distinfo Mon Aug 31 20:02:27 2020 (r547211) +++ head/sysutils/puppetserver5/distinfo Mon Aug 31 20:05:24 2020 (r547212) @@ -1,3 +1,3 @@ -TIMESTAMP = 1594846825 +TIMESTAMP = 1598656625 SHA256 (puppetserver-5.3.14.tar.gz) = 23cebf6fda2233abcf059020bb73c9a9a283a89cfc211e3582cea59813da142c SIZE (puppetserver-5.3.14.tar.gz) = 53787806 Modified: head/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf ============================================================================== --- head/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf Mon Aug 31 20:02:27 2020 (r547211) +++ head/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf Mon Aug 31 20:05:24 2020 (r547212) @@ -1,6 +1,6 @@ ---- ext/config/conf.d/puppetserver.conf.orig 2018-08-21 16:07:02 UTC +--- ext/config/conf.d/puppetserver.conf.orig 2020-07-02 18:59:15 UTC +++ ext/config/conf.d/puppetserver.conf -@@ -2,16 +2,20 @@ +@@ -2,16 +2,21 @@ jruby-puppet: { # Where the puppet-agent dependency places puppet, facter, etc... # Puppet server expects to load Puppet from this location @@ -8,7 +8,8 @@ + ruby-load-path: [ + %%RUBY_SITELIBDIR%%, + %%PREFIX%%/lib/ruby/vendor_ruby, -+ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/facter-2.5.0/lib, ++ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/facter/lib, ++ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/hocon-1.3.1/lib, + ] # This setting determines where JRuby will install gems. It is used for loading gems, @@ -24,7 +25,7 @@ # PLEASE NOTE: Use caution when modifying the below settings. Modifying # these settings will change the value of the corresponding Puppet settings -@@ -26,23 +30,23 @@ jruby-puppet: { +@@ -26,23 +31,23 @@ jruby-puppet: { # (optional) path to puppet conf dir; if not specified, will use # /etc/puppetlabs/puppet
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008312005.07VK5PX9083953>