Browse Source

Remove unnecessary patch to borgbackup (#5023)

Co-authored-by: Will Shanks <willshanks@us.ibm.com>
master
willsALMANJ 5 years ago
committed by GitHub
parent
commit
4c7c98cb88
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      packages/borgbackup/build.sh
  2. 24
      packages/borgbackup/src-borg-repository.py.patch

1
packages/borgbackup/build.sh

@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.borgbackup.org/
TERMUX_PKG_DESCRIPTION="Deduplicating and compressing backup program" TERMUX_PKG_DESCRIPTION="Deduplicating and compressing backup program"
TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_VERSION=1.1.11 TERMUX_PKG_VERSION=1.1.11
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://github.com/borgbackup/borg/releases/download/${TERMUX_PKG_VERSION}/borgbackup-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SRCURL=https://github.com/borgbackup/borg/releases/download/${TERMUX_PKG_VERSION}/borgbackup-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=36090992ba795a5a5091fcd407b67be9bf26d0e88020892d31d7ac81fa970fa4 TERMUX_PKG_SHA256=36090992ba795a5a5091fcd407b67be9bf26d0e88020892d31d7ac81fa970fa4
TERMUX_PKG_DEPENDS="libacl, liblz4, openssl, python, zstd" TERMUX_PKG_DEPENDS="libacl, liblz4, openssl, python, zstd"

24
packages/borgbackup/src-borg-repository.py.patch

@ -1,24 +0,0 @@
diff -uNr borgbackup-1.1.11/src/borg/repository.py borgbackup-1.1.11.mod/src/borg/repository.py
--- borgbackup-1.1.11/src/borg/repository.py 2020-03-08 01:32:06.000000000 +0200
+++ borgbackup-1.1.11.mod/src/borg/repository.py 2020-03-08 23:13:43.555530400 +0200
@@ -294,20 +294,6 @@
logger.warning("Old config file not securely erased on previous config update")
secure_erase(old_config_path)
- if os.path.isfile(config_path):
- link_error_msg = ("Failed to securely erase old repository config file (hardlinks not supported>). "
- "Old repokey data, if any, might persist on physical storage.")
- try:
- os.link(config_path, old_config_path)
- except OSError as e:
- if e.errno in (errno.EMLINK, errno.ENOSYS, errno.EPERM, errno.EACCES, errno.ENOTSUP):
- logger.warning(link_error_msg)
- else:
- raise
- except AttributeError:
- # some python ports have no os.link, see #4901
- logger.warning(link_error_msg)
-
with SaveFile(config_path) as fd:
config.write(fd)
Loading…
Cancel
Save