Update py-barman to 1.4.0.

Version 1.4.0 - 26 Jan 2015

  * Incremental base backup implementation through the reuse_backup
    global/server option. Possible values are off (disabled,
    default), copy (preventing unmodified files from being
    transferred) and link (allowing for deduplication through hard
    links).
  * Store and show deduplication effects when using reuse_backup=
    link.
  * Added transparent support of pg_stat_archiver (PostgreSQL 9.4) in
    check, show-server and status commands.
  * Improved administration by invoking WAL maintenance at the end of
    a successful backup.
  * Changed the way unused WAL files are trashed, by differentiating
    between concurrent and exclusive backup cases.
  * Improved performance of WAL statistics calculation.
  * Treat a missing pg_ident.conf as a WARNING rather than an error.
  * Refactored output layer by removing remaining yield calls.
  * Check that rsync is in the system path.
  * Include history files in WAL management.
  * Improved robustness through more unit tests.
  * Fixed bug #55: Ignore fsync EINVAL errors on directories.
  * Fixed bug #58: retention policies delete.

3 files changed, 23 insertions, 21 deletions

diff --git a/databases/py-barman/Makefile b/databases/py-barman/Makefile
index eb6abf186d9..e47087fd3c8 100644
--- a/databases/py-barman/Makefile
+++ b/databases/py-barman/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2014/11/11 15:38:51 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2015/04/07 09:42:55 fhajny Exp $
 
-DISTNAME=	barman-1.3.3
+DISTNAME=	barman-1.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pgbarman/}
@@ -27,6 +27,8 @@ INSTALLATION_DIRS+=	share/examples/barman
 
 .include "../../mk/bsd.prefs.mk"
 
+BUILD_DEFS+=		VARBASE
+
 BARMAN_DIR?=		${VARBASE}/lib/barman
 BARMAN_LOG_DIR?=	${VARBASE}/log/barman
 BARMAN_USER=		barman
diff --git a/databases/py-barman/distinfo b/databases/py-barman/distinfo
index 6b5ea586263..13d1a2726b2 100644
--- a/databases/py-barman/distinfo
+++ b/databases/py-barman/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2014/11/04 12:56:14 fhajny Exp $
+$NetBSD: distinfo,v 1.2 2015/04/07 09:42:55 fhajny Exp $
 
-SHA1 (barman-1.3.3.tar.gz) = 6f8ff87332d58f1228b741c3a2ad5ea6c88f2da7
-RMD160 (barman-1.3.3.tar.gz) = affebf135e6eaa26a3ce56658064fc17c1d4b9f1
-Size (barman-1.3.3.tar.gz) = 111462 bytes
-SHA1 (patch-barman_backup.py) = c6755e60fba308518afcb7f884353b689256c900
+SHA1 (barman-1.4.0.tar.gz) = bdeab227133bf58005b1b7b3812ffbd52cb3fd18
+RMD160 (barman-1.4.0.tar.gz) = 77bcccac32158f7dffd022a99bfce270758e0ae6
+Size (barman-1.4.0.tar.gz) = 120590 bytes
+SHA1 (patch-barman_backup.py) = 552ce149f700aca35487144d8bc9ba0063bcacf5
diff --git a/databases/py-barman/patches/patch-barman_backup.py b/databases/py-barman/patches/patch-barman_backup.py
index 82c38bcb600..d6cf1f26196 100644
--- a/databases/py-barman/patches/patch-barman_backup.py
+++ b/databases/py-barman/patches/patch-barman_backup.py
@@ -1,23 +1,23 @@
-$NetBSD: patch-barman_backup.py,v 1.1 2014/11/04 12:56:14 fhajny Exp $
+$NetBSD: patch-barman_backup.py,v 1.2 2015/04/07 09:42:55 fhajny Exp $
 
 Make portable for non-glibc platforms too.
---- barman/backup.py.orig	2014-08-14 16:10:43.000000000 +0000
+--- barman/backup.py.orig	2015-01-23 13:23:54.000000000 +0000
 +++ barman/backup.py
-@@ -956,7 +956,7 @@ class BackupManager(object):
-         backup_size = 0
+@@ -1043,7 +1043,7 @@ class BackupManager(object):
+         deduplicated_size = 0
          for dirpath, _, filenames in os.walk(backup_dest):
              # execute fsync() on the containing directory
 -            dir_fd = os.open(dirpath, os.O_DIRECTORY)
 +            dir_fd = os.open(dirpath, os.O_RDONLY)
-             os.fsync(dir_fd)
-             os.close(dir_fd)
-             # execute fsync() on all the contained files
-@@ -1166,7 +1166,7 @@ class BackupManager(object):
-             shutil.move(filename, destfile)
+             try:
+                 os.fsync(dir_fd)
+             except OSError, e:
+@@ -1302,7 +1302,7 @@ class BackupManager(object):
+             shutil.move(srcfile, destfile)
  
          # execute fsync() on the archived WAL containing directory
--        dir_fd = os.open(os.path.dirname(destfile), os.O_DIRECTORY)
-+        dir_fd = os.open(os.path.dirname(destfile), os.O_RDONLY)
-         os.fsync(dir_fd)
-         os.close(dir_fd)
-         # execute fsync() on the archived WAL file
+-        dir_fd = os.open(destdir, os.O_DIRECTORY)
++        dir_fd = os.open(destdir, os.O_RDONLY)
+         try:
+             os.fsync(dir_fd)
+         except OSError, e: