diff --git a/databases/puppetdb-terminus7/Makefile b/databases/puppetdb-terminus7/Makefile index db62e7ea507c..5cad32834799 100644 --- a/databases/puppetdb-terminus7/Makefile +++ b/databases/puppetdb-terminus7/Makefile @@ -1,24 +1,24 @@ PORTNAME= puppetdb-terminus -PORTVERSION= 7.18.0 +PORTVERSION= 7.19.0 CATEGORIES= databases ruby MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/ PKGNAMESUFFIX= 7 DISTNAME= puppetdb-${PORTVERSION} MAINTAINER= puppet@FreeBSD.org COMMENT= PuppetDB storeconfigs backend terminus module WWW= https://docs.puppetlabs.com/puppetdb/latest/ LICENSE= APACHE20 CONFLICTS_INSTALL= puppetdb-terminus[0-9] NO_BUILD= yes USES= gmake ruby post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/Makefile do-install: @cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} ${GMAKE} install-puppetdb-termini .include diff --git a/databases/puppetdb-terminus7/distinfo b/databases/puppetdb-terminus7/distinfo index 46bfac7d20fd..62ffe1b45c95 100644 --- a/databases/puppetdb-terminus7/distinfo +++ b/databases/puppetdb-terminus7/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713224942 -SHA256 (puppetdb-7.18.0.tar.gz) = 851789bfacb640ed2938dc9559a2fb7db5dc69516484abd86091c04a25e2bb6f -SIZE (puppetdb-7.18.0.tar.gz) = 52327161 +TIMESTAMP = 1718150372 +SHA256 (puppetdb-7.19.0.tar.gz) = 807b5581c1c559f2f46ba8f331704d39ed2c3f2b87699eb10c6bad4c5baa617b +SIZE (puppetdb-7.19.0.tar.gz) = 52336282 diff --git a/databases/puppetdb-terminus7/files/patch-Makefile b/databases/puppetdb-terminus7/files/patch-Makefile index dbc0ec99562c..478025098da7 100644 --- a/databases/puppetdb-terminus7/files/patch-Makefile +++ b/databases/puppetdb-terminus7/files/patch-Makefile @@ -1,59 +1,60 @@ ---- Makefile.orig 2024-04-05 22:04:28 UTC +--- Makefile.orig 2024-06-10 16:06:40 UTC +++ Makefile @@ -1,7 +1,7 @@ confdir = /etc prefix = /usr/local datadir = $(prefix)/share confdir = /etc -rubylibdir = $(shell ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']") -+rubylibdir = $(shell %%PREFIX%%/bin/ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']") ++rubylibdir = $(shell /usr/local/bin/ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']") rundir = /var/run bindir = /usr/bin -@@ -36,22 +36,31 @@ install-puppetdb-termini: +@@ -36,22 +36,32 @@ install-puppetdb-termini: install-puppetdb-termini: -- 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 -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/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/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/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/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/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.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/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb" -+ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog" +- 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/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 0755 "$(DESTDIR)$(rubylibdir)/puppet/face/" ++ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face/node" ++ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util" ++ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb" + 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/face/node" + install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/reports" + install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/functions" -+ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb" -+ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util" -+ 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 -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/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/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/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/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/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.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.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/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/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/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/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-rpm-sysv-init: install-rpm-preinst install -d -m 0755 "$(DESTDIR)$(initdir)" diff --git a/databases/puppetdb7/Makefile b/databases/puppetdb7/Makefile index 787a09fc0bae..f2d73d995dc9 100644 --- a/databases/puppetdb7/Makefile +++ b/databases/puppetdb7/Makefile @@ -1,50 +1,50 @@ PORTNAME= puppetdb -PORTVERSION= 7.18.0 +PORTVERSION= 7.19.0 CATEGORIES= databases java MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/ PKGNAMESUFFIX= 7 MAINTAINER= puppet@FreeBSD.org COMMENT= PuppetDB storeconfigs backend WWW= https://docs.puppetlabs.com/puppetdb/latest/ LICENSE= APACHE20 RUN_DEPENDS= bash:shells/bash USE_RC_SUBR= puppetdb CONFLICTS_INSTALL= puppetdb[0-9] # etc/puppetdb/bootstrap.cfg.sample USES= cpe shebangfix CPE_VENDOR= puppet SHEBANG_FILES= ext/bin/puppetdb \ ext/cli/anonymize \ ext/cli/config-migration \ ext/cli/foreground \ ext/cli/ssl-setup \ ext/cli/start \ ext/cli/stop \ ext/cli/reload \ ext/cli/upgrade \ ext/ezbake-functions.sh USE_JAVA= yes NO_ARCH= yes NO_BUILD= yes USERS= puppetdb GROUPS= puppetdb SUB_LIST= JAVA_HOME=${JAVA_HOME} SUB_FILES= pkg-message post-patch: .for file in Makefile ext/bin/puppetdb ext/cli/ssl-setup \ ext/config/conf.d/jetty.ini ext/config/conf.d/config.ini @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file} .endfor @${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" ${WRKSRC}/ext/bin/puppetdb do-install: @cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} make install-puppetdb .include diff --git a/databases/puppetdb7/distinfo b/databases/puppetdb7/distinfo index e6f3c42ed2e3..c5291a0dd529 100644 --- a/databases/puppetdb7/distinfo +++ b/databases/puppetdb7/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713224912 -SHA256 (puppetdb-7.18.0.tar.gz) = 851789bfacb640ed2938dc9559a2fb7db5dc69516484abd86091c04a25e2bb6f -SIZE (puppetdb-7.18.0.tar.gz) = 52327161 +TIMESTAMP = 1718150352 +SHA256 (puppetdb-7.19.0.tar.gz) = 807b5581c1c559f2f46ba8f331704d39ed2c3f2b87699eb10c6bad4c5baa617b +SIZE (puppetdb-7.19.0.tar.gz) = 52336282 diff --git a/databases/puppetdb7/files/patch-Makefile b/databases/puppetdb7/files/patch-Makefile index 43a358e4f5b6..ade9d2c91fd7 100644 --- a/databases/puppetdb7/files/patch-Makefile +++ b/databases/puppetdb7/files/patch-Makefile @@ -1,39 +1,39 @@ ---- Makefile.orig 2024-04-05 22:04:28 UTC +--- Makefile.orig 2024-06-10 16:06:40 UTC +++ Makefile @@ -1,24 +1,24 @@ -prefix = /usr/local +prefix = %%PREFIX%% datadir = $(prefix)/share -confdir = /etc +confdir = %%PREFIX%%/etc rubylibdir = $(shell ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']") rundir = /var/run -bindir = /usr/bin +bindir = %%PREFIX%%/bin 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/logback.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/logback.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/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/logback.xml "$(DESTDIR)$(confdir)/puppetdb/logback.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/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)"