diff options
Diffstat (limited to 'use-system-library.patch')
| -rw-r--r-- | use-system-library.patch | 52 |
1 files changed, 45 insertions, 7 deletions
diff --git a/use-system-library.patch b/use-system-library.patch index 991c9e14e9d5..4aea1e65e7c7 100644 --- a/use-system-library.patch +++ b/use-system-library.patch @@ -1,7 +1,45 @@ -Only in nitrocli-0.2.0: cc -diff -ura nitrocli-0.2.0/nitrokey-sys/build.rs nitrocli-0.2.0.new/nitrokey-sys/build.rs ---- nitrocli-0.2.0/nitrokey-sys/build.rs 2019-01-02 01:21:10.000000000 +0000 -+++ nitrocli-0.2.0.new/nitrokey-sys/build.rs 2019-01-04 16:21:39.881258886 +0000 +diff -ura nitrocli-0.2.2.orig/nitrocli/Cargo.lock nitrocli-0.2.2.new/nitrocli/Cargo.lock +--- nitrocli-0.2.2.orig/nitrocli/Cargo.lock 2019-01-14 03:25:50.000000000 +0000 ++++ nitrocli-0.2.2.new/nitrocli/Cargo.lock 2019-01-14 11:48:45.277717389 +0000 +@@ -20,16 +20,6 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] +-name = "cc" +-version = "1.0.28" +- +-[[package]] +-name = "cc" +-version = "1.0.28" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-replace = "cc 1.0.28" +- +-[[package]] + name = "cfg-if" + version = "0.1.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -105,9 +95,6 @@ + [[package]] + name = "nitrokey-sys" + version = "3.4.1" +-dependencies = [ +- "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", +-] + + [[package]] + name = "nitrokey-sys" +@@ -321,7 +308,6 @@ + [metadata] + "checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e" + "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" +-"checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749" + "checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4" + "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" + "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +Only in nitrocli-0.2.2.new/nitrocli: target +diff -ura nitrocli-0.2.2.orig/nitrokey-sys/build.rs nitrocli-0.2.2.new/nitrokey-sys/build.rs +--- nitrocli-0.2.2.orig/nitrokey-sys/build.rs 2019-01-14 03:25:50.000000000 +0000 ++++ nitrocli-0.2.2.new/nitrokey-sys/build.rs 2019-01-14 11:46:43.052438908 +0000 @@ -1,104 +1,3 @@ -extern crate cc; - @@ -108,9 +146,9 @@ diff -ura nitrocli-0.2.0/nitrokey-sys/build.rs nitrocli-0.2.0.new/nitrokey-sys/b - println!("cargo:rustc-link-lib=hidapi-libusb"); + println!("cargo:rustc-link-lib=nitrokey"); } -diff -ura nitrocli-0.2.0/nitrokey-sys/Cargo.toml nitrocli-0.2.0.new/nitrokey-sys/Cargo.toml ---- nitrocli-0.2.0/nitrokey-sys/Cargo.toml 2019-01-02 01:21:10.000000000 +0000 -+++ nitrocli-0.2.0.new/nitrokey-sys/Cargo.toml 2019-01-04 16:21:53.252875210 +0000 +diff -ura nitrocli-0.2.2.orig/nitrokey-sys/Cargo.toml nitrocli-0.2.2.new/nitrokey-sys/Cargo.toml +--- nitrocli-0.2.2.orig/nitrokey-sys/Cargo.toml 2019-01-14 03:25:50.000000000 +0000 ++++ nitrocli-0.2.2.new/nitrokey-sys/Cargo.toml 2019-01-14 11:46:43.052438908 +0000 @@ -10,6 +10,3 @@ links = "nitrokey" build = "build.rs" |