Date: Tue, 30 Jul 2024 12:21:30 GMT From: Romain =?utf-8?Q?Tarti=C3=A8re?= <romain@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a37439596680 - main - databases/puppetdb8: Update to 8.7.0 Message-ID: <202407301221.46UCLUx0020518@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=a37439596680cb579882ed875c87ad3cbdb5db74 commit a37439596680cb579882ed875c87ad3cbdb5db74 Author: Romain Tartière <romain@FreeBSD.org> AuthorDate: 2024-07-30 12:17:23 +0000 Commit: Romain Tartière <romain@FreeBSD.org> CommitDate: 2024-07-30 12:21:00 +0000 databases/puppetdb8: Update to 8.7.0 Release notes: https://www.puppet.com/docs/puppetdb/8/release_notes#puppetdb-870 With hat: puppet --- databases/puppetdb-terminus8/Makefile | 2 +- databases/puppetdb-terminus8/distinfo | 6 +- databases/puppetdb-terminus8/files/patch-Makefile | 69 ++++++++++++----------- databases/puppetdb8/Makefile | 5 +- databases/puppetdb8/distinfo | 6 +- databases/puppetdb8/files/patch-Makefile | 26 +-------- 6 files changed, 47 insertions(+), 67 deletions(-) diff --git a/databases/puppetdb-terminus8/Makefile b/databases/puppetdb-terminus8/Makefile index 3016b28cc09a..94ac444c7428 100644 --- a/databases/puppetdb-terminus8/Makefile +++ b/databases/puppetdb-terminus8/Makefile @@ -1,5 +1,5 @@ PORTNAME= puppetdb-terminus -PORTVERSION= 8.6.0 +PORTVERSION= 8.7.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 97a4f430cb00..90adc82a94b2 100644 --- a/databases/puppetdb-terminus8/distinfo +++ b/databases/puppetdb-terminus8/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1718150379 -SHA256 (puppetdb-8.6.0.tar.gz) = 99b87d1e9dfd66bc94d3557efc709eb083cedeff19c9751dab79146df9f06139 -SIZE (puppetdb-8.6.0.tar.gz) = 60491728 +TIMESTAMP = 1722084321 +SHA256 (puppetdb-8.7.0.tar.gz) = 9fe2cb3fe270105145cd09a431b33b263155d2c813ee8064bf43b639bd9ff93b +SIZE (puppetdb-8.7.0.tar.gz) = 61636500 diff --git a/databases/puppetdb-terminus8/files/patch-Makefile b/databases/puppetdb-terminus8/files/patch-Makefile index 30fce34fc5a6..2312dab85eb7 100644 --- a/databases/puppetdb-terminus8/files/patch-Makefile +++ b/databases/puppetdb-terminus8/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2024-06-10 16:24:36 UTC +--- Makefile.orig 2024-07-19 17:11:35 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 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 -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/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/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/puppetdb8/Makefile b/databases/puppetdb8/Makefile index 9734579fd653..0496f383c589 100644 --- a/databases/puppetdb8/Makefile +++ b/databases/puppetdb8/Makefile @@ -1,5 +1,5 @@ PORTNAME= puppetdb -PORTVERSION= 8.6.0 +PORTVERSION= 8.7.0 CATEGORIES= databases java MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/ PKGNAMESUFFIX= 8 @@ -44,6 +44,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/puppetdb8/distinfo b/databases/puppetdb8/distinfo index 554be0852318..a1dfa1d544f5 100644 --- a/databases/puppetdb8/distinfo +++ b/databases/puppetdb8/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1718150365 -SHA256 (puppetdb-8.6.0.tar.gz) = 99b87d1e9dfd66bc94d3557efc709eb083cedeff19c9751dab79146df9f06139 -SIZE (puppetdb-8.6.0.tar.gz) = 60491728 +TIMESTAMP = 1721971854 +SHA256 (puppetdb-8.7.0.tar.gz) = 9fe2cb3fe270105145cd09a431b33b263155d2c813ee8064bf43b639bd9ff93b +SIZE (puppetdb-8.7.0.tar.gz) = 61636500 diff --git a/databases/puppetdb8/files/patch-Makefile b/databases/puppetdb8/files/patch-Makefile index f81732dd3ff6..0bdb0aa87c7f 100644 --- a/databases/puppetdb8/files/patch-Makefile +++ b/databases/puppetdb8/files/patch-Makefile @@ -1,6 +1,6 @@ --- Makefile.orig 2024-06-10 16:24:36 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)"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407301221.46UCLUx0020518>