From e63367cea8105bd0c9deff905d1af5ce65dd7f57 Mon Sep 17 00:00:00 2001 From: Daniel Mueller Date: Mon, 16 Dec 2019 19:29:14 -0800 Subject: Update nitrokey crate to 0.3.5 This change updates the nitrokey crate to version 0.3.5. The main reason for this new version of the crate is a build fix due to a backwards compatibility breaking change in upstream libnitrokey. For that reason, we also have to bump the minimum required version to avoid build failures. Import subrepo nitrokey/:nitrokey at f2cc7fdf081340b0b812f0b212537ba2b55d382e --- nitrocli/CHANGELOG.md | 1 + nitrocli/Cargo.lock | 4 ++-- nitrocli/Cargo.toml | 2 +- nitrokey/.builds/archlinux-use-system-lib.yaml | 6 +----- nitrokey/.builds/archlinux.yml | 6 +----- nitrokey/CHANGELOG.md | 3 +++ nitrokey/Cargo.toml | 4 ++-- 7 files changed, 11 insertions(+), 15 deletions(-) diff --git a/nitrocli/CHANGELOG.md b/nitrocli/CHANGELOG.md index a55237e..c726f3f 100644 --- a/nitrocli/CHANGELOG.md +++ b/nitrocli/CHANGELOG.md @@ -8,6 +8,7 @@ Unreleased - Moved its output into `status` command - Removed previously deprecated `--ascii` option from `otp set` command - Fixed wrong hexadecimal conversion used in `otp set` command +- Bumped `nitrokey` dependency to `0.3.5` - Bumped `libc` dependency to `0.2.66` - Bumped `cc` dependency to `1.0.48` diff --git a/nitrocli/Cargo.lock b/nitrocli/Cargo.lock index 18d48b5..7a9cd54 100644 --- a/nitrocli/Cargo.lock +++ b/nitrocli/Cargo.lock @@ -77,14 +77,14 @@ dependencies = [ "argparse 0.2.2", "base32 0.4.0", "libc 0.2.66", - "nitrokey 0.3.4", + "nitrokey 0.3.5", "nitrokey-test 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "nitrokey" -version = "0.3.4" +version = "0.3.5" dependencies = [ "libc 0.2.66", "nitrokey-sys 3.4.3", diff --git a/nitrocli/Cargo.toml b/nitrocli/Cargo.toml index 5c0ea54..97e0b36 100644 --- a/nitrocli/Cargo.toml +++ b/nitrocli/Cargo.toml @@ -53,7 +53,7 @@ path = "../base32" version = "0.2" [dependencies.nitrokey] -version = "0.3.1" +version = "0.3.5" [dev-dependencies.nitrokey-test] version = "0.1.1" diff --git a/nitrokey/.builds/archlinux-use-system-lib.yaml b/nitrokey/.builds/archlinux-use-system-lib.yaml index 6fba33a..01705c1 100644 --- a/nitrokey/.builds/archlinux-use-system-lib.yaml +++ b/nitrokey/.builds/archlinux-use-system-lib.yaml @@ -5,7 +5,7 @@ packages: environment: USE_SYSTEM_LIBNITROKEY: "1" sources: - - https://git.sr.ht/~ireas/nitrokey-rs + - https://git.ireas.org/nitrokey-rs tasks: - build: | cd nitrokey-rs @@ -16,7 +16,3 @@ tasks: - format: | cd nitrokey-rs cargo fmt -- --check -triggers: - - action: email - condition: failure - to: nitrokey-rs-dev diff --git a/nitrokey/.builds/archlinux.yml b/nitrokey/.builds/archlinux.yml index 9d45386..543e93c 100644 --- a/nitrokey/.builds/archlinux.yml +++ b/nitrokey/.builds/archlinux.yml @@ -4,7 +4,7 @@ packages: - hidapi - gcc sources: - - https://git.sr.ht/~ireas/nitrokey-rs + - https://git.ireas.org/nitrokey-rs tasks: - build: | cd nitrokey-rs @@ -15,7 +15,3 @@ tasks: - format: | cd nitrokey-rs cargo fmt -- --check -triggers: - - action: email - condition: failure - to: nitrokey-rs-dev diff --git a/nitrokey/CHANGELOG.md b/nitrokey/CHANGELOG.md index edc33f6..04da117 100644 --- a/nitrokey/CHANGELOG.md +++ b/nitrokey/CHANGELOG.md @@ -1,3 +1,6 @@ +# v0.3.5 (2019-12-16) +- Update the nitrokey-sys dependency version specification to ~3.4. + # v0.3.4 (2019-01-20) - Fix authentication methods that assumed that `char` is signed. diff --git a/nitrokey/Cargo.toml b/nitrokey/Cargo.toml index 838ab45..238cc02 100644 --- a/nitrokey/Cargo.toml +++ b/nitrokey/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nitrokey" -version = "0.3.4" +version = "0.3.5" authors = ["Robin Krahl "] edition = "2018" homepage = "https://code.ireas.org/nitrokey-rs/" @@ -18,7 +18,7 @@ test-storage = [] [dependencies] libc = "0.2" -nitrokey-sys = "3.4" +nitrokey-sys = "~3.4" rand_core = {version = "0.3", default-features = false} rand_os = {version = "0.1"} -- cgit v1.2.3