SHA256
1
0
forked from pool/restic

Accepting request 627986 from Archiving

OBS-URL: https://build.opensuse.org/request/show/627986
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/restic?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger 2018-08-24 15:00:10 +00:00 committed by Git OBS Bridge
commit 22c5635d51
7 changed files with 31 additions and 69 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:359d3b8e555a9952f2b98c81ee3dbec8dc441e12789c436ca564762aaacec095
size 51056544

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEz48Y8oRFdZc/edThkaaGi9P3qQcFAlsc8HMACgkQkaaGi9P3
qQeUSQ//ZjcIa43rB9UnRB/dAAiC24hajHEwifOBQhydTcEW8qpZVgJRvO5HsZvG
k7D6Y0sHRcsXiTgSrHHvgvxsrJqoGxrWQyw76bs77EBCq+Mt1SrlUsnkSx9SEjlD
OAwSgTPE8zcxdcrd4vMQB3iLF7bJhfvPrpTiGdaSDO4BgKmGbytZwhyHaStJ/EJi
FCNQ78WSrYQiX5HbxNRw23ILcduRM5UNZly0EcSgu87A41TMMQNES/KKPN9w6QC2
Zkq9pCXRbZc3KKlKim+Orejz+3hhAOi+ZdI5YjHtVfPOv3jSAFybPq3AOVIIgIdZ
tJRajPzYQW/FlIDqcCzUeKDKxjwdmikbGMZzlldDg0ZvFodwEz723iLiL7uK1CMM
CWqFPkOKc//2IvhInBwJxcNFOdu/MsPbAqYN7ReZFP8VR/iVn2AKGOb88SEazxlB
/lW8qC4ivZMYKYh4fasZIiCKuztQ6iqD1ugyiXXtVyx7p4MKXs1tbLkXLP+Il1Ii
Y8MxtiQd/IU8gBnQ/a+YM2B2SphCfupWo4GJl8okFkQVQP1dudTqN1nMuNHhU15Y
b8AXL6yC5l9/DUks9MEE+g9qsYu6TdMAci1efBvek0bmNiC4DrtCl0X2jKwDkAN+
5OCw+KEK6CuPIhzST1uOhLAmGueZ+d6IhbE75Xlr6rYAATrbqoI=
=zFmW
-----END PGP SIGNATURE-----

3
restic-0.9.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8f8eee3e9651b9f7384a323ba3c26a5667a6388ab2ef8e6d869d3cd69b9f7c95
size 27344284

16
restic-0.9.2.tar.gz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEz48Y8oRFdZc/edThkaaGi9P3qQcFAltoohsACgkQkaaGi9P3
qQcT6A//Q93suYQTyWGVSKCfFpiD+UoRH+ps/iu5wfDhvQck8vPpwneMhpt2ordb
pccrz9oFwkz14uNHDUv94Sqd3+DmRG1DwCYz5vbI0b1307F9KgMPNpgrnic/4+9C
vyhtGFDKN33F4TzAiiUkLWxLkSGOyTX3ERZ7+2XJUWzNxcWGdFNct7eWFIlUhxZ/
ciZib0h7kiAPJ+3DWk+WeAwrVXPtYsFSiCJNCvBAVl6L3u0Ry8WfDwy7H7cGBgQH
4RlKcTqaSdljH9gU9km5URK7Tmxsok09u+Z73bESvi4w09+hiwnaCgiu9UOg0/+a
GL66excsrfO+ASDrBcjj8hnVpirh32VNsnawmd8fqz5vXXFB99GuAzn0U674H8E0
58WHTFqkWJKkrM1obsTsL37OnncpufzEJKWosdTuFp1BmprHXQ3x6fR1BRoLm0/C
WHNJ2S1FoMzCEWcn0zgqIvvw74+8vVdChhExLR6W2p/UKNj5/zYAYBpnndfPgVoM
c3qOn1KFvrO39aT5hHXNHyGO9skxSdxTwG4jDeRbdlAf0qhf4fFaZrMPJvO8W0Qv
mkhqdPgxUWsfgImB730nXv9fj9o8fUKTT+lYxO0Xb81jRZmn7mYlaSKiaw9vWzdW
tubRzuZCsV5Au9v2uhjySChJzQocTkIjYVl2XRJ+KLVgWjzjJYY=
=R6tG
-----END PGP SIGNATURE-----

