From owner-svn-ports-head@freebsd.org Mon Aug 31 20:05:25 2020 Return-Path: Delivered-To: svn-ports-head@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 DE5E73CCB32; Mon, 31 Aug 2020 20:05:25 +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 4BgLm55cpMz43Yp; Mon, 31 Aug 2020 20:05:25 +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 A4145D34B; Mon, 31 Aug 2020 20:05:25 +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 07VK5P9f083957; Mon, 31 Aug 2020 20:05:25 GMT (envelope-from romain@FreeBSD.org) Received: (from romain@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VK5PX9083953; Mon, 31 Aug 2020 20:05:25 GMT (envelope-from romain@FreeBSD.org) Message-Id: <202008312005.07VK5PX9083953@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: Mon, 31 Aug 2020 20:05:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547212 - in head/sysutils/puppetserver5: . files X-SVN-Group: ports-head X-SVN-Commit-Author: romain X-SVN-Commit-Paths: in head/sysutils/puppetserver5: . files X-SVN-Commit-Revision: 547212 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 20:05:25 -0000 Author: romain Date: Mon Aug 31 20:05:24 2020 New Revision: 547212 URL: https://svnweb.freebsd.org/changeset/ports/547212 Log: Update to support Facter 4.x Now that we ship sysutils/rubygem-facter, minor adjustments are needed on the PuppetServer side. The dependency on facter is managed by sysutils/puppet5, so no need for options here. Bump PORTREVISION. With hat: puppet Modified: head/sysutils/puppetserver5/Makefile head/sysutils/puppetserver5/distinfo head/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf Modified: head/sysutils/puppetserver5/Makefile ============================================================================== --- head/sysutils/puppetserver5/Makefile Mon Aug 31 20:02:27 2020 (r547211) +++ head/sysutils/puppetserver5/Makefile Mon Aug 31 20:05:24 2020 (r547212) @@ -2,6 +2,7 @@ PORTNAME= puppetserver PORTVERSION= 5.3.14 +PORTREVISION= 1 CATEGORIES= sysutils java MASTER_SITES= https://downloads.puppetlabs.com/puppet/ PKGNAMESUFFIX= 5 @@ -35,17 +36,6 @@ GROUPS= puppet SUB_LIST= JAVA_HOME=${JAVA_HOME} SUB_FILES= pkg-message - -OPTIONS_DEFAULT= CFACTER -OPTIONS_RADIO= FACTER -OPTIONS_RADIO_FACTER= CFACTER RFACTER - -RFACTER_DESC= Use facter 2.x (written in Ruby) -CFACTER_DESC= Use facter 3.x (experimental rewrite in C++) - -RFACTER_RUN_DEPENDS= rubygem-facter>=2.0:sysutils/rubygem-facter - -CFACTER_RUN_DEPENDS= facter>=3.0:sysutils/facter post-patch: .for file in ext/config/logback.xml ext/config/request-logging.xml \ Modified: head/sysutils/puppetserver5/distinfo ============================================================================== --- head/sysutils/puppetserver5/distinfo Mon Aug 31 20:02:27 2020 (r547211) +++ head/sysutils/puppetserver5/distinfo Mon Aug 31 20:05:24 2020 (r547212) @@ -1,3 +1,3 @@ -TIMESTAMP = 1594846825 +TIMESTAMP = 1598656625 SHA256 (puppetserver-5.3.14.tar.gz) = 23cebf6fda2233abcf059020bb73c9a9a283a89cfc211e3582cea59813da142c SIZE (puppetserver-5.3.14.tar.gz) = 53787806 Modified: head/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf ============================================================================== --- head/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf Mon Aug 31 20:02:27 2020 (r547211) +++ head/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf Mon Aug 31 20:05:24 2020 (r547212) @@ -1,6 +1,6 @@ ---- ext/config/conf.d/puppetserver.conf.orig 2018-08-21 16:07:02 UTC +--- ext/config/conf.d/puppetserver.conf.orig 2020-07-02 18:59:15 UTC +++ ext/config/conf.d/puppetserver.conf -@@ -2,16 +2,20 @@ +@@ -2,16 +2,21 @@ jruby-puppet: { # Where the puppet-agent dependency places puppet, facter, etc... # Puppet server expects to load Puppet from this location @@ -8,7 +8,8 @@ + ruby-load-path: [ + %%RUBY_SITELIBDIR%%, + %%PREFIX%%/lib/ruby/vendor_ruby, -+ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/facter-2.5.0/lib, ++ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/facter/lib, ++ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/hocon-1.3.1/lib, + ] # This setting determines where JRuby will install gems. It is used for loading gems, @@ -24,7 +25,7 @@ # PLEASE NOTE: Use caution when modifying the below settings. Modifying # these settings will change the value of the corresponding Puppet settings -@@ -26,23 +30,23 @@ jruby-puppet: { +@@ -26,23 +31,23 @@ jruby-puppet: { # (optional) path to puppet conf dir; if not specified, will use # /etc/puppetlabs/puppet