git: b50a5bcf50cb - main - databases/puppetdb7: Update to 7.18.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Romain Tartière <romain_at_FreeBSD.org>
Date: Wed, 17 Apr 2024 07:09:11 UTC
The branch main has been updated by romain:

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

commit b50a5bcf50cb15502e37dd7b46470dbdbf4daf12
Author:     Romain Tartière <romain@FreeBSD.org>
AuthorDate: 2024-04-16 06:55:11 +0000
Commit:     Romain Tartière <romain@FreeBSD.org>
CommitDate: 2024-04-16 07:07:49 +0000

    databases/puppetdb7: Update to 7.18.0
    
    Release notes:
    https://www.puppet.com/docs/puppetdb/7/release_notes.html#puppetdb-7180
    
    With hat:       puppet
---
 databases/puppetdb-terminus7/Makefile             |  2 +-
 databases/puppetdb-terminus7/distinfo             |  6 +-
 databases/puppetdb-terminus7/files/patch-Makefile | 68 +++++++++++------------
 databases/puppetdb7/Makefile                      |  2 +-
 databases/puppetdb7/distinfo                      |  6 +-
 databases/puppetdb7/files/patch-Makefile          | 14 ++---
 6 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/databases/puppetdb-terminus7/Makefile b/databases/puppetdb-terminus7/Makefile
index 66457d2580e1..db62e7ea507c 100644
--- a/databases/puppetdb-terminus7/Makefile
+++ b/databases/puppetdb-terminus7/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	puppetdb-terminus
-PORTVERSION=	7.17.1
+PORTVERSION=	7.18.0
 CATEGORIES=	databases ruby
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	7
diff --git a/databases/puppetdb-terminus7/distinfo b/databases/puppetdb-terminus7/distinfo
index 9983583f8489..46bfac7d20fd 100644
--- a/databases/puppetdb-terminus7/distinfo
+++ b/databases/puppetdb-terminus7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709278854
-SHA256 (puppetdb-7.17.1.tar.gz) = ce6a67692b0ed07acbdb55ce4058e4eb77a896c07f4590a2a2ec5079f30fe570
-SIZE (puppetdb-7.17.1.tar.gz) = 52318717
+TIMESTAMP = 1713224942
+SHA256 (puppetdb-7.18.0.tar.gz) = 851789bfacb640ed2938dc9559a2fb7db5dc69516484abd86091c04a25e2bb6f
+SIZE (puppetdb-7.18.0.tar.gz) = 52327161
diff --git a/databases/puppetdb-terminus7/files/patch-Makefile b/databases/puppetdb-terminus7/files/patch-Makefile
index 3f63eac16029..dbc0ec99562c 100644
--- a/databases/puppetdb-terminus7/files/patch-Makefile
+++ b/databases/puppetdb-terminus7/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2024-02-26 19:23:47 UTC
+--- Makefile.orig	2024-04-05 22:04:28 UTC
 +++ Makefile
 @@ -1,7 +1,7 @@ confdir = /etc
  prefix = /usr/local
@@ -13,47 +13,47 @@
  
  
  install-puppetdb-termini:
--	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/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
--	install -Dm 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.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.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
--	install -Dm 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.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/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_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
 -	install -Dm 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.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 -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/face/node"
-+	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource"
-+	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/facts"
-+	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 -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/functions"
-+	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/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
-+	install -m 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.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.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
-+	install -m 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.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 -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/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
+-	install -Dm 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
+-	install -Dm 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.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/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.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
++	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/face/node"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/reports"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/functions"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util"
 +	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_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
 +	install -m 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.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/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/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
++	install -m 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
++	install -m 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.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/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.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
  
  install-rpm-sysv-init: install-rpm-preinst
  	install -d -m 0755 "$(DESTDIR)$(initdir)"
diff --git a/databases/puppetdb7/Makefile b/databases/puppetdb7/Makefile
index 31d0fc8591f4..787a09fc0bae 100644
--- a/databases/puppetdb7/Makefile
+++ b/databases/puppetdb7/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	puppetdb
-PORTVERSION=	7.17.1
+PORTVERSION=	7.18.0
 CATEGORIES=	databases java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	7
diff --git a/databases/puppetdb7/distinfo b/databases/puppetdb7/distinfo
index 4b1e38377a2a..e6f3c42ed2e3 100644
--- a/databases/puppetdb7/distinfo
+++ b/databases/puppetdb7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709278823
-SHA256 (puppetdb-7.17.1.tar.gz) = ce6a67692b0ed07acbdb55ce4058e4eb77a896c07f4590a2a2ec5079f30fe570
-SIZE (puppetdb-7.17.1.tar.gz) = 52318717
+TIMESTAMP = 1713224912
+SHA256 (puppetdb-7.18.0.tar.gz) = 851789bfacb640ed2938dc9559a2fb7db5dc69516484abd86091c04a25e2bb6f
+SIZE (puppetdb-7.18.0.tar.gz) = 52327161
diff --git a/databases/puppetdb7/files/patch-Makefile b/databases/puppetdb7/files/patch-Makefile
index ce7fee75ceec..43a358e4f5b6 100644
--- a/databases/puppetdb7/files/patch-Makefile
+++ b/databases/puppetdb7/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2024-02-26 19:23:47 UTC
+--- Makefile.orig	2024-04-05 22:04:28 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/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/auth.conf "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/auth.conf"
 -	install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/jetty.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/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/conf.d/auth.conf "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/auth.conf"
 -	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/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/auth.conf "$(DESTDIR)$(confdir)/puppetdb/conf.d/auth.conf.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/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/conf.d/auth.conf "$(DESTDIR)$(confdir)/puppetdb/conf.d/auth.conf.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)"