From 013598a531b9de680733a829105dc78ce2e19577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Fri, 5 Aug 2022 16:08:15 -1000 Subject: [PATCH] databases/puppetdb6: Update to 6.22.0 Release notes: https://puppet.com/docs/puppetdb/6/release_notes.html#puppetdb-6220 With hat: puppet --- databases/puppetdb-terminus6/Makefile | 2 +- databases/puppetdb-terminus6/distinfo | 6 +-- .../puppetdb-terminus6/files/patch-Makefile | 54 +++++++++---------- databases/puppetdb6/Makefile | 2 +- databases/puppetdb6/distinfo | 6 +-- databases/puppetdb6/files/patch-Makefile | 22 ++++---- 6 files changed, 44 insertions(+), 48 deletions(-) diff --git a/databases/puppetdb-terminus6/Makefile b/databases/puppetdb-terminus6/Makefile index 4237d10c04575..0e43c4c16ee9c 100644 --- a/databases/puppetdb-terminus6/Makefile +++ b/databases/puppetdb-terminus6/Makefile @@ -1,5 +1,5 @@ PORTNAME= puppetdb-terminus -PORTVERSION= 6.21.0 +PORTVERSION= 6.22.0 CATEGORIES= databases ruby MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/ PKGNAMESUFFIX= 6 diff --git a/databases/puppetdb-terminus6/distinfo b/databases/puppetdb-terminus6/distinfo index d90ef17c82bba..6f2b192087afd 100644 --- a/databases/puppetdb-terminus6/distinfo +++ b/databases/puppetdb-terminus6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1650667243 -SHA256 (puppetdb-6.21.0.tar.gz) = add14d3ef781a15c857a7f6ea18b89b422457428fa65d1223ecfd05a2c1852fb -SIZE (puppetdb-6.21.0.tar.gz) = 48757121 +TIMESTAMP = 1659500754 +SHA256 (puppetdb-6.22.0.tar.gz) = b26de98b4f92ad0d6288ada9149218123fee40912844b8fa54c897f5dc80f384 +SIZE (puppetdb-6.22.0.tar.gz) = 48842812 diff --git a/databases/puppetdb-terminus6/files/patch-Makefile b/databases/puppetdb-terminus6/files/patch-Makefile index cda4fa1c32122..a01cbdc3477b7 100644 --- a/databases/puppetdb-terminus6/files/patch-Makefile +++ b/databases/puppetdb-terminus6/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2022-02-08 23:13:58 UTC +--- Makefile.orig 2022-08-01 21:19:05 UTC +++ Makefile @@ -1,7 +1,7 @@ prefix = /usr/local @@ -9,53 +9,49 @@ rundir = /var/run bindir = /usr/bin -@@ -36,22 +36,34 @@ install-puppetdb: +@@ -36,22 +36,30 @@ install-puppetdb: 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/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/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/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/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb" -- install -Dm 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/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/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.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/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/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/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/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb" - install -Dm 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.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.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb" -+ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet" -+ 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/reports" ++ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face/node" + install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts" ++ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog" + 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/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/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/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/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/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb" -+ install -m 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/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/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.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/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/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/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/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb" + install -m 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.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.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb" install-rpm-sysv-init: install-rpm-preinst diff --git a/databases/puppetdb6/Makefile b/databases/puppetdb6/Makefile index 7228e1ab84116..e162fd4dd5302 100644 --- a/databases/puppetdb6/Makefile +++ b/databases/puppetdb6/Makefile @@ -1,5 +1,5 @@ PORTNAME= puppetdb -PORTVERSION= 6.21.0 +PORTVERSION= 6.22.0 CATEGORIES= databases java MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/ PKGNAMESUFFIX= 6 diff --git a/databases/puppetdb6/distinfo b/databases/puppetdb6/distinfo index b9593073b2cbe..d41864d73c919 100644 --- a/databases/puppetdb6/distinfo +++ b/databases/puppetdb6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1650667141 -SHA256 (puppetdb-6.21.0.tar.gz) = add14d3ef781a15c857a7f6ea18b89b422457428fa65d1223ecfd05a2c1852fb -SIZE (puppetdb-6.21.0.tar.gz) = 48757121 +TIMESTAMP = 1659500711 +SHA256 (puppetdb-6.22.0.tar.gz) = b26de98b4f92ad0d6288ada9149218123fee40912844b8fa54c897f5dc80f384 +SIZE (puppetdb-6.22.0.tar.gz) = 48842812 diff --git a/databases/puppetdb6/files/patch-Makefile b/databases/puppetdb6/files/patch-Makefile index 0fc407f74ebab..6e34d619fbebf 100644 --- a/databases/puppetdb6/files/patch-Makefile +++ b/databases/puppetdb6/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2022-02-08 23:13:58 UTC +--- Makefile.orig 2022-08-01 21:19:05 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/request-logging.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/request-logging.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/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/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/repl.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/repl.ini" +- install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/config.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 -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/request-logging.xml "$(DESTDIR)$(confdir)/puppetdb/request-logging.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/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/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/repl.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/repl.ini.sample" ++ install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/config.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 -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb/cli" install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb/cli/apps" install -d -m 0755 "$(DESTDIR)$(bindir)"