View File

@ -1,46 +0,0 @@
From 5d18f341c3191f7e472faa2659a9c973629a31a5 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <cyphar@cyphar.com>
Date: Sun, 14 Jan 2018 03:31:07 +1100
Subject: [PATCH] restic: switch to pre-1.8 sort.Stable API
This allows us to build restic with older Go versions. It's a bit odd
they decided to implement things this way, given that the old
sort.Interface code still exists in the repo...
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
---
cmd/restic/cmd_snapshots.go | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/cmd/restic/cmd_snapshots.go b/cmd/restic/cmd_snapshots.go
index 5dfb45e9729e..9acf8c0a9d44 100644
--- a/cmd/restic/cmd_snapshots.go
+++ b/cmd/restic/cmd_snapshots.go
@@ -106,9 +106,7 @@ func newFilterLastSnapshotsKey(sn *restic.Snapshot) filterLastSnapshotsKey {
// they will be joined and treated as one item.
func FilterLastSnapshots(list restic.Snapshots) restic.Snapshots {
// Sort the snapshots so that the newer ones are listed first
- sort.SliceStable(list, func(i, j int) bool {
- return list[i].Time.After(list[j].Time)
- })
+ sort.Stable(list)
var results restic.Snapshots
seen := make(map[filterLastSnapshotsKey]bool)
@@ -124,11 +122,8 @@ func FilterLastSnapshots(list restic.Snapshots) restic.Snapshots {
// PrintSnapshots prints a text table of the snapshots in list to stdout.
func PrintSnapshots(stdout io.Writer, list restic.Snapshots, compact bool) {
-
- // always sort the snapshots so that the newer ones are listed last
- sort.SliceStable(list, func(i, j int) bool {
- return list[i].Time.Before(list[j].Time)
- })
+ // Always sort the snapshots so that the newer ones are listed last
+ sort.Stable(sort.Reverse(list))
// Determine the max widths for host and tag.
maxHost, maxTag := 10, 6
--
2.15.1

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Aug 8 03:59:46 UTC 2018 - asarai@suse.com
- Update to 0.9.2.
https://github.com/restic/restic/releases/tag/v0.9.2
See installed /usr/share/doc/packages/restic/CHANGELOG.md
- Remove Go 1.8 compatibility patch, now that we have newer Go versions in
older Leap releases.
- restic-switch-to-pre-1.8-sort.Stable-API.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 28 18:27:51 UTC 2018 - jengelh@inai.de Sat Jul 28 18:27:51 UTC 2018 - jengelh@inai.de

View File

@ -20,7 +20,7 @@
%define import_path github.com/restic/restic %define import_path github.com/restic/restic
Name: restic Name: restic
Version: 0.9.1 Version: 0.9.2
Release: 0 Release: 0
Summary: Backup program with deduplication and encryption Summary: Backup program with deduplication and encryption
License: BSD-2-Clause License: BSD-2-Clause
@ -29,12 +29,11 @@ Url: https://restic.net/
Source0: https://github.com/restic/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz Source0: https://github.com/restic/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
Source1: https://github.com/restic/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc Source1: https://github.com/restic/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc
Source2: %{name}.keyring Source2: %{name}.keyring
# PATCH-FIX-OPENSUSE: Revert to using pre-1.8 Go APIs so we can build on Leap 42.x.
Patch1: restic-switch-to-pre-1.8-sort.Stable-API.patch
BuildRequires: bash-completion BuildRequires: bash-completion
BuildRequires: go BuildRequires: go
BuildRequires: golang-packaging BuildRequires: golang-packaging
BuildRequires: zsh BuildRequires: zsh
BuildRequires: golang(API) >= 1.8
%description %description
restic is a backup program. It supports verification, encryption, restic is a backup program. It supports verification, encryption,
@ -62,7 +61,6 @@ Zsh command line completion support for %{name}.
%prep %prep
%setup -q %setup -q
%patch1 -p1
%build %build
# Set up GOPATH. # Set up GOPATH.