svn commit: r483016 - in head/sysutils/puppetserver5: . files

Romain Tartière romain at FreeBSD.org
Fri Oct 26 10:25:08 UTC 2018 

Author: romain
Date: Fri Oct 26 10:25:05 2018
New Revision: 483016
URL: https://svnweb.freebsd.org/changeset/ports/483016

Log:
  Update to 5.3.6
  
  Release notes:
  https://puppet.com/docs/puppetserver/5.3/release_notes.html#puppet-server-536
  
  While here, remove useless build depends and regenerate patches with make
  makepatch.
  
  With hat:	puppet

Modified:
  head/sysutils/puppetserver5/Makefile
  head/sysutils/puppetserver5/distinfo
  head/sysutils/puppetserver5/files/patch-ext__bin__puppetserver
  head/sysutils/puppetserver5/files/patch-ext__cli_defaults__cli-defaults.sh
  head/sysutils/puppetserver5/files/patch-ext__config__conf.d__global.conf
  head/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf
  head/sysutils/puppetserver5/files/patch-ext__config__conf.d__webserver.conf
  head/sysutils/puppetserver5/files/patch-ext__config__logback.xml
  head/sysutils/puppetserver5/files/patch-ext__config__request-logging.xml

Modified: head/sysutils/puppetserver5/Makefile
==============================================================================
--- head/sysutils/puppetserver5/Makefile	Fri Oct 26 10:21:20 2018	(r483015)
+++ head/sysutils/puppetserver5/Makefile	Fri Oct 26 10:25:05 2018	(r483016)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	puppetserver
-PORTVERSION=	5.3.5
+PORTVERSION=	5.3.6
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppet/
 PKGNAMESUFFIX=	5
@@ -13,7 +13,6 @@ LICENSE=	APACHE20
 
 RUN_DEPENDS=	bash>=0:shells/bash \
 		puppet5>=0:sysutils/puppet5
-BUILD_DEPENDS=	rubygem-rake>=0:devel/rubygem-rake
 
 USES=		shebangfix
 USE_RC_SUBR=	puppetserver
@@ -41,10 +40,8 @@ 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_BUILD_DEPENDS=	rubygem-facter>=2.0:sysutils/rubygem-facter
 RFACTER_RUN_DEPENDS=	rubygem-facter>=2.0:sysutils/rubygem-facter
 
-CFACTER_BUILD_DEPENDS=	facter>=3.0:sysutils/facter
 CFACTER_RUN_DEPENDS=	facter>=3.0:sysutils/facter
 
 post-patch:

Modified: head/sysutils/puppetserver5/distinfo
==============================================================================
--- head/sysutils/puppetserver5/distinfo	Fri Oct 26 10:21:20 2018	(r483015)
+++ head/sysutils/puppetserver5/distinfo	Fri Oct 26 10:25:05 2018	(r483016)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535015241
-SHA256 (puppetserver-5.3.5.tar.gz) = 27a299450e849abec6a4efea64cc571f041fe57c3f5692765f58acd66f8ff625
-SIZE (puppetserver-5.3.5.tar.gz) = 67238513
+TIMESTAMP = 1540363367
+SHA256 (puppetserver-5.3.6.tar.gz) = 96e690412a721d9d9fe8550d7d0203c12648c5d75375babb8a8acfd635827873
+SIZE (puppetserver-5.3.6.tar.gz) = 67822906

Modified: head/sysutils/puppetserver5/files/patch-ext__bin__puppetserver
==============================================================================
--- head/sysutils/puppetserver5/files/patch-ext__bin__puppetserver	Fri Oct 26 10:21:20 2018	(r483015)
+++ head/sysutils/puppetserver5/files/patch-ext__bin__puppetserver	Fri Oct 26 10:25:05 2018	(r483016)
@@ -1,6 +1,6 @@
---- ext/bin/puppetserver.orig	2017-09-28 10:58:44.784311406 -0700
-+++ ext/bin/puppetserver	2017-09-28 11:00:46.034742764 -0700
-@@ -14,6 +14,12 @@
+--- ext/bin/puppetserver.orig	2018-09-28 11:06:23 UTC
++++ ext/bin/puppetserver
+@@ -15,6 +15,12 @@ elif [ `uname` == "OpenBSD" ] ; then
      USER="_puppet"
      INSTALL_DIR="/opt/puppetlabs/server/apps/puppetserver"
      CONFIG="/etc/puppetlabs/puppetserver/conf.d"

