Codebase list rust-subtle / 1421467
package gpgme, needed for ripasso Alexander Kjäll 2 years ago
8 changed file(s) with 177 addition(s) and 0 deletion(s). Raw diff Collapse all Expand all
(New empty file)
0 rust-gpgme (0.10.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
1
2 * Package gpgme 0.10.0 from crates.io using debcargo 2.5.0
3
4 -- Alexander Kjäll <alexander.kjall@gmail.com> Mon, 14 Mar 2022 19:18:35 +0100
0 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
1 Upstream-Name: gpgme
2 Upstream-Contact: John Schug
3 Source: https://github.com/gpg-rs/gpgme
4
5 Files: *
6 Copyright: 2015-2022 John Schug
7 License: LGPL-2.1
8
9 Files: debian/*
10 Copyright:
11 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
12 2022 Alexander Kjäll <alexander.kjall@gmail.com>
13 License: LGPL-2.1
14
15 License: LGPL-2.1
16 Debian systems provide the LGPL 2.1 in /usr/share/common-licenses/LGPL-2.1
0 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
1 Upstream-Name: gpgme
2 Upstream-Contact: FIXME (overlay) UNKNOWN-AUTHORS
3 Source: https://github.com/gpg-rs/gpgme
4
5 Files: *
6 Copyright: FIXME (overlay) UNKNOWN-AUTHORS FIXME (overlay) UNKNOWN-YEARS
7 License: LGPL-2.1
8 Comment:
9 FIXME (overlay): Since upstream copyright years are not available in
10 Cargo.toml, they were extracted from the upstream Git repository. This may not
11 be correct information so you should review and fix this before uploading to
12 the archive.
13
14 Files: ./COPYING
15 Copyright: 1991, 1999 Free Software Foundation, Inc.
16 License: UNKNOWN-LICENSE; FIXME (overlay)
17 Comment:
18 FIXME (overlay): These notices are extracted from files. Please review them
19 before uploading to the archive.
20
21 Files: debian/*
22 Copyright:
23 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
24 2022 Alexander Kjäll <alexander.kjall@gmail.com>
25 License: LGPL-2.1
26
27 License: LGPL-2.1
28 Debian systems provide the LGPL 2.1 in /usr/share/common-licenses/LGPL-2.1
0 overlay = "."
1 uploaders = ["Alexander Kjäll <alexander.kjall@gmail.com>"]
2 test_is_broken = true
0 From b2a207a004ae1e773edc13af65790c8adeb0bddd Mon Sep 17 00:00:00 2001
1 From: =?UTF-8?q?Alexander=20Kj=C3=A4ll?= <alexander.kjall@gmail.com>
2 Date: Mon, 14 Mar 2022 18:47:09 +0100
3 Subject: [PATCH 1/2] delete pinentry binary
4
5 ---
6 Cargo.toml | 3 ---
7 src/bin/pinentry.rs | 18 ------------------
8 tests/common/mod.rs | 2 +-
9 3 files changed, 1 insertion(+), 22 deletions(-)
10 delete mode 100644 src/bin/pinentry.rs
11
12 diff --git a/Cargo.toml b/Cargo.toml
13 index 59f3bca..50f1a57 100644
14 --- a/Cargo.toml
15 +++ b/Cargo.toml
16 @@ -22,9 +22,6 @@ categories = ["api-bindings"]
17 license = "LGPL-2.1"
18 repository = "https://github.com/gpg-rs/gpgme"
19
20 -[[bin]]
21 -name = "pinentry"
22 -test = false
23 [dependencies.bitflags]
24 version = "1"
25
26 diff --git a/src/bin/pinentry.rs b/src/bin/pinentry.rs
27 deleted file mode 100644
28 index 94cdffb..0000000
29 --- a/src/bin/pinentry.rs
30 +++ /dev/null
31 @@ -1,18 +0,0 @@
32 -use std::{io, io::prelude::*};
33 -
34 -#[allow(dead_code)]
35 -fn main() {
36 - println!("OK Your orders please");
37 -
38 - let stdin = io::stdin();
39 - let mut lines = stdin.lock().lines();
40 - while let Some(Ok(cmd)) = lines.next() {
41 - match cmd.split(' ').nth(0) {
42 - Some("GETPIN") => {
43 - println!("D abc");
44 - println!("OK");
45 - }
46 - _ => println!("OK"),
47 - }
48 - }
49 -}
50 diff --git a/tests/common/mod.rs b/tests/common/mod.rs
51 index 96578e2..a4b4907 100644
52 --- a/tests/common/mod.rs
53 +++ b/tests/common/mod.rs
54 @@ -68,7 +68,7 @@ fn import_key(key: &[u8]) {
55 fn setup_agent(dir: &Path) {
56 env::set_var("GNUPGHOME", dir);
57 env::set_var("GPG_AGENT_INFO", "");
58 - let pinentry = Path::new(env!("CARGO_BIN_EXE_pinentry"));
59 + let pinentry = Path::new("pinentry");
60 if !pinentry.exists() {
61 panic!("Unable to find pinentry program");
62 }
63 --
64 2.35.1
65
0 From be92d6a3e54762b715ad28eb6ccf6e8cbce26c12 Mon Sep 17 00:00:00 2001
1 From: =?UTF-8?q?Alexander=20Kj=C3=A4ll?= <alexander.kjall@gmail.com>
2 Date: Mon, 14 Mar 2022 19:05:14 +0100
3 Subject: [PATCH 2/2] replace tempdir with tempfile
4
5 ---
6 Cargo.toml | 4 ++--
7 tests/common/mod.rs | 6 ++----
8 2 files changed, 4 insertions(+), 6 deletions(-)
9
10 diff --git a/Cargo.toml b/Cargo.toml
11 index 50f1a57..61d3ad3 100644
12 --- a/Cargo.toml
13 +++ b/Cargo.toml
14 @@ -52,7 +52,7 @@ version = "1.1"
15 [dev-dependencies.structopt]
16 version = "0.3"
17
18 -[dev-dependencies.tempdir]
19 -version = "0.3"
20 +[dev-dependencies.tempfile]
21 +version = "3"
22 [badges.maintenance]
23 status = "experimental"
24 diff --git a/tests/common/mod.rs b/tests/common/mod.rs
25 index a4b4907..0c42470 100644
26 --- a/tests/common/mod.rs
27 +++ b/tests/common/mod.rs
28 @@ -10,8 +10,6 @@ use std::{
29 },
30 };
31
32 -use tempdir::TempDir;
33 -
34 use gpgme::{self, Context, PassphraseRequest, PinentryMode};
35
36 macro_rules! count {
37 @@ -98,12 +96,12 @@ fn setup_agent(dir: &Path) {
38
39 pub struct TestCase {
40 count: AtomicUsize,
41 - homedir: RwLock<Option<TempDir>>,
42 + homedir: RwLock<Option<tempfile::TempDir>>,
43 }
44
45 impl TestCase {
46 pub fn new(count: usize) -> TestCase {
47 - let dir = TempDir::new(".test-gpgme").unwrap();
48 + let dir = tempfile::TempDir::new().unwrap();
49 setup_agent(dir.path());
50 import_key(include_bytes!("./data/pubdemo.asc"));
51 import_key(include_bytes!("./data/secdemo.asc"));
52 --
53 2.35.1
54
0 remove-pinentry-binary.patch
1 replace-tempdir-with-tempfile.patch