svn commit: r518613 - in head/sysutils/puppetserver6: . files

[Romain Tartière]

Author: romain
Date: Fri Nov 29 00:20:42 2019
New Revision: 518613
URL: https://svnweb.freebsd.org/changeset/ports/518613

Log:
  Update to 6.7.2
  
  Release notes:
  https://puppet.com/docs/puppetserver/6.5/release_notes.html (sic)
  
  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 Nov 29 00:17:31 2019	(r518612)
+++ head/sysutils/puppetserver6/Makefile	Fri Nov 29 00:20:42 2019	(r518613)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	puppetserver
-PORTVERSION=	6.7.1
+PORTVERSION=	6.7.2
 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 Nov 29 00:17:31 2019	(r518612)
+++ head/sysutils/puppetserver6/distinfo	Fri Nov 29 00:20:42 2019	(r518613)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1571245673
-SHA256 (puppetserver-6.7.1.tar.gz) = f217a1c46477757cbae06cdfcea1e9b25ba750df50c86ec0691c7921019c0c6d
-SIZE (puppetserver-6.7.1.tar.gz) = 59202711
+TIMESTAMP = 1574531251
+SHA256 (puppetserver-6.7.2.tar.gz) = a776b707fba123fce8b1de73319f96d22a6c88891e758b166069c8c841f68c23
+SIZE (puppetserver-6.7.2.tar.gz) = 59340246
 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 Nov 29 00:17:31 2019	(r518612)
+++ head/sysutils/puppetserver6/files/patch-ext__config__conf.d__puppetserver.conf	Fri Nov 29 00:20:42 2019	(r518613)
@@ -1,6 +1,6 @@
---- ext/config/conf.d/puppetserver.conf.orig	2019-09-17 14:05:34 UTC
+--- ext/config/conf.d/puppetserver.conf.orig	2019-11-18 21:34:21 UTC
 +++ ext/config/conf.d/puppetserver.conf
-@@ -2,16 +2,23 @@
+@@ -2,16 +2,24 @@
  jruby-puppet: {
      # Where the puppet-agent dependency places puppet, facter, etc...
      # Puppet server expects to load Puppet from this location
@@ -10,6 +10,7 @@
 +        %%RUBY_SITELIBDIR%%,
 +        %%PREFIX%%/lib/ruby/vendor_ruby,
 +        %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/concurrent-ruby-1.1.5/lib,
++        %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/deep_merge-1.2.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,
 +    ]
@@ -27,7 +28,7 @@
  
      # PLEASE NOTE: Use caution when modifying the below settings. Modifying
      # these settings will change the value of the corresponding Puppet settings
-@@ -26,23 +32,23 @@ jruby-puppet: {
+@@ -26,23 +34,23 @@ jruby-puppet: {
  
      # (optional) path to puppet conf dir; if not specified, will use
      # /etc/puppetlabs/puppet