OpenIndiana Userland
parent: a099c668 | patch | commit | ignore whitespace
Marcel Telka
2024-03-30 f9ba3aac090e918abb602b2ce28e58b7dd0f59fa 
sysutils/borgbackup: update to 1.2.8

1 files added
6 files modified
66 ■■■■■ changed files
components/sysutils/borgbackup/Makefile 8 ●●●●● patch | view | raw | blame | history
components/sysutils/borgbackup/borgbackup.p5m 14 ●●●●● patch | view | raw | blame | history
components/sysutils/borgbackup/manifests/sample-manifest.p5m 16 ●●●●● patch | view | raw | blame | history
components/sysutils/borgbackup/patches/01-test-time-sleep.patch 10 ●●●●● patch | view | raw | blame | history
components/sysutils/borgbackup/pkg5 3 ●●●●● patch | view | raw | blame | history
components/sysutils/borgbackup/python-integrate-project.conf 2 ●●●●● patch | view | raw | blame | history
components/sysutils/borgbackup/test/results-all.master 13 ●●●●● patch | view | raw | blame | history 
 components/sysutils/borgbackup/Makefile


@@ -19,14 +19,11 @@


include ../../../make-rules/shared-macros.mk




COMPONENT_NAME =        borgbackup


HUMAN_VERSION =            1.2.7


COMPONENT_REVISION =        1


HUMAN_VERSION =            1.2.8


COMPONENT_SUMMARY =        borgbackup - Deduplicated, encrypted, authenticated and compressed backups


COMPONENT_PROJECT_URL =        https://borgbackup.readthedocs.io/


COMPONENT_ARCHIVE_URL =        \


    https://files.pythonhosted.org/packages/a6/19/f94be9fda92ea73cbf22b643a03a0b64559027ef5467765142d8242e712a/borgbackup-1.2.7.tar.gz


COMPONENT_ARCHIVE_HASH =    \


    sha256:f63f28a3383c041971cec87b061ca39a815b5fd445db24aa8172cac417d9411a


    sha256:d39d22b0d2cb745584d68608a179b6c75f7b40e496e96feb789e41d34991f4aa


COMPONENT_LICENSE =        BSD-3-Clause


COMPONENT_LICENSE_FILE =    LICENSE




@@ -52,6 +49,7 @@


PYTHON_REQUIRED_PACKAGES += library/python/wheel


PYTHON_REQUIRED_PACKAGES += runtime/python


REQUIRED_PACKAGES += compress/zstd


REQUIRED_PACKAGES += library/libxxhash


REQUIRED_PACKAGES += library/lz4


REQUIRED_PACKAGES += library/security/openssl-31


REQUIRED_PACKAGES += system/library




 components/sysutils/borgbackup/borgbackup.p5m


@@ -29,22 +29,22 @@


file path=usr/lib/python$(PYVER)/vendor-packages/borg/__main__.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/_version.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/algorithms/__init__.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/algorithms/checksums.so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/algorithms/checksums.cpython-$(PYV).so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/archive.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/archiver.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/cache.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/chunker.so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/compress.so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/chunker.cpython-$(PYV).so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/compress.cpython-$(PYV).so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/constants.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/crypto/__init__.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/crypto/file_integrity.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/crypto/key.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/crypto/keymanager.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/crypto/low_level.so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/crypto/low_level.cpython-$(PYV).so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/crypto/nonces.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/fuse.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/fuse_impl.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/hashindex.so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/hashindex.cpython-$(PYV).so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/helpers/__init__.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/helpers/checks.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/helpers/datastruct.py


@@ -58,7 +58,7 @@


file path=usr/lib/python$(PYVER)/vendor-packages/borg/helpers/progress.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/helpers/time.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/helpers/yes.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/item.so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/item.cpython-$(PYV).so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/locking.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/logger.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/lrucache.py


@@ -67,7 +67,7 @@


