diff --git a/databases/puppetdb-terminus7/Makefile b/databases/puppetdb-terminus7/Makefile index 2db85ab2d95b4..e044188ca4202 100644 --- a/databases/puppetdb-terminus7/Makefile +++ b/databases/puppetdb-terminus7/Makefile @@ -1,5 +1,5 @@ PORTNAME= puppetdb-terminus -PORTVERSION= 7.3.1 +PORTVERSION= 7.4.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 9216df15aaa8d..55e4d1a824144 100644 --- a/databases/puppetdb-terminus7/distinfo +++ b/databases/puppetdb-terminus7/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619808236 -SHA256 (puppetdb-7.3.1.tar.gz) = 182856800949e87129008db00bd20171ca310ef7d7b3556ab0c39fb029dae69c -SIZE (puppetdb-7.3.1.tar.gz) = 47173502 +TIMESTAMP = 1624643197 +SHA256 (puppetdb-7.4.1.tar.gz) = b7f69991fc953c950dfff479601ee4b9feb651c06515a024fec6a4b834e0a055 +SIZE (puppetdb-7.4.1.tar.gz) = 47409868 diff --git a/databases/puppetdb-terminus7/files/patch-Makefile b/databases/puppetdb-terminus7/files/patch-Makefile index 10b1f7cdbe03c..fc5b9e5800ed1 100644 --- a/databases/puppetdb-terminus7/files/patch-Makefile +++ b/databases/puppetdb-terminus7/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2021-04-21 16:01:00 UTC +--- Makefile.orig 2021-06-17 22:24:06 UTC +++ Makefile @@ -1,7 +1,7 @@ prefix = /usr/local @@ -13,22 +13,22 @@ install-puppetdb-termini: -- 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/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/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/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/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb" -- install -Dm 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/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_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/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/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/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/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb" +- install -Dm 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb" +- install -Dm 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb" +- 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/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.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" @@ -41,22 +41,22 @@ + 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.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.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/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.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/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/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb" -+ install -m 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/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_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/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/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/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/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb" ++ install -m 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb" ++ install -m 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb" ++ 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/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.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 6b3e91aeef310..2a6fc8548625f 100644 --- a/databases/puppetdb7/Makefile +++ b/databases/puppetdb7/Makefile @@ -1,5 +1,5 @@ PORTNAME= puppetdb -PORTVERSION= 7.3.1 +PORTVERSION= 7.4.1 CATEGORIES= databases java MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/ PKGNAMESUFFIX= 7 diff --git a/databases/puppetdb7/distinfo b/databases/puppetdb7/distinfo index 4bb8bf9e0d105..528b3495fbaf7 100644 --- a/databases/puppetdb7/distinfo +++ b/databases/puppetdb7/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619808254 -SHA256 (puppetdb-7.3.1.tar.gz) = 182856800949e87129008db00bd20171ca310ef7d7b3556ab0c39fb029dae69c -SIZE (puppetdb-7.3.1.tar.gz) = 47173502 +TIMESTAMP = 1624643211 +SHA256 (puppetdb-7.4.1.tar.gz) = b7f69991fc953c950dfff479601ee4b9feb651c06515a024fec6a4b834e0a055 +SIZE (puppetdb-7.4.1.tar.gz) = 47409868 diff --git a/databases/puppetdb7/files/patch-Makefile b/databases/puppetdb7/files/patch-Makefile index 4cc572232edf1..dc106373bd541 100644 --- a/databases/puppetdb7/files/patch-Makefile +++ b/databases/puppetdb7/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2021-04-21 16:01:00 UTC +--- Makefile.orig 2021-06-17 22:24:06 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/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/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 -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/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/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/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/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 -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/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/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)"