Modified: head/sysutils/puppetserver5/files/patch-ext__cli_defaults__cli-defaults.sh
==============================================================================
--- head/sysutils/puppetserver5/files/patch-ext__cli_defaults__cli-defaults.sh	Fri Oct 26 10:21:20 2018	(r483015)
+++ head/sysutils/puppetserver5/files/patch-ext__cli_defaults__cli-defaults.sh	Fri Oct 26 10:25:05 2018	(r483016)
@@ -1,5 +1,5 @@
---- ext/cli_defaults/cli-defaults.sh.orig	2017-08-06 01:24:37.981353156 -0700
-+++ ext/cli_defaults/cli-defaults.sh	2017-08-06 01:39:53.280636611 -0700
+--- ext/cli_defaults/cli-defaults.sh.orig	2018-08-21 16:07:05 UTC
++++ ext/cli_defaults/cli-defaults.sh
 @@ -1,6 +1,6 @@
 -INSTALL_DIR="/opt/puppetlabs/server/apps/puppetserver"
 +INSTALL_DIR="%%DATADIR%%"

Modified: head/sysutils/puppetserver5/files/patch-ext__config__conf.d__global.conf
==============================================================================
--- head/sysutils/puppetserver5/files/patch-ext__config__conf.d__global.conf	Fri Oct 26 10:21:20 2018	(r483015)
+++ head/sysutils/puppetserver5/files/patch-ext__config__conf.d__global.conf	Fri Oct 26 10:25:05 2018	(r483016)
@@ -1,5 +1,5 @@
---- ext/config/conf.d/global.conf.orig	2017-08-02 20:34:12.049821329 -0700
-+++ ext/config/conf.d/global.conf	2017-08-02 20:35:03.130347445 -0700
+--- ext/config/conf.d/global.conf.orig	2018-08-21 16:07:02 UTC
++++ ext/config/conf.d/global.conf
 @@ -1,5 +1,5 @@
  global: {
      # Path to logback logging configuration file; for more

Modified: head/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf
==============================================================================
--- head/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf	Fri Oct 26 10:21:20 2018	(r483015)
+++ head/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf	Fri Oct 26 10:25:05 2018	(r483016)
@@ -1,5 +1,5 @@
---- ext/config/conf.d/puppetserver.conf.orig	2017-08-02 20:01:48.229660631 -0700
-+++ ext/config/conf.d/puppetserver.conf	2017-08-04 14:00:29.705675760 -0700
+--- ext/config/conf.d/puppetserver.conf.orig	2018-08-21 16:07:02 UTC
++++ ext/config/conf.d/puppetserver.conf
 @@ -2,16 +2,20 @@
  jruby-puppet: {
      # Where the puppet-agent dependency places puppet, facter, etc...
@@ -24,7 +24,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 @@
+@@ -26,23 +30,23 @@ jruby-puppet: {
  
      # (optional) path to puppet conf dir; if not specified, will use
      # /etc/puppetlabs/puppet

Modified: head/sysutils/puppetserver5/files/patch-ext__config__conf.d__webserver.conf
==============================================================================
--- head/sysutils/puppetserver5/files/patch-ext__config__conf.d__webserver.conf	Fri Oct 26 10:21:20 2018	(r483015)
+++ head/sysutils/puppetserver5/files/patch-ext__config__conf.d__webserver.conf	Fri Oct 26 10:25:05 2018	(r483016)
@@ -1,4 +1,4 @@
---- ext/config/conf.d/webserver.conf.orig       2016-03-28 10:32:26.000000000 -0700
+--- ext/config/conf.d/webserver.conf.orig	2018-08-21 16:07:02 UTC
 +++ ext/config/conf.d/webserver.conf
 @@ -1,5 +1,5 @@
  webserver: {

Modified: head/sysutils/puppetserver5/files/patch-ext__config__logback.xml
==============================================================================
--- head/sysutils/puppetserver5/files/patch-ext__config__logback.xml	Fri Oct 26 10:21:20 2018	(r483015)
+++ head/sysutils/puppetserver5/files/patch-ext__config__logback.xml	Fri Oct 26 10:25:05 2018	(r483016)
@@ -1,5 +1,5 @@
---- ext/config/logback.xml.orig	2017-08-02 19:46:03.829675373 -0700
-+++ ext/config/logback.xml	2017-08-02 19:50:56.742766644 -0700
+--- ext/config/logback.xml.orig	2018-08-21 16:07:02 UTC
++++ ext/config/logback.xml
 @@ -6,12 +6,11 @@
      </appender>
  

Modified: head/sysutils/puppetserver5/files/patch-ext__config__request-logging.xml
==============================================================================
--- head/sysutils/puppetserver5/files/patch-ext__config__request-logging.xml	Fri Oct 26 10:21:20 2018	(r483015)
+++ head/sysutils/puppetserver5/files/patch-ext__config__request-logging.xml	Fri Oct 26 10:25:05 2018	(r483016)
@@ -1,5 +1,5 @@
---- ext/config/request-logging.xml.orig	2016-12-03 22:32:37.248735656 -0800
-+++ ext/config/request-logging.xml	2016-12-03 22:37:39.489420010 -0800
+--- ext/config/request-logging.xml.orig	2018-08-21 16:07:02 UTC
++++ ext/config/request-logging.xml
 @@ -1,10 +1,10 @@
  <configuration debug="false" scan="true">
      <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">

More information about the svn-ports-all mailing list