pleaser: rebuild against rpassword 6
Daniel Kahn Gillmor
1 year, 2 months ago
|
0 |
rust-pleaser (0.5.3-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
|
|
1 |
|
|
2 |
* Team upload.
|
|
3 |
* Package pleaser 0.5.3 from crates.io using debcargo 2.6.0
|
|
4 |
* Add patch to build with rpassword 6.
|
|
5 |
|
|
6 |
-- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Tue, 07 Feb 2023 16:57:12 -0500
|
|
7 |
|
0 | 8 |
rust-pleaser (0.5.3-1) unstable; urgency=medium
|
1 | 9 |
|
2 | 10 |
* Team upload.
|
8 | 8 |
|
9 | 9 |
Files: debian/*
|
10 | 10 |
Copyright:
|
11 | |
2020-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
|
|
11 |
2020-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
|
12 | 12 |
2020-2021 Ed Neville <ed-debian@s5h.net>
|
|
13 |
2020-2023 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
|
13 | 14 |
License: GPL-3.0-or-later
|
14 | 15 |
|
15 | 16 |
License: GPL-3.0-or-later
|
11 | 11 |
be correct information so you should review and fix this before uploading to
|
12 | 12 |
the archive.
|
13 | 13 |
|
14 | |
Files: ./LICENSE
|
|
14 |
Files: LICENSE
|
15 | 15 |
Copyright: 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
16 | 16 |
License: UNKNOWN-LICENSE; FIXME (overlay)
|
17 | 17 |
Comment:
|
18 | 18 |
FIXME (overlay): These notices are extracted from files. Please review them
|
19 | 19 |
before uploading to the archive.
|
20 | 20 |
|
21 | |
Files: ./src/bin/please.rs
|
|
21 |
Files: src/bin/please.rs
|
22 | 22 |
Copyright: 2020-2021 ed neville
|
23 | 23 |
License: UNKNOWN-LICENSE; FIXME (overlay)
|
24 | 24 |
Comment:
|
25 | 25 |
FIXME (overlay): These notices are extracted from files. Please review them
|
26 | 26 |
before uploading to the archive.
|
27 | 27 |
|
28 | |
Files: ./src/bin/pleaseedit.rs
|
|
28 |
Files: src/bin/pleaseedit.rs
|
29 | 29 |
Copyright: 2020-2021 ed neville
|
30 | 30 |
License: UNKNOWN-LICENSE; FIXME (overlay)
|
31 | 31 |
Comment:
|
32 | 32 |
FIXME (overlay): These notices are extracted from files. Please review them
|
33 | 33 |
before uploading to the archive.
|
34 | 34 |
|
35 | |
Files: ./src/lib.rs
|
|
35 |
Files: src/lib.rs
|
36 | 36 |
Copyright: 2020-2021 ed neville
|
37 | 37 |
License: UNKNOWN-LICENSE; FIXME (overlay)
|
38 | 38 |
Comment:
|
|
41 | 41 |
|
42 | 42 |
Files: debian/*
|
43 | 43 |
Copyright:
|
44 | |
2020-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
|
45 | |
2020-2022 Ed Neville <ed-debian@s5h.net>
|
|
44 |
2020-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
|
|
45 |
2020-2023 Ed Neville <ed-debian@s5h.net>
|
46 | 46 |
License: GPL-3.0-or-later
|
47 | 47 |
|
48 | 48 |
License: GPL-3.0-or-later
|
|
0 |
Debian is moving from rpassword 5 to rpassword 6.
|
|
1 |
This change should be sufficient to work properly.
|
|
2 |
|
|
3 |
Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
|
|
4 |
|
|
5 |
diff --git a/src/lib.rs b/src/lib.rs
|
|
6 |
index 4199249..5e98cfa 100644
|
|
7 |
--- a/src/lib.rs
|
|
8 |
+++ b/src/lib.rs
|
|
9 |
@@ -234,10 +234,10 @@ impl pam::Converse for PamConvo {
|
|
10 |
CString::new(self.login.clone()).map_err(|_| ())
|
|
11 |
}
|
|
12 |
fn prompt_blind(&mut self, _msg: &CStr) -> Result<CString, ()> {
|
|
13 |
- match rpassword::read_password_from_tty(Some(&format!(
|
|
14 |
+ match rpassword::prompt_password(format!(
|
|
15 |
"[{}] password for {}: ",
|
|
16 |
self.service, self.login
|
|
17 |
- ))) {
|
|
18 |
+ )) {
|
|
19 |
Ok(password) => self.passwd = Some(password),
|
|
20 |
Err(_) => {
|
|
21 |
println!("Cannot read from terminal");
|
|
22 |
--- a/Cargo.toml
|
|
23 |
+++ b/Cargo.toml
|
|
24 |
@@ -44,7 +44,7 @@
|
|
25 |
version = "1.3"
|
|
26 |
|
|
27 |
[dependencies.rpassword]
|
|
28 |
-version = "5.0"
|
|
29 |
+version = "6"
|
|
30 |
|
|
31 |
[dependencies.syslog]
|
|
32 |
version = ">= 6.0"
|
0 | 0 |
nix-0.25.patch
|
|
1 |
rpassword-6.patch
|
|
2 |
|