From patchwork Sat Apr 11 05:26:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ummeegge X-Patchwork-Id: 2929 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48zk0P1dN3z3yBy for ; Sat, 11 Apr 2020 05:27:17 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48zk0M4bThz2Qs; Sat, 11 Apr 2020 05:27:15 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48zk0L5lS0z2yRV; Sat, 11 Apr 2020 05:27:14 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48zk0K1s8tz2xkV for ; Sat, 11 Apr 2020 05:27:13 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48zk0J5L9Sz2Qs; Sat, 11 Apr 2020 05:27:12 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1586582832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=6/vcAq6idhSpvMnPlfnltuxUlBYccHwbs1OmQ7PYR+o=; b=tCNQ8QdM3QPtbgcMTe/NelGZ5Y//PagRhJjwswWLeBTziXprHQbM+Gqyj29kCoG47gxi6y Fidfsyw3uLX5q3BQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1586582832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=6/vcAq6idhSpvMnPlfnltuxUlBYccHwbs1OmQ7PYR+o=; b=LXiNNPtzeqwUbARDETGQD3JqDa43SxVCX3y3YE6uh85aeJAKfZqACbV//0tgfGIh0Jdj9Z 0FPK/Bd/xJ5GLBTogKUwiViit6e5V0h7afM/uFUeprJ/WV+Mz93MTImPfk8JDbLggttVkV JtSpKeShEMP6VU4bDVMFA38SbFW/ehlJXTvijlrQxeR+qeYQGJhhPDSAh4tLvCMaINiAUo i1vVMuiDCjUfkmiq51A+ZV2UTVnevwRDC9RfN7Z3xHEO/Pm5/K3b7oEcZ0D8UJTyU4xrTy zr0z9n5uKAyAMkfYyM8K3E9AIcp/LaxmJmmcYaqagUCc6L1CMef2HykE6nhf7w== From: Erik Kapfer To: development@lists.ipfire.org Subject: [PATCH] borgbackup: Fixes DEP error. Update to 1.1.11 Date: Sat, 11 Apr 2020 07:26:58 +0200 Message-Id: <20200411052658.26643-1-ummeegge@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=ummeegge@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Fixes #12356 Several fixes but also new features has been added with this version. Full changelog can be found in here --> https://github.com/borgbackup/borg/blob/1.1.11/docs/changes.rst#version-1111-2020-03-08 . Signed-off-by: Erik Kapfer Reviewed-by: Michael Tremer Reviewed-by: Jonatan Schlag --- config/rootfiles/packages/borgbackup | 34 ++++++++++++++++++++++------------ lfs/borgbackup | 8 ++++---- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/config/rootfiles/packages/borgbackup b/config/rootfiles/packages/borgbackup index 19b5a69eb..81a7e7072 100644 --- a/config/rootfiles/packages/borgbackup +++ b/config/rootfiles/packages/borgbackup @@ -1,19 +1,28 @@ usr/bin/borg usr/bin/borgfs -usr/lib/python3.8/site-packages/borg +#usr/lib/python3.8/site-packages/borg usr/lib/python3.8/site-packages/borg/__init__.py usr/lib/python3.8/site-packages/borg/__main__.py usr/lib/python3.8/site-packages/borg/_version.py -usr/lib/python3.8/site-packages/borg/algorithms +#usr/lib/python3.8/site-packages/borg/algorithms usr/lib/python3.8/site-packages/borg/algorithms/__init__.py usr/lib/python3.8/site-packages/borg/algorithms/checksums.cpython-38-MACHINE-linux-gnu.so +#usr/lib/python3.8/site-packages/borg/algorithms/msgpack +usr/lib/python3.8/site-packages/borg/algorithms/msgpack/__init__.py +usr/lib/python3.8/site-packages/borg/algorithms/msgpack/_packer.cpp +usr/lib/python3.8/site-packages/borg/algorithms/msgpack/_packer.cpython-38-MACHINE-linux-gnu.so +usr/lib/python3.8/site-packages/borg/algorithms/msgpack/_unpacker.cpp +usr/lib/python3.8/site-packages/borg/algorithms/msgpack/_unpacker.cpython-38-MACHINE-linux-gnu.so +usr/lib/python3.8/site-packages/borg/algorithms/msgpack/_version.py +usr/lib/python3.8/site-packages/borg/algorithms/msgpack/exceptions.py +usr/lib/python3.8/site-packages/borg/algorithms/msgpack/fallback.py usr/lib/python3.8/site-packages/borg/archive.py usr/lib/python3.8/site-packages/borg/archiver.py usr/lib/python3.8/site-packages/borg/cache.py usr/lib/python3.8/site-packages/borg/chunker.cpython-38-MACHINE-linux-gnu.so usr/lib/python3.8/site-packages/borg/compress.cpython-38-MACHINE-linux-gnu.so usr/lib/python3.8/site-packages/borg/constants.py -usr/lib/python3.8/site-packages/borg/crypto +#usr/lib/python3.8/site-packages/borg/crypto usr/lib/python3.8/site-packages/borg/crypto/__init__.py usr/lib/python3.8/site-packages/borg/crypto/file_integrity.py usr/lib/python3.8/site-packages/borg/crypto/key.py @@ -30,11 +39,12 @@ usr/lib/python3.8/site-packages/borg/lrucache.py usr/lib/python3.8/site-packages/borg/nanorst.py usr/lib/python3.8/site-packages/borg/paperkey.html usr/lib/python3.8/site-packages/borg/patterns.py -usr/lib/python3.8/site-packages/borg/platform +#usr/lib/python3.8/site-packages/borg/platform usr/lib/python3.8/site-packages/borg/platform/__init__.py usr/lib/python3.8/site-packages/borg/platform/base.py usr/lib/python3.8/site-packages/borg/platform/linux.cpython-38-MACHINE-linux-gnu.so usr/lib/python3.8/site-packages/borg/platform/posix.cpython-38-MACHINE-linux-gnu.so +usr/lib/python3.8/site-packages/borg/platform/syncfilerange.cpython-38-MACHINE-linux-gnu.so usr/lib/python3.8/site-packages/borg/remote.py usr/lib/python3.8/site-packages/borg/repository.py usr/lib/python3.8/site-packages/borg/selftest.py @@ -71,11 +81,11 @@ usr/lib/python3.8/site-packages/borg/shellpattern.py usr/lib/python3.8/site-packages/borg/upgrader.py usr/lib/python3.8/site-packages/borg/version.py usr/lib/python3.8/site-packages/borg/xattr.py -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg-info -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg-info/PKG-INFO -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg-info/SOURCES.txt -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg-info/dependency_links.txt -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg-info/entry_points.txt -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg-info/not-zip-safe -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg-info/requires.txt -usr/lib/python3.8/site-packages/borgbackup-1.1.9-py3.8.egg-info/top_level.txt +#usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info +usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/PKG-INFO +usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/SOURCES.txt +usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/dependency_links.txt +usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/entry_points.txt +usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/not-zip-safe +usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/requires.txt +usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/top_level.txt diff --git a/lfs/borgbackup b/lfs/borgbackup index 97efd970d..cdfe5e3d5 100644 --- a/lfs/borgbackup +++ b/lfs/borgbackup @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2020 IPFire Team # # # # 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 # @@ -24,7 +24,7 @@ include Config -VER = 1.1.9 +VER = 1.1.11 THISAPP = borgbackup-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = borgbackup -PAK_VER = 3 +PAK_VER = 4 DEPS = python3-llfuse python3-msgpack @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0fda2c1f636754d0748569bff67a6836 +$(DL_FILE)_MD5 = ab9721f10c2500e0ca872545c64b6e2f install : $(TARGET)