file path=usr/lib/python$(PYVER)/vendor-packages/borg/patterns.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/platform/__init__.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/platform/base.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/platform/posix.so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/platform/posix.cpython-$(PYV).so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/platform/xattr.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/platformflags.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/remote.py




 components/sysutils/borgbackup/manifests/sample-manifest.p5m


@@ -10,7 +10,7 @@


#




#


# Copyright 2023 <contributor>


# Copyright 2024 <contributor>


#




set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)


@@ -29,22 +29,22 @@


file path=usr/lib/python$(PYVER)/vendor-packages/borg/__main__.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/_version.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/algorithms/__init__.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/algorithms/checksums.so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/algorithms/checksums.cpython-$(PYV).so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/archive.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/archiver.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/cache.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/chunker.so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/compress.so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/chunker.cpython-$(PYV).so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/compress.cpython-$(PYV).so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/constants.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/crypto/__init__.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/crypto/file_integrity.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/crypto/key.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/crypto/keymanager.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/crypto/low_level.so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/crypto/low_level.cpython-$(PYV).so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/crypto/nonces.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/fuse.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/fuse_impl.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/hashindex.so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/hashindex.cpython-$(PYV).so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/helpers/__init__.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/helpers/checks.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/helpers/datastruct.py


@@ -58,7 +58,7 @@


file path=usr/lib/python$(PYVER)/vendor-packages/borg/helpers/progress.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/helpers/time.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/helpers/yes.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/item.so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/item.cpython-$(PYV).so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/locking.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/logger.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/lrucache.py


@@ -67,7 +67,7 @@


file path=usr/lib/python$(PYVER)/vendor-packages/borg/patterns.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/platform/__init__.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/platform/base.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/platform/posix.so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/platform/posix.cpython-$(PYV).so


file path=usr/lib/python$(PYVER)/vendor-packages/borg/platform/xattr.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/platformflags.py


file path=usr/lib/python$(PYVER)/vendor-packages/borg/remote.py




 components/sysutils/borgbackup/patches/01-test-time-sleep.patch


New file


@@ -0,0 +1,10 @@


--- borgbackup-1.2.8/src/borg/testsuite/locking.py.orig


+++ borgbackup-1.2.8/src/borg/testsuite/locking.py


@@ -35,6 +35,7 @@


         time.sleep(timeout * 1.5)


         assert t.timed_out()


 


+    @pytest.mark.skip(reason="fails: https://www.illumos.org/issues/16432")


     def test_notimeout_sleep(self):


         timeout, sleep = None, 0.5


         t = TimeoutTimer(timeout, sleep).start()




 components/sysutils/borgbackup/pkg5


@@ -1,6 +1,7 @@


{


    "dependencies": [


        "compress/zstd",


        "library/libxxhash",


        "library/lz4",


        "library/python/cython-39",


        "library/python/msgpack-39",


@@ -17,4 +18,4 @@


        "backup/borg"


    ],


    "name": "borgbackup"


}


}




 components/sysutils/borgbackup/python-integrate-project.conf


@@ -13,6 +13,8 @@


# Copyright 2023 Marcel Telka


#




%patch% 01-test-time-sleep.patch




%include-2%


COMPONENT_FMRI =        backup/borg


COMPONENT_CLASSIFICATION =    Applications/System Utilities




 components/sysutils/borgbackup/test/results-all.master


@@ -8,7 +8,7 @@


Tests disabled: BSD flags, fuse2, fuse3


rootdir: $(@D)


configfile: setup.cfg


X workers [1562 items]


X workers [1565 items]




scheduling tests via LoadScheduling




@@ -27,8 +27,8 @@


archive.py::test_invalid_msgpacked_item[\x00] <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archive.py PASSED


archive.py::test_invalid_msgpacked_item[\x80] <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archive.py PASSED


archive.py::test_invalid_msgpacked_item[\x81\xa3foo\xa3bar] <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archive.py PASSED


