svn commit: r553128 - in head/sysutils/puppetserver6: . files
Romain Tartière
romain at FreeBSD.org
Fri Oct 23 18:43:56 UTC 2020
Author: romain
Date: Fri Oct 23 18:43:55 2020
New Revision: 553128
URL: https://svnweb.freebsd.org/changeset/ports/553128
Log:
Update to 6.14.0
Release notes:
https://puppet.com/docs/puppet/6.19/server/release_notes.html#puppet-server-6140
While here, adjust the default configuration file so that it is not required to
tune it after ech dependency upgrade.
With hat: puppet
Modified:
head/sysutils/puppetserver6/Makefile
head/sysutils/puppetserver6/distinfo
head/sysutils/puppetserver6/files/patch-ext__config__conf.d__puppetserver.conf
Modified: head/sysutils/puppetserver6/Makefile
==============================================================================
--- head/sysutils/puppetserver6/Makefile Fri Oct 23 18:42:35 2020 (r553127)
+++ head/sysutils/puppetserver6/Makefile Fri Oct 23 18:43:55 2020 (r553128)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= puppetserver
-PORTVERSION= 6.13.0
+PORTVERSION= 6.14.0
CATEGORIES= sysutils java
MASTER_SITES= https://downloads.puppetlabs.com/puppet/:upstream \
https://raw.githubusercontent.com/jruby/jruby/fb3ba4b3543b72e735ba53b51e6b7ec8a9916e1b/lib/ruby/stdlib/ffi/:ffi
Modified: head/sysutils/puppetserver6/distinfo
==============================================================================
--- head/sysutils/puppetserver6/distinfo Fri Oct 23 18:42:35 2020 (r553127)
+++ head/sysutils/puppetserver6/distinfo Fri Oct 23 18:43:55 2020 (r553128)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1598484564
-SHA256 (puppetserver-6.13.0.tar.gz) = 6586db5424260a050e7cbfdd9dd01d939906068cab758d6fe7e54819f032b914
-SIZE (puppetserver-6.13.0.tar.gz) = 61890579
+TIMESTAMP = 1603228817
+SHA256 (puppetserver-6.14.0.tar.gz) = adf5eefbbb76544d3acef163ea22923525ed8779fed52dc3d01c34ea260cfaa5
+SIZE (puppetserver-6.14.0.tar.gz) = 61960111
SHA256 (ffi.rb) = f991c5eb6b6e4c88541af592207aa7ea14ba48f482978b3b479c4b17390e8e93
SIZE (ffi.rb) = 5893
Modified: head/sysutils/puppetserver6/files/patch-ext__config__conf.d__puppetserver.conf
==============================================================================
--- head/sysutils/puppetserver6/files/patch-ext__config__conf.d__puppetserver.conf Fri Oct 23 18:42:35 2020 (r553127)
+++ head/sysutils/puppetserver6/files/patch-ext__config__conf.d__puppetserver.conf Fri Oct 23 18:43:55 2020 (r553128)
@@ -1,6 +1,6 @@
---- ext/config/conf.d/puppetserver.conf.orig 2020-08-24 19:31:08 UTC
+--- ext/config/conf.d/puppetserver.conf.orig 2020-10-16 14:28:08 UTC
+++ ext/config/conf.d/puppetserver.conf
-@@ -2,16 +2,26 @@
+@@ -2,16 +2,20 @@
jruby-puppet: {
# Where the puppet-agent dependency places puppet, facter, etc...
# Puppet server expects to load Puppet from this location
@@ -9,12 +9,6 @@
+ %%PREFIX%%/share/puppetserver/lib,
+ %%RUBY_SITELIBDIR%%,
+ %%PREFIX%%/lib/ruby/vendor_ruby,
-+ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/concurrent-ruby-1.1.7/lib/concurrent-ruby,
-+ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/deep_merge-1.2.1/lib,
-+ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/facter/lib,
-+ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/hocon-1.3.1/lib,
-+ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/multi_json-1.13.1/lib,
-+ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/semantic_puppet-1.0.2/lib,
+ ]
# This setting determines where JRuby will install gems. It is used for loading gems,
@@ -26,11 +20,11 @@
# the gem-home directory as well as any other directories that gems can be loaded
# from (including the vendored gems directory for gems that ship with puppetserver)
- gem-path: [${jruby-puppet.gem-home}, "/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems", "/opt/puppetlabs/puppet/lib/ruby/vendor_gems"]
-+ gem-path: [${jruby-puppet.gem-home}, "/var/puppet/server/data/puppetserver/vendored-jruby-gems"]
++ gem-path: [${jruby-puppet.gem-home}, "/var/puppet/server/data/puppetserver/vendored-jruby-gems", "%%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%"]
# PLEASE NOTE: Use caution when modifying the below settings. Modifying
# these settings will change the value of the corresponding Puppet settings
-@@ -26,23 +36,23 @@ jruby-puppet: {
+@@ -26,23 +30,23 @@ jruby-puppet: {
# (optional) path to puppet conf dir; if not specified, will use
# /etc/puppetlabs/puppet
More information about the svn-ports-all
mailing list