Index: databases/puppetdb/Makefile =================================================================== --- databases/puppetdb/Makefile +++ databases/puppetdb/Makefile @@ -1,13 +1,15 @@ # $FreeBSD$ PORTNAME= puppetdb -PORTVERSION= 2.2.2 +PORTVERSION= 2.3.4 CATEGORIES= databases java MASTER_SITES= http://downloads.puppetlabs.com/puppetdb/ MAINTAINER= xaque208@gmail.com COMMENT= PuppetDB storeconfigs backend +LICENSE= APACHE20 + RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ puppet>=0:${PORTSDIR}/sysutils/puppet BUILD_DEPENDS= rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \ Index: databases/puppetdb/distinfo =================================================================== --- databases/puppetdb/distinfo +++ databases/puppetdb/distinfo @@ -1,2 +1,2 @@ -SHA256 (puppetdb-2.2.2.tar.gz) = b2921a97e985ee2bf3cf8c6294cfd27e8080637e7d575895001c3949199b2142 -SIZE (puppetdb-2.2.2.tar.gz) = 21797613 +SHA256 (puppetdb-2.3.4.tar.gz) = bb48d7b8b26a54f814a8d35019392fc1414375080592884af1734ad72a594630 +SIZE (puppetdb-2.3.4.tar.gz) = 23814293 Index: databases/puppetdb/files/patch-Rakefile =================================================================== --- databases/puppetdb/files/patch-Rakefile +++ databases/puppetdb/files/patch-Rakefile @@ -1,6 +1,6 @@ ---- ./Rakefile.orig 2014-07-07 17:37:05.000000000 +0000 -+++ ./Rakefile 2014-09-01 19:12:56.379106833 +0000 -@@ -80,29 +80,29 @@ +--- Rakefile.orig 2015-05-07 19:54:34 UTC ++++ Rakefile +@@ -80,29 +80,29 @@ if @pe @java_bin = "/opt/puppet/bin/java" else @install_dir = case @osfamily @@ -38,7 +38,7 @@ end end -@@ -129,6 +129,8 @@ +@@ -129,6 +129,8 @@ case @osfamily @plibdir = @pe ? PE_SITELIBDIR : (%x(ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']").chomp) when /openbsd/ @plibdir = @pe ? PE_SITELIBDIR : '/usr/local/lib/ruby/site_ruby/1.9.1' Index: databases/puppetdb/files/patch-ext__files__config.ini =================================================================== --- databases/puppetdb/files/patch-ext__files__config.ini +++ databases/puppetdb/files/patch-ext__files__config.ini @@ -1,5 +1,5 @@ ---- ./ext/files/config.ini.orig 2014-09-01 19:00:53.886157411 +0000 -+++ ./ext/files/config.ini 2014-09-01 19:06:59.957163437 +0000 +--- ext/files/config.ini.orig 2015-05-07 19:54:50 UTC ++++ ext/files/config.ini @@ -3,9 +3,9 @@ [global] Index: databases/puppetdb/files/patch-ext__files__database.ini =================================================================== --- databases/puppetdb/files/patch-ext__files__database.ini +++ databases/puppetdb/files/patch-ext__files__database.ini @@ -1,6 +1,6 @@ ---- ./ext/files/database.ini.orig 2014-07-07 17:37:41.000000000 +0000 -+++ ./ext/files/database.ini 2014-09-01 19:00:53.907156973 +0000 -@@ -12,7 +12,7 @@ +--- ext/files/database.ini.orig 2015-05-07 19:54:50 UTC ++++ ext/files/database.ini +@@ -12,7 +12,7 @@ subprotocol = hsqldb # For the embedded DB: file:/path/to/database;hsqldb.tx=mvcc;sql.syntax_pgs=true # For PostgreSQL: //host:port/databaseName # Defaults to embedded DB located in /db Index: databases/puppetdb/files/patch-ext__files__puppetdb =================================================================== --- databases/puppetdb/files/patch-ext__files__puppetdb +++ databases/puppetdb/files/patch-ext__files__puppetdb @@ -1,5 +1,5 @@ ---- ./ext/files/puppetdb.orig 2014-09-01 19:00:53.880156353 +0000 -+++ ./ext/files/puppetdb 2014-09-01 19:03:36.589145104 +0000 +--- ext/files/puppetdb.orig 2015-05-07 19:54:50 UTC ++++ ext/files/puppetdb @@ -6,7 +6,7 @@ # Display usage then exit @@ -9,7 +9,7 @@ local files="${libexecdir}/puppetdb-*" # Seems trying to match an asterisk is hard in bash -@@ -48,7 +48,7 @@ +@@ -48,7 +48,7 @@ EOD function execsubcommand { sub=$1 shift Index: databases/puppetdb/files/patch-ext__files__puppetdb-anonymize =================================================================== --- databases/puppetdb/files/patch-ext__files__puppetdb-anonymize +++ databases/puppetdb/files/patch-ext__files__puppetdb-anonymize @@ -1,5 +1,5 @@ ---- ./ext/files/puppetdb-anonymize.orig 2014-09-01 19:00:53.880156353 +0000 -+++ ./ext/files/puppetdb-anonymize 2014-09-01 19:08:46.772124148 +0000 +--- ext/files/puppetdb-anonymize.orig 2015-05-07 19:54:50 UTC ++++ ext/files/puppetdb-anonymize @@ -1,5 +1,5 @@ #!/bin/bash Index: databases/puppetdb/files/patch-ext__files__puppetdb-export =================================================================== --- databases/puppetdb/files/patch-ext__files__puppetdb-export +++ databases/puppetdb/files/patch-ext__files__puppetdb-export @@ -1,5 +1,5 @@ ---- ./ext/files/puppetdb-export.orig 2014-09-01 19:00:53.880156353 +0000 -+++ ./ext/files/puppetdb-export 2014-09-01 19:05:29.845137420 +0000 +--- ext/files/puppetdb-export.orig 2015-05-07 19:54:50 UTC ++++ ext/files/puppetdb-export @@ -1,5 +1,5 @@ #!/bin/bash Index: databases/puppetdb/files/patch-ext__files__puppetdb-foreground =================================================================== --- databases/puppetdb/files/patch-ext__files__puppetdb-foreground +++ databases/puppetdb/files/patch-ext__files__puppetdb-foreground @@ -1,5 +1,5 @@ ---- ./ext/files/puppetdb-foreground.orig 2014-09-01 19:00:53.881157604 +0000 -+++ ./ext/files/puppetdb-foreground 2014-09-01 19:09:39.676120322 +0000 +--- ext/files/puppetdb-foreground.orig 2015-05-07 19:54:50 UTC ++++ ext/files/puppetdb-foreground @@ -1,7 +1,7 @@ #!/bin/bash Index: databases/puppetdb/files/patch-ext__files__puppetdb-import =================================================================== --- databases/puppetdb/files/patch-ext__files__puppetdb-import +++ databases/puppetdb/files/patch-ext__files__puppetdb-import @@ -1,5 +1,5 @@ ---- ./ext/files/puppetdb-import.orig 2014-09-01 19:00:53.881157604 +0000 -+++ ./ext/files/puppetdb-import 2014-09-01 19:08:07.084126366 +0000 +--- ext/files/puppetdb-import.orig 2015-05-07 19:54:50 UTC ++++ ext/files/puppetdb-import @@ -1,5 +1,5 @@ #!/bin/bash Index: databases/puppetdb/files/patch-ext__files__puppetdb-ssl-setup =================================================================== --- databases/puppetdb/files/patch-ext__files__puppetdb-ssl-setup +++ databases/puppetdb/files/patch-ext__files__puppetdb-ssl-setup @@ -1,6 +1,6 @@ ---- ./ext/files/puppetdb-ssl-setup.orig 2014-09-01 19:00:53.881157604 +0000 -+++ ./ext/files/puppetdb-ssl-setup 2014-09-01 19:04:54.653139914 +0000 -@@ -226,11 +226,11 @@ +--- ext/files/puppetdb-ssl-setup.orig 2015-05-07 19:54:50 UTC ++++ ext/files/puppetdb-ssl-setup +@@ -226,11 +226,11 @@ else agent_confdir=`puppet agent --configprint confdir` agent_vardir=`puppet agent --configprint vardir` Index: databases/puppetdb/files/patch-ext__files__puppetdb.newsyslog =================================================================== --- databases/puppetdb/files/patch-ext__files__puppetdb.newsyslog +++ databases/puppetdb/files/patch-ext__files__puppetdb.newsyslog @@ -1,5 +1,5 @@ ---- ./ext/files/puppetdb.newsyslog.orig 2014-09-01 19:00:53.887156756 +0000 -+++ ./ext/files/puppetdb.newsyslog 2014-09-01 19:00:53.887156756 +0000 +--- ext/files/puppetdb.newsyslog.orig 2015-05-11 17:50:44 UTC ++++ ext/files/puppetdb.newsyslog @@ -0,0 +1,3 @@ +# See man 5 newsyslog.conf or man.freebsd.org/newsyslog.conf(5) +# logfilename [owner:group] mode count size when flags [/pid_file] [sig_num] Index: databases/puppetdb/files/patch-tasks__install.rake =================================================================== --- databases/puppetdb/files/patch-tasks__install.rake +++ databases/puppetdb/files/patch-tasks__install.rake @@ -1,6 +1,6 @@ ---- tasks/install.rake.orig 2014-07-07 17:37:05.000000000 +0000 -+++ tasks/install.rake 2014-09-01 19:42:02.500986018 +0000 -@@ -14,24 +14,21 @@ +--- tasks/install.rake.orig 2015-05-07 19:54:35 UTC ++++ tasks/install.rake +@@ -14,24 +14,21 @@ task :install => [ JAR_FILE ] do @osfamily = Facter.value(:osfamily).downcase mkdir_p "#{DESTDIR}/#{@install_dir}" mkdir_p "#{DESTDIR}/#{@config_dir}" @@ -34,7 +34,7 @@ else mkdir_p "#{DESTDIR}#{@lib_dir}/state" mkdir_p "#{DESTDIR}#{@lib_dir}/db" -@@ -40,11 +37,11 @@ +@@ -40,11 +37,11 @@ task :install => [ JAR_FILE ] do end cp_p JAR_FILE, "#{DESTDIR}/#{@install_dir}" @@ -51,7 +51,7 @@ cp_pr "ext/files/logback.xml", "#{DESTDIR}/#{@config_dir}/.." cp_pr "ext/files/puppetdb", "#{DESTDIR}/#{@sbin_dir}" -@@ -100,6 +97,11 @@ +@@ -100,6 +97,11 @@ task :install => [ JAR_FILE ] do cp_p "ext/files/puppetdb.openbsd.init", "#{DESTDIR}/etc/rc.d/#{@name}.rc" cp_p "ext/files/puppetdb.env", "#{DESTDIR}/#{@libexec_dir}/#{@name}.env" chmod 0755, "#{DESTDIR}/etc/rc.d/#{@name}.rc" @@ -63,7 +63,7 @@ elsif @osfamily == "archlinux" #systemd! mkdir_p "#{DESTDIR}/etc/sysconfig" -@@ -113,10 +115,5 @@ +@@ -113,10 +115,5 @@ task :install => [ JAR_FILE ] do end chmod 0750, "#{DESTDIR}/#{@config_dir}" chmod 0640, "#{DESTDIR}/#{@config_dir}/../logback.xml"