From a20192f0a098eeaf25692cd8536ad435cc6a55d9 Mon Sep 17 00:00:00 2001 From: Tommy Nguyen Date: Sat, 31 Jul 2021 17:40:25 -0400 Subject: [PATCH 1/3] docs: update referenced freebsd version Fixes: https://github.com/borgbackup/borg/issues/5942 --- docs/changes.rst | 5 +++-- docs/global.rst.inc | 1 + docs/installation.rst | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/changes.rst b/docs/changes.rst index dc798dd67f..3a39b4c6ad 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -1,3 +1,4 @@ +.. include:: global.rst.inc .. _important_notes: Important notes @@ -1619,7 +1620,7 @@ New features: Other changes: - remove annoying hardlinked symlinks warning, #3175 -- vagrant: use self-made FreeBSD 10.3 box, #3022 +- vagrant: use self-made FreeBSD |freebsd_version| box, #3022 - travis: don't brew update, hopefully fixes #2532 - docs: @@ -3866,7 +3867,7 @@ Other changes: - Debian 7 "wheezy" 32bit, Debian 8 "jessie" 64bit - Ubuntu 12.04 32bit, Ubuntu 14.04 64bit - Centos 7 64bit - - FreeBSD 10.2 64bit + - FreeBSD |freebsd_version| 64bit - OpenBSD 5.7 64bit - NetBSD 6.1.5 64bit - Darwin (OS X Yosemite) diff --git a/docs/global.rst.inc b/docs/global.rst.inc index 14725f7312..9ddf9d3370 100644 --- a/docs/global.rst.inc +++ b/docs/global.rst.inc @@ -3,6 +3,7 @@ .. |package_filename| replace:: |package_dirname|.tar.gz .. |package_url| replace:: https://pypi.python.org/packages/source/b/borgbackup/|package_filename| .. |git_url| replace:: https://github.com/borgbackup/borg.git +.. |freebsd_version| replace:: 12.1 .. _github: https://github.com/borgbackup/borg .. _issue tracker: https://github.com/borgbackup/borg/issues .. _deduplication: https://en.wikipedia.org/wiki/Data_deduplication diff --git a/docs/installation.rst b/docs/installation.rst index 233ff98d03..11f78b2bdb 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -113,7 +113,7 @@ are available on the releases_ page for the following platforms: * **MacOS**: 10.10 or newer (To avoid signing issues download the file via command line **or** remove the ``quarantine`` attribute after downloading: ``$ xattr -dr com.apple.quarantine borg-macosx64.tgz``) -* **FreeBSD**: 10.2 (unknown whether it works for older releases) +* **FreeBSD**: |freebsd_version| (unknown whether it works for older releases) ARM binaries are built by Johann Bauer, see: https://borg.bauerj.eu/ From 7aa273c0ded3f58a09c487636679e397639a041b Mon Sep 17 00:00:00 2001 From: Tommy Nguyen Date: Tue, 3 Aug 2021 12:48:13 -0400 Subject: [PATCH 2/3] Revert changes to changes.rst --- docs/changes.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/changes.rst b/docs/changes.rst index 3a39b4c6ad..dc798dd67f 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -1,4 +1,3 @@ -.. include:: global.rst.inc .. _important_notes: Important notes @@ -1620,7 +1619,7 @@ New features: Other changes: - remove annoying hardlinked symlinks warning, #3175 -- vagrant: use self-made FreeBSD |freebsd_version| box, #3022 +- vagrant: use self-made FreeBSD 10.3 box, #3022 - travis: don't brew update, hopefully fixes #2532 - docs: @@ -3867,7 +3866,7 @@ Other changes: - Debian 7 "wheezy" 32bit, Debian 8 "jessie" 64bit - Ubuntu 12.04 32bit, Ubuntu 14.04 64bit - Centos 7 64bit - - FreeBSD |freebsd_version| 64bit + - FreeBSD 10.2 64bit - OpenBSD 5.7 64bit - NetBSD 6.1.5 64bit - Darwin (OS X Yosemite) From 3ba0274ff03866790b71aefc1548605267ca4660 Mon Sep 17 00:00:00 2001 From: Tommy Nguyen Date: Wed, 4 Aug 2021 21:10:05 -0400 Subject: [PATCH 3/3] Address review comments. --- docs/global.rst.inc | 1 - docs/installation.rst | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/global.rst.inc b/docs/global.rst.inc index 9ddf9d3370..14725f7312 100644 --- a/docs/global.rst.inc +++ b/docs/global.rst.inc @@ -3,7 +3,6 @@ .. |package_filename| replace:: |package_dirname|.tar.gz .. |package_url| replace:: https://pypi.python.org/packages/source/b/borgbackup/|package_filename| .. |git_url| replace:: https://github.com/borgbackup/borg.git -.. |freebsd_version| replace:: 12.1 .. _github: https://github.com/borgbackup/borg .. _issue tracker: https://github.com/borgbackup/borg/issues .. _deduplication: https://en.wikipedia.org/wiki/Data_deduplication diff --git a/docs/installation.rst b/docs/installation.rst index 11f78b2bdb..e1519ca046 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -110,10 +110,10 @@ are available on the releases_ page for the following platforms: * **Linux**: glibc >= 2.13 (ok for most supported Linux releases). Older glibc releases are untested and may not work. -* **MacOS**: 10.10 or newer (To avoid signing issues download the file via +* **MacOS**: 10.12 or newer (To avoid signing issues download the file via command line **or** remove the ``quarantine`` attribute after downloading: ``$ xattr -dr com.apple.quarantine borg-macosx64.tgz``) -* **FreeBSD**: |freebsd_version| (unknown whether it works for older releases) +* **FreeBSD**: 12.1 (unknown whether it works for older releases) ARM binaries are built by Johann Bauer, see: https://borg.bauerj.eu/