databases/puppetdb7: Update to 7.19.1

Release notes:
https://www.puppet.com/docs/puppetdb/7/release_notes#puppetdb-7191

With hat:	puppet
This commit is contained in:
Romain Tartière 2024-07-30 14:15:47 +02:00
parent 5f3f88552c
commit a2df42803d
No known key found for this signature in database
GPG key ID: BA4D1D955112336F
6 changed files with 43 additions and 63 deletions

View file

@ -1,5 +1,5 @@
PORTNAME= puppetdb-terminus PORTNAME= puppetdb-terminus
PORTVERSION= 7.19.0 PORTVERSION= 7.19.1
CATEGORIES= databases ruby CATEGORIES= databases ruby
MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/ MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/
PKGNAMESUFFIX= 7 PKGNAMESUFFIX= 7

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1718150372 TIMESTAMP = 1722084139
SHA256 (puppetdb-7.19.0.tar.gz) = 807b5581c1c559f2f46ba8f331704d39ed2c3f2b87699eb10c6bad4c5baa617b SHA256 (puppetdb-7.19.1.tar.gz) = 2a4437279a2693d42e315f0d02d90d57d9ec3ba7ddf789387132504390c127ed
SIZE (puppetdb-7.19.0.tar.gz) = 52336282 SIZE (puppetdb-7.19.1.tar.gz) = 52342245

View file

@ -1,4 +1,4 @@
--- Makefile.orig 2024-06-10 16:06:40 UTC --- Makefile.orig 2024-07-19 17:09:14 UTC
+++ Makefile +++ Makefile
@@ -1,7 +1,7 @@ confdir = /etc @@ -1,7 +1,7 @@ confdir = /etc
prefix = /usr/local prefix = /usr/local
@ -9,52 +9,53 @@
rundir = /var/run rundir = /var/run
bindir = /usr/bin bindir = /usr/bin
@@ -36,22 +36,32 @@ install-puppetdb-termini: @@ -36,22 +36,33 @@ install-puppetdb-termini:
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/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
- install -Dm 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb" - install -Dm 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.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/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.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/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/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/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
- install -Dm 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb" - install -Dm 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
- install -Dm 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb" - 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/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/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/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/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
- install -Dm 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb" - install -Dm 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
+ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face/" - 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/face/node"
+ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util" + install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/functions"
+ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb" + install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector"
+ 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/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/node"
+ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource" + install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource"
+ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/reports" + install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/reports"
+ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/functions" + install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util"
+ install -m 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb" + install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb"
+ 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.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb" + install -m 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
+ install -m 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
+ install -m 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.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/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/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/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
+ install -m 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb" + install -m 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
+ install -m 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.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/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/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/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/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
+ install -m 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.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-rpm-sysv-init: install-rpm-preinst
install -d -m 0755 "$(DESTDIR)$(initdir)" install -d -m 0755 "$(DESTDIR)$(initdir)"

View file

@ -1,5 +1,5 @@
PORTNAME= puppetdb PORTNAME= puppetdb
PORTVERSION= 7.19.0 PORTVERSION= 7.19.1
CATEGORIES= databases java CATEGORIES= databases java
MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/ MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/
PKGNAMESUFFIX= 7 PKGNAMESUFFIX= 7
@ -43,6 +43,9 @@ post-patch:
@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file} @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file}
.endfor .endfor
@${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" ${WRKSRC}/ext/bin/puppetdb @${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: do-install:
@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} make install-puppetdb @cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} make install-puppetdb

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1718150352 TIMESTAMP = 1721971840
SHA256 (puppetdb-7.19.0.tar.gz) = 807b5581c1c559f2f46ba8f331704d39ed2c3f2b87699eb10c6bad4c5baa617b SHA256 (puppetdb-7.19.1.tar.gz) = 2a4437279a2693d42e315f0d02d90d57d9ec3ba7ddf789387132504390c127ed
SIZE (puppetdb-7.19.0.tar.gz) = 52336282 SIZE (puppetdb-7.19.1.tar.gz) = 52342245

View file

@ -1,6 +1,6 @@
--- Makefile.orig 2024-06-10 16:06:40 UTC --- Makefile.orig 2024-07-19 17:09:14 UTC
+++ Makefile +++ Makefile
@@ -1,24 +1,24 @@ @@ -1,9 +1,9 @@
-prefix = /usr/local -prefix = /usr/local
+prefix = %%PREFIX%% +prefix = %%PREFIX%%
datadir = $(prefix)/share datadir = $(prefix)/share
@ -13,27 +13,3 @@
install-puppetdb: install-puppetdb:
install -d -m 0755 "$(DESTDIR)$(datadir)/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)"