git: b60c3a3cc350 - main - databases/puppetdb8: Upate to 8.6.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Romain Tartière <romain_at_FreeBSD.org>
Date: Sun, 16 Jun 2024 20:14:24 UTC
The branch main has been updated by romain:

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

commit b60c3a3cc35060771e5609d55c7ee0105092e826
Author:     Romain Tartière <romain@FreeBSD.org>
AuthorDate: 2024-06-16 20:11:33 +0000
Commit:     Romain Tartière <romain@FreeBSD.org>
CommitDate: 2024-06-16 20:12:59 +0000

    databases/puppetdb8: Upate to 8.6.0
    
    Release notes:
    https://www.puppet.com/docs/puppetdb/8/release_notes.html#puppetdb-860
    
    With hat:       puppet
---
 databases/puppetdb-terminus8/Makefile             |  2 +-
 databases/puppetdb-terminus8/distinfo             |  6 ++--
 databases/puppetdb-terminus8/files/patch-Makefile | 43 ++++++++++++-----------
 databases/puppetdb8/Makefile                      |  2 +-
 databases/puppetdb8/distinfo                      |  6 ++--
 databases/puppetdb8/files/patch-Makefile          | 14 ++++----
 6 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/databases/puppetdb-terminus8/Makefile b/databases/puppetdb-terminus8/Makefile
index 243ebf5b79ae..3016b28cc09a 100644
--- a/databases/puppetdb-terminus8/Makefile
+++ b/databases/puppetdb-terminus8/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	puppetdb-terminus
-PORTVERSION=	8.5.1
+PORTVERSION=	8.6.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 78bbbc29b50e..97a4f430cb00 100644
--- a/databases/puppetdb-terminus8/distinfo
+++ b/databases/puppetdb-terminus8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1715198343
-SHA256 (puppetdb-8.5.1.tar.gz) = 14f7308442a52c140520f3f4d2caf05cc798eb8711d8b997599ad33f717da227
-SIZE (puppetdb-8.5.1.tar.gz) = 60435203
+TIMESTAMP = 1718150379
+SHA256 (puppetdb-8.6.0.tar.gz) = 99b87d1e9dfd66bc94d3557efc709eb083cedeff19c9751dab79146df9f06139
+SIZE (puppetdb-8.6.0.tar.gz) = 60491728
diff --git a/databases/puppetdb-terminus8/files/patch-Makefile b/databases/puppetdb-terminus8/files/patch-Makefile
index 540986e1f0f5..30fce34fc5a6 100644
--- a/databases/puppetdb-terminus8/files/patch-Makefile
+++ b/databases/puppetdb-terminus8/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2024-04-18 21:01:34 UTC
+--- Makefile.orig	2024-06-10 16:24:36 UTC
 +++ Makefile
 @@ -1,7 +1,7 @@ confdir = /etc
  prefix = /usr/local
@@ -9,7 +9,7 @@
  rundir = /var/run
  bindir = /usr/bin
  
-@@ -36,22 +36,31 @@ install-puppetdb-termini:
+@@ -36,22 +36,32 @@ install-puppetdb-termini:
  
  
  install-puppetdb-termini:
@@ -18,42 +18,43 @@
 -	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/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/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/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.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_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.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/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
+-	install -Dm 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/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 -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face/node"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/functions"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/node"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource"
-+	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 -Dm 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
++	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/face"
++	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/face/node"
++	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/util"
++	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb"
++	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts"
++	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog"
++	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/node"
++	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource"
++	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/reports"
++	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/functions"
 +	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/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/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/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/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.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_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.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/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
++	install -m 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/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/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
  
  install-rpm-sysv-init: install-rpm-preinst
  	install -d -m 0755 "$(DESTDIR)$(initdir)"
diff --git a/databases/puppetdb8/Makefile b/databases/puppetdb8/Makefile
index 35a7d9169d59..9734579fd653 100644
--- a/databases/puppetdb8/Makefile
+++ b/databases/puppetdb8/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	puppetdb
-PORTVERSION=	8.5.1
+PORTVERSION=	8.6.0
 CATEGORIES=	databases java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	8
diff --git a/databases/puppetdb8/distinfo b/databases/puppetdb8/distinfo
index 3003c228d70d..554be0852318 100644
--- a/databases/puppetdb8/distinfo
+++ b/databases/puppetdb8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1715198331
-SHA256 (puppetdb-8.5.1.tar.gz) = 14f7308442a52c140520f3f4d2caf05cc798eb8711d8b997599ad33f717da227
-SIZE (puppetdb-8.5.1.tar.gz) = 60435203
+TIMESTAMP = 1718150365
+SHA256 (puppetdb-8.6.0.tar.gz) = 99b87d1e9dfd66bc94d3557efc709eb083cedeff19c9751dab79146df9f06139
+SIZE (puppetdb-8.6.0.tar.gz) = 60491728
diff --git a/databases/puppetdb8/files/patch-Makefile b/databases/puppetdb8/files/patch-Makefile
index f3eda6f97377..f81732dd3ff6 100644
--- a/databases/puppetdb8/files/patch-Makefile
+++ b/databases/puppetdb8/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2024-04-18 21:01:34 UTC
+--- Makefile.orig	2024-06-10 16:24:36 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/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/bootstrap.cfg"
+-	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/config.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/config.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/database.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/database.ini"
 -	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/repl.ini"
--	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/request-logging.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/request-logging.xml"
+-	install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/logback.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/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/config.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/config.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/database.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/database.ini.sample"
 +	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/repl.ini.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/request-logging.xml "$(DESTDIR)$(confdir)/puppetdb/request-logging.xml.sample"
++	install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetdb/logback.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)"