diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 18 | ||||
| -rw-r--r-- | use-system-library.patch | 120 |
3 files changed, 138 insertions, 10 deletions
@@ -1,15 +1,17 @@ pkgbase = nitrocli pkgdesc = Command-line interface for Nitrokey devices pkgver = 0.2.0 - pkgrel = 2 + pkgrel = 3 url = https://github.com/d-e-s-o/nitrocli arch = x86_64 license = GPL3 makedepends = cargo - depends = hidapi + depends = libnitrokey>=3.4.1 depends = gnupg - source = nitrocli-0.2.0.tar.gz::https://crates.io/api/v1/crates/nitrocli/0.2.0/download - sha512sums = aca356201c29ed670595d2d637edc2ce15df0a59a6843c68632b702fc92dd8df85cf6e17eed6d5d95e8dd2e83e1f15c3691f2e9bd1aeb0fc908c2217af7e74ae + source = nitrocli-0.2.0.tar.gz::https://github.com/d-e-s-o/nitrocli/archive/v0.2.0.tar.gz + source = use-system-library.patch + sha512sums = f119335e05170c7125d6ecdfdbd9ad30f0bf8fafbd694ecb97e99da25982317dfd0faa9f8b962cda2d2d565a447affefdd8f9198ba85e713fe93f1bd8f90b1ec + sha512sums = d53050632a6f68705d344469a040579e5ea23db6ce7e1e36ae2f7a206a543cbea409ad3f025495a9f12c46a4c488ffbfab3cc781cbed058f88a3c23f8d2667cf pkgname = nitrocli @@ -1,23 +1,29 @@ # Maintainer: Robin Krahl <robin.krahl@ireas.org> pkgname=nitrocli pkgver=0.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="Command-line interface for Nitrokey devices" arch=('x86_64') url="https://github.com/d-e-s-o/nitrocli" license=('GPL3') -depends=('hidapi' 'gnupg') +depends=('libnitrokey>=3.4.1' 'gnupg') makedepends=('cargo') -source=("$pkgname-$pkgver.tar.gz"::https://crates.io/api/v1/crates/$pkgname/$pkgver/download) -sha512sums=('aca356201c29ed670595d2d637edc2ce15df0a59a6843c68632b702fc92dd8df85cf6e17eed6d5d95e8dd2e83e1f15c3691f2e9bd1aeb0fc908c2217af7e74ae') +source=("$pkgname-$pkgver.tar.gz"::https://github.com/d-e-s-o/nitrocli/archive/v0.2.0.tar.gz "use-system-library.patch") +sha512sums=('f119335e05170c7125d6ecdfdbd9ad30f0bf8fafbd694ecb97e99da25982317dfd0faa9f8b962cda2d2d565a447affefdd8f9198ba85e713fe93f1bd8f90b1ec' + 'd53050632a6f68705d344469a040579e5ea23db6ce7e1e36ae2f7a206a543cbea409ad3f025495a9f12c46a4c488ffbfab3cc781cbed058f88a3c23f8d2667cf') -build() { +prepare() { cd "$pkgname-$pkgver" + patch -p1 -i "$srcdir/use-system-library.patch" +} + +build() { + cd "$pkgname-$pkgver/nitrocli" cargo build --release } package() { - cd "$pkgname-$pkgver" + cd "$pkgname-$pkgver/nitrocli" install -Dm755 target/release/nitrocli "$pkgdir"/usr/bin/nitrocli install -Dm644 doc/nitrocli.1 "$pkgdir"/usr/share/man/man1/nitrocli.1 } diff --git a/use-system-library.patch b/use-system-library.patch new file mode 100644 index 000000000000..991c9e14e9d5 --- /dev/null +++ b/use-system-library.patch @@ -0,0 +1,120 @@ +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 +@@ -1,104 +1,3 @@ +-extern crate cc; +- +-use std::env; +-use std::io; +-use std::io::{Read, Write}; +-use std::fs; +-use std::path; +- +-struct Version { +- major: String, +- minor: String, +- git: String, +-} +- +-fn stringify(err: env::VarError) -> String { +- format!("{}", err) +-} +- +-fn extract_git_version(pre: &str) -> Result<String, String> { +- // If a pre-release version is set, it is expected to have the format +- // pre.v<maj>.<min>.<n>.g<hash>, where <maj> and <min> are the last major and minor version, +- // <n> is the number of commits since this version and <hash> is the hash of the last commit. +- let parts: Vec<&str> = pre.split('.').collect(); +- if parts.len() != 5 { +- return Err(format!("'{}' is not a valid pre-release version", pre)); +- } +- Ok(format!("{}.{}-{}-{}", parts[1], parts[2], parts[3], parts[4])) +-} +- +-fn get_version() -> Result<Version, String> { +- let major = env::var("CARGO_PKG_VERSION_MAJOR").map_err(stringify)?; +- let minor = env::var("CARGO_PKG_VERSION_MINOR").map_err(stringify)?; +- let patch = env::var("CARGO_PKG_VERSION_PATCH").map_err(stringify)?; +- let pre = env::var("CARGO_PKG_VERSION_PRE").map_err(stringify)?; +- +- let git = match pre.is_empty() { +- true => match patch.is_empty() { +- true => format!("v{}.{}", major, minor), +- false => format!("v{}.{}.{}", major, minor, patch), +- }, +- false => extract_git_version(&pre)?, +- }; +- +- Ok(Version { +- major, +- minor, +- git, +- }) +-} +- +-fn prepare_version_source( +- version: &Version, +- out_path: &path::Path, +- library_path: &path::Path +-) -> io::Result<path::PathBuf> { +- let out = out_path.join("version.cc"); +- let template = library_path.join("version.cc.in"); +- +- let mut file = fs::File::open(template)?; +- let mut data = String::new(); +- file.read_to_string(&mut data)?; +- drop(file); +- +- let data = data +- .replace("@PROJECT_VERSION_MAJOR@", &version.major) +- .replace("@PROJECT_VERSION_MINOR@", &version.minor) +- .replace("@PROJECT_VERSION_GIT@", &version.git); +- +- let mut file = fs::File::create(&out)?; +- file.write_all(data.as_bytes())?; +- +- Ok(out) +-} +- + fn main() { +- let out_dir = env::var("OUT_DIR").expect("Environment variable OUT_DIR is not set"); +- let out_path = path::PathBuf::from(out_dir); +- +- let version = get_version().expect("Could not extract library version"); +- +- let sources = [ +- "DeviceCommunicationExceptions.cpp", +- "NK_C_API.cc", +- "NitrokeyManager.cc", +- "command_id.cc", +- "device.cc", +- "log.cc", +- "misc.cc", +- ]; +- let library_dir = format!("libnitrokey-{}", version.git); +- let library_path = path::Path::new(&library_dir); +- +- let version_source = prepare_version_source(&version, &out_path, &library_path) +- .expect("Could not prepare the version source file"); +- +- cc::Build::new() +- .cpp(true) +- .include(library_path.join("libnitrokey")) +- .files(sources.iter().map(|s| library_path.join(s))) +- .file(version_source) +- .compile("libnitrokey.a"); +- +- 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 +@@ -10,6 +10,3 @@ + links = "nitrokey" + build = "build.rs" + readme = "README.md" +- +-[build-dependencies] +-cc = "1.0" |