From 86b67291c6cc44c925ae6465eb8716f14cea19e1 Mon Sep 17 00:00:00 2001 From: Benjamin Pereto Date: Jul 13 2016 13:24:30 +0000 Subject: Upstream 1.0.6 --- diff --git a/.gitignore b/.gitignore index 328b7e6..7dc8b68 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /borgbackup-1.0.2.tar.gz /*.src.rpm /borgbackup-1.0.3.tar.gz +/borgbackup-1.0.6.tar.gz diff --git a/0001-fix-sparse-file-test.patch b/0001-fix-sparse-file-test.patch deleted file mode 100644 index fd8ca6d..0000000 --- a/0001-fix-sparse-file-test.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 9be32e97b120d889e41fddb7258fa2928118b01d Mon Sep 17 00:00:00 2001 -From: Thomas Waldmann -Date: Wed, 15 Jun 2016 12:22:29 +0200 -Subject: [PATCH] fix sparse file test, fixes #1170 - -found out that xfs is doing stuff behind the scenes: it is pre-allocating 16MB -to prevent fragmentation (in my case, value depends on misc factors). - -fixed the test so it just checks that the extracted sparse file uses less (not -necessary much less) space than a non-sparse file would use. - -another problem showed up when i tried to verify the holes in the sparse file -via SEEK_HOLE, SEEK_DATA: -after the few bytes of real data in the file, there was another 16MB -preallocated space. -So I ended up checking just the hole at the start of the file. - -tested on: ext4, xfs, zfs, btrfs ---- - borg/testsuite/archiver.py | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/borg/testsuite/archiver.py b/borg/testsuite/archiver.py -index 6a89213..a454862 100644 ---- a/borg/testsuite/archiver.py -+++ b/borg/testsuite/archiver.py -@@ -412,8 +412,21 @@ def test_sparse_file(self): - self.assert_equal(fd.read(hole_size), b'\0' * hole_size) - st = os.stat(filename) - self.assert_equal(st.st_size, total_len) -- if sparse_support and hasattr(st, 'st_blocks'): -- self.assert_true(st.st_blocks * 512 < total_len / 9) # is output sparse? -+ if sparse_support: -+ if hasattr(st, 'st_blocks'): -+ # do only check if it is less, do NOT check if it is much less -+ # as that causes troubles on xfs and zfs: -+ self.assert_true(st.st_blocks * 512 < total_len) -+ if hasattr(os, 'SEEK_HOLE') and hasattr(os, 'SEEK_DATA'): -+ with open(filename, 'rb') as fd: -+ # only check if the first hole is as expected, because the 2nd hole check -+ # is problematic on xfs due to its "dynamic speculative EOF preallocation -+ try: -+ self.assert_equal(fd.seek(0, os.SEEK_HOLE), 0) -+ self.assert_equal(fd.seek(0, os.SEEK_DATA), hole_size) -+ except OSError: -+ # does not really support SEEK_HOLE/SEEK_DATA -+ pass - - def test_unusual_filenames(self): - filenames = ['normal', 'with some blanks', '(with_parens)', ] diff --git a/0001-utf8-to-unicode-string-literal.patch b/0001-utf8-to-unicode-string-literal.patch new file mode 100644 index 0000000..f182a54 --- /dev/null +++ b/0001-utf8-to-unicode-string-literal.patch @@ -0,0 +1,11 @@ +--- a/docs/conf.py 2016-04-03 17:16:30.000000000 +0200 ++++ b/docs/conf.py 2016-04-17 12:26:06.000000000 +0200 +@@ -44,7 +44,7 @@ + + # General information about the project. + project = 'Borg - Deduplicating Archiver' +-copyright = '2010-2014 Jonas Borgström, 2015-2016 The Borg Collective (see AUTHORS file)' ++copyright = u'2010-2014 Jonas Borgström, 2015-2016 The Borg Collective (see AUTHORS file)' + + # The version info for the project you're documenting, acts as replacement for + # |version| and |release|, also used in various other places throughout the diff --git a/borgbackup.spec b/borgbackup.spec index 022ec02..4899ab1 100644 --- a/borgbackup.spec +++ b/borgbackup.spec @@ -1,17 +1,15 @@ %global srcname borgbackup Name: %{srcname} -Version: 1.0.3 -Release: 2%{?dist} +Version: 1.0.6 +Release: 1%{?dist} Summary: A deduplicating backup program with compression and authenticated encryption License: BSD URL: https://borgbackup.readthedocs.org -Source0: http://pypi.python.org/packages/source/b/%{srcname}/%{srcname}-%{version}.tar.gz +Source0: https://files.pythonhosted.org/packages/source/b/%{srcname}/%{srcname}-%{version}.tar.gz -Patch0: utf8_to_unicode_string_literal.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1331820 -Patch1: 0001-fix-sparse-file-test.patch +Patch0: 0001-utf8-to-unicode-string-literal.patch # build BuildRequires: python%{python3_pkgversion}-devel @@ -60,7 +58,6 @@ rm -rf %{srcname}.egg-info # there is a python3 of sphinx %patch0 -p1 %endif -%patch1 -p1 %build %py3_build @@ -84,7 +81,7 @@ find . -name *.so -type f -exec chmod 0755 {} \; install -D -m 0644 docs/_build/man/borg*.1* %{buildroot}%{_mandir}/man1/borg.1 %check -PYTHONPATH=$(pwd) py.test-3 --pyargs borg.testsuite -vk "not test_non_ascii_acl and not test_fuse_mount and not benchmark" +PYTHONPATH=$(pwd) py.test-3 --pyargs borg.testsuite -vk "not test_non_ascii_acl and not test_fuse and not benchmark" %files %license LICENSE @@ -97,6 +94,11 @@ PYTHONPATH=$(pwd) py.test-3 --pyargs borg.testsuite -vk "not test_non_ascii_acl %changelog +* Wed Jul 13 2016 Benjamin Pereto - 1.0.6-1 +- upstream version 1.0.6 (BZ#1354371) +- update source url (now pointing to files.pythonhosted.org) +- testsuite on XFS is patched upstream + * Fri Jul 01 2016 Yaakov Selkowitz - 1.0.3-2 - Fix testsuite on XFS (#1331820) diff --git a/sources b/sources index 58afddc..af7b28e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -94b81bdba533d1f9f70785cd8c2234a0 borgbackup-1.0.3.tar.gz +4434e111e90e6bac7181e44cc580f83c borgbackup-1.0.6.tar.gz diff --git a/utf8_to_unicode_string_literal.patch b/utf8_to_unicode_string_literal.patch deleted file mode 100644 index f182a54..0000000 --- a/utf8_to_unicode_string_literal.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/docs/conf.py 2016-04-03 17:16:30.000000000 +0200 -+++ b/docs/conf.py 2016-04-17 12:26:06.000000000 +0200 -@@ -44,7 +44,7 @@ - - # General information about the project. - project = 'Borg - Deduplicating Archiver' --copyright = '2010-2014 Jonas Borgström, 2015-2016 The Borg Collective (see AUTHORS file)' -+copyright = u'2010-2014 Jonas Borgström, 2015-2016 The Borg Collective (see AUTHORS file)' - - # The version info for the project you're documenting, acts as replacement for - # |version| and |release|, also used in various other places throughout the