Hello ports@,
databases/barman has been updated to 1.4.0. Changes include improvements
to incremental backup and bugfixes to retention policies.
Announcement with more information is available at
http://www.postgresql.org/about/news/1566/
This software currently has no maintainer; I am offering to be
maintainer, which this diff reflects.
Please note that while preparing this diff I encountered the
FULLPKGNAME\- issue in make-plist(1) that was discussed in
http://marc.info/?l=openbsd-ports&m=136853948729478. When I applied
Samir's patch mentioned in that thread, the problem was resolved. Is
that patch still up for consideration?
- Eric
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/barman/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Makefile 26 Aug 2013 09:37:52 -0000 1.2
+++ Makefile 7 Feb 2015 03:45:43 -0000
@@ -2,11 +2,12 @@
COMMENT = backup and restoration manager for PostgreSQL
-MODPY_EGG_VERSION = 1.2.2
+MODPY_EGG_VERSION = 1.4.0
DISTNAME = barman-${MODPY_EGG_VERSION}
CATEGORIES = databases
HOMEPAGE = http://www.pgbarman.org/
-REVISION = 0
+
+MAINTAINER= Eric Lalonde <[email protected]>
# GPLv3
PERMIT_PACKAGE_CDROM = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/barman/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 10 Aug 2013 13:42:45 -0000 1.1.1.1
+++ distinfo 7 Feb 2015 03:45:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (barman-1.2.2.tar.gz) = /U+UG6ti9YdezyOKkPWtBaWWIvO+qIJl7kg2KREu82Y=
-SIZE (barman-1.2.2.tar.gz) = 70412
+SHA256 (barman-1.4.0.tar.gz) = 0YwzG9bYkxvWDasnK8nVEutJS/3bEZZNfKQw9Rt+Rek=
+SIZE (barman-1.4.0.tar.gz) = 120590
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/databases/barman/patches/patch-setup_py,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-setup_py
--- patches/patch-setup_py 10 Aug 2013 13:42:45 -0000 1.1.1.1
+++ patches/patch-setup_py 7 Feb 2015 03:45:43 -0000
@@ -1,14 +1,13 @@
-$OpenBSD: patch-setup_py,v 1.1.1.1 2013/08/10 13:42:45 landry Exp $
---- setup.py.orig Thu Nov 22 20:52:33 2012
-+++ setup.py Thu Nov 22 20:52:51 2012
-@@ -54,8 +54,8 @@ setup(
- packages=['barman', 'barman.test', ],
+--- setup.py.orig Mon Jan 12 03:10:22 2015
++++ setup.py Fri Feb 6 16:26:04 2015
+@@ -74,8 +74,8 @@ setup(
+ packages=['barman', ],
scripts=['bin/barman', ],
data_files=[
- ('share/man/man1', ['doc/barman.1']),
- ('share/man/man5', ['doc/barman.5']),
+ ('man/man1', ['doc/barman.1']),
+ ('man/man5', ['doc/barman.5']),
- ],
+ ],
license='GPL-3.0',
description=__doc__.split("\n")[0],
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/barman/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST 26 Aug 2013 09:37:52 -0000 1.2
+++ pkg/PLIST 7 Feb 2015 03:45:43 -0000
@@ -3,9 +3,9 @@
@newuser _barman:723:723:daemon:Barman User:/nonexistent:/sbin/nologin
@extraunexec rm -rf /var/db/barman/*
@extraunexec rm -rf /var/log/barman/*
+@mode 0750
@owner _barman
@group _barman
-@mode 0750
@sample /var/db/barman/
@sample /var/log/barman/
@mode
@@ -13,12 +13,12 @@
@group
bin/barman
lib/python${MODPY_VERSION}/site-packages/barman/
-lib/python${MODPY_VERSION}/site-packages/barman-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/barman-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/barman-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/barman-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/barman-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/barman-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/barman/__init__.py
lib/python${MODPY_VERSION}/site-packages/barman/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/barman/backup.py
@@ -31,19 +31,26 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/barman/compression.pyc
lib/python${MODPY_VERSION}/site-packages/barman/config.py
lib/python${MODPY_VERSION}/site-packages/barman/config.pyc
+lib/python${MODPY_VERSION}/site-packages/barman/diagnose.py
+lib/python${MODPY_VERSION}/site-packages/barman/diagnose.pyc
+lib/python${MODPY_VERSION}/site-packages/barman/fs.py
+lib/python${MODPY_VERSION}/site-packages/barman/fs.pyc
+lib/python${MODPY_VERSION}/site-packages/barman/hooks.py
+lib/python${MODPY_VERSION}/site-packages/barman/hooks.pyc
+lib/python${MODPY_VERSION}/site-packages/barman/infofile.py
+lib/python${MODPY_VERSION}/site-packages/barman/infofile.pyc
lib/python${MODPY_VERSION}/site-packages/barman/lockfile.py
lib/python${MODPY_VERSION}/site-packages/barman/lockfile.pyc
+lib/python${MODPY_VERSION}/site-packages/barman/output.py
+lib/python${MODPY_VERSION}/site-packages/barman/output.pyc
lib/python${MODPY_VERSION}/site-packages/barman/retention_policies.py
lib/python${MODPY_VERSION}/site-packages/barman/retention_policies.pyc
lib/python${MODPY_VERSION}/site-packages/barman/server.py
lib/python${MODPY_VERSION}/site-packages/barman/server.pyc
-lib/python${MODPY_VERSION}/site-packages/barman/test/
-lib/python${MODPY_VERSION}/site-packages/barman/test/__init__.py
-lib/python${MODPY_VERSION}/site-packages/barman/test/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/barman/test/test_config.py
-lib/python${MODPY_VERSION}/site-packages/barman/test/test_config.pyc
-lib/python${MODPY_VERSION}/site-packages/barman/test/test_xlog.py
-lib/python${MODPY_VERSION}/site-packages/barman/test/test_xlog.pyc
+lib/python${MODPY_VERSION}/site-packages/barman/testing_helpers.py
+lib/python${MODPY_VERSION}/site-packages/barman/testing_helpers.pyc
+lib/python${MODPY_VERSION}/site-packages/barman/utils.py
+lib/python${MODPY_VERSION}/site-packages/barman/utils.pyc
lib/python${MODPY_VERSION}/site-packages/barman/version.py
lib/python${MODPY_VERSION}/site-packages/barman/version.pyc
lib/python${MODPY_VERSION}/site-packages/barman/xlog.py
@@ -55,10 +62,7 @@ share/doc/barman/README
share/doc/pkg-readmes/${FULLPKGNAME}
share/examples/barman/
share/examples/barman/barman.conf
+@mode 0640
@owner root
@group _barman
-@mode 0640
@sample ${SYSCONFDIR}/barman.conf
-@mode
-@owner
-@group