From owner-svn-ports-all@freebsd.org Thu Feb 7 07:42:10 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B55A414CE10B; Thu, 7 Feb 2019 07:42:10 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5997374329; Thu, 7 Feb 2019 07:42:10 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4FF2E19EA5; Thu, 7 Feb 2019 07:42:10 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x177gAXU045648; Thu, 7 Feb 2019 07:42:10 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x177g9dx045645; Thu, 7 Feb 2019 07:42:09 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201902070742.x177g9dx045645@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Thu, 7 Feb 2019 07:42:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492348 - in head/databases/pgbarman: . files X-SVN-Group: ports-head X-SVN-Commit-Author: matthew X-SVN-Commit-Paths: in head/databases/pgbarman: . files X-SVN-Commit-Revision: 492348 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5997374329 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.971,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Feb 2019 07:42:11 -0000 Author: matthew Date: Thu Feb 7 07:42:09 2019 New Revision: 492348 URL: https://svnweb.freebsd.org/changeset/ports/492348 Log: Update to 2.6 ChangeLog: https://sourceforge.net/projects/pgbarman/files/2.6/ Reorder some items in the Makefile to mollify portlint. Modified: head/databases/pgbarman/Makefile head/databases/pgbarman/distinfo head/databases/pgbarman/files/patch-barman_config.py head/databases/pgbarman/files/patch-doc_barman.5 Modified: head/databases/pgbarman/Makefile ============================================================================== --- head/databases/pgbarman/Makefile Thu Feb 7 07:33:28 2019 (r492347) +++ head/databases/pgbarman/Makefile Thu Feb 7 07:42:09 2019 (r492348) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= barman -DISTVERSION= 2.5 -PORTREVISION= 1 +DISTVERSION= 2.6 CATEGORIES= databases MASTER_SITES= SF/${PKGNAMEPREFIX}${PORTNAME}/${DISTVERSION} PKGNAMEPREFIX= pg @@ -21,14 +20,14 @@ RUN_DEPENDS= rsync:net/rsync \ ${PYTHON_PKGNAMEPREFIX}argh>=0.21.2:devel/py-argh@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}argcomplete>0:devel/py-argcomplete@${PY_FLAVOR} +USES= pgsql python +USE_PYTHON= autoplist distutils concurrent optsuffix + +WANT_PGSQL= client NO_ARCH= yes USERS= barman GROUPS= barman - -USES= pgsql python -WANT_PGSQL= client -USE_PYTHON= autoplist distutils concurrent optsuffix PORTDOCS= tutorial.pdf Modified: head/databases/pgbarman/distinfo ============================================================================== --- head/databases/pgbarman/distinfo Thu Feb 7 07:33:28 2019 (r492347) +++ head/databases/pgbarman/distinfo Thu Feb 7 07:42:09 2019 (r492348) @@ -1,5 +1,5 @@ -TIMESTAMP = 1540631448 -SHA256 (barman-2.5.tar.gz) = b270a87b9cf5fb6145ccb21b81f31a4d5f88b339f3906be56ab8261d4e623c43 -SIZE (barman-2.5.tar.gz) = 1002958 +TIMESTAMP = 1549406044 +SHA256 (barman-2.6.tar.gz) = 181586cf1186de73e740b39edd324aed09b766f466e9b496c375d9750bd51718 +SIZE (barman-2.6.tar.gz) = 1205731 SHA256 (tutorial.pdf) = 21acf6152b959c55b996fb6479c722d3f416eac3384479498a25911a3912a158 SIZE (tutorial.pdf) = 349394 Modified: head/databases/pgbarman/files/patch-barman_config.py ============================================================================== --- head/databases/pgbarman/files/patch-barman_config.py Thu Feb 7 07:33:28 2019 (r492347) +++ head/databases/pgbarman/files/patch-barman_config.py Thu Feb 7 07:42:09 2019 (r492348) @@ -1,6 +1,6 @@ ---- barman/config.py.orig 2016-09-23 12:56:55 UTC +--- barman/config.py.orig 2019-01-31 16:56:08 UTC +++ barman/config.py -@@ -520,8 +520,8 @@ class Config(object): +@@ -566,8 +566,8 @@ class Config(object): """ CONFIG_FILES = [ '~/.barman.conf', Modified: head/databases/pgbarman/files/patch-doc_barman.5 ============================================================================== --- head/databases/pgbarman/files/patch-doc_barman.5 Thu Feb 7 07:33:28 2019 (r492347) +++ head/databases/pgbarman/files/patch-doc_barman.5 Thu Feb 7 07:42:09 2019 (r492348) @@ -1,12 +1,12 @@ ---- doc/barman.5.orig 2016-09-26 15:32:17 UTC +--- doc/barman.5.orig 2019-01-31 16:56:08 UTC +++ doc/barman.5 -@@ -17,7 +17,7 @@ The system\-level Barman configuration f +@@ -17,7 +17,7 @@ The system\-level Barman configuration file is located .IP .nf \f[C] -/etc/barman.conf +%%PREFIX%%/etc/barman.conf - \f[] + \f[R] .fi .PP @@ -25,7 +25,7 @@ or @@ -15,44 +15,44 @@ \f[C] -/etc/barman/barman.conf +%%PREFIX%%/etc/barman/barman.conf - \f[] + \f[R] .fi .PP @@ -51,9 +51,9 @@ configurations. - If the value of \f[C]configuration_files_directory\f[] is a directory, - Barman reads all files with \f[C]\&.conf\f[] extension that exist in - that folder. --For example, if you set it to \f[C]/etc/barman.d\f[], you can specify -+For example, if you set it to \f[C]%%PREFIX%%/etc/barman.d\f[], you can specify + If the value of \f[C]configuration_files_directory\f[R] is a directory, + Barman reads all files with \f[C].conf\f[R] extension that exist in that + folder. +-For example, if you set it to \f[C]/etc/barman.d\f[R], you can specify ++For example, if you set it to \f[C]%%PREFIX%%/etc/barman.d\f[R], you can specify your PostgreSQL servers placing each section in a separate --\f[C]\&.conf\f[] file inside the \f[C]/etc/barman.d\f[] folder. -+\f[C]\&.conf\f[] file inside the \f[C]%%PREFIX%%/etc/barman.d\f[] folder. +-\f[C].conf\f[R] file inside the \f[C]/etc/barman.d\f[R] folder. ++\f[C].conf\f[R] file inside the \f[C]%%PREFIX%%/etc/barman.d\f[R] folder. .SH OPTIONS .TP .B active -@@ -608,7 +608,7 @@ Here is an example of configuration file +@@ -625,7 +625,7 @@ Here is an example of configuration file: \f[C] [barman] - ;\ Main\ directory --barman_home\ =\ /var/lib/barman -+barman_home\ =\ /var/barman + ; Main directory +-barman_home = /var/lib/barman ++barman_home = /var/barman - ;\ System\ user - barman_user\ =\ barman -@@ -628,13 +628,13 @@ reuse_backup\ =\ link - description\ =\ \ "Main\ PostgreSQL\ Database" + ; System user + barman_user = barman +@@ -645,13 +645,13 @@ reuse_backup = link + description = \[dq]Main PostgreSQL Database\[dq] - ;\ SSH\ options --ssh_command\ =\ ssh\ postgres\@pg -+ssh_command\ =\ ssh\ %%PGUSER%%\@pg + ; SSH options +-ssh_command = ssh postgres\[at]pg ++ssh_command = ssh %%PGUSER%%\[at]pg - ;\ PostgreSQL\ connection\ string --conninfo\ =\ host=pg\ user=postgres -+conninfo\ =\ host=pg\ user=%%PGUSER%%\ db=postgres + ; PostgreSQL connection string +-conninfo = host=pg user=postgres ++conninfo = host=pg user=%%PGUSER%% - ;\ PostgreSQL\ streaming\ connection\ string --streaming_conninfo\ =\ host=pg\ user=postgres -+streaming_conninfo\ =\ host=pg\ user=%%PGUSER%% + ; PostgreSQL streaming connection string +-streaming_conninfo = host=pg user=postgres ++streaming_conninfo = host=pg user=%%PGUSER%% - ;\ Minimum\ number\ of\ required\ backups\ (redundancy) - minimum_redundancy\ =\ 1 + ; Minimum number of required backups (redundancy) + minimum_redundancy = 1