From: Peter Michael Green Date: Sat, 29 Jan 2022 11:24:31 +0000 (+0000) Subject: nitrokey - revert vcs to the version that is in unstable. X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=617464ccafa918cacd275afdbf6cd3886c014b19;p=debcargo-conf.git nitrokey - revert vcs to the version that is in unstable. --- diff --git a/src/nitrokey/debian/changelog b/src/nitrokey/debian/changelog index 2e2acc418..e2c069f8b 100644 --- a/src/nitrokey/debian/changelog +++ b/src/nitrokey/debian/changelog @@ -1,16 +1,3 @@ -rust-nitrokey (0.6.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium - - * Team upload. - * Package nitrokey 0.6.0 from crates.io using debcargo 2.4.0 - - -- Sylvestre Ledru Sun, 29 Mar 2020 23:20:22 +0200 - -rust-nitrokey (0.4.0-1) experimental; urgency=medium - - * Package nitrokey 0.4.0 from crates.io using debcargo 2.4.1 - - -- Robin Krahl Wed, 15 Jan 2020 11:55:02 +0000 - rust-nitrokey (0.3.4-2) unstable; urgency=medium * Team upload. diff --git a/src/nitrokey/debian/copyright b/src/nitrokey/debian/copyright index e4bc3b8c7..9e5f408d1 100644 --- a/src/nitrokey/debian/copyright +++ b/src/nitrokey/debian/copyright @@ -4,37 +4,13 @@ Upstream-Contact: Robin Krahl Source: https://git.ireas.org/nitrokey-rs/ Files: * -Copyright: 2018-2020 Robin Krahl +Copyright: 2018 Robin Krahl License: MIT -Files: ./.gitignore -Copyright: 2019 Robin Krahl -License: CC0-1.0 - -Files: ./CHANGELOG.md -Copyright: 2019-2020 Robin Krahl -License: CC0-1.0 - -Files: ./Cargo.toml -Copyright: 2019-2020 Robin Krahl -License: CC0-1.0 - -Files: ./Cargo.toml.orig -Copyright: 2019-2020 Robin Krahl -License: CC0-1.0 - -Files: ./README.md -Copyright: 2019 Robin Krahl -License: CC0-1.0 - -Files: ./TODO.md -Copyright: 2019 Robin Krahl -License: CC0-1.0 - Files: debian/* Copyright: - 2019-2020 Debian Rust Maintainers - 2019-2020 Robin Krahl + 2019 Debian Rust Maintainers + 2019 Robin Krahl License: MIT License: MIT @@ -55,7 +31,3 @@ License: MIT LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -License: CC0-1.0 - Debian systems provide the CC0 1.0 Universal License in - /usr/share/common-licenses/CC0-1.0 diff --git a/src/nitrokey/debian/copyright.debcargo.hint b/src/nitrokey/debian/copyright.debcargo.hint index 29731bff4..08974899b 100644 --- a/src/nitrokey/debian/copyright.debcargo.hint +++ b/src/nitrokey/debian/copyright.debcargo.hint @@ -12,178 +12,17 @@ Comment: be correct information so you should review and fix this before uploading to the archive. -Files: ./.gitignore -Copyright: 2019 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./CHANGELOG.md -Copyright: 2019-2020 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./Cargo.toml.orig -Copyright: 2019-2020 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./LICENSES/MIT.txt +Files: ./LICENSE Copyright: 2018 Robin Krahl License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./README.md -Copyright: 2019 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./TODO.md -Copyright: 2019 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./examples/list-devices.rs -Copyright: 2020 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./examples/otp.rs -Copyright: 2020 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/auth.rs -Copyright: 2018-2019 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/config.rs -Copyright: 2018-2019 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/device/mod.rs -Copyright: 2018-2019 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/device/pro.rs -Copyright: 2018-2019 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/device/storage.rs -Copyright: 2019-2020 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/device/wrapper.rs -Copyright: 2018-2019 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/error.rs -Copyright: 2019 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/lib.rs -Copyright: 2018-2019 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/otp.rs -Copyright: 2018-2019 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/pws.rs -Copyright: 2018-2019 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/util.rs -Copyright: 2018-2019 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./tests/device.rs -Copyright: 2018-2020 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./tests/lib.rs -Copyright: 2019 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./tests/otp.rs -Copyright: 2018-2019 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./tests/pws.rs -Copyright: 2018-2019 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./tests/util/mod.rs -Copyright: 2018-2019 Robin Krahl -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - Files: debian/* Copyright: - 2019-2020 Debian Rust Maintainers - 2019-2020 Robin Krahl + 2019 Debian Rust Maintainers + 2019 Robin Krahl License: MIT License: MIT diff --git a/src/nitrokey/debian/patches/rand-core-0.5.patch b/src/nitrokey/debian/patches/rand-core-0.5.patch new file mode 100644 index 000000000..d99d204bb --- /dev/null +++ b/src/nitrokey/debian/patches/rand-core-0.5.patch @@ -0,0 +1,23 @@ +--- a/src/util.rs ++++ b/src/util.rs +@@ -4,8 +4,7 @@ + use std::os::raw::{c_char, c_int}; + + use libc::{c_void, free}; +-use rand_core::RngCore; +-use rand_os::OsRng; ++use rand_core::{RngCore, OsRng}; + + /// Error types returned by Nitrokey device or by the library. + #[derive(Clone, Copy, Debug, PartialEq)] +@@ -113,9 +112,8 @@ + } + + pub fn generate_password(length: usize) -> Result, CommandError> { +- let mut rng = OsRng::new()?; + let mut data = vec![0u8; length]; +- rng.fill_bytes(&mut data[..]); ++ OsRng.fill_bytes(&mut data[..]); + Ok(data) + } + diff --git a/src/nitrokey/debian/patches/relax-dep-versions.patch b/src/nitrokey/debian/patches/relax-dep-versions.patch new file mode 100644 index 000000000..0833764ea --- /dev/null +++ b/src/nitrokey/debian/patches/relax-dep-versions.patch @@ -0,0 +1,16 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -30,11 +30,9 @@ + version = "3.4" + + [dependencies.rand_core] +-version = "0.3" +-default-features = false ++version = "0.5" ++features = ["getrandom"] + +-[dependencies.rand_os] +-version = "0.1" + [dev-dependencies.nitrokey-test] + version = "0.1" + diff --git a/src/nitrokey/debian/patches/series b/src/nitrokey/debian/patches/series new file mode 100644 index 000000000..c21e3027d --- /dev/null +++ b/src/nitrokey/debian/patches/series @@ -0,0 +1,2 @@ +relax-dep-versions.patch +rand-core-0.5.patch