From owner-svn-ports-all@freebsd.org Fri Oct 23 18:43:56 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 65A9744D1EA; Fri, 23 Oct 2020 18:43:56 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CHtRc26zMz4TkW; Fri, 23 Oct 2020 18:43:56 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2CA36BD3C; Fri, 23 Oct 2020 18:43:56 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09NIhu4C090752; Fri, 23 Oct 2020 18:43:56 GMT (envelope-from romain@FreeBSD.org) Received: (from romain@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09NIhtKQ090741; Fri, 23 Oct 2020 18:43:55 GMT (envelope-from romain@FreeBSD.org) Message-Id: <202010231843.09NIhtKQ090741@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: romain set sender to romain@FreeBSD.org using -f From: =?UTF-8?Q?Romain_Tarti=c3=a8re?= Date: Fri, 23 Oct 2020 18:43:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553128 - in head/sysutils/puppetserver6: . files X-SVN-Group: ports-head X-SVN-Commit-Author: romain X-SVN-Commit-Paths: in head/sysutils/puppetserver6: . files X-SVN-Commit-Revision: 553128 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Oct 2020 18:43:56 -0000 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