archive.py::test_invalid_msgpacked_item[\x900] <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archive.py PASSED


archive.py::test_invalid_msgpacked_item[\x901] <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archive.py PASSED


archive.py::test_invalid_msgpacked_item[\x90_0] <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archive.py PASSED


archive.py::test_invalid_msgpacked_item[\x90_1] <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archive.py PASSED


archive.py::test_invalid_msgpacked_item[\x92\xa3foo\xa3bar0] <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archive.py PASSED


archive.py::test_invalid_msgpacked_item[\x92\xa3foo\xa3bar1] <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archive.py PASSED


archive.py::test_invalid_msgpacked_item[\xa0] <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archive.py PASSED


@@ -264,6 +264,7 @@


archiver.py::ArchiverTestCase::test_unusual_filenames <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archiver.py PASSED


archiver.py::ArchiverTestCase::test_usage <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archiver.py PASSED


archiver.py::ArchiverTestCase::test_with_lock <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archiver.py PASSED


archiver.py::ArchiverTestCase::test_with_lock_non_existent_command <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archiver.py PASSED


archiver.py::ArchiverTestCaseBinary::test_aes_counter_uniqueness_keyfile <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archiver.py SKIPPED


archiver.py::ArchiverTestCaseBinary::test_aes_counter_uniqueness_passphrase <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archiver.py SKIPPED


archiver.py::ArchiverTestCaseBinary::test_atime <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archiver.py SKIPPED


@@ -459,6 +460,7 @@


archiver.py::ArchiverTestCaseBinary::test_unusual_filenames <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archiver.py SKIPPED


archiver.py::ArchiverTestCaseBinary::test_usage <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archiver.py SKIPPED


archiver.py::ArchiverTestCaseBinary::test_with_lock <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archiver.py SKIPPED


archiver.py::ArchiverTestCaseBinary::test_with_lock_non_existent_command <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archiver.py SKIPPED


archiver.py::DiffArchiverTestCase::test_basic_functionality <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archiver.py PASSED


archiver.py::DiffArchiverTestCase::test_sort_option <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archiver.py PASSED


archiver.py::DiffArchiverTestCase::test_time_diffs <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archiver.py PASSED


@@ -664,6 +666,7 @@


archiver.py::RemoteArchiverTestCase::test_unusual_filenames <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archiver.py PASSED


archiver.py::RemoteArchiverTestCase::test_usage <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archiver.py PASSED


archiver.py::RemoteArchiverTestCase::test_with_lock <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archiver.py PASSED


archiver.py::RemoteArchiverTestCase::test_with_lock_non_existent_command <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archiver.py PASSED


archiver.py::TestBuildFilter::test_basic <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archiver.py PASSED


archiver.py::TestBuildFilter::test_empty <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archiver.py PASSED


archiver.py::TestBuildFilter::test_strip_components <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/archiver.py PASSED


@@ -1172,7 +1175,7 @@


locking.py::TestLockRoster::test_kill_stale <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/locking.py PASSED


locking.py::TestLockRoster::test_migrate_lock <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/locking.py PASSED


locking.py::TestLockRoster::test_modify_get <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/locking.py PASSED


locking.py::TestTimeoutTimer::test_notimeout_sleep <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/locking.py PASSED


locking.py::TestTimeoutTimer::test_notimeout_sleep <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/locking.py SKIPPED


locking.py::TestTimeoutTimer::test_timeout <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/locking.py PASSED


logger.py::test_lazy_logger <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/logger.py PASSED


logger.py::test_multiple_loggers <- ../prototype/i386$(PYTHON_DIR)/vendor-packages/borg/testsuite/logger.py PASSED


@@ -1590,6 +1593,6 @@


-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html




=========================== short test summary info ============================


======== 1239 passed, 323 skipped, 7 warnings ========


======== 1240 passed, 325 skipped, 7 warnings ========


  py$(PYV): OK


  congratulations :)