From 2b367a30df6e155621c116c41cc262dd96ad1a33 Mon Sep 17 00:00:00 2001 From: Robin Krahl Date: Sun, 20 Sep 2020 04:37:31 +0200 Subject: Use quilt to manage modifications in src/ffi.rs Previously, we manually modified the src/ffi.rs file to add deprecation attributes. With this patch, we use quilt to automatically apply patches with the changes. --- patches/deprecated.diff | 24 ++++++++++++++++++++++++ patches/series | 1 + 2 files changed, 25 insertions(+) create mode 100644 patches/deprecated.diff create mode 100644 patches/series (limited to 'patches') diff --git a/patches/deprecated.diff b/patches/deprecated.diff new file mode 100644 index 0000000..dff4b55 --- /dev/null +++ b/patches/deprecated.diff @@ -0,0 +1,24 @@ +Add deprecated attribute to depracted functions + +bindgen does add the deprecated attribute to deprecated functions. This patch +manually adds the attributes libnitrokey’s deprecated functions. +Index: nitrokey-sys-rs/src/ffi.rs +=================================================================== +--- nitrokey-sys-rs.orig/src/ffi.rs ++++ nitrokey-sys-rs/src/ffi.rs +@@ -763,6 +763,7 @@ extern "C" { + /// deprecated in favor of NK_get_status_as_string. + /// @return string representation of the status or an empty string + /// if the command failed ++ #[deprecated(since = "3.5.0", note="use `NK_get_status_as_string` instead")] + pub fn NK_status() -> *mut ::std::os::raw::c_char; + } + extern "C" { +@@ -1017,6 +1018,7 @@ extern "C" { + pub fn NK_totp_set_time_soft(time: u64) -> ::std::os::raw::c_int; + } + extern "C" { ++ #[deprecated(since = "3.4.0", note="use `NK_totp_set_time_soft` instead")] + pub fn NK_totp_get_time() -> ::std::os::raw::c_int; + } + extern "C" { diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..82bbc83 --- /dev/null +++ b/patches/series @@ -0,0 +1 @@ +deprecated.diff -- cgit v1.2.3