Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 19 Feb 2021 23:16:04 +0000 (UTC)
From:      =?UTF-8?Q?Romain_Tarti=c3=a8re?= <romain@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r566115 - in head/databases: puppetdb-terminus6 puppetdb-terminus6/files puppetdb6 puppetdb6/files
Message-ID:  <202102192316.11JNG4cp080463@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: romain
Date: Fri Feb 19 23:16:04 2021
New Revision: 566115
URL: https://svnweb.freebsd.org/changeset/ports/566115

Log:
  Update to 6.14.0
  
  Release notes:
  https://puppet.com/docs/puppetdb/6.13/release_notes.html#puppetdb-6140 (sic)
  
  With hat:	puppet

Modified:
  head/databases/puppetdb-terminus6/Makefile
  head/databases/puppetdb-terminus6/distinfo
  head/databases/puppetdb-terminus6/files/patch-Makefile
  head/databases/puppetdb6/Makefile
  head/databases/puppetdb6/distinfo
  head/databases/puppetdb6/files/patch-Makefile
  head/databases/puppetdb6/pkg-plist

Modified: head/databases/puppetdb-terminus6/Makefile
==============================================================================
--- head/databases/puppetdb-terminus6/Makefile	Fri Feb 19 23:14:55 2021	(r566114)
+++ head/databases/puppetdb-terminus6/Makefile	Fri Feb 19 23:16:04 2021	(r566115)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	puppetdb-terminus
-PORTVERSION=	6.13.1
+PORTVERSION=	6.14.0
 CATEGORIES=	databases ruby
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	6

Modified: head/databases/puppetdb-terminus6/distinfo
==============================================================================
--- head/databases/puppetdb-terminus6/distinfo	Fri Feb 19 23:14:55 2021	(r566114)
+++ head/databases/puppetdb-terminus6/distinfo	Fri Feb 19 23:16:04 2021	(r566115)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604551624
-SHA256 (puppetdb-6.13.1.tar.gz) = ee72627dcc2b79b04f10d3e077bde77feb5e7bc7611f5788e373e5ab85b4da42
-SIZE (puppetdb-6.13.1.tar.gz) = 46404282
+TIMESTAMP = 1612946765
+SHA256 (puppetdb-6.14.0.tar.gz) = c94f817b68cf2e933b6b8e4bff61f0fe1617a92c6db5ef80f2fdbf187c902b6b
+SIZE (puppetdb-6.14.0.tar.gz) = 47122444

Modified: head/databases/puppetdb-terminus6/files/patch-Makefile
==============================================================================
--- head/databases/puppetdb-terminus6/files/patch-Makefile	Fri Feb 19 23:14:55 2021	(r566114)
+++ head/databases/puppetdb-terminus6/files/patch-Makefile	Fri Feb 19 23:16:04 2021	(r566115)
@@ -1,4 +1,4 @@
---- Makefile.orig
+--- Makefile.orig	2021-02-05 20:02:13 UTC
 +++ Makefile
 @@ -1,7 +1,7 @@
  prefix = /usr/local
@@ -9,26 +9,26 @@
  rundir = /var/run
  bindir = /usr/bin
  
-@@ -34,22 +34,34 @@
+@@ -36,22 +36,34 @@ install-puppetdb:
  
  
  install-puppetdb-termini:
--	install -Dm 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
 -	install -Dm 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb"
+-	install -Dm 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
 -	install -Dm 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
--	install -Dm 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
+-	install -Dm 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
 -	install -Dm 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
 -	install -Dm 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
--	install -Dm 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
+-	install -Dm 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
 -	install -Dm 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
--	install -Dm 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
 -	install -Dm 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
+-	install -Dm 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
 -	install -Dm 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
--	install -Dm 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
 -	install -Dm 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
--	install -Dm 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
--	install -Dm 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
+-	install -Dm 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
 -	install -Dm 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
+-	install -Dm 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
+-	install -Dm 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face/node"
@@ -41,22 +41,22 @@
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/reports"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb"
-+	install -m 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
 +	install -m 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb"
++	install -m 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
 +	install -m 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
-+	install -m 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
++	install -m 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
 +	install -m 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
 +	install -m 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
-+	install -m 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
++	install -m 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
 +	install -m 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
-+	install -m 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
 +	install -m 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
++	install -m 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
 +	install -m 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
-+	install -m 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
 +	install -m 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
