- Update from 1.1.17 to 1.2.0 - Update of rootfile - borgbackup now requires the python module pkgconfig, installed as a set with this patch - Changelog Compatibility notes: dropped support / testing for older Pythons, minimum requirement is 3.8. In case your OS does not provide Python >= 3.8, consider using our binary, which does not need an external Python interpreter. Or continue using borg 1.1.x, which is still supported. freeing repository space only happens when “borg compact” is invoked. mount: the default for --numeric-ids is False now (same as borg extract) borg create --noatime is deprecated. Not storing atime is the default behaviour now (use --atime if you want to store the atime). list: corrected mix-up of “isomtime” and “mtime” formats. Previously, “isomtime” was the default but produced a verbose human format, while “mtime” produced a ISO-8601-like format. The behaviours have been swapped (so “mtime” is human, “isomtime” is ISO-like), and the default is now “mtime”. “isomtime” is now a real ISO-8601 format (“T” between date and time, not a space). create/recreate --list: file status for all files used to get announced AFTER the file (with borg < 1.2). Now, file status is announced BEFORE the file contents are processed. If the file status changes later (e.g. due to an error or a content change), the updated/final file status will be printed again. removed deprecated-since-long stuff (deprecated since): command “borg change-passphrase” (2017-02), use “borg key …” option “--keep-tag-files” (2017-01), use “--keep-exclude-tags” option “--list-format” (2017-10), use “--format” option “--ignore-inode” (2017-09), use “--files-cache” w/o “inode” option “--no-files-cache” (2017-09), use “--files-cache=disabled” removed BORG_HOSTNAME_IS_UNIQUE env var. to use borg you must implement one of these 2 scenarios: the combination of FQDN and result of uuid.getnode() must be unique and stable (this should be the case for almost everybody, except when having duplicate FQDN and MAC address or all-zero MAC address) if you are aware that 1) is not the case for you, you must set BORG_HOST_ID env var to something unique. exit with 128 + signal number, #5161. if you have scripts expecting rc == 2 for a signal exit, you need to update them to check for >= 128. Fixes: diff: reduce memory consumption, fix is_hardlink_master, #6295 compact: fix / improve freeable / freed space log output derive really freed space from quota use before/after, #5679 do not say “freeable”, but “maybe freeable” (based on hint, unsure) fix race conditions in internal SaveFile function, #6306 #6028 implement internal safe_unlink (was: truncate_and_unlink) function more safely: usually it does not truncate any more, only under “disk full” circumstances and only if there is only one hardlink. see: https://github.com/borgbackup/borg/discussions/6286 Other changes: info: use a pre12-meta cache to accelerate stats for borg < 1.2 archives. the first time borg info is invoked on a borg 1.1 repo, it can take a rather long time computing and caching some stats values for 1.1 archives, which borg 1.2 archives have in their archive metadata structure. be patient, esp. if you have lots of old archives. following invocations are much faster due to the cache. related change: add archive name to calc_stats progress display. docs: add borg 1.2 upgrade notes, #6217 link to borg placeholders and borg patterns help init: explain the encryption modes better clarify usage of patternfile roots put import-tar docs into same file as export-tar docs explain the difference between a path that ends with or without a slash, #6297
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/packages/borgbackup | 64 ++++++++++++++++------------ lfs/borgbackup | 6 +-- 2 files changed, 40 insertions(+), 30 deletions(-)
diff --git a/config/rootfiles/packages/borgbackup b/config/rootfiles/packages/borgbackup index dccaf4711..041d9e89a 100644 --- a/config/rootfiles/packages/borgbackup +++ b/config/rootfiles/packages/borgbackup @@ -6,33 +6,38 @@ usr/lib/python3.10/site-packages/borg/__main__.py usr/lib/python3.10/site-packages/borg/_version.py #usr/lib/python3.10/site-packages/borg/algorithms usr/lib/python3.10/site-packages/borg/algorithms/__init__.py -usr/lib/python3.10/site-packages/borg/algorithms/checksums.cpython-310-xxxMACHINExxx-linux-gnu.so -#usr/lib/python3.10/site-packages/borg/algorithms/msgpack -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/__init__.py -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_packer.cpp -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_packer.cpython-310-xxxMACHINExxx-linux-gnu.so -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_unpacker.cpp -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_unpacker.cpython-310-xxxMACHINExxx-linux-gnu.so -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_version.py -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/exceptions.py -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/fallback.py +usr/lib/python3.10/site-packages/borg/algorithms/checksums.cpython-310-x86_64-linux-gnu.so usr/lib/python3.10/site-packages/borg/archive.py usr/lib/python3.10/site-packages/borg/archiver.py usr/lib/python3.10/site-packages/borg/cache.py -usr/lib/python3.10/site-packages/borg/chunker.cpython-310-xxxMACHINExxx-linux-gnu.so -usr/lib/python3.10/site-packages/borg/compress.cpython-310-xxxMACHINExxx-linux-gnu.so +usr/lib/python3.10/site-packages/borg/chunker.cpython-310-x86_64-linux-gnu.so +usr/lib/python3.10/site-packages/borg/compress.cpython-310-x86_64-linux-gnu.so usr/lib/python3.10/site-packages/borg/constants.py #usr/lib/python3.10/site-packages/borg/crypto usr/lib/python3.10/site-packages/borg/crypto/__init__.py usr/lib/python3.10/site-packages/borg/crypto/file_integrity.py usr/lib/python3.10/site-packages/borg/crypto/key.py usr/lib/python3.10/site-packages/borg/crypto/keymanager.py -usr/lib/python3.10/site-packages/borg/crypto/low_level.cpython-310-xxxMACHINExxx-linux-gnu.so +usr/lib/python3.10/site-packages/borg/crypto/low_level.cpython-310-x86_64-linux-gnu.so usr/lib/python3.10/site-packages/borg/crypto/nonces.py usr/lib/python3.10/site-packages/borg/fuse.py -usr/lib/python3.10/site-packages/borg/hashindex.cpython-310-xxxMACHINExxx-linux-gnu.so -usr/lib/python3.10/site-packages/borg/helpers.py -usr/lib/python3.10/site-packages/borg/item.cpython-310-xxxMACHINExxx-linux-gnu.so +usr/lib/python3.10/site-packages/borg/fuse_impl.py +usr/lib/python3.10/site-packages/borg/hashindex.cpython-310-x86_64-linux-gnu.so +#usr/lib/python3.10/site-packages/borg/helpers +usr/lib/python3.10/site-packages/borg/helpers/__init__.py +usr/lib/python3.10/site-packages/borg/helpers/checks.py +usr/lib/python3.10/site-packages/borg/helpers/datastruct.py +usr/lib/python3.10/site-packages/borg/helpers/errors.py +usr/lib/python3.10/site-packages/borg/helpers/fs.py +usr/lib/python3.10/site-packages/borg/helpers/manifest.py +usr/lib/python3.10/site-packages/borg/helpers/misc.py +usr/lib/python3.10/site-packages/borg/helpers/msgpack.py +usr/lib/python3.10/site-packages/borg/helpers/parseformat.py +usr/lib/python3.10/site-packages/borg/helpers/process.py +usr/lib/python3.10/site-packages/borg/helpers/progress.py +usr/lib/python3.10/site-packages/borg/helpers/time.py +usr/lib/python3.10/site-packages/borg/helpers/yes.py +usr/lib/python3.10/site-packages/borg/item.cpython-310-x86_64-linux-gnu.so usr/lib/python3.10/site-packages/borg/locking.py usr/lib/python3.10/site-packages/borg/logger.py usr/lib/python3.10/site-packages/borg/lrucache.py @@ -42,9 +47,11 @@ usr/lib/python3.10/site-packages/borg/patterns.py #usr/lib/python3.10/site-packages/borg/platform usr/lib/python3.10/site-packages/borg/platform/__init__.py usr/lib/python3.10/site-packages/borg/platform/base.py -usr/lib/python3.10/site-packages/borg/platform/linux.cpython-310-xxxMACHINExxx-linux-gnu.so -usr/lib/python3.10/site-packages/borg/platform/posix.cpython-310-xxxMACHINExxx-linux-gnu.so -usr/lib/python3.10/site-packages/borg/platform/syncfilerange.cpython-310-xxxMACHINExxx-linux-gnu.so +usr/lib/python3.10/site-packages/borg/platform/linux.cpython-310-x86_64-linux-gnu.so +usr/lib/python3.10/site-packages/borg/platform/posix.cpython-310-x86_64-linux-gnu.so +usr/lib/python3.10/site-packages/borg/platform/syncfilerange.cpython-310-x86_64-linux-gnu.so +usr/lib/python3.10/site-packages/borg/platform/xattr.py +usr/lib/python3.10/site-packages/borg/platformflags.py usr/lib/python3.10/site-packages/borg/remote.py usr/lib/python3.10/site-packages/borg/repository.py usr/lib/python3.10/site-packages/borg/selftest.py @@ -58,8 +65,11 @@ usr/lib/python3.10/site-packages/borg/testsuite/benchmark.py usr/lib/python3.10/site-packages/borg/testsuite/cache.py usr/lib/python3.10/site-packages/borg/testsuite/checksums.py usr/lib/python3.10/site-packages/borg/testsuite/chunker.py +usr/lib/python3.10/site-packages/borg/testsuite/chunker_pytest.py +usr/lib/python3.10/site-packages/borg/testsuite/chunker_slow.py usr/lib/python3.10/site-packages/borg/testsuite/compress.py usr/lib/python3.10/site-packages/borg/testsuite/crypto.py +usr/lib/python3.10/site-packages/borg/testsuite/efficient_collection_queue.py usr/lib/python3.10/site-packages/borg/testsuite/file_integrity.py usr/lib/python3.10/site-packages/borg/testsuite/hashindex.py usr/lib/python3.10/site-packages/borg/testsuite/helpers.py @@ -81,11 +91,11 @@ usr/lib/python3.10/site-packages/borg/testsuite/xattr.py usr/lib/python3.10/site-packages/borg/upgrader.py usr/lib/python3.10/site-packages/borg/version.py usr/lib/python3.10/site-packages/borg/xattr.py -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/PKG-INFO -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/SOURCES.txt -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/dependency_links.txt -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/entry_points.txt -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/not-zip-safe -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/requires.txt -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/top_level.txt +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/PKG-INFO +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/SOURCES.txt +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/dependency_links.txt +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/entry_points.txt +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/not-zip-safe +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/requires.txt +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/top_level.txt diff --git a/lfs/borgbackup b/lfs/borgbackup index 9244900bf..08a3e8ec7 100644 --- a/lfs/borgbackup +++ b/lfs/borgbackup @@ -24,7 +24,7 @@
include Config
-VER = 1.1.17 +VER = 1.2.0 SUMMARY = Deduplicating backup program with compression and authenticated encryption
THISAPP = borgbackup-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = borgbackup -PAK_VER = 10 +PAK_VER = 11
DEPS =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 3ceb51f3c2e4ee4e38495ca0bdef2d5c1b30225afe9a3c9987a82f4a1facd4aa203fb21512e655fbbab400bcbd412ff4aefa80242aa21a579e086d38bf3e1078 +$(DL_FILE)_BLAKE2 = 9e6cb8d85ca196cbdd6baba694bc7987d63f85d2ba0e25f3ac1e59400882fff71e29b04ca218ee78f23daeb52d13547062b0c80bd0d3f5b460b28b4f274d11ec
install : $(TARGET)
- Instal the python pkgconfig module - required for borgbackup - Install of rootfile
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/packages/python3-pkgconfig | 8 ++ lfs/python3-pkgconfig | 86 +++++++++++++++++++++ make.sh | 1 + 3 files changed, 95 insertions(+) create mode 100644 config/rootfiles/packages/python3-pkgconfig create mode 100644 lfs/python3-pkgconfig
diff --git a/config/rootfiles/packages/python3-pkgconfig b/config/rootfiles/packages/python3-pkgconfig new file mode 100644 index 000000000..54c0155a4 --- /dev/null +++ b/config/rootfiles/packages/python3-pkgconfig @@ -0,0 +1,8 @@ +usr/lib/python3.10/site-packages/pkgconfig +#usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info +#usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info/PKG-INFO +#usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info/SOURCES.txt +#usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info/dependency_links.txt +#usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info/top_level.txt +usr/lib/python3.10/site-packages/pkgconfig/__init__.py +usr/lib/python3.10/site-packages/pkgconfig/pkgconfig.py diff --git a/lfs/python3-pkgconfig b/lfs/python3-pkgconfig new file mode 100644 index 000000000..a91aca39b --- /dev/null +++ b/lfs/python3-pkgconfig @@ -0,0 +1,86 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2020 IPFire Team info@ipfire.org # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.5.5 +SUMMARY = Python module to interface Python with pkg-config + +THISAPP = pkgconfig-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = python3-pkgconfig +PAK_VER = 1 + +DEPS = + +SERVICES = + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 0eb3ff11b1fdcd3b1b4d3310d408d5f9a036a48c0f3176d77a13e566df35beea8ee6b3afe4c7643cc1808584e525f4d0fac9ab706b751c933f853ed1e9aecd0e + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && python3 setup.py build + cd $(DIR_APP) && python3 setup.py install --root=/ + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 95e6e89db..9f6d032e2 100755 --- a/make.sh +++ b/make.sh @@ -1641,6 +1641,7 @@ buildipfire() { lfsmake2 python3-click lfsmake2 python3-arrow lfsmake2 python3-terminaltables + lfsmake2 python3-pkgconfig lfsmake2 aws-cli lfsmake2 oci-python-sdk lfsmake2 oci-cli
Hello Adolf,
On 12 Apr 2022, at 11:32, Adolf Belka adolf.belka@ipfire.org wrote:
- Update from 1.1.17 to 1.2.0
- Update of rootfile
- borgbackup now requires the python module pkgconfig, installed as a set with this patch
- Changelog Compatibility notes: dropped support / testing for older Pythons, minimum requirement is 3.8. In case your OS does not provide Python >= 3.8, consider using our binary, which does not need an external Python interpreter. Or continue using borg 1.1.x, which is still supported. freeing repository space only happens when “borg compact” is invoked. mount: the default for --numeric-ids is False now (same as borg extract) borg create --noatime is deprecated. Not storing atime is the default behaviour now (use --atime if you want to store the atime). list: corrected mix-up of “isomtime” and “mtime” formats. Previously, “isomtime” was the default but produced a verbose human format, while “mtime” produced a ISO-8601-like format. The behaviours have been swapped (so “mtime” is human, “isomtime” is ISO-like), and the default is now “mtime”. “isomtime” is now a real ISO-8601 format (“T” between date and time, not a space). create/recreate --list: file status for all files used to get announced AFTER the file (with borg < 1.2). Now, file status is announced BEFORE the file contents are processed. If the file status changes later (e.g. due to an error or a content change), the updated/final file status will be printed again. removed deprecated-since-long stuff (deprecated since): command “borg change-passphrase” (2017-02), use “borg key …” option “--keep-tag-files” (2017-01), use “--keep-exclude-tags” option “--list-format” (2017-10), use “--format” option “--ignore-inode” (2017-09), use “--files-cache” w/o “inode” option “--no-files-cache” (2017-09), use “--files-cache=disabled” removed BORG_HOSTNAME_IS_UNIQUE env var. to use borg you must implement one of these 2 scenarios: the combination of FQDN and result of uuid.getnode() must be unique and stable (this should be the case for almost everybody, except when having duplicate FQDN and MAC address or all-zero MAC address) if you are aware that 1) is not the case for you, you must set BORG_HOST_ID env var to something unique. exit with 128 + signal number, #5161. if you have scripts expecting rc == 2 for a signal exit, you need to update them to check for >= 128. Fixes: diff: reduce memory consumption, fix is_hardlink_master, #6295 compact: fix / improve freeable / freed space log output derive really freed space from quota use before/after, #5679 do not say “freeable”, but “maybe freeable” (based on hint, unsure) fix race conditions in internal SaveFile function, #6306 #6028 implement internal safe_unlink (was: truncate_and_unlink) function more safely: usually it does not truncate any more, only under “disk full” circumstances and only if there is only one hardlink. see: https://github.com/borgbackup/borg/discussions/6286 Other changes: info: use a pre12-meta cache to accelerate stats for borg < 1.2 archives. the first time borg info is invoked on a borg 1.1 repo, it can take a rather long time computing and caching some stats values for 1.1 archives, which borg 1.2 archives have in their archive metadata structure. be patient, esp. if you have lots of old archives. following invocations are much faster due to the cache. related change: add archive name to calc_stats progress display. docs: add borg 1.2 upgrade notes, #6217 link to borg placeholders and borg patterns help init: explain the encryption modes better clarify usage of patternfile roots put import-tar docs into same file as export-tar docs explain the difference between a path that ends with or without a slash, #6297
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/packages/borgbackup | 64 ++++++++++++++++------------ lfs/borgbackup | 6 +-- 2 files changed, 40 insertions(+), 30 deletions(-)
diff --git a/config/rootfiles/packages/borgbackup b/config/rootfiles/packages/borgbackup index dccaf4711..041d9e89a 100644 --- a/config/rootfiles/packages/borgbackup +++ b/config/rootfiles/packages/borgbackup @@ -6,33 +6,38 @@ usr/lib/python3.10/site-packages/borg/__main__.py usr/lib/python3.10/site-packages/borg/_version.py #usr/lib/python3.10/site-packages/borg/algorithms usr/lib/python3.10/site-packages/borg/algorithms/__init__.py -usr/lib/python3.10/site-packages/borg/algorithms/checksums.cpython-310-xxxMACHINExxx-linux-gnu.so -#usr/lib/python3.10/site-packages/borg/algorithms/msgpack -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/__init__.py -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_packer.cpp -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_packer.cpython-310-xxxMACHINExxx-linux-gnu.so -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_unpacker.cpp -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_unpacker.cpython-310-xxxMACHINExxx-linux-gnu.so -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_version.py -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/exceptions.py -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/fallback.py +usr/lib/python3.10/site-packages/borg/algorithms/checksums.cpython-310-x86_64-linux-gnu.so usr/lib/python3.10/site-packages/borg/archive.py usr/lib/python3.10/site-packages/borg/archiver.py usr/lib/python3.10/site-packages/borg/cache.py -usr/lib/python3.10/site-packages/borg/chunker.cpython-310-xxxMACHINExxx-linux-gnu.so -usr/lib/python3.10/site-packages/borg/compress.cpython-310-xxxMACHINExxx-linux-gnu.so +usr/lib/python3.10/site-packages/borg/chunker.cpython-310-x86_64-linux-gnu.so +usr/lib/python3.10/site-packages/borg/compress.cpython-310-x86_64-linux-gnu.so usr/lib/python3.10/site-packages/borg/constants.py #usr/lib/python3.10/site-packages/borg/crypto usr/lib/python3.10/site-packages/borg/crypto/__init__.py usr/lib/python3.10/site-packages/borg/crypto/file_integrity.py usr/lib/python3.10/site-packages/borg/crypto/key.py usr/lib/python3.10/site-packages/borg/crypto/keymanager.py -usr/lib/python3.10/site-packages/borg/crypto/low_level.cpython-310-xxxMACHINExxx-linux-gnu.so +usr/lib/python3.10/site-packages/borg/crypto/low_level.cpython-310-x86_64-linux-gnu.so usr/lib/python3.10/site-packages/borg/crypto/nonces.py usr/lib/python3.10/site-packages/borg/fuse.py -usr/lib/python3.10/site-packages/borg/hashindex.cpython-310-xxxMACHINExxx-linux-gnu.so -usr/lib/python3.10/site-packages/borg/helpers.py -usr/lib/python3.10/site-packages/borg/item.cpython-310-xxxMACHINExxx-linux-gnu.so +usr/lib/python3.10/site-packages/borg/fuse_impl.py +usr/lib/python3.10/site-packages/borg/hashindex.cpython-310-x86_64-linux-gnu.so +#usr/lib/python3.10/site-packages/borg/helpers +usr/lib/python3.10/site-packages/borg/helpers/__init__.py +usr/lib/python3.10/site-packages/borg/helpers/checks.py +usr/lib/python3.10/site-packages/borg/helpers/datastruct.py +usr/lib/python3.10/site-packages/borg/helpers/errors.py +usr/lib/python3.10/site-packages/borg/helpers/fs.py +usr/lib/python3.10/site-packages/borg/helpers/manifest.py +usr/lib/python3.10/site-packages/borg/helpers/misc.py +usr/lib/python3.10/site-packages/borg/helpers/msgpack.py +usr/lib/python3.10/site-packages/borg/helpers/parseformat.py +usr/lib/python3.10/site-packages/borg/helpers/process.py +usr/lib/python3.10/site-packages/borg/helpers/progress.py +usr/lib/python3.10/site-packages/borg/helpers/time.py +usr/lib/python3.10/site-packages/borg/helpers/yes.py +usr/lib/python3.10/site-packages/borg/item.cpython-310-x86_64-linux-gnu.so
You re-introduced the architecture name here. x86_64 should be xxxMACHINExxx. What a great variable name :)
usr/lib/python3.10/site-packages/borg/locking.py usr/lib/python3.10/site-packages/borg/logger.py usr/lib/python3.10/site-packages/borg/lrucache.py @@ -42,9 +47,11 @@ usr/lib/python3.10/site-packages/borg/patterns.py #usr/lib/python3.10/site-packages/borg/platform usr/lib/python3.10/site-packages/borg/platform/__init__.py usr/lib/python3.10/site-packages/borg/platform/base.py -usr/lib/python3.10/site-packages/borg/platform/linux.cpython-310-xxxMACHINExxx-linux-gnu.so -usr/lib/python3.10/site-packages/borg/platform/posix.cpython-310-xxxMACHINExxx-linux-gnu.so -usr/lib/python3.10/site-packages/borg/platform/syncfilerange.cpython-310-xxxMACHINExxx-linux-gnu.so +usr/lib/python3.10/site-packages/borg/platform/linux.cpython-310-x86_64-linux-gnu.so +usr/lib/python3.10/site-packages/borg/platform/posix.cpython-310-x86_64-linux-gnu.so +usr/lib/python3.10/site-packages/borg/platform/syncfilerange.cpython-310-x86_64-linux-gnu.so +usr/lib/python3.10/site-packages/borg/platform/xattr.py +usr/lib/python3.10/site-packages/borg/platformflags.py usr/lib/python3.10/site-packages/borg/remote.py usr/lib/python3.10/site-packages/borg/repository.py usr/lib/python3.10/site-packages/borg/selftest.py @@ -58,8 +65,11 @@ usr/lib/python3.10/site-packages/borg/testsuite/benchmark.py usr/lib/python3.10/site-packages/borg/testsuite/cache.py usr/lib/python3.10/site-packages/borg/testsuite/checksums.py usr/lib/python3.10/site-packages/borg/testsuite/chunker.py +usr/lib/python3.10/site-packages/borg/testsuite/chunker_pytest.py +usr/lib/python3.10/site-packages/borg/testsuite/chunker_slow.py usr/lib/python3.10/site-packages/borg/testsuite/compress.py usr/lib/python3.10/site-packages/borg/testsuite/crypto.py +usr/lib/python3.10/site-packages/borg/testsuite/efficient_collection_queue.py usr/lib/python3.10/site-packages/borg/testsuite/file_integrity.py usr/lib/python3.10/site-packages/borg/testsuite/hashindex.py usr/lib/python3.10/site-packages/borg/testsuite/helpers.py @@ -81,11 +91,11 @@ usr/lib/python3.10/site-packages/borg/testsuite/xattr.py usr/lib/python3.10/site-packages/borg/upgrader.py usr/lib/python3.10/site-packages/borg/version.py usr/lib/python3.10/site-packages/borg/xattr.py -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/PKG-INFO -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/SOURCES.txt -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/dependency_links.txt -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/entry_points.txt -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/not-zip-safe -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/requires.txt -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/top_level.txt +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/PKG-INFO +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/SOURCES.txt +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/dependency_links.txt +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/entry_points.txt +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/not-zip-safe +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/requires.txt +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/top_level.txt diff --git a/lfs/borgbackup b/lfs/borgbackup index 9244900bf..08a3e8ec7 100644 --- a/lfs/borgbackup +++ b/lfs/borgbackup @@ -24,7 +24,7 @@
include Config
-VER = 1.1.17 +VER = 1.2.0 SUMMARY = Deduplicating backup program with compression and authenticated encryption
THISAPP = borgbackup-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = borgbackup -PAK_VER = 10 +PAK_VER = 11
DEPS =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 3ceb51f3c2e4ee4e38495ca0bdef2d5c1b30225afe9a3c9987a82f4a1facd4aa203fb21512e655fbbab400bcbd412ff4aefa80242aa21a579e086d38bf3e1078 +$(DL_FILE)_BLAKE2 = 9e6cb8d85ca196cbdd6baba694bc7987d63f85d2ba0e25f3ac1e59400882fff71e29b04ca218ee78f23daeb52d13547062b0c80bd0d3f5b460b28b4f274d11ec
install : $(TARGET)
-- 2.35.1
Hi Michael,
On 13/04/2022 10:47, Michael Tremer wrote:
Hello Adolf,
On 12 Apr 2022, at 11:32, Adolf Belka adolf.belka@ipfire.org wrote:
- Update from 1.1.17 to 1.2.0
- Update of rootfile
- borgbackup now requires the python module pkgconfig, installed as a set with this patch
- Changelog Compatibility notes: dropped support / testing for older Pythons, minimum requirement is 3.8. In case your OS does not provide Python >= 3.8, consider using our binary, which does not need an external Python interpreter. Or continue using borg 1.1.x, which is still supported. freeing repository space only happens when “borg compact” is invoked. mount: the default for --numeric-ids is False now (same as borg extract) borg create --noatime is deprecated. Not storing atime is the default behaviour now (use --atime if you want to store the atime). list: corrected mix-up of “isomtime” and “mtime” formats. Previously, “isomtime” was the default but produced a verbose human format, while “mtime” produced a ISO-8601-like format. The behaviours have been swapped (so “mtime” is human, “isomtime” is ISO-like), and the default is now “mtime”. “isomtime” is now a real ISO-8601 format (“T” between date and time, not a space). create/recreate --list: file status for all files used to get announced AFTER the file (with borg < 1.2). Now, file status is announced BEFORE the file contents are processed. If the file status changes later (e.g. due to an error or a content change), the updated/final file status will be printed again. removed deprecated-since-long stuff (deprecated since): command “borg change-passphrase” (2017-02), use “borg key …” option “--keep-tag-files” (2017-01), use “--keep-exclude-tags” option “--list-format” (2017-10), use “--format” option “--ignore-inode” (2017-09), use “--files-cache” w/o “inode” option “--no-files-cache” (2017-09), use “--files-cache=disabled” removed BORG_HOSTNAME_IS_UNIQUE env var. to use borg you must implement one of these 2 scenarios: the combination of FQDN and result of uuid.getnode() must be unique and stable (this should be the case for almost everybody, except when having duplicate FQDN and MAC address or all-zero MAC address) if you are aware that 1) is not the case for you, you must set BORG_HOST_ID env var to something unique. exit with 128 + signal number, #5161. if you have scripts expecting rc == 2 for a signal exit, you need to update them to check for >= 128. Fixes: diff: reduce memory consumption, fix is_hardlink_master, #6295 compact: fix / improve freeable / freed space log output derive really freed space from quota use before/after, #5679 do not say “freeable”, but “maybe freeable” (based on hint, unsure) fix race conditions in internal SaveFile function, #6306 #6028 implement internal safe_unlink (was: truncate_and_unlink) function more safely: usually it does not truncate any more, only under “disk full” circumstances and only if there is only one hardlink. see: https://github.com/borgbackup/borg/discussions/6286 Other changes: info: use a pre12-meta cache to accelerate stats for borg < 1.2 archives. the first time borg info is invoked on a borg 1.1 repo, it can take a rather long time computing and caching some stats values for 1.1 archives, which borg 1.2 archives have in their archive metadata structure. be patient, esp. if you have lots of old archives. following invocations are much faster due to the cache. related change: add archive name to calc_stats progress display. docs: add borg 1.2 upgrade notes, #6217 link to borg placeholders and borg patterns help init: explain the encryption modes better clarify usage of patternfile roots put import-tar docs into same file as export-tar docs explain the difference between a path that ends with or without a slash, #6297
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/packages/borgbackup | 64 ++++++++++++++++------------ lfs/borgbackup | 6 +-- 2 files changed, 40 insertions(+), 30 deletions(-)
diff --git a/config/rootfiles/packages/borgbackup b/config/rootfiles/packages/borgbackup index dccaf4711..041d9e89a 100644 --- a/config/rootfiles/packages/borgbackup +++ b/config/rootfiles/packages/borgbackup @@ -6,33 +6,38 @@ usr/lib/python3.10/site-packages/borg/__main__.py usr/lib/python3.10/site-packages/borg/_version.py #usr/lib/python3.10/site-packages/borg/algorithms usr/lib/python3.10/site-packages/borg/algorithms/__init__.py -usr/lib/python3.10/site-packages/borg/algorithms/checksums.cpython-310-xxxMACHINExxx-linux-gnu.so -#usr/lib/python3.10/site-packages/borg/algorithms/msgpack -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/__init__.py -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_packer.cpp -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_packer.cpython-310-xxxMACHINExxx-linux-gnu.so -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_unpacker.cpp -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_unpacker.cpython-310-xxxMACHINExxx-linux-gnu.so -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/_version.py -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/exceptions.py -usr/lib/python3.10/site-packages/borg/algorithms/msgpack/fallback.py +usr/lib/python3.10/site-packages/borg/algorithms/checksums.cpython-310-x86_64-linux-gnu.so usr/lib/python3.10/site-packages/borg/archive.py usr/lib/python3.10/site-packages/borg/archiver.py usr/lib/python3.10/site-packages/borg/cache.py -usr/lib/python3.10/site-packages/borg/chunker.cpython-310-xxxMACHINExxx-linux-gnu.so -usr/lib/python3.10/site-packages/borg/compress.cpython-310-xxxMACHINExxx-linux-gnu.so +usr/lib/python3.10/site-packages/borg/chunker.cpython-310-x86_64-linux-gnu.so +usr/lib/python3.10/site-packages/borg/compress.cpython-310-x86_64-linux-gnu.so usr/lib/python3.10/site-packages/borg/constants.py #usr/lib/python3.10/site-packages/borg/crypto usr/lib/python3.10/site-packages/borg/crypto/__init__.py usr/lib/python3.10/site-packages/borg/crypto/file_integrity.py usr/lib/python3.10/site-packages/borg/crypto/key.py usr/lib/python3.10/site-packages/borg/crypto/keymanager.py -usr/lib/python3.10/site-packages/borg/crypto/low_level.cpython-310-xxxMACHINExxx-linux-gnu.so +usr/lib/python3.10/site-packages/borg/crypto/low_level.cpython-310-x86_64-linux-gnu.so usr/lib/python3.10/site-packages/borg/crypto/nonces.py usr/lib/python3.10/site-packages/borg/fuse.py -usr/lib/python3.10/site-packages/borg/hashindex.cpython-310-xxxMACHINExxx-linux-gnu.so -usr/lib/python3.10/site-packages/borg/helpers.py -usr/lib/python3.10/site-packages/borg/item.cpython-310-xxxMACHINExxx-linux-gnu.so +usr/lib/python3.10/site-packages/borg/fuse_impl.py +usr/lib/python3.10/site-packages/borg/hashindex.cpython-310-x86_64-linux-gnu.so +#usr/lib/python3.10/site-packages/borg/helpers +usr/lib/python3.10/site-packages/borg/helpers/__init__.py +usr/lib/python3.10/site-packages/borg/helpers/checks.py +usr/lib/python3.10/site-packages/borg/helpers/datastruct.py +usr/lib/python3.10/site-packages/borg/helpers/errors.py +usr/lib/python3.10/site-packages/borg/helpers/fs.py +usr/lib/python3.10/site-packages/borg/helpers/manifest.py +usr/lib/python3.10/site-packages/borg/helpers/misc.py +usr/lib/python3.10/site-packages/borg/helpers/msgpack.py +usr/lib/python3.10/site-packages/borg/helpers/parseformat.py +usr/lib/python3.10/site-packages/borg/helpers/process.py +usr/lib/python3.10/site-packages/borg/helpers/progress.py +usr/lib/python3.10/site-packages/borg/helpers/time.py +usr/lib/python3.10/site-packages/borg/helpers/yes.py +usr/lib/python3.10/site-packages/borg/item.cpython-310-x86_64-linux-gnu.so
You re-introduced the architecture name here. x86_64 should be xxxMACHINExxx. What a great variable name :)
Yes I missed that. Will redo the patch set as a v2.
make.sh build must also have missed those, as I would have fixed it if there was a message about that.
I suspect that the whitelisting that was put in to deal with a false alarm that occurred has also covered this situation.
Regards, Adolf.
usr/lib/python3.10/site-packages/borg/locking.py usr/lib/python3.10/site-packages/borg/logger.py usr/lib/python3.10/site-packages/borg/lrucache.py @@ -42,9 +47,11 @@ usr/lib/python3.10/site-packages/borg/patterns.py #usr/lib/python3.10/site-packages/borg/platform usr/lib/python3.10/site-packages/borg/platform/__init__.py usr/lib/python3.10/site-packages/borg/platform/base.py -usr/lib/python3.10/site-packages/borg/platform/linux.cpython-310-xxxMACHINExxx-linux-gnu.so -usr/lib/python3.10/site-packages/borg/platform/posix.cpython-310-xxxMACHINExxx-linux-gnu.so -usr/lib/python3.10/site-packages/borg/platform/syncfilerange.cpython-310-xxxMACHINExxx-linux-gnu.so +usr/lib/python3.10/site-packages/borg/platform/linux.cpython-310-x86_64-linux-gnu.so +usr/lib/python3.10/site-packages/borg/platform/posix.cpython-310-x86_64-linux-gnu.so +usr/lib/python3.10/site-packages/borg/platform/syncfilerange.cpython-310-x86_64-linux-gnu.so +usr/lib/python3.10/site-packages/borg/platform/xattr.py +usr/lib/python3.10/site-packages/borg/platformflags.py usr/lib/python3.10/site-packages/borg/remote.py usr/lib/python3.10/site-packages/borg/repository.py usr/lib/python3.10/site-packages/borg/selftest.py @@ -58,8 +65,11 @@ usr/lib/python3.10/site-packages/borg/testsuite/benchmark.py usr/lib/python3.10/site-packages/borg/testsuite/cache.py usr/lib/python3.10/site-packages/borg/testsuite/checksums.py usr/lib/python3.10/site-packages/borg/testsuite/chunker.py +usr/lib/python3.10/site-packages/borg/testsuite/chunker_pytest.py +usr/lib/python3.10/site-packages/borg/testsuite/chunker_slow.py usr/lib/python3.10/site-packages/borg/testsuite/compress.py usr/lib/python3.10/site-packages/borg/testsuite/crypto.py +usr/lib/python3.10/site-packages/borg/testsuite/efficient_collection_queue.py usr/lib/python3.10/site-packages/borg/testsuite/file_integrity.py usr/lib/python3.10/site-packages/borg/testsuite/hashindex.py usr/lib/python3.10/site-packages/borg/testsuite/helpers.py @@ -81,11 +91,11 @@ usr/lib/python3.10/site-packages/borg/testsuite/xattr.py usr/lib/python3.10/site-packages/borg/upgrader.py usr/lib/python3.10/site-packages/borg/version.py usr/lib/python3.10/site-packages/borg/xattr.py -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/PKG-INFO -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/SOURCES.txt -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/dependency_links.txt -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/entry_points.txt -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/not-zip-safe -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/requires.txt -usr/lib/python3.10/site-packages/borgbackup-1.1.17-py3.10.egg-info/top_level.txt +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/PKG-INFO +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/SOURCES.txt +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/dependency_links.txt +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/entry_points.txt +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/not-zip-safe +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/requires.txt +#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/top_level.txt diff --git a/lfs/borgbackup b/lfs/borgbackup index 9244900bf..08a3e8ec7 100644 --- a/lfs/borgbackup +++ b/lfs/borgbackup @@ -24,7 +24,7 @@
include Config
-VER = 1.1.17 +VER = 1.2.0 SUMMARY = Deduplicating backup program with compression and authenticated encryption
THISAPP = borgbackup-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = borgbackup -PAK_VER = 10 +PAK_VER = 11
DEPS =
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 3ceb51f3c2e4ee4e38495ca0bdef2d5c1b30225afe9a3c9987a82f4a1facd4aa203fb21512e655fbbab400bcbd412ff4aefa80242aa21a579e086d38bf3e1078 +$(DL_FILE)_BLAKE2 = 9e6cb8d85ca196cbdd6baba694bc7987d63f85d2ba0e25f3ac1e59400882fff71e29b04ca218ee78f23daeb52d13547062b0c80bd0d3f5b460b28b4f274d11ec
install : $(TARGET)
-- 2.35.1
-
Adolf Belka -
Michael Tremer