Browse Source

Updated copyright

master
Dennis Schwerdel 4 years ago
parent
commit
bdb13b96cf
  1. 3
      CHANGELOG.md
  2. 271
      Cargo.lock
  3. 6
      Cargo.toml
  4. 2
      LICENSE.md
  5. 2
      deb/Makefile
  6. 2
      docs/man/zvault-addkey.1.md
  7. 2
      docs/man/zvault-algotest.1.md
  8. 2
      docs/man/zvault-analyze.1.md
  9. 2
      docs/man/zvault-backup.1.md
  10. 2
      docs/man/zvault-bundleinfo.1.md
  11. 2
      docs/man/zvault-bundlelist.1.md
  12. 2
      docs/man/zvault-check.1.md
  13. 2
      docs/man/zvault-config.1.md
  14. 2
      docs/man/zvault-copy.1.md
  15. 2
      docs/man/zvault-diff.1.md
  16. 2
      docs/man/zvault-genkey.1.md
  17. 2
      docs/man/zvault-import.1.md
  18. 2
      docs/man/zvault-info.1.md
  19. 2
      docs/man/zvault-init.1.md
  20. 2
      docs/man/zvault-list.1.md
  21. 2
      docs/man/zvault-mount.1.md
  22. 2
      docs/man/zvault-prune.1.md
  23. 2
      docs/man/zvault-remove.1.md
  24. 2
      docs/man/zvault-restore.1.md
  25. 2
      docs/man/zvault-vacuum.1.md
  26. 2
      docs/man/zvault-versions.1.md
  27. 2
      docs/man/zvault.1.md
  28. 91
      lang/de.po
  29. 74
      lang/default.pot
  30. 12
      src/bundledb/reader.rs
  31. 3
      src/util/compression.rs

3
CHANGELOG.md

