diff --git a/databases/puppetdb-terminus6/Makefile b/databases/puppetdb-terminus6/Makefile index 28e7d9f5f5105..cfccc2f7db2c5 100644 --- a/databases/puppetdb-terminus6/Makefile +++ b/databases/puppetdb-terminus6/Makefile @@ -1,5 +1,5 @@ PORTNAME= puppetdb-terminus -PORTVERSION= 6.18.0 +PORTVERSION= 6.19.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 ea2db49de4858..a3e6bb8ae51ef 100644 --- a/databases/puppetdb-terminus6/distinfo +++ b/databases/puppetdb-terminus6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1626931664 -SHA256 (puppetdb-6.18.0.tar.gz) = 150c4ef06c265f38ef4dd73c6dfd54fd7fa0a71e1400a2ba2fd4c1b227cfdfea -SIZE (puppetdb-6.18.0.tar.gz) = 47459324 +TIMESTAMP = 1634188724 +SHA256 (puppetdb-6.19.0.tar.gz) = a679f921e716c49b30d3a252f7436f17f1daad4e2c48d0f72096424b1c037cdb +SIZE (puppetdb-6.19.0.tar.gz) = 48048366 diff --git a/databases/puppetdb-terminus6/files/patch-Makefile b/databases/puppetdb-terminus6/files/patch-Makefile index 4e72558864c89..df186670f2cea 100644 --- a/databases/puppetdb-terminus6/files/patch-Makefile +++ b/databases/puppetdb-terminus6/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2021-07-13 22:34:05 UTC +--- Makefile.orig 2021-10-07 07:55:24 UTC +++ Makefile @@ -1,7 +1,7 @@ prefix = /usr/local @@ -13,21 +13,21 @@ install-puppetdb-termini: -- install -Dm 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb" - install -Dm 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.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/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.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/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.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/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.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/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.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb" -- 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/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/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb" - install -Dm 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb" + install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet" + install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face" @@ -41,21 +41,21 @@ + 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/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.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/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.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/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.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/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.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/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.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb" -+ 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/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/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb" + install -m 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb" install-rpm-sysv-init: install-rpm-preinst diff --git a/databases/puppetdb6/Makefile b/databases/puppetdb6/Makefile index 62b9579601c03..468e9a7895069 100644 --- a/databases/puppetdb6/Makefile +++ b/databases/puppetdb6/Makefile @@ -1,5 +1,5 @@ PORTNAME= puppetdb -PORTVERSION= 6.18.0 +PORTVERSION= 6.19.0 CATEGORIES= databases java MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/ PKGNAMESUFFIX= 6 diff --git a/databases/puppetdb6/distinfo b/databases/puppetdb6/distinfo index ef518f5351183..f586ff0e6d558 100644 --- a/databases/puppetdb6/distinfo +++ b/databases/puppetdb6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1626931697 -SHA256 (puppetdb-6.18.0.tar.gz) = 150c4ef06c265f38ef4dd73c6dfd54fd7fa0a71e1400a2ba2fd4c1b227cfdfea -SIZE (puppetdb-6.18.0.tar.gz) = 47459324 +TIMESTAMP = 1634188627 +SHA256 (puppetdb-6.19.0.tar.gz) = a679f921e716c49b30d3a252f7436f17f1daad4e2c48d0f72096424b1c037cdb +SIZE (puppetdb-6.19.0.tar.gz) = 48048366 diff --git a/databases/puppetdb6/files/patch-Makefile b/databases/puppetdb6/files/patch-Makefile index 792f7b753c8c6..4beb3c14368a5 100644 --- a/databases/puppetdb6/files/patch-Makefile +++ b/databases/puppetdb6/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2021-07-13 22:34:05 UTC +--- Makefile.orig 2021-10-07 07:55:24 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/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/repl.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/repl.ini" +- install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/logback.xml" +- 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/repl.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/repl.ini" - 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/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/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 -d -m 0755 "$(DESTDIR)$(confdir)/puppetdb/conf.d" -+ 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/repl.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/repl.ini.sample" ++ install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetdb/logback.xml.sample" ++ 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/repl.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/repl.ini.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/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/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 -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb/cli" install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb/cli/apps" install -d -m 0755 "$(DESTDIR)$(bindir)"