From owner-svn-ports-all@freebsd.org Sun Mar 21 00:53:51 2021 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 B63125B920E; Sun, 21 Mar 2021 00:53:51 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F2zf74pqMz3hc9; Sun, 21 Mar 2021 00:53:51 +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 97EBC11A5E; Sun, 21 Mar 2021 00:53:51 +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 12L0rp57015225; Sun, 21 Mar 2021 00:53:51 GMT (envelope-from romain@FreeBSD.org) Received: (from romain@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12L0roQV015222; Sun, 21 Mar 2021 00:53:50 GMT (envelope-from romain@FreeBSD.org) Message-Id: <202103210053.12L0roQV015222@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: Sun, 21 Mar 2021 00:53:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568899 - in head/sysutils/puppetserver7: . files X-SVN-Group: ports-head X-SVN-Commit-Author: romain X-SVN-Commit-Paths: in head/sysutils/puppetserver7: . files X-SVN-Commit-Revision: 568899 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.34 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: Sun, 21 Mar 2021 00:53:51 -0000 Author: romain Date: Sun Mar 21 00:53:50 2021 New Revision: 568899 URL: https://svnweb.freebsd.org/changeset/ports/568899 Log: Update to 7.1.0 Release notes: https://puppet.com/docs/puppet/7.5/server/release_notes.html#puppet-server-710 With hat: puppet Modified: head/sysutils/puppetserver7/Makefile head/sysutils/puppetserver7/distinfo head/sysutils/puppetserver7/files/patch-ext__config__conf.d__puppetserver.conf Modified: head/sysutils/puppetserver7/Makefile ============================================================================== --- head/sysutils/puppetserver7/Makefile Sun Mar 21 00:52:57 2021 (r568898) +++ head/sysutils/puppetserver7/Makefile Sun Mar 21 00:53:50 2021 (r568899) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= puppetserver -PORTVERSION= 7.0.3 +PORTVERSION= 7.1.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/puppetserver7/distinfo ============================================================================== --- head/sysutils/puppetserver7/distinfo Sun Mar 21 00:52:57 2021 (r568898) +++ head/sysutils/puppetserver7/distinfo Sun Mar 21 00:53:50 2021 (r568899) @@ -1,5 +1,5 @@ -TIMESTAMP = 1612946654 -SHA256 (puppetserver-7.0.3.tar.gz) = e0430925ad68cc66e580e10987845ed7397d333dccd1329c2ffe7c9df4bbbefb -SIZE (puppetserver-7.0.3.tar.gz) = 62780509 +TIMESTAMP = 1616187255 +SHA256 (puppetserver-7.1.0.tar.gz) = e278eea1e65d1abcf8503ef05553af262f70d80be32d029b622773f4afadaa70 +SIZE (puppetserver-7.1.0.tar.gz) = 62812783 SHA256 (ffi.rb) = f991c5eb6b6e4c88541af592207aa7ea14ba48f482978b3b479c4b17390e8e93 SIZE (ffi.rb) = 5893 Modified: head/sysutils/puppetserver7/files/patch-ext__config__conf.d__puppetserver.conf ============================================================================== --- head/sysutils/puppetserver7/files/patch-ext__config__conf.d__puppetserver.conf Sun Mar 21 00:52:57 2021 (r568898) +++ head/sysutils/puppetserver7/files/patch-ext__config__conf.d__puppetserver.conf Sun Mar 21 00:53:50 2021 (r568899) @@ -1,4 +1,4 @@ ---- ext/config/conf.d/puppetserver.conf.orig 2020-10-16 14:28:08 UTC +--- ext/config/conf.d/puppetserver.conf.orig 2021-03-12 18:01:54 UTC +++ ext/config/conf.d/puppetserver.conf @@ -2,16 +2,20 @@ jruby-puppet: { @@ -28,28 +28,28 @@ # (optional) path to puppet conf dir; if not specified, will use # /etc/puppetlabs/puppet -- master-conf-dir: /etc/puppetlabs/puppet -+ master-conf-dir: %%PREFIX%%/etc/puppet +- server-conf-dir: /etc/puppetlabs/puppet ++ server-conf-dir: %%PREFIX%%/etc/puppet # (optional) path to puppet code dir; if not specified, will use # /etc/puppetlabs/code -- master-code-dir: /etc/puppetlabs/code -+ master-code-dir: %%PREFIX%%/etc/puppet/code +- server-code-dir: /etc/puppetlabs/code ++ server-code-dir: %%PREFIX%%/etc/puppet/code # (optional) path to puppet var dir; if not specified, will use # /opt/puppetlabs/server/data/puppetserver -- master-var-dir: /opt/puppetlabs/server/data/puppetserver -+ master-var-dir: /var/puppet/server/data/puppetserver +- server-var-dir: /opt/puppetlabs/server/data/puppetserver ++ server-var-dir: /var/puppet/server/data/puppetserver # (optional) path to puppet run dir; if not specified, will use # /var/run/puppetlabs/puppetserver -- master-run-dir: /var/run/puppetlabs/puppetserver -+ master-run-dir: /var/run/puppetserver +- server-run-dir: /var/run/puppetlabs/puppetserver ++ server-run-dir: /var/run/puppetserver # (optional) path to puppet log dir; if not specified, will use # /var/log/puppetlabs/puppetserver -- master-log-dir: /var/log/puppetlabs/puppetserver -+ master-log-dir: /var/log/puppetserver +- server-log-dir: /var/log/puppetlabs/puppetserver ++ server-log-dir: /var/log/puppetserver # (optional) maximum number of JRuby instances to allow #max-active-instances: 1