Hello community, here is the log from the commit of package borgbackup for openSUSE:Factory checked in at 2019-02-19 11:57:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/borgbackup (Old) and /work/SRC/openSUSE:Factory/.borgbackup.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "borgbackup" Tue Feb 19 11:57:49 2019 rev:20 rq:674342 version:1.1.9 Changes: -------- --- /work/SRC/openSUSE:Factory/borgbackup/borgbackup.changes 2018-12-11 15:50:02.818059759 +0100 +++ /work/SRC/openSUSE:Factory/.borgbackup.new.28833/borgbackup.changes 2019-02-19 11:57:54.865217753 +0100 @@ -1,0 +2,76 @@ +Tue Feb 12 15:39:43 UTC 2019 - Hans-Peter Jansen <[email protected]> + +- Modify patch fix-msgpack-requirement.patch to allow msgpack-0.5.4 + as well. See patch for discussion. +- Clean-up dependency blocks + +------------------------------------------------------------------- +Mon Feb 11 18:11:41 UTC 2019 - Jan Engelhardt <[email protected]> + +- Update RPM groups. + +------------------------------------------------------------------- +Mon Feb 11 10:30:18 UTC 2019 - Antonio Larrosa <[email protected]> + +- Update to 1.1.9: + - Fixes: + - security fix: configure FUSE with "default_permissions", + gh#borgbackup/borg#3903 "default_permissions" is now enforced by borg by + default to let the kernel check uid/gid/mode based permissions. + "ignore_permissions" can be given to not enforce "default_permissions". + - make “hostname” short, even on misconfigured systems, + gh#borgbackup/borg#4262 + - fix free space calculation on macOS (and others?), + gh#borgbackup/borg#4289 + - config: quit with error message when no key is provided, + gh#borgbackup/borg#4223 + - recover_segment: handle too small segment files correctly, + gh#borgbackup/borg#4272 + - correctly release memoryview, gh#borgbackup/borg#4243 + - avoid diaper pattern in configparser by opening files, + gh#borgbackup/borg#4263 + - add "# cython: language_level=3" directive to .pyx + files, #4214 + - info: consider part files for "This archive" stats, + gh#borgbackup/borg#3522 + - work around Microsoft WSL issue gh#borgbackup/borg#645 (sync_file_range), + #1961 + - New features: + - add –rsh command line option to complement BORG_RSH env var, + gh#borgbackup/borg#1701 + - init: -make-parent-dirs parent1/parent2/repo_dir, gh#borgbackup/borg#4235 + - Other: + - add archive name to check -repair output, gh#borgbackup/borg#3447 + - check for unsupported msgpack versions + - shell completions: + - new shell completions for borg 1.1.9 + - more complete shell completions for borg mount -o + - added shell completions for borg help + - option arguments for zsh tab completion + - docs: + - add FAQ regarding free disk space check, gh#borgbackup/borg#3905 + - update BORG_PASSCOMMAND example and clarify variable expansion, + gh#borgbackup/borg#4249 + - FAQ regarding change of compression settings, gh#borgbackup/borg#4222 + - add note about BSD flags to changelog, gh#borgbackup/borg#4246 + - improve logging in example automation script + - add note about files changing during backup, gh#borgbackup/borg#4081 + - work around the backslash issue, gh#borgbackup/borg#4280 + - update release workflow using twine (docs, scripts), + gh#borgbackup/borg#4213 + - add warnings on repository copies to avoid future problems, + gh#borgbackup/borg#4272 + - tests: + - fix the homebrew 1.9 issues on travis-ci, gh#borgbackup/borg#4254 + - fix duplicate test method name, gh#borgbackup/borg#4311 + +- Moved the docs to a new -doc subpackage +- Use the %license tag for the license + +------------------------------------------------------------------- +Sun Feb 3 07:35:57 UTC 2019 - Hans-Peter Jansen <[email protected]> + +- Add conditionals to control various build aspects distribution + agnostic + +------------------------------------------------------------------- @@ -13 +89,5 @@ - - Other + - docs: + - option --format is required for some expensive-to-compute values for json + - borg list by default does not compute expensive values except when they + are needed. whether they are needed is determined by the format, in + standard mode as well as in --json mode. @@ -16 +96,7 @@ - - vagrant uses python 3.5.6 for builds + - tests: + - stop using fakeroot on travis, avoids sporadic EISDIR errors + - xattr key names must start with "user." on linux + - fix code so flake8 3.6 does not complain + - explicitly convert environment variable to str + - fix DeprecationWarning: Flags not at the start of the expression + - support pytest4 @@ -895 +980,0 @@ - Old: ---- borgbackup-1.1.8.tar.gz borgbackup-1.1.8.tar.gz.asc New: ---- borgbackup-1.1.9.tar.gz borgbackup-1.1.9.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ borgbackup.spec ++++++ --- /var/tmp/diff_new_pack.lBbIt5/_old 2019-02-19 11:57:56.757216734 +0100 +++ /var/tmp/diff_new_pack.lBbIt5/_new 2019-02-19 11:57:56.761216732 +0100 @@ -1,8 +1,8 @@ # # spec file for package borgbackup # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2016-2018 LISA GmbH, Bingen, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016-2019 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -13,12 +13,28 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%if 0%{?suse_version} >= 1500 +# deal with renamed python-msgpack package +%bcond_without borg_msgpack +# use new compression libs (lz4, zstd) +%bcond_without borg_newcompr +# run tests (may fail without former conditionals) +%bcond_without borg_test +# use sphinx guzzle theme +%bcond_without borg_guzzle +%else +%bcond_with borg_msgpack +%bcond_with borg_newcompr +%bcond_with borg_test +%bcond_with borg_guzzle +%endif + Name: borgbackup -Version: 1.1.8 +Version: 1.1.9 Release: 0 Summary: Deduplicating backup program with compression and authenticated encryption License: BSD-3-Clause @@ -34,42 +50,48 @@ # python3-guzzle_sphinx_theme isn't available everywhere, # fall back to Sphinx default theme for older distributions Patch2: borgbackup-1.1.4-sphinx-default-theme.patch + +# build dependencies +BuildRequires: bash +%if 0%{?suse_version} == 1320 || 0%{?sle_version} == 120200 +BuildRequires: bash-completion +%endif +BuildRequires: fish BuildRequires: libacl-devel -%if 0%{?suse_version} >= 1500 +%if %{with borg_newcompr} BuildRequires: liblz4-devel >= 1.7.0 BuildRequires: libzstd-devel >= 1.3.0 %endif BuildRequires: openssl-devel >= 1.0.0 BuildRequires: python3 >= 3.4 BuildRequires: python3-Cython +%if %{with borg_msgpack} +Requires: python3-msgpack >= 0.4.6 +%else +Requires: python3-msgpack-python >= 0.4.6 +%endif +BuildRequires: python3-setuptools +BuildRequires: python3-setuptools_scm +BuildRequires: python3-sphinx_rtd_theme +BuildRequires: zsh + # docs requirements BuildRequires: python3-Sphinx BuildRequires: python3-devel -%if 0%{?suse_version} >= 1500 +%if %{with borg_guzzle} BuildRequires: python3-guzzle_sphinx_theme %endif -%if 0%{?suse_version} >= 1500 +%if %{with borg_msgpack} BuildRequires: python3-msgpack >= 0.4.6 %else BuildRequires: python3-msgpack-python >= 0.4.6 %endif # testing requirements -BuildRequires: bash -%if 0%{?sle_version} == 120200 -BuildRequires: bash-completion -%endif -BuildRequires: fish +%if %{with borg_test} BuildRequires: python3-pytest -BuildRequires: python3-setuptools -BuildRequires: python3-setuptools_scm -BuildRequires: python3-sphinx_rtd_theme -BuildRequires: zsh -%if 0%{?suse_version} >= 1500 -Requires: python3-msgpack >= 0.4.6 -%else -Requires: python3-msgpack-python >= 0.4.6 %endif + # weak dependencies Recommends: python3-llfuse BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -80,6 +102,16 @@ facilitating frequent backups and storing to not fully trusted targets. +%package doc +Summary: Documentation files for borgbackup +Group: Documentation/HTML + +%description doc +BorgBackup is a deduplicating backup program which stores deltas. It +supports compression and authenticated encryption as well, +facilitating frequent backups and storing to not fully trusted +targets. + Run borg for a commands overview and check out the docs at %{_docdir}/%{name}/html/index.html. @@ -129,16 +161,15 @@ facilitating frequent backups and storing to not fully trusted targets. -This package contains the zsh completion script for borgbackup. +This package contains the fish completion script for borgbackup. %prep %setup -q +%if %{with borg_msgpack} # fix msgpack requirement -%if 0%{?suse_version} >= 1500 %patch1 -p1 %endif -# fall back to sphinx default theme -%if 0%{?suse_version} < 1500 +%if ! %{with borg_guzzle} %patch2 -p1 %endif # a single test is failing: test_non_ascii_acl - which is a rather esoteric check @@ -167,8 +198,7 @@ install -D -m 0644 scripts/shell_completions/zsh/_borg %{buildroot}/%{_datadir}/zsh/site-functions/_borg install -D -m 0644 scripts/shell_completions/fish/borg.fish %{buildroot}/%{_datadir}/fish/vendor_completions.d/borg.fish -# disable tests for leap versions: their pytest package is too old -%if 0%{?suse_version} != 1315 +%if %{with borg_test} %check # testing the build is a little awkward, since the original testsuite is based on tox and # tox tries to create a virtual environment, that we need tight control on in order to get @@ -184,13 +214,18 @@ %files %defattr(-,root,root,-) -%doc CHANGES.rst LICENSE README.rst docs/_build/html +%doc CHANGES.rst README.rst +%license LICENSE %{python3_sitearch}/borg/ %{python3_sitearch}/borgbackup-%{version}-py%{py3_ver}.egg-info %{_bindir}/borg %{_bindir}/borgfs %{_mandir}/man1/borg.1%{ext_man} +%files doc +%defattr(-,root,root,-) +%doc docs/_build/html + %files bash-completion %defattr(-,root,root,-) %{_datadir}/bash-completion/completions/borg ++++++ borgbackup-1.1.8.tar.gz -> borgbackup-1.1.9.tar.gz ++++++ ++++ 41679 lines of diff (skipped) ++++++ fix-msgpack-requirement.patch ++++++ --- /var/tmp/diff_new_pack.lBbIt5/_old 2019-02-19 11:57:57.213216488 +0100 +++ /var/tmp/diff_new_pack.lBbIt5/_new 2019-02-19 11:57:57.213216488 +0100 @@ -6,20 +6,30 @@ releases which we already packaged, and dropped py34 support is not an issue for us since we have py36. So we're safe to require any +From Hans-Peter Jansen <[email protected]> +Subject: Allow msgpack-0.5.4 as well + +In order to successfully build and test borgbackup on Leap 15.0, we +specifically allow msgpack-0.5.4 here as well. This version is +functional, as long as the Cython code is used, which we do. See: + + https://github.com/borgbackup/borg/issues/3753 + https://github.com/msgpack/msgpack-python/issues/283 + --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: borgbackup-1.1.6/setup.py +Index: b/setup.py =================================================================== ---- borgbackup-1.1.6.orig/setup.py -+++ borgbackup-1.1.6/setup.py +--- a/setup.py ++++ b/setup.py @@ -39,7 +39,7 @@ install_requires = [ # we are rather picky about msgpack versions, because a good working msgpack is # very important for borg, see https://github.com/borgbackup/borg/issues/3753 # best versions seem to be 0.4.6, 0.4.7, 0.4.8 and 0.5.6: - 'msgpack-python >=0.4.6, <=0.5.6, !=0.5.0, !=0.5.1, !=0.5.2, !=0.5.3, !=0.5.4, !=0.5.5', -+ 'msgpack >=0.4.6, <=0.5.6, !=0.5.0, !=0.5.1, !=0.5.2, !=0.5.3, !=0.5.4, !=0.5.5', ++ 'msgpack >=0.4.6, <=0.5.6, !=0.5.0, !=0.5.1, !=0.5.2, !=0.5.3, !=0.5.5', # if you can't satisfy the above requirement, these are versions that might # also work ok, IF you make sure to use the COMPILED version of msgpack-python, # NOT the PURE PYTHON fallback implementation: ==0.5.1, ==0.5.4