-+	install -m 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
-+	install -m 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
++	install -m 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
 +	install -m 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
++	install -m 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
++	install -m 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
  
  install-rpm-sysv-init: install-rpm-preinst
  	install -d -m 0755 "$(DESTDIR)$(initdir)"

Modified: head/databases/puppetdb6/Makefile
==============================================================================
--- head/databases/puppetdb6/Makefile	Fri Feb 19 23:14:55 2021	(r566114)
+++ head/databases/puppetdb6/Makefile	Fri Feb 19 23:16:04 2021	(r566115)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	puppetdb
-PORTVERSION=	6.13.1
+PORTVERSION=	6.14.0
 CATEGORIES=	databases java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	6

Modified: head/databases/puppetdb6/distinfo
==============================================================================
--- head/databases/puppetdb6/distinfo	Fri Feb 19 23:14:55 2021	(r566114)
+++ head/databases/puppetdb6/distinfo	Fri Feb 19 23:16:04 2021	(r566115)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604551611
-SHA256 (puppetdb-6.13.1.tar.gz) = ee72627dcc2b79b04f10d3e077bde77feb5e7bc7611f5788e373e5ab85b4da42
-SIZE (puppetdb-6.13.1.tar.gz) = 46404282
+TIMESTAMP = 1612946752
+SHA256 (puppetdb-6.14.0.tar.gz) = c94f817b68cf2e933b6b8e4bff61f0fe1617a92c6db5ef80f2fdbf187c902b6b
+SIZE (puppetdb-6.14.0.tar.gz) = 47122444

Modified: head/databases/puppetdb6/files/patch-Makefile
==============================================================================
--- head/databases/puppetdb6/files/patch-Makefile	Fri Feb 19 23:14:55 2021	(r566114)
+++ head/databases/puppetdb6/files/patch-Makefile	Fri Feb 19 23:16:04 2021	(r566115)
@@ -1,6 +1,6 @@
---- Makefile.orig
+--- Makefile.orig	2021-02-05 20:02:13 UTC
 +++ Makefile
-@@ -1,23 +1,23 @@
+@@ -1,24 +1,24 @@
 -prefix = /usr/local
 +prefix = %%PREFIX%%
  datadir = $(prefix)/share
@@ -18,19 +18,21 @@
  	install -m 0644 ext/ezbake.manifest "$(DESTDIR)$(datadir)/puppetdb"
 -	install -d -m 0755 "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d"
 -	install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/bootstrap.cfg"
+-	install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/logback.xml"
+-	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/repl.ini"
 -	install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/config.ini"
--	install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/database.ini"
 -	install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/jetty.ini"
--	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/repl.ini"
--	install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/logback.xml"
+-	install -m 0644 ext/config/conf.d/auth.conf "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/auth.conf"
+-	install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/database.ini"
 -	install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/request-logging.xml"
 +	install -d -m 0755 "$(DESTDIR)$(confdir)/puppetdb/conf.d"
 +	install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetdb/bootstrap.cfg.sample"
++	install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetdb/logback.xml.sample"
++	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/repl.ini.sample"
 +	install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/config.ini.sample"
-+	install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/database.ini.sample"
 +	install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/jetty.ini.sample"
-+	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/repl.ini.sample"
-+	install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetdb/logback.xml.sample"
++	install -m 0644 ext/config/conf.d/auth.conf "$(DESTDIR)$(confdir)/puppetdb/conf.d/auth.conf.sample"
++	install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/database.ini.sample"
 +	install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetdb/request-logging.xml.sample"
  	install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb/cli"
  	install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb/cli/apps"

Modified: head/databases/puppetdb6/pkg-plist
==============================================================================
--- head/databases/puppetdb6/pkg-plist	Fri Feb 19 23:14:55 2021	(r566114)
+++ head/databases/puppetdb6/pkg-plist	Fri Feb 19 23:16:04 2021	(r566115)
@@ -13,6 +13,7 @@ bin/puppetdb
 %%DATADIR%%/puppetdb.jar
 @group puppetdb
 @sample etc/puppetdb/bootstrap.cfg.sample
+@sample etc/puppetdb/conf.d/auth.conf.sample
 @sample etc/puppetdb/conf.d/config.ini.sample
 @sample etc/puppetdb/conf.d/database.ini.sample
 @sample etc/puppetdb/conf.d/jetty.ini.sample



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102192316.11JNG4cp080463>