git: 6d719096e388 - main - databases/puppetdb8: Update to 8.3.0

From: Romain Tartière <romain_at_FreeBSD.org>
Date: Wed, 24 Jan 2024 03:13:12 UTC
The branch main has been updated by romain:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6d719096e38863e06832d54d383b077da249f7ee

commit 6d719096e38863e06832d54d383b077da249f7ee
Author:     Romain Tartière <romain@FreeBSD.org>
AuthorDate: 2024-01-23 18:30:11 +0000
Commit:     Romain Tartière <romain@FreeBSD.org>
CommitDate: 2024-01-24 03:12:01 +0000

    databases/puppetdb8: Update to 8.3.0
    
    Release notes:
    https://www.puppet.com/docs/puppetdb/8/release_notes.html#puppetdb-830
    
    With hat:       puppet
---
 databases/puppetdb-terminus8/Makefile             |  2 +-
 databases/puppetdb-terminus8/distinfo             |  6 ++---
 databases/puppetdb-terminus8/files/patch-Makefile | 30 +++++++++++------------
 databases/puppetdb8/Makefile                      |  3 +--
 databases/puppetdb8/distinfo                      |  6 ++---
 databases/puppetdb8/files/patch-Makefile          | 14 +++++------
 6 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/databases/puppetdb-terminus8/Makefile b/databases/puppetdb-terminus8/Makefile
index d63e7a69ab4d..77324bf09bf1 100644
--- a/databases/puppetdb-terminus8/Makefile
+++ b/databases/puppetdb-terminus8/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	puppetdb-terminus
-PORTVERSION=	8.2.0
+PORTVERSION=	8.3.0
 CATEGORIES=	databases ruby
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	8
diff --git a/databases/puppetdb-terminus8/distinfo b/databases/puppetdb-terminus8/distinfo
index 954cebbf1b57..e4d1ef83f47b 100644
--- a/databases/puppetdb-terminus8/distinfo
+++ b/databases/puppetdb-terminus8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1699635870
-SHA256 (puppetdb-8.2.0.tar.gz) = 816f96e2f62ee3070598c6904717b92e273f73d5b29463afdbd10a7d5f7310f1
-SIZE (puppetdb-8.2.0.tar.gz) = 59250096
+TIMESTAMP = 1705781020
+SHA256 (puppetdb-8.3.0.tar.gz) = dec0ff1d67fb79f2e814f41c2f2bff9ce92eb7334cfd0422eedf4baf5c741eac
+SIZE (puppetdb-8.3.0.tar.gz) = 59747018
diff --git a/databases/puppetdb-terminus8/files/patch-Makefile b/databases/puppetdb-terminus8/files/patch-Makefile
index d1f9f35b62bc..ff2e77bd179b 100644
--- a/databases/puppetdb-terminus8/files/patch-Makefile
+++ b/databases/puppetdb-terminus8/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2023-10-27 18:52:46 UTC
+--- Makefile.orig	2024-01-17 22:39:39 UTC
 +++ Makefile
 @@ -1,7 +1,7 @@ confdir = /etc
  prefix = /usr/local
@@ -13,21 +13,21 @@
  
  
  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/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
 -	install -Dm 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.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/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
+-	install -Dm 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
 -	install -Dm 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
--	install -Dm 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.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/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
 -	install -Dm 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.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/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
+-	install -Dm 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
+-	install -Dm 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
 -	install -Dm 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
 +	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/face/node"
 +	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/functions"
@@ -38,21 +38,21 @@
 +	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/reports"
 +	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/util"
 +	install -d -m 755 "$(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/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
 +	install -m 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.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/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
++	install -m 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
 +	install -m 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
-+	install -m 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.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/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
 +	install -m 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.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/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
++	install -m 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
++	install -m 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
 +	install -m 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
  
  install-rpm-sysv-init: install-rpm-preinst
diff --git a/databases/puppetdb8/Makefile b/databases/puppetdb8/Makefile
index b51ae0ee9f8d..686d1f8c707b 100644
--- a/databases/puppetdb8/Makefile
+++ b/databases/puppetdb8/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	puppetdb
-PORTVERSION=	8.2.0
-PORTREVISION=	1
+PORTVERSION=	8.3.0
 CATEGORIES=	databases java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	8
diff --git a/databases/puppetdb8/distinfo b/databases/puppetdb8/distinfo
index 8f6980a1a92e..c708bec4ddd0 100644
--- a/databases/puppetdb8/distinfo
+++ b/databases/puppetdb8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1699635852
-SHA256 (puppetdb-8.2.0.tar.gz) = 816f96e2f62ee3070598c6904717b92e273f73d5b29463afdbd10a7d5f7310f1
-SIZE (puppetdb-8.2.0.tar.gz) = 59250096
+TIMESTAMP = 1705780996
+SHA256 (puppetdb-8.3.0.tar.gz) = dec0ff1d67fb79f2e814f41c2f2bff9ce92eb7334cfd0422eedf4baf5c741eac
+SIZE (puppetdb-8.3.0.tar.gz) = 59747018
diff --git a/databases/puppetdb8/files/patch-Makefile b/databases/puppetdb8/files/patch-Makefile
index d02bf911354d..854c7e2f61cc 100644
--- a/databases/puppetdb8/files/patch-Makefile
+++ b/databases/puppetdb8/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2023-10-27 18:52:46 UTC
+--- Makefile.orig	2024-01-17 22:39:39 UTC
 +++ Makefile
 @@ -1,24 +1,24 @@
 -prefix = /usr/local
@@ -17,23 +17,23 @@
  	install -m 0774 ext/ezbake-functions.sh "$(DESTDIR)$(datadir)/puppetdb"
  	install -m 0644 ext/ezbake.manifest "$(DESTDIR)$(datadir)/puppetdb"
 -	install -d -m 0755 "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d"
+-	install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/request-logging.xml"
 -	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/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/auth.conf "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/auth.conf"
+-	install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/config.ini"
 -	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/repl.ini"
--	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/request-logging.xml "$(DESTDIR)$(confdir)/puppetdb/request-logging.xml.sample"
 +	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/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/auth.conf "$(DESTDIR)$(confdir)/puppetdb/conf.d/auth.conf.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/repl.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/repl.ini.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"
  	install -d -m 0755 "$(DESTDIR)$(bindir)"