below an easy update to Puppetdb 5.2.6, works for me on my puppetmaster.

if noone objects, I'll go ahead with it in the next few days.

any tests, comments, or even OKs?

Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/puppetdb5/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile    6 Nov 2018 14:48:46 -0000       1.12
+++ Makefile    7 Nov 2018 11:03:35 -0000
@@ -3,15 +3,13 @@
 COMMENT-main=  fast, scalable, and reliable data warehouse for Puppet
 COMMENT-plugin= PuppetDB terminus plugin

-V=             5.2.4
+V=             5.2.6
 DISTNAME=      puppetdb-$V
 PKGNAME-main=  ${DISTNAME}
 PKGNAME-plugin= puppetdb-termini-$V
 CATEGORIES=    databases
-REVISION-main= 0
-REVISION-plugin=1

-HOMEPAGE=      http://docs.puppetlabs.com/puppetdb/latest/
+HOMEPAGE=      https://puppet.com/docs/puppetdb/

 MAINTAINER=    Sebastian Reitenbach <sebas...@openbsd.org>

Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/puppetdb5/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo    24 Jul 2018 20:40:15 -0000      1.5
+++ distinfo    7 Nov 2018 11:03:35 -0000
@@ -1,2 +1,2 @@
-SHA256 (puppetdb-5.2.4.tar.gz) = cN9ZVGAljYXkzTHV/rc05cxuDl+W7gkdIU7U8FHGfI4=
-SIZE (puppetdb-5.2.4.tar.gz) = 25438658
+SHA256 (puppetdb-5.2.6.tar.gz) = xj/OcHdet9hKYuKeZIHXHDWaYrpxQjRyb3noezc8tU8=
+SIZE (puppetdb-5.2.6.tar.gz) = 25637942
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/databases/puppetdb5/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile      20 Nov 2017 12:47:32 -0000      1.1.1.1
+++ patches/patch-Makefile      7 Nov 2018 11:03:35 -0000
@@ -18,10 +18,10 @@

  install-puppetdb:
        install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb"
-@@ -30,7 +30,6 @@ install-puppetdb:
-       install -m 0755 ext/cli/config-migration 
"$(DESTDIR)$(datadir)/puppetdb/cli/apps/config-migration"
+@@ -31,7 +31,6 @@ install-puppetdb:
        install -m 0755 ext/cli/foreground 
"$(DESTDIR)$(datadir)/puppetdb/cli/apps/foreground"
        install -m 0755 ext/cli/ssl-setup 
"$(DESTDIR)$(datadir)/puppetdb/cli/apps/ssl-setup"
+       install -m 0755 ext/cli/upgrade 
"$(DESTDIR)$(datadir)/puppetdb/cli/apps/upgrade"
 -      install -d -m 0755 "$(DESTDIR)$(rundir)"


Index: patches/patch-ext_bin_puppetdb
===================================================================
RCS file: /cvs/ports/databases/puppetdb5/patches/patch-ext_bin_puppetdb,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ext_bin_puppetdb
--- patches/patch-ext_bin_puppetdb      20 Nov 2017 12:47:32 -0000      1.1.1.1
+++ patches/patch-ext_bin_puppetdb      7 Nov 2018 11:03:35 -0000
@@ -2,9 +2,9 @@
 Index: ext/bin/puppetdb
 --- ext/bin/puppetdb.orig
 +++ ext/bin/puppetdb
-@@ -12,8 +12,8 @@ elif [ `uname` == "OpenBSD" ] ; then
-     JAVA_BIN=$(javaPathHelper -c puppetdb)
+@@ -13,8 +13,8 @@ elif [ `uname` == "OpenBSD" ] ; then
      JAVA_ARGS="-Xmx192m"
+     TK_ARGS=""
      USER="_puppetdb"
 -    INSTALL_DIR="/opt/puppetlabs/server/apps/puppetdb"
 -    CONFIG="/etc/puppetlabs/puppetdb/conf.d"
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/databases/puppetdb5/pkg/PLIST-main,v
retrieving revision 1.7
diff -u -r1.7 PLIST-main
--- pkg/PLIST-main      4 Sep 2018 12:46:10 -0000       1.7
+++ pkg/PLIST-main      7 Nov 2018 11:03:35 -0000
@@ -35,6 +35,7 @@
 share/puppetdb/cli/apps/ssl-setup
 share/puppetdb/cli/apps/start
 share/puppetdb/cli/apps/stop
+share/puppetdb/cli/apps/upgrade
 share/puppetdb/puppetdb.jar
 @owner _puppetdb
 @sample /var/db/puppetlabs/server/data/puppetdb/

Reply via email to