@ -5,8 +5,9 @@ This project follows [semantic versioning](http://semver.org).
### UNRELEASED
* [added] Translation infrastructure (**requires nightly rust**)
* [fixed] Also including the first min_size bytes in hash
* [modified] Updated dependencies
* [modified] Updated copyright date
* [fixed] Also including the first min_size bytes in hash
### v0.4.0 (2017-07-21)

271
Cargo.lock

@ -11,6 +11,14 @@ name = "ansi_term"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "ansi_term"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "arrayvec"
version = "0.4.7"
@ -19,19 +27,52 @@ dependencies = [
"nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "aster"
version = "0.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "atty"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "bindgen"
version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cexpr 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"clang-sys 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
"clap 2.30.0 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi_codegen 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "bitflags"
version = "0.7.0"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "bitflags"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@ -53,6 +94,14 @@ name = "byteorder"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "cexpr"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "cfg-if"
version = "0.1.2"
@ -67,6 +116,17 @@ dependencies = [
"time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "clang-sys"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"libloading 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "clap"
version = "2.30.0"
@ -91,13 +151,22 @@ name = "crossbeam"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "env_logger"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "filetime"
version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -120,13 +189,18 @@ name = "fuse"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"thread-scoped 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "glob"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "kernel32-sys"
version = "0.2.2"
@ -153,15 +227,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "libc"
version = "0.2.36"
version = "0.2.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "libloading"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "libsodium-sys"
version = "0.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -197,12 +281,20 @@ dependencies = [
"cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "memchr"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "memchr"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -224,6 +316,14 @@ name = "nodrop"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "nom"
version = "3.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "num"
version = "0.1.42"
@ -231,7 +331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
"num-iter 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -239,7 +339,7 @@ name = "num-integer"
version = "0.1.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -248,7 +348,7 @@ version = "0.1.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -256,12 +356,12 @@ name = "num-traits"
version = "0.1.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "num-traits"
version = "0.2.0"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@ -270,16 +370,41 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "peeking_take_while"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "pkg-config"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "quasi"
version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"syntex_errors 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
"syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "quasi_codegen"
version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)",
"syntex 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
"syntex_errors 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
"syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "quick-error"
version = "1.2.1"
@ -291,7 +416,7 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -358,6 +483,11 @@ name = "runtime-fmt"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "rustc-serialize"
version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "serde"
version = "1.0.27"
@ -396,18 +526,18 @@ name = "sodiumoxide"
version = "0.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"libsodium-sys 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "squash-sys"
version = "0.9.0"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"bindgen 0.28.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -416,13 +546,55 @@ name = "strsim"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "syntex"
version = "0.58.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"syntex_errors 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
"syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "syntex_errors"
version = "0.58.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
"syntex_pos 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
"term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "syntex_pos"
version = "0.58.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "syntex_syntax"
version = "0.58.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
"syntex_errors 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
"syntex_pos 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "tar"
version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"filetime 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
"xattr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -436,12 +608,21 @@ dependencies = [
"remove_dir_all 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "term"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "termion"
version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -473,7 +654,7 @@ name = "time"
version = "0.1.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -483,6 +664,11 @@ name = "unicode-width"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "unicode-xid"
version = "0.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "unreachable"
version = "1.0.0"
@ -496,7 +682,7 @@ name = "users"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -548,7 +734,7 @@ name = "xattr"
version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -556,7 +742,7 @@ name = "xattr"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -569,9 +755,9 @@ dependencies = [
[[package]]
name = "zvault"
version = "0.4.0"
version = "0.5.0"
dependencies = [
"ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
"ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -580,7 +766,7 @@ dependencies = [
"filetime 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"fuse 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"libsodium-sys 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
"locale_config 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -597,7 +783,7 @@ dependencies = [
"serde_utils 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_yaml 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"sodiumoxide 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
"squash-sys 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"squash-sys 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tar 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
"users 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -607,42 +793,56 @@ dependencies = [
[metadata]
"checksum aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4"
"checksum ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6b3568b48b7cefa6b8ce125f9bb4989e52fbcc29ebea88df04cc7c5f12f70455"
"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
"checksum arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "a1e964f9e24d588183fcb43503abda40d288c8657dfc27311516ce2f05675aef"
"checksum aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfdf7355d9db158df68f976ed030ab0f6578af811f5a7bb6dcf221ec24e0e0"
"checksum atty 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8352656fd42c30a0c3c89d26dea01e3b77c0ab2af18230835c15e2e13cd51859"
"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
"checksum bindgen 0.28.0 (registry+https://github.com/rust-lang/crates.io-index)" = "16a8070d69d86935d11b0778dbdbc83a0a799d982e521baa62d0812b727734be"
"checksum bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1370e9fc2a6ae53aea8b7a5110edbd08836ed87c88736dfabccade1c2b44bff4"
"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
"checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf"
"checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
"checksum byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "652805b7e73fada9d85e9a6682a4abd490cb52d96aeecc12e33a0de34dfd0d23"
"checksum cexpr 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42aac45e9567d97474a834efdee3081b3c942b2205be932092f53354ce503d6c"
"checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
"checksum chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c20ebe0b2b08b0aeddba49c609fe7957ba2e33449882cb186a180bc60682fa9"
"checksum clang-sys 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "611ec2e3a7623afd8a8c0d027887b6b55759d894abbf5fe11b9dc11b50d5b49a"
"checksum clap 2.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1c07b9257a00f3fc93b7f3c417fc15607ec7a56823bc2c37ec744e266387de5b"
"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
"checksum crossbeam 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "24ce9782d4d5c53674646a6a4c1863a21a8fc0cb649b3c94dfc16e45071dea19"
"checksum env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3ddf21e73e016298f5cb37d6ef8e8da8e39f91f9ec8b0df44b7deb16a9f8cd5b"
"checksum filetime 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "714653f3e34871534de23771ac7b26e999651a0a228f47beb324dfdf1dd4b10f"
"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
"checksum fuse 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80e57070510966bfef93662a81cb8aa2b1c7db0964354fa9921434f04b9e8660"
"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
"checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d"
"checksum libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "e32a70cf75e5846d53a673923498228bbec6a8624708a9ea5645f075d6276122"
"checksum libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "1e5d97d6708edaa407429faa671b942dc0f2727222fb6b6539bf1db936e4b121"
"checksum libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)" = "56aebce561378d99a0bb578f8cb15b6114d2a1814a6c7949bbe646d968bb4fa9"
"checksum libloading 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fd38073de8f7965d0c17d30546d4bb6da311ab428d1c7a3fc71dff7f9d4979b9"
"checksum libsodium-sys 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)" = "fcbd1beeed8d44caa8a669ebaa697c313976e242c03cc9fb23d88bf1656f5542"
"checksum linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "70fb39025bc7cdd76305867c4eccf2f2dcf6e9a57f5b21a93e1c2d86cd03ec9e"
"checksum locale_config 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "14fbee0e39bc2dd6a2427c4fdea66e9826cc1fd09b0a0b7550359f5f6efe1dab"
"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
"checksum log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "89f010e843f2b1a31dbd316b3b8d443758bc634bed37aabade59c686d644e0a2"
"checksum memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a"
"checksum memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d"
"checksum mmap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc85448a6006dd2ba26a385a564a8a0f1f2c7e78c70f1a70b2e0f4af286b823"
"checksum murmurhash3 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a2983372caf4480544083767bf2d27defafe32af49ab4df3a0b7fc90793a3664"
"checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2"
"checksum nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05aec50c70fd288702bcd93284a8444607f3292dbdf2a30de5ea5dcdbe72287b"
"checksum num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e"
"checksum num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f8d26da319fb45674985c78f1d1caf99aa4941f785d384a2ae36d0740bc3e2fe"
"checksum num-iter 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "4b226df12c5a59b63569dd57fafb926d91b385dfce33d8074a412411b689d593"
"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
"checksum num-traits 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e7de20f146db9d920c45ee8ed8f71681fd9ade71909b48c3acbd766aa504cf10"
"checksum num-traits 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3c2bd9b9d21e48e956b763c9f37134dc62d9e95da6edb3f672cacb6caf3cd3"
"checksum pbr 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e048e3afebb6c454bb1c5d0fe73fda54698b4715d78ed8e7302447c37736d23a"
"checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
"checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903"
"checksum quasi 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18c45c4854d6d1cf5d531db97c75880feb91c958b0720f4ec1057135fec358b3"
"checksum quasi_codegen 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9e25fa23c044c1803f43ca59c98dac608976dd04ce799411edd58ece776d4"
"checksum quick-error 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eda5fe9b71976e62bc81b781206aaa076401769b2143379d3eb2118388babac4"
"checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5"
"checksum redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "0d92eecebad22b767915e4d529f89f28ee96dbbf5a4810d2b844373f136417fd"
@ -653,21 +853,28 @@ dependencies = [
"checksum rmp 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "a3d45d7afc9b132b34a2479648863aa95c5c88e98b32285326a6ebadc80ec5c9"
"checksum rmp-serde 0.13.7 (registry+https://github.com/rust-lang/crates.io-index)" = "011e1d58446e9fa3af7cdc1fb91295b10621d3ac4cb3a85cc86385ee9ca50cd3"
"checksum runtime-fmt 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "647a821d66049faccc993fc3c379d1181b81a484097495cda79ffdb17b55b87f"
"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
"checksum serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)" = "db99f3919e20faa51bb2996057f5031d8685019b5a06139b1ce761da671b8526"
"checksum serde_bytes 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "52b678af90a3aebc4484c22d639bf374eb7d598988edb33fa73c4febd6046a59"
"checksum serde_utils 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f6e0edb364c93646633800df969086bc7c5c25fb3f1eb57349990d1cb4cae4bc"
"checksum serde_yaml 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e0f868d400d9d13d00988da49f7f02aeac6ef00f11901a8c535bd59d777b9e19"
"checksum sodiumoxide 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)" = "eb5cb2f14f9a51352ad65e59257a0a9459d5a36a3615f3d53a974c82fdaaa00a"
"checksum squash-sys 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db1f9dde91d819b7746e153bc32489fa19e6a106c3d7f2b92187a4efbdc88b40"
"checksum squash-sys 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "76f31a010ae66493a57b16f02d7df88d966d78ce7f09d54d922a082954cfc7ee"
"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
"checksum syntex 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a8f5e3aaa79319573d19938ea38d068056b826db9883a5d47f86c1cecc688f0e"
"checksum syntex_errors 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)" = "867cc5c2d7140ae7eaad2ae9e8bf39cb18a67ca651b7834f88d46ca98faadb9c"
"checksum syntex_pos 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13ad4762fe52abc9f4008e85c4fb1b1fe3aa91ccb99ff4826a439c7c598e1047"
"checksum syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6e0e4dbae163dd98989464c23dd503161b338790640e11537686f2ef0f25c791"
"checksum tar 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)" = "1605d3388ceb50252952ffebab4b5dc43017ead7e4481b175961c283bb951195"
"checksum tempdir 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f73eebdb68c14bcb24aef74ea96079830e7fa7b31a6106e42ea7ee887c1e134e"
"checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
"checksum textwrap 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0b59b6b4b44d867f1370ef1bd91bfb262bf07bf0ae65c202ea2fbc16153b693"
"checksum thread-scoped 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bcbb6aa301e5d3b0b5ef639c9a9c7e2f1c944f177b460c04dc24c69b1fa2bd99"
"checksum thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "279ef31c19ededf577bfd12dfae728040a21f635b06a24cd670ff510edd38963"
"checksum time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "a15375f1df02096fb3317256ce2cee6a1f42fc84ea5ad5fc8c421cfe40c73098"
"checksum unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f"
"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
"checksum users 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "99ab1b53affc9f75f57da4a8b051a188e84d20d43bea0dd9bd8db71eebbca6da"
"checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122"

6
Cargo.toml

@ -1,6 +1,6 @@
[package]
name = "zvault"
version = "0.4.0"
version = "0.5.0"
authors = ["Dennis Schwerdel <schwerdel@googlemail.com>"]
description = "Deduplicating backup tool"
@ -13,7 +13,7 @@ rmp-serde = "0.13"
serde_yaml = "0.7"
serde_utils = "0.6"
serde_bytes = "0.10"
squash-sys = "0.9"
squash-sys = "0.10"
quick-error = "1.1"
blake2-rfc = "0.2"
murmurhash3 = "0.0.5"
@ -21,7 +21,7 @@ chrono = "0.4"
clap = "^2.24"
log = "0.4"
byteorder = "1.0"
ansi_term = "0.10"
ansi_term = "0.11"
sodiumoxide = "0.0.16"
libsodium-sys = "0.0.16"
filetime = "0.1"

2
LICENSE.md

@ -1,7 +1,7 @@
# License: GPL-3
zVault - Deduplicating backup solution
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
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

2
deb/Makefile

@ -25,7 +25,7 @@ $(PACKAGE)/man/*: ../docs/man/*
$(PACKAGE)/zvault: ../target/release/zvault
cp ../target/release/zvault $(PACKAGE)/zvault
strip -s $(PACKAGE)/zvault
strip -s $(PACKAGE)/zvault
../target/release/zvault: ../src/*.rs ../Cargo.toml
(cd ..; cargo build --release)

2
docs/man/zvault-addkey.1.md

@ -62,5 +62,5 @@ key will be set as default encryption key.
## COPYRIGHT
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
This software is licensed under GPL-3 or newer (see LICENSE.md)

2
docs/man/zvault-algotest.1.md

@ -84,5 +84,5 @@ The options are exactly the same as for _zvault-init(1)_.
## COPYRIGHT
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
This software is licensed under GPL-3 or newer (see LICENSE.md)

2
docs/man/zvault-analyze.1.md

@ -40,5 +40,5 @@ running _zvault-vacuum(1)_ with different ratios.
## COPYRIGHT
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
This software is licensed under GPL-3 or newer (see LICENSE.md)

2
docs/man/zvault-backup.1.md

@ -161,5 +161,5 @@ the case of directories) will be left out of the backup.
## COPYRIGHT
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
This software is licensed under GPL-3 or newer (see LICENSE.md)

2
docs/man/zvault-bundleinfo.1.md

@ -41,5 +41,5 @@ names on the remote storage that do not relate to the bundle id.
## COPYRIGHT
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
This software is licensed under GPL-3 or newer (see LICENSE.md)

2
docs/man/zvault-bundlelist.1.md

@ -38,5 +38,5 @@ given its bundle id.
## COPYRIGHT
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
This software is licensed under GPL-3 or newer (see LICENSE.md)

2
docs/man/zvault-check.1.md

@ -105,5 +105,5 @@ has become inaccessible.
## COPYRIGHT
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
This software is licensed under GPL-3 or newer (see LICENSE.md)

2
docs/man/zvault-config.1.md

@ -88,5 +88,5 @@ data and can be changed at any time without any drawback.
## COPYRIGHT
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
This software is licensed under GPL-3 or newer (see LICENSE.md)

2
docs/man/zvault-copy.1.md

@ -39,5 +39,5 @@ If `repository` is omitted, the default repository location is used instead.
## COPYRIGHT
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
This software is licensed under GPL-3 or newer (see LICENSE.md)

2
docs/man/zvault-diff.1.md

@ -47,5 +47,5 @@ modified (_mod_).
## COPYRIGHT
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
This software is licensed under GPL-3 or newer (see LICENSE.md)

2
docs/man/zvault-genkey.1.md

@ -41,5 +41,5 @@ writes it to the given file `FILE`.
## COPYRIGHT
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
This software is licensed under GPL-3 or newer (see LICENSE.md)

2
docs/man/zvault-import.1.md

@ -55,5 +55,5 @@ imported via _zvault-backup(1)_ also with the `--tar` flag.
## COPYRIGHT
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
This software is licensed under GPL-3 or newer (see LICENSE.md)

2
docs/man/zvault-info.1.md

@ -39,5 +39,5 @@ The repository, backup or backup subtree given by `PATH` must be in the format
## COPYRIGHT
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
This software is licensed under GPL-3 or newer (see LICENSE.md)

2
docs/man/zvault-init.1.md

@ -92,5 +92,5 @@ configuration can be changed by _zvault-config(1)_ later.
## COPYRIGHT
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
This software is licensed under GPL-3 or newer (see LICENSE.md)

2
docs/man/zvault-list.1.md

@ -50,5 +50,5 @@ filesystem which is faster than _zvault-list(1)_ for multiple listings.
## COPYRIGHT
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
This software is licensed under GPL-3 or newer (see LICENSE.md)

2
docs/man/zvault-mount.1.md

@ -52,5 +52,5 @@ this way is slower than using _zvault-restore(1)_.
## COPYRIGHT
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
This software is licensed under GPL-3 or newer (see LICENSE.md)

2
docs/man/zvault-prune.1.md

@ -104,5 +104,5 @@ data of the deleted backups becomes inaccessible and can not be restored.**
## COPYRIGHT
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
This software is licensed under GPL-3 or newer (see LICENSE.md)

2
docs/man/zvault-remove.1.md

@ -62,5 +62,5 @@ data of the deleted backups becomes inaccessible and can not be restored.**
## COPYRIGHT
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
This software is licensed under GPL-3 or newer (see LICENSE.md)

2
docs/man/zvault-restore.1.md

@ -54,5 +54,5 @@ If `--tar` is not set, the data will be written into the existing folder `DST`.
## COPYRIGHT
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
This software is licensed under GPL-3 or newer (see LICENSE.md)

2
docs/man/zvault-vacuum.1.md

@ -81,5 +81,5 @@ should be avoided when the storage space permits it.
## COPYRIGHT
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
This software is licensed under GPL-3 or newer (see LICENSE.md)

2
docs/man/zvault-versions.1.md

@ -42,5 +42,5 @@ earliest backup that version appeared in.
## COPYRIGHT
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
This software is licensed under GPL-3 or newer (see LICENSE.md)

2
docs/man/zvault.1.md

@ -341,5 +341,5 @@ To reclaim storage space after removing some backups vacuum needs to be run
## COPYRIGHT
Copyright (C) 2017 Dennis Schwerdel
Copyright (C) 2017-2018 Dennis Schwerdel
This software is licensed under GPL-3 or newer (see LICENSE.md)

91
lang/de.po

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-02-24 23:55+0100\n"
"PO-Revision-Date: 2018-02-25 00:08+0100\n"
"POT-Creation-Date: 2018-03-03 16:10+0100\n"
"PO-Revision-Date: 2018-03-03 16:18+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: de\n"
@ -43,7 +43,7 @@ msgstr ""
"schreiben\n"
"\tverursacht durch: {}"
#: ../src/bundledb/cache.rs:26 ../src/bundledb/reader.rs:22 ../src/index.rs:34
#: ../src/bundledb/cache.rs:26 ../src/bundledb/reader.rs:22 ../src/index.rs:33
#: ../src/repository/backup_file.rs:39 ../src/repository/bundle_map.rs:32
msgid "Wrong header"
msgstr "Falsche Kopfdaten"
@ -66,33 +66,42 @@ msgstr ""
#: ../src/bundledb/cache.rs:36
msgid "Failed to decode bundle cache"
msgstr ""
msgstr "Konnte Zwischenspeicher für Paketdateien nicht dekodieren"
#: ../src/bundledb/cache.rs:37
msgid ""
"Bundle cache error: failed to decode bundle cache\n"
"\tcaused by: {}"
msgstr ""
"Fehler im Zwischenspeicher für Paketdateien: konnte Zwischenspeicher nicht "
"dekodieren\n"
"\tverursacht durch: {}"
#: ../src/bundledb/cache.rs:42
msgid "Failed to encode bundle cache"
msgstr ""
msgstr "Konnte Zwischenspeicher für Paketdateien nicht kodieren"
#: ../src/bundledb/cache.rs:43
msgid ""
"Bundle cache error: failed to encode bundle cache\n"
"\tcaused by: {}"
msgstr ""
"Fehler im Zwischenspeicher für Paketdateien: konnte Zwischenspeicher nicht "
"kodieren\n"
"\tverursacht durch: {}"
#: ../src/bundledb/db.rs:17
msgid "Failed to list bundles"
msgstr ""
msgstr "Konnte Liste von Paketdateien nicht laden"
#: ../src/bundledb/db.rs:18
msgid ""
"Bundle db error: failed to list bundles\n"
"\tcaused by: {}"
msgstr ""
"Fehler im Zwischenspeicher für Paketdateien: konnte Liste der Paketdateien "
"nicht laden\n"
"\tverursacht durch: {}"
#: ../src/bundledb/db.rs:23
msgid "Failed to read bundle"
@ -166,57 +175,57 @@ msgstr ""
msgid "Ignoring unreadable bundle"
msgstr ""
#: ../src/bundledb/db.rs:149
#: ../src/bundledb/db.rs:150
msgid "Failed to read local bundle cache, rebuilding cache"
msgstr ""
#: ../src/bundledb/db.rs:156
#: ../src/bundledb/db.rs:157
msgid "Failed to read remote bundle cache, rebuilding cache"
msgstr ""
#: ../src/bundledb/db.rs:222
#: ../src/bundledb/db.rs:226
msgid "Copying new meta bundle to local cache: {}"
msgstr ""
#: ../src/bundledb/db.rs:410
#: ../src/bundledb/db.rs:415
msgid "checking bundles"
msgstr ""
#: ../src/bundledb/db.rs:436
#: ../src/bundledb/db.rs:441
msgid "repairing bundles"
msgstr ""
#: ../src/bundledb/db.rs:452
#: ../src/bundledb/db.rs:457
msgid "Moving bundle to {:?}"
msgstr ""
#: ../src/bundledb/db.rs:464
#: ../src/bundledb/db.rs:469
msgid ""
"Problem detected: failed to read bundle header: {}\n"
"\tcaused by: {}"
msgstr ""
#: ../src/bundledb/db.rs:475
#: ../src/bundledb/db.rs:480
msgid ""
"Problem detected: failed to read bundle chunks: {}\n"
"\tcaused by: {}"
msgstr ""
#: ../src/bundledb/db.rs:486
#: ../src/bundledb/db.rs:491
msgid ""
"Problem detected: failed to read bundle data: {}\n"
"\tcaused by: {}"
msgstr ""
#: ../src/bundledb/db.rs:493
#: ../src/bundledb/db.rs:498
msgid "Problem detected: bundle data was truncated: {}"
msgstr ""
#: ../src/bundledb/db.rs:494
#: ../src/bundledb/db.rs:499
msgid "Copying readable data into new bundle"
msgstr ""
#: ../src/bundledb/db.rs:512
#: ../src/bundledb/db.rs:517
msgid "New bundle id is {}"
msgstr ""
@ -317,7 +326,11 @@ msgstr ""
msgid "Raw data size does not match size in header, truncated bundle"
msgstr ""
#: ../src/bundledb/reader.rs:306
#: ../src/bundledb/reader.rs:304
msgid "Stored hash does not match hash in header, modified data"
msgstr ""
#: ../src/bundledb/reader.rs:316
msgid ""
"Bundle(\n"
"\tid: {}\n"
@ -851,10 +864,6 @@ msgstr ""
msgid "No subcommand given"
msgstr ""
#: ../src/cli/logger.rs:11
msgid "failed printing to stderr"
msgstr ""
#: ../src/cli/mod.rs:108
msgid ""
"Failed to {}\n"
@ -911,13 +920,11 @@ msgid "Modified data size: {}"
msgstr ""
#: ../src/cli/mod.rs:190
#, python-format
msgid "Deduplicated size: {}, {:.1}% saved"
msgid "Deduplicated size: {}, {:.1}%"
msgstr ""
#: ../src/cli/mod.rs:196
#, python-format
msgid "Compressed size: {} in {} bundles, {:.1}% saved"
msgid "Compressed size: {} in {} bundles, {:.1}%"
msgstr ""
#: ../src/cli/mod.rs:202
@ -1367,64 +1374,64 @@ msgstr ""
msgid "add key pair"
msgstr "Hinzufügen eines Schlüsselpaars"
#: ../src/index.rs:24
#: ../src/index.rs:23
msgid "Failed to open index file"
msgstr ""
#: ../src/index.rs:25
#: ../src/index.rs:24
msgid ""
"Index error: failed to open the index file\n"
"\tcaused by: {}"
msgstr ""
#: ../src/index.rs:30
#: ../src/index.rs:29
msgid "Failed to memory-map the index file"
msgstr ""
#: ../src/index.rs:31
#: ../src/index.rs:30
msgid ""
"Index error: failed to memory-map the index file\n"
"\tcaused by: {}"
msgstr ""
#: ../src/index.rs:35
#: ../src/index.rs:34
msgid "Index error: file has the wrong magic header"
msgstr ""
#: ../src/index.rs:38
#: ../src/index.rs:37
msgid "Unsupported version"
msgstr ""
#: ../src/index.rs:39
#: ../src/index.rs:38
msgid "Index error: index file has unsupported version: {}"
msgstr ""
#: ../src/index.rs:42
#: ../src/index.rs:41
msgid "Key at wrong position"
msgstr ""
#: ../src/index.rs:43
#: ../src/index.rs:42
msgid "Index error: key has wrong position, expected at: {}, but is at: {:?}"
msgstr ""
#: ../src/index.rs:46
#: ../src/index.rs:45
msgid "Wrong entry count"
msgstr "Falsche Anzahl an Einträgen"
#: ../src/index.rs:47
#: ../src/index.rs:46
msgid "Index error: index has wrong entry count, expected {}, but is {}"
msgstr ""
#: ../src/index.rs:150
#: ../src/index.rs:177
msgid "Memory map too small"
msgstr ""
#: ../src/index.rs:210
#: ../src/index.rs:237
msgid "Inconsistent after creation"
msgstr ""
#: ../src/index.rs:444 ../src/index.rs:453 ../src/index.rs:462
#: ../src/index.rs:472
#: ../src/index.rs:472 ../src/index.rs:481 ../src/index.rs:490
#: ../src/index.rs:500
msgid "Inconsistent before get"
msgstr ""

74
lang/default.pot

@ -22,7 +22,7 @@ msgid ""
"\tcaused by: {}"
msgstr ""
#: ../src/bundledb/cache.rs:26 ../src/bundledb/reader.rs:22 ../src/index.rs:34
#: ../src/bundledb/cache.rs:26 ../src/bundledb/reader.rs:22 ../src/index.rs:33
#: ../src/repository/backup_file.rs:39 ../src/repository/bundle_map.rs:32
msgid "Wrong header"
msgstr ""
@ -142,57 +142,57 @@ msgstr ""
msgid "Ignoring unreadable bundle"
msgstr ""
#: ../src/bundledb/db.rs:149
#: ../src/bundledb/db.rs:150
msgid "Failed to read local bundle cache, rebuilding cache"
msgstr ""
#: ../src/bundledb/db.rs:156
#: ../src/bundledb/db.rs:157
msgid "Failed to read remote bundle cache, rebuilding cache"
msgstr ""
#: ../src/bundledb/db.rs:222
#: ../src/bundledb/db.rs:226
msgid "Copying new meta bundle to local cache: {}"
msgstr ""
#: ../src/bundledb/db.rs:410
#: ../src/bundledb/db.rs:415
msgid "checking bundles"
msgstr ""
#: ../src/bundledb/db.rs:436
#: ../src/bundledb/db.rs:441
msgid "repairing bundles"
msgstr ""
#: ../src/bundledb/db.rs:452
#: ../src/bundledb/db.rs:457
msgid "Moving bundle to {:?}"
msgstr ""
#: ../src/bundledb/db.rs:464
#: ../src/bundledb/db.rs:469
msgid ""
"Problem detected: failed to read bundle header: {}\n"
"\tcaused by: {}"
msgstr ""
#: ../src/bundledb/db.rs:475
#: ../src/bundledb/db.rs:480
msgid ""
"Problem detected: failed to read bundle chunks: {}\n"
"\tcaused by: {}"
msgstr ""
#: ../src/bundledb/db.rs:486
#: ../src/bundledb/db.rs:491
msgid ""
"Problem detected: failed to read bundle data: {}\n"
"\tcaused by: {}"
msgstr ""
#: ../src/bundledb/db.rs:493
#: ../src/bundledb/db.rs:498
msgid "Problem detected: bundle data was truncated: {}"
msgstr ""
#: ../src/bundledb/db.rs:494
#: ../src/bundledb/db.rs:499
msgid "Copying readable data into new bundle"
msgstr ""
#: ../src/bundledb/db.rs:512
#: ../src/bundledb/db.rs:517
msgid "New bundle id is {}"
msgstr ""
@ -293,7 +293,11 @@ msgstr ""
msgid "Raw data size does not match size in header, truncated bundle"
msgstr ""
#: ../src/bundledb/reader.rs:306
#: ../src/bundledb/reader.rs:304
msgid "Stored hash does not match hash in header, modified data"
msgstr ""
#: ../src/bundledb/reader.rs:316
msgid ""
"Bundle(\n"
"\tid: {}\n"
@ -478,7 +482,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-02-24 23:54+0100\n"
"POT-Creation-Date: 2018-03-03 16:08+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -853,10 +857,6 @@ msgstr ""
msgid "No subcommand given"
msgstr ""
#: ../src/cli/logger.rs:11
msgid "failed printing to stderr"
msgstr ""
#: ../src/cli/mod.rs:108
msgid ""
"Failed to {}\n"
@ -913,13 +913,11 @@ msgid "Modified data size: {}"
msgstr ""
#: ../src/cli/mod.rs:190
#, possible-python-format
msgid "Deduplicated size: {}, {:.1}% saved"
msgid "Deduplicated size: {}, {:.1}%"
msgstr ""
#: ../src/cli/mod.rs:196
#, possible-python-format
msgid "Compressed size: {} in {} bundles, {:.1}% saved"
msgid "Compressed size: {} in {} bundles, {:.1}%"
msgstr ""
#: ../src/cli/mod.rs:202
@ -1369,64 +1367,64 @@ msgstr ""
msgid "add key pair"
msgstr ""
#: ../src/index.rs:24
#: ../src/index.rs:23
msgid "Failed to open index file"
msgstr ""
#: ../src/index.rs:25
#: ../src/index.rs:24
msgid ""
"Index error: failed to open the index file\n"
"\tcaused by: {}"
msgstr ""
#: ../src/index.rs:30
#: ../src/index.rs:29
msgid "Failed to memory-map the index file"
msgstr ""
#: ../src/index.rs:31
#: ../src/index.rs:30
msgid ""
"Index error: failed to memory-map the index file\n"
"\tcaused by: {}"
msgstr ""
#: ../src/index.rs:35
#: ../src/index.rs:34
msgid "Index error: file has the wrong magic header"
msgstr ""
#: ../src/index.rs:38
#: ../src/index.rs:37
msgid "Unsupported version"
msgstr ""
#: ../src/index.rs:39
#: ../src/index.rs:38
msgid "Index error: index file has unsupported version: {}"
msgstr ""
#: ../src/index.rs:42
#: ../src/index.rs:41
msgid "Key at wrong position"
msgstr ""
#: ../src/index.rs:43
#: ../src/index.rs:42
msgid "Index error: key has wrong position, expected at: {}, but is at: {:?}"
msgstr ""
#: ../src/index.rs:46
#: ../src/index.rs:45
msgid "Wrong entry count"
msgstr ""
#: ../src/index.rs:47
#: ../src/index.rs:46
msgid "Index error: index has wrong entry count, expected {}, but is {}"
msgstr ""
#: ../src/index.rs:150
#: ../src/index.rs:177
msgid "Memory map too small"
msgstr ""
#: ../src/index.rs:210
#: ../src/index.rs:237
msgid "Inconsistent after creation"
msgstr ""
#: ../src/index.rs:444 ../src/index.rs:453 ../src/index.rs:462
#: ../src/index.rs:472
#: ../src/index.rs:472 ../src/index.rs:481 ../src/index.rs:490
#: ../src/index.rs:500
msgid "Inconsistent before get"
msgstr ""

12
src/bundledb/reader.rs

@ -295,7 +295,17 @@ impl BundleReader {
tr!("Raw data size does not match size in header, truncated bundle")
));
}
//TODO: verify checksum
let mut pos = 0;
for chunk in self.chunks.as_ref().unwrap().as_ref() {
let data = &contents[pos..pos+chunk.1 as usize];
if self.info.hash_method.hash(data) != chunk.0 {
return Err(BundleReaderError::Integrity(
self.id(),
tr!("Stored hash does not match hash in header, modified data")
));
}
pos += chunk.1 as usize;
}
Ok(())
}
}

3
src/util/compression.rs

@ -3,7 +3,6 @@ use std::ffi::{CStr, CString};
use std::io::{self, Write};
use std::str::FromStr;
use libc;
use squash::*;
@ -285,7 +284,7 @@ impl CompressionStream {
impl Drop for CompressionStream {
fn drop(&mut self) {
unsafe {
squash_object_unref(self.stream as *mut libc::c_void);
squash_object_unref(self.stream as *mut ::std::os::raw::c_void);
}
}
}

Loading…
Cancel
Save