Merge branch 'pending-pleaser' into 'master'
Bumping pleaser 0.5.4
See merge request rust-team/debcargo-conf!474
ed neville
1 year, 2 months ago
|
0 |
rust-pleaser (0.5.4-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
|
|
1 |
|
|
2 |
* Package pleaser 0.5.4 from crates.io using debcargo 2.6.0
|
|
3 |
|
|
4 |
-- Ed Neville <ed-debian@s5h.net> Wed, 08 Feb 2023 19:43:42 +0000
|
|
5 |
|
| 0 | 6 |
rust-pleaser (0.5.3-2) unstable; urgency=medium
|
| 1 | 7 |
|
| 2 | 8 |
* Team upload.
|
src/pleaser/debian/patches/nix-0.25.patch
less
more
| 0 | |
Index: pleaser/src/lib.rs
|
| 1 | |
===================================================================
|
| 2 | |
--- pleaser.orig/src/lib.rs
|
| 3 | |
+++ pleaser/src/lib.rs
|
| 4 | |
@@ -454,12 +454,10 @@ pub fn common_opt_arguments(
|
| 5 | |
std::process::exit(0);
|
| 6 | |
}
|
| 7 | |
|
| 8 | |
- let mut buf = [0u8; 64];
|
| 9 | |
- ro.hostname = gethostname(&mut buf)
|
| 10 | |
+ ro.hostname = gethostname()
|
| 11 | |
.expect("Failed getting hostname")
|
| 12 | |
- .to_str()
|
| 13 | |
- .expect("Hostname wasn't valid UTF-8")
|
| 14 | |
- .to_string();
|
| 15 | |
+ .into_string()
|
| 16 | |
+ .expect("Hostname wasn't valid UTF-8");
|
| 17 | |
}
|
| 18 | |
|
| 19 | |
/// read an ini file and traverse includes
|
| 20 | |
Index: pleaser/Cargo.toml
|
| 21 | |
===================================================================
|
| 22 | |
--- pleaser.orig/Cargo.toml
|
| 23 | |
+++ pleaser/Cargo.toml
|
| 24 | |
@@ -32,7 +32,7 @@ version = "0.2"
|
| 25 | |
version = "0.2"
|
| 26 | |
|
| 27 | |
[dependencies.nix]
|
| 28 | |
-version = ">= 0.23"
|
| 29 | |
+version = ">= 0.25"
|
| 30 | |
|
| 31 | |
[dependencies.pam]
|
| 32 | |
version = "0.7"
|
src/pleaser/debian/patches/rpassword-6.patch
less
more
| 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"
|
src/pleaser/debian/patches/series
less
more
| 0 | |
nix-0.25.patch
|
| 1 | |
rpassword-6.patch
|
| 2 | |
|
| 1 | 1 |
|
| 2 | 2 |
%:
|
| 3 | 3 |
dh $@ --buildsystem cargo
|
|
4 |
|
|
5 |
override_dh_install:
|
|
6 |
mkdir -p debian/pleaser/usr/share/zsh/vendor-completions debian/pleaser/etc/bash_completion.d
|
|
7 |
cp -f completions/zsh/_please debian/pleaser/usr/share/zsh/vendor-completions
|
|
8 |
cp -f completions/bash/please debian/pleaser/etc/bash_completion.d
|
|
9 |
dh_install
|
| 4 | 10 |
|
| 5 | 11 |
override_dh_installman:
|
| 6 | 12 |
cd man && ln -s please.1 pleaseedit.1
|