cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 6.13.0

Browse Source 
Release notes:
https://puppet.com/docs/puppetserver/latest/release_notes.html#puppet-server-6130

While here, allow to use Facter 4.x which is now in the FreeBSD tree.

With hat:	puppet
This commit is contained in:
Romain Tartière 2020-08-31 20:06:40 +00:00
parent a668adadf5
commit d4d097fa4a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=547213
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysutils/puppetserver6/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= puppetserver
PORTVERSION= 6.12.1
PORTVERSION= 6.13.0
CATEGORIES= sysutils java
MASTER_SITES= https://downloads.puppetlabs.com/puppet/:upstream \
https://raw.githubusercontent.com/jruby/jruby/fb3ba4b3543b72e735ba53b51e6b7ec8a9916e1b/lib/ruby/stdlib/ffi/:ffi

6
sysutils/puppetserver6/distinfo
View File

@ -1,5 +1,5 @@
TIMESTAMP = 1594766207
SHA256 (puppetserver-6.12.1.tar.gz) = be311584817ec5eef13ff3e6ef895bdb58d9dd00d7c074fa2a49480d29dfc957
SIZE (puppetserver-6.12.1.tar.gz) = 60422470
TIMESTAMP = 1598484564
SHA256 (puppetserver-6.13.0.tar.gz) = 6586db5424260a050e7cbfdd9dd01d939906068cab758d6fe7e54819f032b914
SIZE (puppetserver-6.13.0.tar.gz) = 61890579
SHA256 (ffi.rb) = f991c5eb6b6e4c88541af592207aa7ea14ba48f482978b3b479c4b17390e8e93
SIZE (ffi.rb) = 5893

10
sysutils/puppetserver6/files/patch-ext__config__conf.d__puppetserver.conf
View File

@ -1,6 +1,6 @@
--- ext/config/conf.d/puppetserver.conf.orig 2019-11-18 21:34:21 UTC
--- ext/config/conf.d/puppetserver.conf.orig 2020-08-24 19:31:08 UTC
+++ ext/config/conf.d/puppetserver.conf
@@ -2,16 +2,24 @@
@@ -2,16 +2,26 @@
jruby-puppet: {
# Where the puppet-agent dependency places puppet, facter, etc...
# Puppet server expects to load Puppet from this location
@ -9,8 +9,10 @@
+ %%PREFIX%%/share/puppetserver/lib,
+ %%RUBY_SITELIBDIR%%,
+ %%PREFIX%%/lib/ruby/vendor_ruby,
+ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/concurrent-ruby-1.1.6/lib/concurrent-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,
+ ]
@ -28,7 +30,7 @@
# PLEASE NOTE: Use caution when modifying the below settings. Modifying
# these settings will change the value of the corresponding Puppet settings
@@ -26,23 +34,23 @@ jruby-puppet: {
@@ -26,23 +36,23 @@ jruby-puppet: {
# (optional) path to puppet conf dir; if not specified, will use
# /etc/puppetlabs/puppet