git: a2df42803d87 - main - databases/puppetdb7: Update to 7.19.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Romain Tartière <romain_at_FreeBSD.org>
Date: Tue, 30 Jul 2024 12:21:29 UTC
The branch main has been updated by romain:

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

commit a2df42803d87ca1f62ed238afc9017779aec07cc
Author:     Romain Tartière <romain@FreeBSD.org>
AuthorDate: 2024-07-30 12:15:47 +0000
Commit:     Romain Tartière <romain@FreeBSD.org>
CommitDate: 2024-07-30 12:20:58 +0000

    databases/puppetdb7: Update to 7.19.1
    
    Release notes:
    https://www.puppet.com/docs/puppetdb/7/release_notes#puppetdb-7191
    
    With hat:       puppet
---
 databases/puppetdb-terminus7/Makefile             |  2 +-
 databases/puppetdb-terminus7/distinfo             |  6 +--
 databases/puppetdb-terminus7/files/patch-Makefile | 59 ++++++++++++-----------
 databases/puppetdb7/Makefile                      |  5 +-
 databases/puppetdb7/distinfo                      |  6 +--
 databases/puppetdb7/files/patch-Makefile          | 28 +----------
 6 files changed, 43 insertions(+), 63 deletions(-)

diff --git a/databases/puppetdb-terminus7/Makefile b/databases/puppetdb-terminus7/Makefile
index 5cad32834799..377ca7690d1e 100644
--- a/databases/puppetdb-terminus7/Makefile
+++ b/databases/puppetdb-terminus7/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	puppetdb-terminus
-PORTVERSION=	7.19.0
+PORTVERSION=	7.19.1
 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 62ffe1b45c95..c9bf6a00143d 100644
--- a/databases/puppetdb-terminus7/distinfo
+++ b/databases/puppetdb-terminus7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1718150372
-SHA256 (puppetdb-7.19.0.tar.gz) = 807b5581c1c559f2f46ba8f331704d39ed2c3f2b87699eb10c6bad4c5baa617b
-SIZE (puppetdb-7.19.0.tar.gz) = 52336282
+TIMESTAMP = 1722084139
+SHA256 (puppetdb-7.19.1.tar.gz) = 2a4437279a2693d42e315f0d02d90d57d9ec3ba7ddf789387132504390c127ed
+SIZE (puppetdb-7.19.1.tar.gz) = 52342245
diff --git a/databases/puppetdb-terminus7/files/patch-Makefile b/databases/puppetdb-terminus7/files/patch-Makefile
index 478025098da7..5a65712aa286 100644
--- a/databases/puppetdb-terminus7/files/patch-Makefile
+++ b/databases/puppetdb-terminus7/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2024-06-10 16:06:40 UTC
+--- Makefile.orig	2024-07-19 17:09:14 UTC
 +++ Makefile
 @@ -1,7 +1,7 @@ confdir = /etc
  prefix = /usr/local
@@ -9,52 +9,53 @@
  rundir = /var/run
  bindir = /usr/bin
  
-@@ -36,22 +36,32 @@ install-puppetdb-termini:
+@@ -36,22 +36,33 @@ install-puppetdb-termini:
  
  
  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/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/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/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/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.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/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
+-	install -Dm 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.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/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 -Dm 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face/"
+-	install -Dm 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/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 -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face"
 +	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face/node"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/functions"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector"
 +	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/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 -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb"
++	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/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/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.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/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
++	install -m 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.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 -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 -m 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/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-rpm-sysv-init: install-rpm-preinst
  	install -d -m 0755 "$(DESTDIR)$(initdir)"
diff --git a/databases/puppetdb7/Makefile b/databases/puppetdb7/Makefile
index f2d73d995dc9..3102011cf8cc 100644
--- a/databases/puppetdb7/Makefile
+++ b/databases/puppetdb7/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	puppetdb
-PORTVERSION=	7.19.0
+PORTVERSION=	7.19.1
 CATEGORIES=	databases java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	7
@@ -43,6 +43,9 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file}
 .endfor
 	@${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" ${WRKSRC}/ext/bin/puppetdb
+	@${REINPLACE_CMD} -e 's|/puppetlabs/puppetdb/|/puppetdb/|' \
+		-e 's|\(install -m 0644 ext/config/.*\)"|\1.sample"|' \
+		${WRKSRC}/Makefile
 
 do-install:
 	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} make install-puppetdb
diff --git a/databases/puppetdb7/distinfo b/databases/puppetdb7/distinfo
index c5291a0dd529..d2054dae1e8e 100644
--- a/databases/puppetdb7/distinfo
+++ b/databases/puppetdb7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1718150352
-SHA256 (puppetdb-7.19.0.tar.gz) = 807b5581c1c559f2f46ba8f331704d39ed2c3f2b87699eb10c6bad4c5baa617b
-SIZE (puppetdb-7.19.0.tar.gz) = 52336282
+TIMESTAMP = 1721971840
+SHA256 (puppetdb-7.19.1.tar.gz) = 2a4437279a2693d42e315f0d02d90d57d9ec3ba7ddf789387132504390c127ed
+SIZE (puppetdb-7.19.1.tar.gz) = 52342245
diff --git a/databases/puppetdb7/files/patch-Makefile b/databases/puppetdb7/files/patch-Makefile
index ade9d2c91fd7..583fcfa9fe4a 100644
--- a/databases/puppetdb7/files/patch-Makefile
+++ b/databases/puppetdb7/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2024-06-10 16:06:40 UTC
+--- Makefile.orig	2024-07-19 17:09:14 UTC
 +++ Makefile
-@@ -1,24 +1,24 @@
+@@ -1,9 +1,9 @@
 -prefix = /usr/local
 +prefix = %%PREFIX%%
  datadir = $(prefix)/share
@@ -13,27 +13,3 @@
  
  install-puppetdb:
  	install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb"
- 	install -m 0644 puppetdb.jar "$(DESTDIR)$(datadir)/puppetdb"
- 	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/repl.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/repl.ini"
--	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/repl.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/repl.ini.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)"