Merge remote-tracking branch 'origin/master'
Reinhard Tartler
1 year, 2 months ago
0 | rust-atoi (2.0.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package atoi 2.0.0 from crates.io using debcargo 2.6.0 | |
4 | * Collapse features | |
5 | ||
6 | -- Blair Noctis <n@sail.ng> Fri, 10 Feb 2023 22:10:13 +0000 | |
7 | ||
0 | 8 | rust-atoi (0.2.3-1) unstable; urgency=medium |
1 | 9 | |
2 | 10 | * Package atoi 0.2.3 from crates.io using debcargo 2.2.6 |
0 | 0 | Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ |
1 | 1 | Upstream-Name: atoi |
2 | Upstream-Contact: Markus Klein <markus-klein@live.de> | |
2 | Upstream-Contact: Markus Klein | |
3 | 3 | Source: https://github.com/pacman82/atoi-rs |
4 | 4 | |
5 | 5 | Files: * |
6 | Copyright: FIXME (overlay) UNKNOWN-YEARS Markus Klein <markus-klein@live.de> | |
6 | Copyright: FIXME (overlay) UNKNOWN-YEARS Markus Klein | |
7 | 7 | License: MIT |
8 | 8 | Comment: |
9 | 9 | FIXME (overlay): Since upstream copyright years are not available in |
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: 2017 |
16 | 16 | License: UNKNOWN-LICENSE; FIXME (overlay) |
17 | 17 | Comment: |
20 | 20 | |
21 | 21 | Files: debian/* |
22 | 22 | Copyright: |
23 | 2018 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
24 | 2018 FIXME (overlay) Your Name <Your Email> | |
23 | 2018-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
24 | 2018-2023 kpcyrd <git@rxv.cc> | |
25 | 25 | License: MIT |
26 | 26 | |
27 | 27 | License: MIT |
0 | rust-cargo-metadata (0.15.3-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package cargo_metadata 0.15.3 from crates.io using debcargo 2.6.0 | |
4 | * Relax deps on camino, derive_builder | |
5 | ||
6 | -- Blair Noctis <n@sail.ng> Thu, 02 Feb 2023 19:12:22 +0000 | |
7 | ||
0 | 8 | rust-cargo-metadata (0.14.2-1) unstable; urgency=medium |
1 | 9 | |
2 | 10 | * Team upload. |
13 | 13 | |
14 | 14 | Files: debian/* |
15 | 15 | Copyright: |
16 | 2018-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
17 | 2018-2022 Matt Kraai <kraai@debian.org> | |
18 | 2018-2022 Robin Krahl <robin.krahl@ireas.org> | |
16 | 2018-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
17 | 2018-2023 Matt Kraai <kraai@debian.org> | |
18 | 2018-2023 Robin Krahl <robin.krahl@ireas.org> | |
19 | 19 | License: MIT |
20 | 20 | |
21 | 21 | License: MIT |
0 | --- a/Cargo.toml | |
1 | +++ b/Cargo.toml | |
2 | @@ -25,14 +25,14 @@ | |
3 | other_field = "foo" | |
4 | ||
5 | [dependencies.camino] | |
6 | -version = "1.0.7" | |
7 | +version = "< 1.2" | |
8 | features = ["serde1"] | |
9 | ||
10 | [dependencies.cargo-platform] | |
11 | version = "0.1.2" | |
12 | ||
13 | [dependencies.derive_builder] | |
14 | -version = "0.11.1" | |
15 | +version = "< 0.13" | |
16 | optional = true | |
17 | ||
18 | [dependencies.semver] |
0 | relax-deps.patch |
0 | rust-configparser (3.0.2-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
0 | rust-configparser (3.0.2-2) unstable; urgency=medium | |
1 | ||
2 | * Package configparser 3.0.2 from crates.io using debcargo 2.6.0 | |
3 | * Use CARGO_TARGET_TMPDIR instead of /tmp as it is safer. | |
4 | * Avoiding changing current directory in tests, it leads to race conditions. | |
5 | ||
6 | -- Peter Michael Green <plugwash@debian.org> Sat, 11 Feb 2023 08:18:13 +0000 | |
7 | ||
8 | rust-configparser (3.0.2-1) unstable; urgency=medium | |
1 | 9 | |
2 | 10 | * Team upload. |
3 | 11 | * Package configparser 3.0.2 from crates.io using debcargo 2.6.0 |
4 | 12 | * Patch to write test files in /tmp to avoid permission error (Closes: #1030971) |
5 | 13 | * Collapse features |
6 | 14 | |
7 | -- Blair Noctis <n@sail.ng> Fri, 10 Feb 2023 13:53:52 +0000 | |
15 | -- Blair Noctis <n@sail.ng> Sat, 11 Feb 2023 07:14:28 +0000 | |
8 | 16 | |
9 | 17 | rust-configparser (2.0.0-2) unstable; urgency=medium |
10 | 18 |
8 | 8 | |
9 | 9 | Files: debian/* |
10 | 10 | Copyright: |
11 | 2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
11 | 2021-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
12 | 12 | 2021 Daniel Kahn Gillmor <dkg@fifthhorseman.net> |
13 | 13 | License: MIT or LGPL-3.0-or-later |
14 | 14 |
0 | Description: Write test file in CARGO_TARGET_TMPDIR | |
1 | Last-Update: 2023-02-11 | |
2 | --- | |
3 | This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ | |
4 | Index: configparser/tests/test.rs | |
5 | =================================================================== | |
6 | --- configparser.orig/tests/test.rs | |
7 | +++ configparser/tests/test.rs | |
8 | @@ -4,6 +4,7 @@ use std::error::Error; | |
9 | #[test] | |
10 | #[allow(clippy::approx_constant)] | |
11 | fn non_cs() -> Result<(), Box<dyn Error>> { | |
12 | + use std::path::PathBuf; | |
13 | let mut config = Ini::new(); | |
14 | let map = config.load("tests/test.ini")?; | |
15 | config.set_comment_symbols(&[';', '#', '!']); | |
16 | @@ -39,8 +40,9 @@ fn non_cs() -> Result<(), Box<dyn Error> | |
17 | "defaultvalues" | |
18 | ); | |
19 | config.setstr("DEFAULT", "defaultvalues", None); | |
20 | - config.write("output.ini")?; | |
21 | - let map2 = config.clone().load("output.ini")?; | |
22 | + let path = PathBuf::from(env!("CARGO_TARGET_TMPDIR")); | |
23 | + config.write(path.join("output.ini"))?; | |
24 | + let map2 = config.clone().load(path.join("output.ini"))?; | |
25 | assert_eq!(map2, *config.get_map_ref()); | |
26 | let map3 = config.clone().read(config.writes())?; | |
27 | assert_eq!(map2, map3); | |
28 | @@ -106,6 +108,7 @@ fn non_cs() -> Result<(), Box<dyn Error> | |
29 | #[test] | |
30 | #[allow(clippy::approx_constant)] | |
31 | fn cs() -> Result<(), Box<dyn Error>> { | |
32 | + use std::path::PathBuf; | |
33 | let mut config = Ini::new_cs(); | |
34 | let map = config.load("tests/test.ini")?; | |
35 | config.set_comment_symbols(&[';', '#', '!']); | |
36 | @@ -141,8 +144,9 @@ fn cs() -> Result<(), Box<dyn Error>> { | |
37 | "defaultvalues" | |
38 | ); | |
39 | config.setstr("default", "defaultvalues", None); | |
40 | - config.write("output2.ini")?; | |
41 | - let map2 = config.clone().load("output2.ini")?; | |
42 | + let path = PathBuf::from(env!("CARGO_TARGET_TMPDIR")); | |
43 | + config.write(path.join("output2.ini"))?; | |
44 | + let map2 = config.clone().load(path.join("output2.ini"))?; | |
45 | assert_eq!(map2, *config.get_map_ref()); | |
46 | let map3 = config.clone().read(config.writes())?; | |
47 | assert_eq!(map2, map3); | |
48 | @@ -238,6 +242,7 @@ Float=3.1415 | |
49 | #[test] | |
50 | #[cfg(feature = "async-std")] | |
51 | fn async_load_write() -> Result<(), Box<dyn Error>> { | |
52 | + use std::path::PathBuf; | |
53 | const OUT_FILE_CONTENTS: &str = "defaultvalues=defaultvalues | |
54 | [topsecret] | |
55 | KFC = the secret herb is orega- | |
56 | @@ -258,24 +263,25 @@ fn async_load_write() -> Result<(), Box< | |
57 | ||
58 | let mut config = Ini::new(); | |
59 | config.read(OUT_FILE_CONTENTS.to_owned())?; | |
60 | - config.write("output_sync.ini")?; | |
61 | + let path = PathBuf::from(env!("CARGO_TARGET_TMPDIR")); | |
62 | + config.write(path.join("output_sync.ini"))?; | |
63 | ||
64 | async_std::task::block_on::<_, Result<_, String>>(async { | |
65 | let mut config_async = Ini::new(); | |
66 | config_async.read(OUT_FILE_CONTENTS.to_owned())?; | |
67 | config_async | |
68 | - .write_async("output_async.ini") | |
69 | + .write_async(path.join("output_async.ini")) | |
70 | .await | |
71 | .map_err(|e| e.to_string())?; | |
72 | Ok(()) | |
73 | })?; | |
74 | ||
75 | let mut sync_content = Ini::new(); | |
76 | - sync_content.load("output_sync.ini")?; | |
77 | + sync_content.load(path.join("output_sync.ini"))?; | |
78 | ||
79 | let async_content = async_std::task::block_on::<_, Result<_, String>>(async { | |
80 | let mut async_content = Ini::new(); | |
81 | - async_content.load_async("output_async.ini").await?; | |
82 | + async_content.load_async(path.join("output_async.ini")).await?; | |
83 | Ok(async_content) | |
84 | })?; | |
85 |
0 | Description: Write test file in /tmp | |
1 | Last-Update: 2023-02-10 | |
2 | --- | |
3 | This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ | |
4 | --- a/tests/test.rs | |
5 | +++ b/tests/test.rs | |
6 | @@ -39,6 +39,7 @@ | |
7 | "defaultvalues" | |
8 | ); | |
9 | config.setstr("DEFAULT", "defaultvalues", None); | |
10 | + std::env::set_current_dir("/tmp")?; | |
11 | config.write("output.ini")?; | |
12 | let map2 = config.clone().load("output.ini")?; | |
13 | assert_eq!(map2, *config.get_map_ref()); | |
14 | @@ -141,6 +142,7 @@ | |
15 | "defaultvalues" | |
16 | ); | |
17 | config.setstr("default", "defaultvalues", None); | |
18 | + std::env::set_current_dir("/tmp")?; | |
19 | config.write("output2.ini")?; | |
20 | let map2 = config.clone().load("output2.ini")?; | |
21 | assert_eq!(map2, *config.get_map_ref()); | |
22 | @@ -258,6 +260,7 @@ | |
23 | ||
24 | let mut config = Ini::new(); | |
25 | config.read(OUT_FILE_CONTENTS.to_owned())?; | |
26 | + std::env::set_current_dir("/tmp")?; | |
27 | config.write("output_sync.ini")?; | |
28 | ||
29 | async_std::task::block_on::<_, Result<_, String>>(async { |
0 | rust-fs-err (2.9.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Package fs-err 2.9.0 from crates.io using debcargo 2.6.0 | |
3 | * Patch to disable feature tokio, code uses unstable feature | |
4 | ||
5 | -- Blair Noctis <n@sail.ng> Fri, 10 Feb 2023 18:37:44 +0000 |
0 | Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ | |
1 | Upstream-Name: fs-err | |
2 | Upstream-Contact: Andrew Hickman <andrew.hickman1@sky.com> | |
3 | Source: https://github.com/andrewhickman/fs-err | |
4 | ||
5 | Files: * | |
6 | Copyright: 2020-2022 Andrew Hickman <andrew.hickman1@sky.com> | |
7 | License: MIT or Apache-2.0 | |
8 | ||
9 | Files: debian/* | |
10 | Copyright: | |
11 | 2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
12 | 2023 Blair Noctis <n@sail.ng> | |
13 | License: MIT or Apache-2.0 | |
14 | ||
15 | License: Apache-2.0 | |
16 | Debian systems provide the Apache 2.0 license in | |
17 | /usr/share/common-licenses/Apache-2.0 | |
18 | ||
19 | License: MIT | |
20 | Permission is hereby granted, free of charge, to any person obtaining a copy | |
21 | of this software and associated documentation files (the "Software"), to deal | |
22 | in the Software without restriction, including without limitation the rights | |
23 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |
24 | copies of the Software, and to permit persons to whom the Software is | |
25 | furnished to do so, subject to the following conditions: | |
26 | . | |
27 | The above copyright notice and this permission notice shall be included in all | |
28 | copies or substantial portions of the Software. | |
29 | . | |
30 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |
31 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |
32 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | |
33 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | |
34 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | |
35 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | |
36 | SOFTWARE. |
0 | Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ | |
1 | Upstream-Name: fs-err | |
2 | Upstream-Contact: Andrew Hickman <andrew.hickman1@sky.com> | |
3 | Source: https://github.com/andrewhickman/fs-err | |
4 | ||
5 | Files: * | |
6 | Copyright: FIXME (overlay) UNKNOWN-YEARS Andrew Hickman <andrew.hickman1@sky.com> | |
7 | License: MIT or Apache-2.0 | |
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: debian/* | |
15 | Copyright: | |
16 | 2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
17 | 2023 Blair Noctis <n@sail.ng> | |
18 | License: MIT or Apache-2.0 | |
19 | ||
20 | License: Apache-2.0 | |
21 | Debian systems provide the Apache 2.0 license in | |
22 | /usr/share/common-licenses/Apache-2.0 | |
23 | ||
24 | License: MIT | |
25 | Permission is hereby granted, free of charge, to any person obtaining a copy | |
26 | of this software and associated documentation files (the "Software"), to deal | |
27 | in the Software without restriction, including without limitation the rights | |
28 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |
29 | copies of the Software, and to permit persons to whom the Software is | |
30 | furnished to do so, subject to the following conditions: | |
31 | . | |
32 | The above copyright notice and this permission notice shall be included in all | |
33 | copies or substantial portions of the Software. | |
34 | . | |
35 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |
36 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |
37 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | |
38 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | |
39 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | |
40 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | |
41 | SOFTWARE. |
0 | Description: tokio related code uses unstable feature `std::task::ready!` | |
1 | Last-Update: 2023-02-10 | |
2 | --- | |
3 | This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ | |
4 | --- a/Cargo.toml | |
5 | +++ b/Cargo.toml | |
6 | @@ -46,12 +46,6 @@ | |
7 | "docsrs", | |
8 | ] | |
9 | ||
10 | -[dependencies.tokio] | |
11 | -version = "1.21" | |
12 | -features = ["fs"] | |
13 | -optional = true | |
14 | -default_features = false | |
15 | - | |
16 | [dev-dependencies.serde_json] | |
17 | version = "1.0.64" | |
18 |
0 | disable-tokio-unstable.patch |
0 | rust-greetd-ipc (0.9.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
0 | rust-greetd-ipc (0.9.0-1) unstable; urgency=medium | |
1 | 1 | |
2 | 2 | * Package greetd_ipc 0.9.0 from crates.io using debcargo 2.6.0 |
3 | 3 | |
4 | -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Thu, 09 Feb 2023 00:41:54 +0900 | |
4 | -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Thu, 09 Feb 2023 00:47:27 +0900 | |
5 | 5 | |
6 | 6 | rust-greetd-ipc (0.8.0-1) unstable; urgency=medium |
7 | 7 |
0 | rust-indoc (2.0.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package indoc 2.0.0 from crates.io using debcargo 2.6.0 | |
4 | ||
5 | -- Blair Noctis <n@sail.ng> Fri, 10 Feb 2023 14:20:57 +0000 | |
6 | ||
0 | 7 | rust-indoc (1.0.4-1) unstable; urgency=medium |
1 | 8 | |
2 | 9 | * Package indoc 1.0.4 from crates.io using debcargo 2.5.0 |
13 | 13 | |
14 | 14 | Files: debian/* |
15 | 15 | Copyright: |
16 | 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
17 | 2022 Jelmer Vernooij <jelmer@debian.org> | |
16 | 2022-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
17 | 2022-2023 Jelmer Vernooij <jelmer@debian.org> | |
18 | 18 | License: MIT or Apache-2.0 |
19 | 19 | |
20 | 20 | License: Apache-2.0 |
0 | rust-io-lifetimes (1.0.5-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package io-lifetimes 1.0.5 from crates.io using debcargo 2.6.0 | |
4 | * Drop no-async-std.diff, now in Debian | |
5 | * Mark tests of features mio, socket2 broken | |
6 | ||
7 | -- Blair Noctis <n@sail.ng> Fri, 10 Feb 2023 18:30:32 +0000 | |
8 | ||
0 | 9 | rust-io-lifetimes (0.7.2-3) unstable; urgency=medium |
1 | 10 | |
2 | 11 | * Drop fs-err support since it's not in Debian. |
13 | 13 | |
14 | 14 | Files: debian/* |
15 | 15 | Copyright: |
16 | 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
17 | 2022 John Goerzen <jgoerzen@complete.org> | |
16 | 2022-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
17 | 2022-2023 John Goerzen <jgoerzen@complete.org> | |
18 | 18 | License: Apache-2.0 WITH LLVM-exception or Apache-2.0 or MIT |
19 | 19 | |
20 | 20 | License: Apache-2.0 |
1 | 1 | uploaders = ["John Goerzen <jgoerzen@complete.org>"] |
2 | 2 | collapse_features = true |
3 | 3 | |
4 | [packages."lib+mio"] | |
5 | # error says "the trait `From<mio::net::TcpStream>` is not implemented for `OwnedFd`" | |
6 | # but it is implemented, in `src/impls_mio.rs` | |
7 | test_is_broken = true | |
8 | ||
9 | [packages."lib+socket2"] | |
10 | # same | |
11 | test_is_broken = true |
4 | 4 | This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ |
5 | 5 | --- a/Cargo.toml |
6 | 6 | +++ b/Cargo.toml |
7 | @@ -27,10 +27,6 @@ | |
7 | @@ -35,10 +35,6 @@ | |
8 | 8 | license = "Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT" |
9 | 9 | repository = "https://github.com/sunfishcode/io-lifetimes" |
10 | 10 | |
12 | 12 | -version = "2.6.0" |
13 | 13 | -optional = true |
14 | 14 | - |
15 | [dependencies.mio] | |
16 | version = "0.8.0" | |
17 | features = [ | |
15 | [features] | |
16 | close = [ | |
17 | "libc", |
0 | Description: Drop async-std dep since it's not in Debian | |
1 | Author: John Goerzen <jgoerzen@complete.org> | |
2 | Last-Update: 2022-10-27 | |
3 | --- | |
4 | This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ | |
5 | --- a/Cargo.toml | |
6 | +++ b/Cargo.toml | |
7 | @@ -27,11 +27,6 @@ | |
8 | license = "Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT" | |
9 | repository = "https://github.com/sunfishcode/io-lifetimes" | |
10 | ||
11 | -[dependencies.async-std] | |
12 | -version = "1.9.0" | |
13 | -features = ["unstable"] | |
14 | -optional = true | |
15 | - | |
16 | [dependencies.fs-err] | |
17 | version = "2.6.0" | |
18 | optional = true |
2 | 2 | Last-Update: 2022-10-03 |
3 | 3 | --- |
4 | 4 | This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ |
5 | Index: io-lifetimes/Cargo.toml | |
6 | =================================================================== | |
7 | --- io-lifetimes.orig/Cargo.toml | |
8 | +++ io-lifetimes/Cargo.toml | |
9 | @@ -61,7 +61,6 @@ optional = true | |
5 | --- a/Cargo.toml | |
6 | +++ b/Cargo.toml | |
7 | @@ -42,7 +42,6 @@ | |
10 | 8 | [features] |
11 | 9 | close = [ |
12 | 10 | "libc", |
14 | 12 | ] |
15 | 13 | default = ["close"] |
16 | 14 | |
17 | @@ -73,14 +72,3 @@ optional = true | |
15 | @@ -81,14 +80,3 @@ | |
18 | 16 | version = "0.2.96" |
19 | 17 | optional = true |
20 | 18 | |
21 | 19 | -[target."cfg(windows)".dependencies.windows-sys] |
22 | -version = "0.36.0" | |
20 | -version = "0.45.0" | |
23 | 21 | -features = [ |
24 | 22 | - "Win32_Foundation", |
25 | 23 | - "Win32_Storage_FileSystem", |
0 | rust-lewton (0.10.2-1) unstable; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package lewton 0.10.2 from crates.io using debcargo 2.6.0 | |
4 | * Patch to remove dep on alto, archived upstream, only used in example | |
5 | * Patch to remove feature async_ogg thus dep on tokio-io, futures because | |
6 | tokio-io was deprecated upstream | |
7 | * Relax deps on ogg | |
8 | * Collapse features | |
9 | ||
10 | -- Blair Noctis <n@sail.ng> Sat, 11 Feb 2023 08:32:58 +0000 | |
11 | ||
0 | 12 | rust-lewton (0.9.4-3) unstable; urgency=medium |
1 | 13 | |
2 | 14 | * Team upload. |
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: |
16 | 16 | 2016 est31 <MTest31@outlook.com> and contributors |
17 | 17 | 2016 est31 <MTest31@outlook.com> and contributors |
20 | 20 | FIXME (overlay): These notices are extracted from files. Please review them |
21 | 21 | before uploading to the archive. |
22 | 22 | |
23 | Files: ./lewton.h | |
24 | Copyright: 2019 est31 <MTest31@outlook.com> | |
25 | License: UNKNOWN-LICENSE; FIXME (overlay) | |
26 | Comment: | |
27 | FIXME (overlay): These notices are extracted from files. Please review them | |
28 | before uploading to the archive. | |
29 | ||
30 | Files: ./src/audio.rs | |
23 | Files: src/audio.rs | |
31 | 24 | Copyright: 2016 est31 <MTest31@outlook.com> |
32 | 25 | License: UNKNOWN-LICENSE; FIXME (overlay) |
33 | 26 | Comment: |
34 | 27 | FIXME (overlay): These notices are extracted from files. Please review them |
35 | 28 | before uploading to the archive. |
36 | 29 | |
37 | Files: ./src/bitpacking.rs | |
30 | Files: src/bitpacking.rs | |
38 | 31 | Copyright: 2016 est31 <MTest31@outlook.com> |
39 | 32 | License: UNKNOWN-LICENSE; FIXME (overlay) |
40 | 33 | Comment: |
41 | 34 | FIXME (overlay): These notices are extracted from files. Please review them |
42 | 35 | before uploading to the archive. |
43 | 36 | |
44 | Files: ./src/header.rs | |
37 | Files: src/header.rs | |
45 | 38 | Copyright: 2016 est31 <MTest31@outlook.com> |
46 | 39 | License: UNKNOWN-LICENSE; FIXME (overlay) |
47 | 40 | Comment: |
48 | 41 | FIXME (overlay): These notices are extracted from files. Please review them |
49 | 42 | before uploading to the archive. |
50 | 43 | |
51 | Files: ./src/header_cached.rs | |
44 | Files: src/header_cached.rs | |
52 | 45 | Copyright: 2016 est31 <MTest31@outlook.com> |
53 | 46 | License: UNKNOWN-LICENSE; FIXME (overlay) |
54 | 47 | Comment: |
55 | 48 | FIXME (overlay): These notices are extracted from files. Please review them |
56 | 49 | before uploading to the archive. |
57 | 50 | |
58 | Files: ./src/huffman_tree.rs | |
51 | Files: src/huffman_tree.rs | |
59 | 52 | Copyright: 2016 est31 <MTest31@outlook.com> |
60 | 53 | License: UNKNOWN-LICENSE; FIXME (overlay) |
61 | 54 | Comment: |
62 | 55 | FIXME (overlay): These notices are extracted from files. Please review them |
63 | 56 | before uploading to the archive. |
64 | 57 | |
65 | Files: ./src/imdct.rs | |
58 | Files: src/imdct.rs | |
66 | 59 | Copyright: 2016 est31 <MTest31@outlook.com> |
67 | 60 | License: UNKNOWN-LICENSE; FIXME (overlay) |
68 | 61 | Comment: |
69 | 62 | FIXME (overlay): These notices are extracted from files. Please review them |
70 | 63 | before uploading to the archive. |
71 | 64 | |
72 | Files: ./src/imdct_test.rs | |
65 | Files: src/imdct_test.rs | |
73 | 66 | Copyright: 2016 est31 <MTest31@outlook.com> |
74 | 67 | License: UNKNOWN-LICENSE; FIXME (overlay) |
75 | 68 | Comment: |
76 | 69 | FIXME (overlay): These notices are extracted from files. Please review them |
77 | 70 | before uploading to the archive. |
78 | 71 | |
79 | Files: ./src/inside_ogg.rs | |
72 | Files: src/inside_ogg.rs | |
80 | 73 | Copyright: 2016 est31 <MTest31@outlook.com> |
81 | 74 | License: UNKNOWN-LICENSE; FIXME (overlay) |
82 | 75 | Comment: |
83 | 76 | FIXME (overlay): These notices are extracted from files. Please review them |
84 | 77 | before uploading to the archive. |
85 | 78 | |
86 | Files: ./src/lib.rs | |
79 | Files: src/lib.rs | |
87 | 80 | Copyright: 2016 est31 <MTest31@outlook.com> |
88 | 81 | License: UNKNOWN-LICENSE; FIXME (overlay) |
89 | 82 | Comment: |
90 | 83 | FIXME (overlay): These notices are extracted from files. Please review them |
91 | 84 | before uploading to the archive. |
92 | 85 | |
93 | Files: ./src/samples.rs | |
86 | Files: src/samples.rs | |
94 | 87 | Copyright: 2019 est31 <MTest31@outlook.com> |
95 | 88 | License: UNKNOWN-LICENSE; FIXME (overlay) |
96 | 89 | Comment: |
99 | 92 | |
100 | 93 | Files: debian/* |
101 | 94 | Copyright: |
102 | 2019-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
103 | 2019-2020 Ximin Luo <infinity0@debian.org> | |
95 | 2019-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
96 | 2019-2023 Ximin Luo <infinity0@debian.org> | |
104 | 97 | License: MIT or Apache-2.0 |
105 | 98 | |
106 | 99 | License: Apache-2.0 |
0 | Index: lewton/Cargo.toml | |
1 | =================================================================== | |
2 | --- lewton.orig/Cargo.toml | |
3 | +++ lewton/Cargo.toml | |
4 | @@ -31,7 +31,7 @@ crate-type = ["lib", "cdylib"] | |
5 | version = "1.0" | |
6 | ||
7 | [dependencies.smallvec] | |
8 | -version = "0.6" | |
9 | +version = "1" | |
10 | ||
11 | [dependencies.ogg] | |
12 | version = "0.7" |
0 | --- a/Cargo.toml | |
1 | +++ b/Cargo.toml | |
2 | @@ -43,7 +43,7 @@ | |
3 | optional = true | |
4 | ||
5 | [dependencies.ogg] | |
6 | -version = "0.8" | |
7 | +version = "0.9" | |
8 | optional = true | |
9 | ||
10 | [dependencies.tinyvec] | |
11 | @@ -57,7 +57,7 @@ | |
12 | version = "3" | |
13 | ||
14 | [dev-dependencies.ogg] | |
15 | -version = "0.8" | |
16 | +version = "0.9" | |
17 | ||
18 | [features] | |
19 | async_ogg = ["ogg", "ogg/async", "futures", "tokio-io"] |
0 | Description: Remove dep on alto, which is archived upstream | |
1 | (and only used in an example anyway) | |
2 | Last-Update: 2023-02-10 | |
3 | --- a/Cargo.toml | |
4 | +++ b/Cargo.toml | |
5 | @@ -32,9 +32,6 @@ | |
6 | name = "perf" | |
7 | required-features = ["ogg"] | |
8 | ||
9 | -[[example]] | |
10 | -name = "player" | |
11 | -required-features = ["ogg"] | |
12 | [dependencies.byteorder] | |
13 | version = "1.0" | |
14 | ||
15 | @@ -53,8 +50,6 @@ | |
16 | [dependencies.tokio-io] | |
17 | version = "0.1" | |
18 | optional = true | |
19 | -[dev-dependencies.alto] | |
20 | -version = "3" | |
21 | ||
22 | [dev-dependencies.ogg] | |
23 | version = "0.9" |
0 | Description: Remove feature async-io, depends on deprecated tokio-io | |
1 | This also removes dep on futures | |
2 | --- a/Cargo.toml | |
3 | +++ b/Cargo.toml | |
4 | @@ -35,10 +35,6 @@ | |
5 | [dependencies.byteorder] | |
6 | version = "1.0" | |
7 | ||
8 | -[dependencies.futures] | |
9 | -version = "0.1" | |
10 | -optional = true | |
11 | - | |
12 | [dependencies.ogg] | |
13 | version = "0.9" | |
14 | optional = true | |
15 | @@ -47,13 +43,9 @@ | |
16 | version = "1.0" | |
17 | features = ["alloc"] | |
18 | ||
19 | -[dependencies.tokio-io] | |
20 | -version = "0.1" | |
21 | -optional = true | |
22 | - | |
23 | [dev-dependencies.ogg] | |
24 | version = "0.9" | |
25 | ||
26 | [features] | |
27 | -async_ogg = ["ogg", "ogg/async", "futures", "tokio-io"] | |
28 | +#async_ogg = ["ogg", "ogg/async", "futures", "tokio-io"] | |
29 | default = ["ogg"] |
0 | rust-libsodium-sys (0.2.7-1) unstable; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package libsodium-sys 0.2.7 from crates.io using debcargo 2.6.0 | |
4 | * Patch to always use Debian packaged libsodium (Closes: #1031038) | |
5 | * Add exclusion for `libsodium/` | |
6 | ||
7 | -- Blair Noctis <n@sail.ng> Sat, 11 Feb 2023 06:56:36 +0000 | |
8 | ||
0 | 9 | rust-libsodium-sys (0.2.5-2) unstable; urgency=medium |
1 | 10 | |
2 | 11 | * Team upload. |
4 | 4 | |
5 | 5 | Files: * |
6 | 6 | Copyright: |
7 | 2015-2019 dnaq | |
8 | 2015-2019 The sodiumoxide Developers | |
7 | 2015-2022 dnaq | |
8 | 2015-2022 The sodiumoxide Developers | |
9 | 9 | License: MIT or Apache-2.0 |
10 | 10 | |
11 | 11 | Files: debian/* |
12 | 12 | Copyright: |
13 | 2019 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
13 | 2019-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
14 | 14 | 2019 kpcyrd <git@rxv.cc> |
15 | 15 | License: MIT or Apache-2.0 |
16 | 16 |
11 | 11 | be correct information so you should review and fix this before uploading to |
12 | 12 | the archive. |
13 | 13 | |
14 | Files: ./LICENSE-MIT | |
14 | Files: LICENSE-MIT | |
15 | 15 | Copyright: 2015 The sodiumoxide Developers |
16 | 16 | License: UNKNOWN-LICENSE; FIXME (overlay) |
17 | 17 | Comment: |
20 | 20 | |
21 | 21 | Files: debian/* |
22 | 22 | Copyright: |
23 | 2019-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
24 | 2019-2020 kpcyrd <git@rxv.cc> | |
23 | 2019-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
24 | 2019-2023 kpcyrd <git@rxv.cc> | |
25 | 25 | License: MIT or Apache-2.0 |
26 | 26 | |
27 | 27 | License: Apache-2.0 |
0 | 0 | overlay = "." |
1 | 1 | uploaders = ["kpcyrd <git@rxv.cc>"] |
2 | excludes = ["mingw/*", "msvc/*", "libsodium-*.tar.gz", "src/gen.sh"] | |
2 | excludes = ["libsodium/*", "mingw/*", "msvc/*", "libsodium-*.tar.gz", "src/gen.sh"] | |
3 | 3 | |
4 | 4 | [packages.lib] |
5 | 5 | depends = ["libsodium-dev"] |
0 | use-packaged-libsodium.patch |
0 | --- a/build.rs | |
1 | +++ b/build.rs | |
2 | @@ -28,11 +28,11 @@ | |
3 | } | |
4 | ||
5 | let lib_dir_isset = env::var("SODIUM_LIB_DIR").is_ok(); | |
6 | - let use_pkg_isset = if cfg!(feature = "use-pkg-config") { | |
7 | + let use_pkg_isset = /*if cfg!(feature = "use-pkg-config") {*/ | |
8 | true | |
9 | - } else { | |
10 | + /*} else { | |
11 | env::var("SODIUM_USE_PKG_CONFIG").is_ok() | |
12 | - }; | |
13 | + }*/; | |
14 | let shared_isset = env::var("SODIUM_SHARED").is_ok(); | |
15 | ||
16 | if lib_dir_isset && use_pkg_isset { | |
17 | @@ -47,7 +47,7 @@ | |
18 | } | |
19 | ||
20 | find_libsodium_pkg(); | |
21 | - } else { | |
22 | + } /*else { | |
23 | if shared_isset { | |
24 | println!( | |
25 | "cargo:warning=SODIUM_SHARED has no effect for building libsodium from source" | |
26 | @@ -55,7 +55,7 @@ | |
27 | } | |
28 | ||
29 | build_libsodium(); | |
30 | - } | |
31 | + }*/ | |
32 | } | |
33 | ||
34 | /* Must be called when SODIUM_LIB_DIR is set to any value | |
35 | @@ -134,7 +134,7 @@ | |
36 | } | |
37 | } | |
38 | ||
39 | -#[cfg(windows)] | |
40 | +/*#[cfg(windows)] | |
41 | fn make_libsodium(_: &str, _: &Path, _: &Path) -> PathBuf { | |
42 | // We don't build anything on windows, we simply linked to precompiled | |
43 | // libs. | |
44 | @@ -291,14 +291,14 @@ | |
45 | } | |
46 | ||
47 | install_dir.join("lib") | |
48 | -} | |
49 | +}*/ | |
50 | ||
51 | #[cfg(any(windows, target_env = "msvc"))] | |
52 | fn get_crate_dir() -> PathBuf { | |
53 | env::var("CARGO_MANIFEST_DIR").unwrap().into() | |
54 | } | |
55 | ||
56 | -#[cfg(target_env = "msvc")] | |
57 | +/*#[cfg(target_env = "msvc")] | |
58 | fn is_release_profile() -> bool { | |
59 | env::var("PROFILE").unwrap() == "release" | |
60 | } | |
61 | @@ -329,9 +329,9 @@ | |
62 | #[cfg(all(windows, not(target_env = "msvc"), target_pointer_width = "64"))] | |
63 | fn get_lib_dir() -> PathBuf { | |
64 | get_crate_dir().join("mingw/win64/") | |
65 | -} | |
66 | +}*/ | |
67 | ||
68 | -fn build_libsodium() { | |
69 | +/*fn build_libsodium() { | |
70 | use std::{ffi::OsStr, fs}; | |
71 | ||
72 | // Determine build target triple | |
73 | @@ -396,4 +396,4 @@ | |
74 | ||
75 | println!("cargo:include={}", include_dir.to_str().unwrap()); | |
76 | println!("cargo:lib={}", lib_dir.to_str().unwrap()); | |
77 | -} | |
78 | +}*/ |
0 | rust-lsd (0.23.1-3) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
0 | rust-lsd (0.23.1-3) unstable; urgency=medium | |
1 | 1 | |
2 | 2 | * Package lsd 0.23.1 from crates.io using debcargo 2.6.0 |
3 | 3 | * Add shell completion files for bash, fish and zsh (Closes: #1028645) |
4 | 4 | |
5 | -- Alexander Kjäll <alexander.kjall@gmail.com> Sat, 21 Jan 2023 15:57:24 +0100 | |
5 | -- Alexander Kjäll <alexander.kjall@gmail.com> Fri, 27 Jan 2023 09:57:30 +0100 | |
6 | 6 | |
7 | 7 | rust-lsd (0.23.1-2) unstable; urgency=medium |
8 | 8 |
0 | rust-mio (0.8.5-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package mio 0.8.5 from crates.io using debcargo 2.6.0 | |
4 | ||
5 | -- Blair Noctis <n@sail.ng> Fri, 10 Feb 2023 17:59:46 +0000 | |
6 | ||
0 | 7 | rust-mio (0.8.4-1) unstable; urgency=medium |
1 | 8 | |
2 | 9 | * Team upload. |
17 | 17 | be correct information so you should review and fix this before uploading to |
18 | 18 | the archive. |
19 | 19 | |
20 | Files: ./LICENSE | |
20 | Files: LICENSE | |
21 | 21 | Copyright: 2014 Carl Lerche and other MIO contributors |
22 | 22 | License: UNKNOWN-LICENSE; FIXME (overlay) |
23 | 23 | Comment: |
26 | 26 | |
27 | 27 | Files: debian/* |
28 | 28 | Copyright: |
29 | 2018-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
30 | 2018-2022 kpcyrd <git@rxv.cc> | |
29 | 2018-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
30 | 2018-2023 kpcyrd <git@rxv.cc> | |
31 | 31 | License: MIT |
32 | 32 | |
33 | 33 | License: MIT |
0 | 0 | --- a/Cargo.toml |
1 | 1 | +++ b/Cargo.toml |
2 | @@ -89,7 +89,7 @@ required-features = [ | |
2 | @@ -90,7 +90,7 @@ | |
3 | 3 | version = "0.4.8" |
4 | 4 | |
5 | 5 | [dev-dependencies.env_logger] |
0 | 0 | --- a/Cargo.toml |
1 | 1 | +++ b/Cargo.toml |
2 | @@ -100,26 +100,8 @@ default = [] | |
2 | @@ -101,26 +101,8 @@ | |
3 | 3 | net = [] |
4 | 4 | os-ext = [ |
5 | 5 | "os-poll", |
18 | 18 | version = "0.2.121" |
19 | 19 | - |
20 | 20 | -[target."cfg(windows)".dependencies.windows-sys] |
21 | -version = "0.36" | |
21 | -version = "0.42" | |
22 | 22 | -features = [ |
23 | - "Win32_Storage_FileSystem", | |
24 | 23 | - "Win32_Foundation", |
25 | 24 | - "Win32_Networking_WinSock", |
25 | - "Win32_Storage_FileSystem", | |
26 | 26 | - "Win32_System_IO", |
27 | 27 | - "Win32_System_WindowsProgramming", |
28 | 28 | -] |
0 | rust-ogg (0.9.0-1) unstable; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package ogg 0.9.0 from crates.io using debcargo 2.6.0 (Closes: #1031015) | |
4 | * Relax dep on tokio-util to packaged higher 0.7 | |
5 | * Collapse features | |
6 | ||
7 | -- Blair Noctis <n@sail.ng> Fri, 10 Feb 2023 23:46:12 +0000 | |
8 | ||
0 | 9 | rust-ogg (0.7.0-1) unstable; urgency=medium |
1 | 10 | |
2 | 11 | * Package ogg 0.7.0 from crates.io using debcargo 2.4.0 |
4 | 4 | |
5 | 5 | Files: * |
6 | 6 | Copyright: |
7 | 2016-2018 est31 <MTest31@outlook.com> and contributors | |
7 | 2016-2022 est31 <MTest31@outlook.com> and contributors | |
8 | 8 | 2002-2015 Xiph.org Foundation |
9 | 9 | License: BSD-3-Clause |
10 | 10 | |
11 | 11 | Files: debian/* |
12 | 12 | Copyright: |
13 | 2019 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
13 | 2019-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
14 | 14 | 2019 Ximin Luo <infinity0@debian.org> |
15 | 15 | License: BSD-3-Clause |
16 | 16 |
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: |
16 | 16 | 2016-2017 est31 <MTest31@outlook.com> and contributors |
17 | 17 | 2002-2015 Xiph.org Foundation |
20 | 20 | FIXME (overlay): These notices are extracted from files. Please review them |
21 | 21 | before uploading to the archive. |
22 | 22 | |
23 | Files: ./examples/crc32-table-generate.rs | |
23 | Files: examples/dump-all.rs | |
24 | Copyright: 2018 est31 <MTest31@outlook.com> | |
25 | License: UNKNOWN-LICENSE; FIXME (overlay) | |
26 | Comment: | |
27 | FIXME (overlay): These notices are extracted from files. Please review them | |
28 | before uploading to the archive. | |
29 | ||
30 | Files: examples/format-info.rs | |
24 | 31 | Copyright: 2016 est31 <MTest31@outlook.com> |
25 | 32 | License: UNKNOWN-LICENSE; FIXME (overlay) |
26 | 33 | Comment: |
27 | 34 | FIXME (overlay): These notices are extracted from files. Please review them |
28 | 35 | before uploading to the archive. |
29 | 36 | |
30 | Files: ./examples/dump-all.rs | |
37 | Files: examples/repack.rs | |
31 | 38 | Copyright: 2018 est31 <MTest31@outlook.com> |
32 | 39 | License: UNKNOWN-LICENSE; FIXME (overlay) |
33 | 40 | Comment: |
34 | 41 | FIXME (overlay): These notices are extracted from files. Please review them |
35 | 42 | before uploading to the archive. |
36 | 43 | |
37 | Files: ./examples/format-info.rs | |
44 | Files: src/crc.rs | |
45 | Copyright: 2016-2017 est31 <MTest31@outlook.com> | |
46 | License: UNKNOWN-LICENSE; FIXME (overlay) | |
47 | Comment: | |
48 | FIXME (overlay): These notices are extracted from files. Please review them | |
49 | before uploading to the archive. | |
50 | ||
51 | Files: src/lib.rs | |
38 | 52 | Copyright: 2016 est31 <MTest31@outlook.com> |
39 | 53 | License: UNKNOWN-LICENSE; FIXME (overlay) |
40 | 54 | Comment: |
41 | 55 | FIXME (overlay): These notices are extracted from files. Please review them |
42 | 56 | before uploading to the archive. |
43 | 57 | |
44 | Files: ./examples/repack.rs | |
45 | Copyright: 2018 est31 <MTest31@outlook.com> | |
46 | License: UNKNOWN-LICENSE; FIXME (overlay) | |
47 | Comment: | |
48 | FIXME (overlay): These notices are extracted from files. Please review them | |
49 | before uploading to the archive. | |
50 | ||
51 | Files: ./src/crc.rs | |
58 | Files: src/reading.rs | |
52 | 59 | Copyright: 2016-2017 est31 <MTest31@outlook.com> |
53 | 60 | License: UNKNOWN-LICENSE; FIXME (overlay) |
54 | 61 | Comment: |
55 | 62 | FIXME (overlay): These notices are extracted from files. Please review them |
56 | 63 | before uploading to the archive. |
57 | 64 | |
58 | Files: ./src/lib.rs | |
59 | Copyright: 2016 est31 <MTest31@outlook.com> | |
60 | License: UNKNOWN-LICENSE; FIXME (overlay) | |
61 | Comment: | |
62 | FIXME (overlay): These notices are extracted from files. Please review them | |
63 | before uploading to the archive. | |
64 | ||
65 | Files: ./src/reading.rs | |
65 | Files: src/test.rs | |
66 | 66 | Copyright: 2016-2017 est31 <MTest31@outlook.com> |
67 | 67 | License: UNKNOWN-LICENSE; FIXME (overlay) |
68 | 68 | Comment: |
69 | 69 | FIXME (overlay): These notices are extracted from files. Please review them |
70 | 70 | before uploading to the archive. |
71 | 71 | |
72 | Files: ./src/test.rs | |
72 | Files: src/writing.rs | |
73 | 73 | Copyright: 2016-2017 est31 <MTest31@outlook.com> |
74 | 74 | License: UNKNOWN-LICENSE; FIXME (overlay) |
75 | 75 | Comment: |
76 | 76 | FIXME (overlay): These notices are extracted from files. Please review them |
77 | 77 | before uploading to the archive. |
78 | 78 | |
79 | Files: ./src/writing.rs | |
80 | Copyright: 2016-2017 est31 <MTest31@outlook.com> | |
81 | License: UNKNOWN-LICENSE; FIXME (overlay) | |
82 | Comment: | |
83 | FIXME (overlay): These notices are extracted from files. Please review them | |
84 | before uploading to the archive. | |
85 | ||
86 | Files: ./tests/async_read.rs | |
79 | Files: tests/async_read.rs | |
87 | 80 | Copyright: 2016 est31 <MTest31@outlook.com> |
88 | 81 | License: UNKNOWN-LICENSE; FIXME (overlay) |
89 | 82 | Comment: |
92 | 85 | |
93 | 86 | Files: debian/* |
94 | 87 | Copyright: |
95 | 2019 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
96 | 2019 Ximin Luo <infinity0@debian.org> | |
88 | 2019-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
89 | 2019-2023 Ximin Luo <infinity0@debian.org> | |
97 | 90 | License: BSD-3-Clause |
98 | 91 | |
99 | 92 | License: BSD-3-Clause |
0 | --- a/Cargo.toml | |
1 | +++ b/Cargo.toml | |
2 | @@ -62,7 +62,7 @@ | |
3 | optional = true | |
4 | ||
5 | [dependencies.tokio-util] | |
6 | -version = "0.6" | |
7 | +version = "0.7" | |
8 | features = [ | |
9 | "codec", | |
10 | "compat", |
0 | relax-deps.patch |
0 | rust-os-pipe (1.1.3-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package os_pipe 1.1.3 from crates.io using debcargo 2.6.0 | |
4 | * Patch out a test requiring compiled test binary | |
5 | * Patch out Windows deps | |
6 | * Drop remove-unstable-io-safety.patch, tests fine | |
7 | * Refresh patches | |
8 | ||
9 | -- Blair Noctis <n@sail.ng> Fri, 10 Feb 2023 17:43:11 +0000 | |
10 | ||
0 | 11 | rust-os-pipe (1.1.1-1) unstable; urgency=medium |
1 | 12 | |
2 | 13 | * Team upload. |
13 | 13 | |
14 | 14 | Files: debian/* |
15 | 15 | Copyright: |
16 | 2018-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
17 | 2018-2022 Paride Legovini <paride@debian.org> | |
18 | 2018-2022 Wolfgang Silbermayr <wolfgang@silbermayr.at> | |
16 | 2018-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
17 | 2018-2023 Paride Legovini <paride@debian.org> | |
18 | 2018-2023 Wolfgang Silbermayr <wolfgang@silbermayr.at> | |
19 | 19 | License: MIT |
20 | 20 | |
21 | 21 | License: MIT |
0 | diff --git a/src/lib.rs b/src/lib.rs | |
1 | index 8929fae..ac80a53 100644 | |
2 | 0 | --- a/src/lib.rs |
3 | 1 | +++ b/src/lib.rs |
4 | @@ -381,87 +381,6 @@ mod tests { | |
2 | @@ -381,7 +381,7 @@ | |
5 | 3 | assert_eq!(out, data); |
6 | 4 | } |
7 | 5 | |
8 | 6 | - #[test] |
9 | - fn test_pipes_are_not_inheritable() { | |
10 | - // Create pipes for a child process. | |
11 | - let (input_reader, mut input_writer) = crate::pipe().unwrap(); | |
12 | - let (mut output_reader, output_writer) = crate::pipe().unwrap(); | |
13 | - | |
14 | - // Create a bunch of duplicated copies, which we'll close later. This | |
15 | - // tests that duplication preserves non-inheritability. | |
16 | - let ir_dup = input_reader.try_clone().unwrap(); | |
17 | - let iw_dup = input_writer.try_clone().unwrap(); | |
18 | - let or_dup = output_reader.try_clone().unwrap(); | |
19 | - let ow_dup = output_writer.try_clone().unwrap(); | |
20 | - | |
21 | - // Spawn the child. Note that this temporary Command object takes | |
22 | - // ownership of our copies of the child's stdin and stdout, and then | |
23 | - // closes them immediately when it drops. That stops us from blocking | |
24 | - // our own read below. We use our own simple implementation of cat for | |
25 | - // compatibility with Windows. | |
26 | - let mut child = Command::new(path_to_exe("cat")) | |
27 | - .stdin(input_reader) | |
28 | - .stdout(output_writer) | |
29 | - .spawn() | |
30 | - .unwrap(); | |
31 | - | |
32 | - // Drop all the dups now that the child is spawned. | |
33 | - drop(ir_dup); | |
34 | - drop(iw_dup); | |
35 | - drop(or_dup); | |
36 | - drop(ow_dup); | |
37 | - | |
38 | - // Write to the child's stdin. This is a small write, so it shouldn't | |
39 | - // block. | |
40 | - input_writer.write_all(b"hello").unwrap(); | |
41 | - drop(input_writer); | |
42 | - | |
43 | - // Read from the child's stdout. If this child has accidentally | |
44 | - // inherited the write end of its own stdin, then it will never exit, | |
45 | - // and this read will block forever. That's what this test is all | |
46 | - // about. | |
47 | - let mut output = Vec::new(); | |
48 | - output_reader.read_to_end(&mut output).unwrap(); | |
49 | - child.wait().unwrap(); | |
50 | - | |
51 | - // Confirm that we got the right bytes. | |
52 | - assert_eq!(b"hello", &*output); | |
53 | - } | |
54 | - | |
55 | - #[test] | |
56 | - fn test_parent_handles() { | |
57 | - // This test invokes the `swap` test program, which uses parent_stdout() and | |
58 | - // parent_stderr() to swap the outputs for another child that it spawns. | |
59 | - | |
60 | - // Create pipes for a child process. | |
61 | - let (reader, mut writer) = crate::pipe().unwrap(); | |
62 | - | |
63 | - // Write input. This shouldn't block because it's small. Then close the write end, or else | |
64 | - // the child will hang. | |
65 | - writer.write_all(b"quack").unwrap(); | |
66 | - drop(writer); | |
67 | - | |
68 | - // Use `swap` to run `cat_both`. `cat_both will read "quack" from stdin | |
69 | - // and write it to stdout and stderr with different tags. But because we | |
70 | - // run it inside `swap`, the tags in the output should be backwards. | |
71 | - let output = Command::new(path_to_exe("swap")) | |
72 | - .arg(path_to_exe("cat_both")) | |
73 | - .stdin(reader) | |
74 | - .output() | |
75 | - .unwrap(); | |
76 | - | |
77 | - // Check for a clean exit. | |
78 | - assert!( | |
79 | - output.status.success(), | |
80 | - "child process returned {:#?}", | |
81 | - output | |
82 | - ); | |
83 | - | |
84 | - // Confirm that we got the right bytes. | |
85 | - assert_eq!(b"stderr: quack", &*output.stdout); | |
86 | - assert_eq!(b"stdout: quack", &*output.stderr); | |
87 | - } | |
88 | - | |
89 | #[test] | |
90 | fn test_parent_handles_dont_close() { | |
91 | // Open and close each parent pipe multiple times. If this closes the | |
7 | + //#[test] | |
8 | fn test_pipes_are_not_inheritable() { | |
9 | // Create pipes for a child process. | |
10 | let (input_reader, mut input_writer) = crate::pipe().unwrap(); |
0 | Description: Disable a test requiring compiled test binaries | |
1 | Last-Update: 2023-02-10 | |
2 | --- | |
3 | This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ | |
4 | --- a/src/lib.rs | |
5 | +++ b/src/lib.rs | |
6 | @@ -428,7 +428,7 @@ | |
7 | assert_eq!(b"hello", &*output); | |
8 | } | |
9 | ||
10 | - #[test] | |
11 | + //#[test] | |
12 | fn test_parent_handles() { | |
13 | // This test invokes the `swap` test program, which uses parent_stdout() and | |
14 | // parent_stderr() to swap the outputs for another child that it spawns. |
0 | diff --git a/Cargo.toml b/Cargo.toml | |
1 | index ccab0d9..6056323 100644 | |
2 | --- a/Cargo.toml | |
3 | +++ b/Cargo.toml | |
4 | @@ -26,9 +26,6 @@ keywords = [ | |
5 | license = "MIT" | |
6 | repository = "https://github.com/oconnor663/os_pipe.rs" | |
7 | ||
8 | -[package.metadata.docs.rs] | |
9 | -features = ["io_safety"] | |
10 | - | |
11 | [features] | |
12 | io_safety = [] | |
13 | ||
14 | diff --git a/src/unix.rs b/src/unix.rs | |
15 | index f01f3ee..c66f2c2 100644 | |
16 | --- a/src/unix.rs | |
17 | +++ b/src/unix.rs | |
18 | @@ -90,45 +90,3 @@ impl FromRawFd for PipeWriter { | |
19 | PipeWriter(File::from_raw_fd(fd)) | |
20 | } | |
21 | } | |
22 | - | |
23 | -#[cfg(feature = "io_safety")] | |
24 | -impl From<PipeReader> for OwnedFd { | |
25 | - fn from(pr: PipeReader) -> Self { | |
26 | - pr.0.into() | |
27 | - } | |
28 | -} | |
29 | - | |
30 | -#[cfg(feature = "io_safety")] | |
31 | -impl AsFd for PipeReader { | |
32 | - fn as_fd(&self) -> BorrowedFd<'_> { | |
33 | - self.0.as_fd() | |
34 | - } | |
35 | -} | |
36 | - | |
37 | -#[cfg(feature = "io_safety")] | |
38 | -impl From<OwnedFd> for PipeReader { | |
39 | - fn from(fd: OwnedFd) -> Self { | |
40 | - PipeReader(fd.into()) | |
41 | - } | |
42 | -} | |
43 | - | |
44 | -#[cfg(feature = "io_safety")] | |
45 | -impl From<PipeWriter> for OwnedFd { | |
46 | - fn from(pw: PipeWriter) -> Self { | |
47 | - pw.0.into() | |
48 | - } | |
49 | -} | |
50 | - | |
51 | -#[cfg(feature = "io_safety")] | |
52 | -impl AsFd for PipeWriter { | |
53 | - fn as_fd(&self) -> BorrowedFd<'_> { | |
54 | - self.0.as_fd() | |
55 | - } | |
56 | -} | |
57 | - | |
58 | -#[cfg(feature = "io_safety")] | |
59 | -impl From<OwnedFd> for PipeWriter { | |
60 | - fn from(fd: OwnedFd) -> Self { | |
61 | - PipeWriter(fd.into()) | |
62 | - } | |
63 | -} |
0 | --- a/Cargo.toml | |
1 | +++ b/Cargo.toml | |
2 | @@ -34,12 +34,3 @@ | |
3 | ||
4 | [target."cfg(not(windows))".dependencies.libc] | |
5 | version = "0.2.62" | |
6 | - | |
7 | -[target."cfg(windows)".dependencies.windows-sys] | |
8 | -version = "0.45.0" | |
9 | -features = [ | |
10 | - "Win32_Foundation", | |
11 | - "Win32_System_Pipes", | |
12 | - "Win32_Security", | |
13 | - "Win32_System_Threading", | |
14 | -] |
0 | remove-windows-deps.patch | |
0 | 1 | delete-broken-tests.patch |
1 | 2 | python-is-python3.patch |
2 | remove-unstable-io-safety.patch | |
3 | disable-test-requiring-bin.patch |
2 | 2 | * Team upload. |
3 | 3 | * Package pathsearch 0.2.0 from crates.io using debcargo 2.6.0 |
4 | 4 | |
5 | -- Igor Petruk <ipetruk@google.com> Mon, 09 Jan 2023 21:47:01 +0100 | |
5 | -- Igor Petruk <ipetruk@google.com> Tue, 10 Jan 2023 15:08:26 +0100 |
0 | rust-proc-macro-error (1.0.4-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package proc-macro-error 1.0.4 from crates.io using debcargo 2.6.0 | |
4 | * Patch to disable tests requiring unavailable test crate | |
5 | * Relax fixed deps | |
6 | * Collapse features | |
7 | ||
8 | -- Blair Noctis <n@sail.ng> Fri, 10 Feb 2023 17:08:03 +0000 | |
9 | ||
0 | 10 | rust-proc-macro-error (1.0.3-1) unstable; urgency=medium |
1 | 11 | |
2 | 12 | * Team upload. |
11 | 11 | be correct information so you should review and fix this before uploading to |
12 | 12 | the archive. |
13 | 13 | |
14 | Files: ./LICENSE-APACHE | |
14 | Files: LICENSE-APACHE | |
15 | 15 | Copyright: 2019-2020 CreepySkeleton <creepy-skeleton@yandex.ru> |
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: ./LICENSE-MIT | |
21 | Files: LICENSE-MIT | |
22 | 22 | Copyright: 2019-2020 CreepySkeleton |
23 | 23 | License: UNKNOWN-LICENSE; FIXME (overlay) |
24 | 24 | Comment: |
27 | 27 | |
28 | 28 | Files: debian/* |
29 | 29 | Copyright: |
30 | 2019-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
31 | 2019-2020 kpcyrd <git@rxv.cc> | |
30 | 2019-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
31 | 2019-2023 kpcyrd <git@rxv.cc> | |
32 | 32 | License: MIT or Apache-2.0 |
33 | 33 | |
34 | 34 | License: Apache-2.0 |
0 | Description: Disable tests requiring unavailable test crate | |
1 | Last-Update: 2023-02-10 | |
2 | --- | |
3 | This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ | |
4 | --- a/tests/ok.rs | |
5 | +++ b/tests/ok.rs | |
6 | @@ -1,4 +1,4 @@ | |
7 | -extern crate test_crate; | |
8 | +/*extern crate test_crate; | |
9 | ||
10 | use test_crate::*; | |
11 | ||
12 | @@ -7,4 +7,4 @@ | |
13 | #[test] | |
14 | fn check_it_works() { | |
15 | it_works(); | |
16 | -} | |
17 | +}*/ | |
18 | --- a/tests/macro-errors.rs | |
19 | +++ b/tests/macro-errors.rs | |
20 | @@ -1,7 +1,7 @@ | |
21 | extern crate trybuild; | |
22 | ||
23 | #[cfg_attr(skip_ui_tests, ignore)] | |
24 | -#[test] | |
25 | +//#[test] | |
26 | fn ui() { | |
27 | let t = trybuild::TestCases::new(); | |
28 | t.compile_fail("tests/ui/*.rs"); |
0 | --- a/Cargo.toml | |
1 | +++ b/Cargo.toml | |
2 | @@ -38,10 +38,10 @@ | |
3 | optional = true | |
4 | default-features = false | |
5 | [dev-dependencies.serde_derive] | |
6 | -version = "=1.0.107" | |
7 | +version = "1.0.147" | |
8 | ||
9 | [dev-dependencies.toml] | |
10 | -version = "=0.5.2" | |
11 | +version = "0.5.2" | |
12 | ||
13 | [dev-dependencies.trybuild] | |
14 | version = "1.0.19" |
0 | rust-proc-macro-error-attr (1.0.4-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package proc-macro-error-attr 1.0.4 from crates.io using debcargo 2.6.0 | |
4 | ||
5 | -- Blair Noctis <n@sail.ng> Wed, 01 Feb 2023 19:31:54 +0000 | |
6 | ||
0 | 7 | rust-proc-macro-error-attr (1.0.3-1) unstable; urgency=medium |
1 | 8 | |
2 | 9 | * Package proc-macro-error-attr 1.0.3 from crates.io using debcargo 2.4.2 |
11 | 11 | be correct information so you should review and fix this before uploading to |
12 | 12 | the archive. |
13 | 13 | |
14 | Files: ./LICENSE-APACHE | |
14 | Files: LICENSE-APACHE | |
15 | 15 | Copyright: 2019-2020 CreepySkeleton <creepy-skeleton@yandex.ru> |
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: ./LICENSE-MIT | |
21 | Files: LICENSE-MIT | |
22 | 22 | Copyright: 2019-2020 CreepySkeleton |
23 | 23 | License: UNKNOWN-LICENSE; FIXME (overlay) |
24 | 24 | Comment: |
27 | 27 | |
28 | 28 | Files: debian/* |
29 | 29 | Copyright: |
30 | 2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
31 | 2020 Daniel Kahn Gillmor <dkg@fifthhorseman.net> | |
30 | 2020-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
31 | 2020-2023 Daniel Kahn Gillmor <dkg@fifthhorseman.net> | |
32 | 32 | License: MIT or Apache-2.0 |
33 | 33 | |
34 | 34 | License: Apache-2.0 |
0 | rust-quinn-proto (0.9.2-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
0 | rust-quinn-proto (0.9.2-2) unstable; urgency=medium | |
1 | 1 | |
2 | 2 | * Package quinn-proto 0.9.2 from crates.io using debcargo 2.6.0 |
3 | 3 | * Include patch to fix autopkgtest on i386 (Closes: #1030838) |
4 | 4 | |
5 | -- Matthias Geiger <matthias.geiger1024@tutanota.de> Wed, 08 Feb 2023 13:50:33 +0100 | |
5 | -- Matthias Geiger <matthias.geiger1024@tutanota.de> Wed, 08 Feb 2023 13:53:26 +0100 | |
6 | 6 | |
7 | 7 | rust-quinn-proto (0.9.2-1) unstable; urgency=medium |
8 | 8 |
0 | rust-r2d2 (0.8.10-5) unstable; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package r2d2 0.8.10 from crates.io using debcargo 2.6.0 | |
4 | * Add mipsel to the list of architectures on which to skip idle_timeout. | |
5 | ||
6 | -- Peter Michael Green <plugwash@debian.org> Sat, 11 Feb 2023 06:00:09 +0000 | |
7 | ||
8 | rust-r2d2 (0.8.10-4) unstable; urgency=medium | |
9 | ||
10 | * Package r2d2 0.8.10 from crates.io using debcargo 2.6.0 | |
11 | * Fix test properly on affected arches | |
12 | ||
13 | -- Matthias Geiger <matthias.geiger1024@tutanota.de> Sat, 11 Feb 2023 00:44:13 +0100 | |
14 | ||
0 | 15 | rust-r2d2 (0.8.10-3) unstable; urgency=medium |
1 | 16 | |
2 | 17 | * Package r2d2 0.8.10 from crates.io using debcargo 2.6.0 |
3 | 3 | } |
4 | 4 | |
5 | 5 | #[test] |
6 | +#[cfg(not(target_arch = "x86", "arm", "powerpc64"))] | |
6 | +#[cfg(not(any(target_arch = "x32", target_arch = "arm", target_arch = "powerpc64", target_arch = "mips")))] | |
7 | 7 | fn test_idle_timeout() { |
8 | 8 | static DROPPED: AtomicUsize = AtomicUsize::new(0); |
9 | 9 |
0 | rust-ripasso-cursive (0.6.1-2) unstable; urgency=medium | |
1 | ||
2 | * Package ripasso-cursive 0.6.1 from crates.io using debcargo 2.6.0 | |
3 | * Add translation files from upstream | |
4 | * Fix the new user wizard | |
5 | ||
6 | -- Alexander Kjäll <alexander.kjall@gmail.com> Sat, 11 Feb 2023 09:01:46 +0000 | |
7 | ||
0 | 8 | rust-ripasso-cursive (0.6.1-1) unstable; urgency=medium |
1 | 9 | |
2 | 10 | * Package ripasso-cursive 0.6.1 from crates.io using debcargo 2.6.0 |
0 | diff --git a/build.rs b/build.rs | |
1 | index eb3e307..dbde16e 100644 | |
2 | --- a/build.rs | |
3 | +++ b/build.rs | |
4 | @@ -116,7 +116,6 @@ fn generate_translation_files() { | |
5 | dir.pop(); | |
6 | dir.pop(); | |
7 | dir.pop(); | |
8 | - dir.push("cursive"); | |
9 | dir.push("res"); | |
10 | ||
11 | let translation_path_glob = dir.join("**/*.po"); |
0 | 0 | relax-deps.patch |
1 | unbreak-new-user-wizard.patch | |
2 | fix-translation-generation.patch | |
3 | translation-locations.patch |
0 | diff --git a/src/main.rs b/src/main.rs | |
1 | index a2693b7..787eb36 100644 | |
2 | --- a/src/main.rs | |
3 | +++ b/src/main.rs | |
4 | @@ -1073,7 +1073,7 @@ fn do_delete_last_word(ui: &mut Cursive, store: PasswordStoreType) { | |
5 | fn get_translation_catalog() -> gettext::Catalog { | |
6 | let locale = locale_config::Locale::current(); | |
7 | ||
8 | - let mut translation_locations = vec!["/usr/share/ripasso"]; | |
9 | + let mut translation_locations = vec![]; | |
10 | if let Some(path) = option_env!("TRANSLATION_INPUT_PATH") { | |
11 | translation_locations.insert(0, path); | |
12 | } | |
13 | @@ -1097,6 +1097,20 @@ fn get_translation_catalog() -> gettext::Catalog { | |
14 | } | |
15 | } | |
16 | ||
17 | + for preferred in locale.tags_for("messages") { | |
18 | + let langid_res: std::result::Result<LanguageIdentifier, _> = | |
19 | + format!("{preferred}").parse(); | |
20 | + | |
21 | + if let Ok(langid) = langid_res { | |
22 | + let file = std::fs::File::open(format!("/usr/share/locale/{}/LC_MESSAGES/ripasso-cursive.mo", langid.language)); | |
23 | + if let Ok(file) = file { | |
24 | + if let Ok(catalog) = gettext::Catalog::parse(file) { | |
25 | + return catalog; | |
26 | + } | |
27 | + } | |
28 | + } | |
29 | + } | |
30 | + | |
31 | gettext::Catalog::empty() | |
32 | } | |
33 |
0 | diff --git a/src/main.rs b/src/main.rs | |
1 | index 9354d59..a2693b7 100644 | |
2 | --- a/src/main.rs | |
3 | +++ b/src/main.rs | |
4 | @@ -1169,6 +1169,19 @@ fn get_stores(config: &config::Config, home: &Option<PathBuf>) -> Result<Vec<Pas | |
5 | )?); | |
6 | } | |
7 | } | |
8 | + } else if final_stores.len() == 0 && home.is_some() { | |
9 | + let default_path = home.clone().unwrap().join(".password_store"); | |
10 | + if default_path.exists() { | |
11 | + final_stores.push(PasswordStore::new( | |
12 | + "default", | |
13 | + &Some(default_path), | |
14 | + &None, | |
15 | + home, | |
16 | + &None, | |
17 | + &CryptoImpl::GpgMe, | |
18 | + &None, | |
19 | + )?); | |
20 | + } | |
21 | } | |
22 | ||
23 | Ok(final_stores) | |
24 | @@ -1176,7 +1189,7 @@ fn get_stores(config: &config::Config, home: &Option<PathBuf>) -> Result<Vec<Pas | |
25 | ||
26 | /// Validates the config for password stores. | |
27 | /// Returns a list of paths that the new store wizard should be run for | |
28 | -fn validate_stores_config(settings: &config::Config) -> Vec<PathBuf> { | |
29 | +fn validate_stores_config(settings: &config::Config, home: &Option<PathBuf>) -> Vec<PathBuf> { | |
30 | let mut incomplete_stores: Vec<PathBuf> = vec![]; | |
31 | ||
32 | let stores_res = settings.get("stores"); | |
33 | @@ -1202,6 +1215,8 @@ fn validate_stores_config(settings: &config::Config) -> Vec<PathBuf> { | |
34 | } | |
35 | } | |
36 | } | |
37 | + } else if incomplete_stores.len() == 0 && home.is_some() { | |
38 | + incomplete_stores.push(home.clone().unwrap().join(".password_store")); | |
39 | } | |
40 | ||
41 | incomplete_stores | |
42 | @@ -1758,7 +1773,7 @@ fn main() { | |
43 | let password_store_signing_key = std::env::var("PASSWORD_STORE_SIGNING_KEY").ok(); | |
44 | let xdg_config_home = match std::env::var("XDG_CONFIG_HOME") { | |
45 | Err(_) => None, | |
46 | - Ok(home_path) => Some(PathBuf::from(home_path)), | |
47 | + Ok(config_home_path) => Some(PathBuf::from(config_home_path)), | |
48 | }; | |
49 | ||
50 | pass::read_config( | |
51 | @@ -1774,7 +1789,7 @@ fn main() { | |
52 | } | |
53 | let (config, config_file_location) = config_res.unwrap(); | |
54 | ||
55 | - for path in validate_stores_config(&config) { | |
56 | + for path in validate_stores_config(&config, &home) { | |
57 | wizard::show_init_menu(&Some(path), &home); | |
58 | } | |
59 | ||
60 | @@ -1783,7 +1798,8 @@ fn main() { | |
61 | eprintln!("Error {}", err); | |
62 | process::exit(1); | |
63 | } | |
64 | - let stores: StoreListType = Arc::new(Mutex::new( | |
65 | + | |
66 | +let stores: StoreListType = Arc::new(Mutex::new( | |
67 | stores | |
68 | .unwrap() | |
69 | .into_iter() | |
70 | @@ -1791,6 +1807,19 @@ fn main() { | |
71 | .collect(), | |
72 | )); | |
73 | ||
74 | + if !config_file_location.exists() && stores.lock().unwrap().len() == 1 { | |
75 | + let mut config_file_dir = config_file_location.clone(); | |
76 | + config_file_dir.pop(); | |
77 | + if let Err(err) = std::fs::create_dir_all(config_file_dir) { | |
78 | + eprintln!("Error {err}"); | |
79 | + process::exit(1); | |
80 | + } | |
81 | + if let Err(err) = pass::save_config(stores.clone(), &config_file_location) { | |
82 | + eprintln!("Error {err}"); | |
83 | + process::exit(1); | |
84 | + } | |
85 | + } | |
86 | + | |
87 | let store: PasswordStoreType = Arc::new(Mutex::new(stores.lock().unwrap()[0].clone())); | |
88 | #[allow(clippy::significant_drop_in_scrutinee)] | |
89 | for ss in stores.lock().unwrap().iter() { |
0 | #!/usr/bin/make -f | |
1 | ||
2 | include /usr/share/dpkg/pkg-info.mk | |
3 | ||
4 | %: | |
5 | dh $@ --buildsystem cargo | |
6 | ||
7 | override_dh_install: | |
8 | mkdir -p debian/ripasso-cursive/usr/share/locale/de/LC_MESSAGES/ | |
9 | mkdir -p debian/ripasso-cursive/usr/share/locale/fr/LC_MESSAGES/ | |
10 | mkdir -p debian/ripasso-cursive/usr/share/locale/it/LC_MESSAGES/ | |
11 | mkdir -p debian/ripasso-cursive/usr/share/locale/nb/LC_MESSAGES/ | |
12 | mkdir -p debian/ripasso-cursive/usr/share/locale/nn/LC_MESSAGES/ | |
13 | mkdir -p debian/ripasso-cursive/usr/share/locale/sv/LC_MESSAGES/ | |
14 | cp -f target/translations/cursive/de.mo debian/ripasso-cursive/usr/share/locale/de/LC_MESSAGES/ripasso-cursive.mo | |
15 | cp -f target/translations/cursive/fr.mo debian/ripasso-cursive/usr/share/locale/fr/LC_MESSAGES/ripasso-cursive.mo | |
16 | cp -f target/translations/cursive/it.mo debian/ripasso-cursive/usr/share/locale/it/LC_MESSAGES/ripasso-cursive.mo | |
17 | cp -f target/translations/cursive/nb.mo debian/ripasso-cursive/usr/share/locale/nb/LC_MESSAGES/ripasso-cursive.mo | |
18 | cp -f target/translations/cursive/nn.mo debian/ripasso-cursive/usr/share/locale/nn/LC_MESSAGES/ripasso-cursive.mo | |
19 | cp -f target/translations/cursive/sv.mo debian/ripasso-cursive/usr/share/locale/sv/LC_MESSAGES/ripasso-cursive.mo | |
20 | dh_install | |
21 |
0 | rust-rmp-serde (1.1.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
0 | rust-rmp-serde (1.1.1-1) unstable; urgency=medium | |
1 | 1 | |
2 | 2 | * Package rmp-serde 1.1.1 from crates.io using debcargo 2.5.0 |
3 | 3 | |
4 | -- Blair Noctis <n@sail.ng> Tue, 08 Nov 2022 14:36:45 +0000 | |
4 | -- Blair Noctis <n@sail.ng> Fri, 10 Feb 2023 20:32:43 -0500 | |
5 | 5 | |
6 | 6 | rust-rmp-serde (1.1.0-1) unstable; urgency=medium |
7 | 7 |
8 | 8 | |
9 | 9 | Files: debian/* |
10 | 10 | Copyright: |
11 | 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
12 | 2022 Blair Noctis <n@sail.ng> | |
11 | 2022-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
12 | 2022-2023 Blair Noctis <n@sail.ng> | |
13 | 13 | License: MIT |
14 | 14 | |
15 | 15 | License: MIT |
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: 2017 Evgeny Safronov |
16 | 16 | License: UNKNOWN-LICENSE; FIXME (overlay) |
17 | 17 | Comment: |
20 | 20 | |
21 | 21 | Files: debian/* |
22 | 22 | Copyright: |
23 | 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
24 | 2022 Blair Noctis <n@sail.ng> | |
23 | 2022-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
24 | 2022-2023 Blair Noctis <n@sail.ng> | |
25 | 25 | License: MIT |
26 | 26 | |
27 | 27 | License: MIT |
0 | rust-roff-0.1 (0.1.0-3) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
0 | rust-roff-0.1 (0.1.0-3) unstable; urgency=medium | |
1 | 1 | |
2 | * Team upload. | |
3 | * Package roff 0.1.0 from crates.io using debcargo 2.6.0 | |
4 | ||
5 | [ Alexander Kjäll ] | |
2 | 6 | * Package roff 0.1.0 from crates.io using debcargo 2.5.0 |
3 | 7 | * Updated dependency versions to match what is in debian |
4 | 8 | |
5 | -- Alexander Kjäll <alexander.kjall@gmail.com> Fri, 11 Nov 2022 23:29:05 +0100 | |
9 | -- James McCoy <jamessan@debian.org> Fri, 10 Feb 2023 20:12:43 -0500 | |
6 | 10 | |
7 | 11 | rust-roff-0.1 (0.1.0-2) unstable; urgency=medium |
8 | 12 |
11 | 11 | |
12 | 12 | Files: debian/* |
13 | 13 | Copyright: |
14 | 2020-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
15 | 2020-2022 Alexander Kjäll <alexander.kjall@gmail.com> | |
14 | 2020-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
15 | 2020-2023 Alexander Kjäll <alexander.kjall@gmail.com> | |
16 | 16 | License: MIT or Apache-2.0 |
17 | 17 | |
18 | 18 | License: Apache-2.0 |
11 | 11 | be correct information so you should review and fix this before uploading to |
12 | 12 | the archive. |
13 | 13 | |
14 | Files: ./LICENSE-MIT | |
14 | Files: LICENSE-MIT | |
15 | 15 | Copyright: 2015 The assert_cli Developers |
16 | 16 | License: UNKNOWN-LICENSE; FIXME (overlay) |
17 | 17 | Comment: |
20 | 20 | |
21 | 21 | Files: debian/* |
22 | 22 | Copyright: |
23 | 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
24 | 2022 Alexander Kjäll <alexander.kjall@gmail.com> | |
23 | 2022-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
24 | 2022-2023 Alexander Kjäll <alexander.kjall@gmail.com> | |
25 | 25 | License: MIT or Apache-2.0 |
26 | 26 | |
27 | 27 | License: Apache-2.0 |
0 | rust-sequoia-keyring-linter (1.0.0-2) unstable; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package sequoia-keyring-linter 1.0.0 from crates.io using debcargo 2.6.0 | |
4 | * Apply upstream patch for rpassword 6.0 (Closes: #1030915). | |
5 | ||
6 | -- Peter Michael Green <plugwash@debian.org> Sat, 11 Feb 2023 06:43:16 +0000 | |
7 | ||
0 | 8 | rust-sequoia-keyring-linter (1.0.0-1) unstable; urgency=medium |
1 | 9 | |
2 | 10 | * Package sequoia-keyring-linter 1.0.0 from crates.io using debcargo 2.5.0 |
3 | 3 | Source: https://gitlab.com/sequoia-pgp/keyring-linter |
4 | 4 | |
5 | 5 | Files: * |
6 | Copyright: 2020-2022 Neal Walfield <neal@sequoia-pgp.org> | |
6 | Copyright: 2020-2023 Neal Walfield <neal@sequoia-pgp.org> | |
7 | 7 | License: GPL-2.0-or-later |
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-2022 Daniel Kahn Gillmor <dkg@fifthhorseman.net> |
13 | 13 | License: GPL-2.0-or-later |
14 | 14 |
11 | 11 | be correct information so you should review and fix this before uploading to |
12 | 12 | the archive. |
13 | 13 | |
14 | Files: ./LICENSE.txt | |
14 | Files: LICENSE.txt | |
15 | 15 | Copyright: 1989, 1991 Free Software Foundation, Inc., |
16 | 16 | License: UNKNOWN-LICENSE; FIXME (overlay) |
17 | 17 | Comment: |
20 | 20 | |
21 | 21 | Files: debian/* |
22 | 22 | Copyright: |
23 | 2020-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
24 | 2020-2022 Daniel Kahn Gillmor <dkg@fifthhorseman.net> | |
23 | 2020-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
24 | 2020-2023 Daniel Kahn Gillmor <dkg@fifthhorseman.net> | |
25 | 25 | License: GPL-2.0-or-later |
26 | 26 | |
27 | 27 | License: GPL-2.0-or-later |
0 | This patch is based on the upstream commit described below, adapter for use | |
1 | in the Debian package by Peter Michael Green. | |
2 | ||
3 | commit 68531230aa061034d6144adf19ebc681bb8d5253 | |
4 | Author: Neal H. Walfield <neal@pep.foundation> | |
5 | Date: Fri Feb 10 11:28:50 2023 +0100 | |
6 | ||
7 | Update to rpassword 6.0. | |
8 | ||
9 | - Debian has moved to rpassword 6.0, which has a different API from | |
10 | rpassword 5.0. Follow Debian. | |
11 | ||
12 | - Fixes #18. | |
13 | ||
14 | Index: sequoia-keyring-linter/src/keyring-linter.rs | |
15 | =================================================================== | |
16 | --- sequoia-keyring-linter.orig/src/keyring-linter.rs | |
17 | +++ sequoia-keyring-linter/src/keyring-linter.rs | |
18 | @@ -54,11 +54,11 @@ fn decrypt_key<R>(key: Key<key::SecretPa | |
19 | let mut first = true; | |
20 | loop { | |
21 | // Prompt the user. | |
22 | - match rpassword::read_password_from_tty( | |
23 | - Some(&format!( | |
24 | + match rpassword::prompt_password( | |
25 | + &format!( | |
26 | "{}Enter password to unlock {} (blank to skip): ", | |
27 | if first { "" } else { "Invalid password. " }, | |
28 | - key.keyid().to_hex()))) | |
29 | + key.keyid().to_hex())) | |
30 | { | |
31 | Ok(p) => { | |
32 | first = false; | |
33 | Index: sequoia-keyring-linter/Cargo.toml | |
34 | =================================================================== | |
35 | --- sequoia-keyring-linter.orig/Cargo.toml | |
36 | +++ sequoia-keyring-linter/Cargo.toml | |
37 | @@ -45,7 +45,7 @@ version = "1" | |
38 | version = "0.2" | |
39 | ||
40 | [dependencies.rpassword] | |
41 | -version = "5.0" | |
42 | +version = "6.0" | |
43 | ||
44 | [dependencies.sequoia-openpgp] | |
45 | version = "1.0" |
0 | rpassword-6.patch |
0 | rust-sequoia-sop (0.27.3-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
0 | rust-sequoia-sop (0.27.3-1) unstable; urgency=medium | |
1 | 1 | |
2 | 2 | * Package sequoia-sop 0.27.3 from crates.io using debcargo 2.6.0 |
3 | 3 | |
4 | -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Tue, 07 Feb 2023 19:50:26 -0500 | |
4 | -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Tue, 07 Feb 2023 19:56:32 -0500 | |
5 | 5 | |
6 | 6 | rust-sequoia-sop (0.27.2-1) unstable; urgency=medium |
7 | 7 |
0 | rust-serde-json (1.0.93-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package serde_json 1.0.93 from crates.io using debcargo 2.6.0 | |
4 | ||
5 | -- Blair Noctis <n@sail.ng> Fri, 10 Feb 2023 14:23:26 +0000 | |
6 | ||
0 | 7 | rust-serde-json (1.0.87-1) unstable; urgency=medium |
1 | 8 | |
2 | 9 | * Team upload. |
17 | 17 | |
18 | 18 | Files: debian/* |
19 | 19 | Copyright: |
20 | 2018-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
21 | 2018-2022 kpcyrd <git@rxv.cc> | |
22 | 2018-2022 Wolfgang Silbermayr <wolfgang@silbermayr.at> | |
20 | 2018-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
21 | 2018-2023 kpcyrd <git@rxv.cc> | |
22 | 2018-2023 Wolfgang Silbermayr <wolfgang@silbermayr.at> | |
23 | 23 | License: MIT or Apache-2.0 |
24 | 24 | |
25 | 25 | License: Apache-2.0 |
0 | rust-serde-repr (0.1.10-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package serde_repr 0.1.10 from crates.io using debcargo 2.6.0 | |
4 | ||
5 | -- Blair Noctis <n@sail.ng> Fri, 10 Feb 2023 17:09:13 +0000 | |
6 | ||
0 | 7 | rust-serde-repr (0.1.7-1) unstable; urgency=medium |
1 | 8 | |
2 | 9 | * Team upload. |
13 | 13 | |
14 | 14 | Files: debian/* |
15 | 15 | Copyright: |
16 | 2020-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
17 | 2020-2022 Andrej Shadura <andrewsh@debian.org> | |
16 | 2020-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
17 | 2020-2023 Andrej Shadura <andrewsh@debian.org> | |
18 | 18 | License: MIT or Apache-2.0 |
19 | 19 | |
20 | 20 | License: Apache-2.0 |
0 | New: | |
1 | - unsafe-libyaml | |
2 | Note: | |
3 | Preparation update, should be in sync with at least alacritty-* and bat |
0 | rust-serde-yaml (0.9.17-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package serde_yaml 0.9.17 from crates.io using debcargo 2.6.0 | |
4 | ||
5 | -- Blair Noctis <n@sail.ng> Fri, 10 Feb 2023 15:54:06 +0000 | |
6 | ||
0 | 7 | rust-serde-yaml (0.8.26-1) unstable; urgency=medium |
1 | 8 | |
2 | 9 | * Team upload. |
13 | 13 | |
14 | 14 | Files: debian/* |
15 | 15 | Copyright: |
16 | 2019-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
17 | 2019-2022 Wolfgang Silbermayr <wolfgang@silbermayr.at> | |
16 | 2019-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
17 | 2019-2023 Wolfgang Silbermayr <wolfgang@silbermayr.at> | |
18 | 18 | License: MIT or Apache-2.0 |
19 | 19 | |
20 | 20 | License: Apache-2.0 |
0 | rust-socket2 (0.4.7-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package socket2 0.4.7 from crates.io using debcargo 2.6.0 | |
4 | ||
5 | -- Blair Noctis <n@sail.ng> Fri, 10 Feb 2023 17:32:22 +0000 | |
6 | ||
0 | 7 | rust-socket2 (0.4.4-1) unstable; urgency=medium |
1 | 8 | |
2 | 9 | * Team upload. |
15 | 15 | be correct information so you should review and fix this before uploading to |
16 | 16 | the archive. |
17 | 17 | |
18 | Files: ./LICENSE-MIT | |
18 | Files: LICENSE-MIT | |
19 | 19 | Copyright: 2014 Alex Crichton |
20 | 20 | License: UNKNOWN-LICENSE; FIXME (overlay) |
21 | 21 | Comment: |
22 | 22 | FIXME (overlay): These notices are extracted from files. Please review them |
23 | 23 | before uploading to the archive. |
24 | 24 | |
25 | Files: ./src/lib.rs | |
25 | Files: src/lib.rs | |
26 | 26 | Copyright: 2015 The Rust Project Developers. |
27 | 27 | License: UNKNOWN-LICENSE; FIXME (overlay) |
28 | 28 | Comment: |
29 | 29 | FIXME (overlay): These notices are extracted from files. Please review them |
30 | 30 | before uploading to the archive. |
31 | 31 | |
32 | Files: ./src/socket.rs | |
32 | Files: src/socket.rs | |
33 | 33 | Copyright: 2015 The Rust Project Developers. |
34 | 34 | License: UNKNOWN-LICENSE; FIXME (overlay) |
35 | 35 | Comment: |
36 | 36 | FIXME (overlay): These notices are extracted from files. Please review them |
37 | 37 | before uploading to the archive. |
38 | 38 | |
39 | Files: ./src/sys/unix.rs | |
39 | Files: src/sys/unix.rs | |
40 | 40 | Copyright: 2015 The Rust Project Developers. |
41 | 41 | License: UNKNOWN-LICENSE; FIXME (overlay) |
42 | 42 | Comment: |
43 | 43 | FIXME (overlay): These notices are extracted from files. Please review them |
44 | 44 | before uploading to the archive. |
45 | 45 | |
46 | Files: ./src/sys/windows.rs | |
46 | Files: src/sys/windows.rs | |
47 | 47 | Copyright: 2015 The Rust Project Developers. |
48 | 48 | License: UNKNOWN-LICENSE; FIXME (overlay) |
49 | 49 | Comment: |
52 | 52 | |
53 | 53 | Files: debian/* |
54 | 54 | Copyright: |
55 | 2018-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
56 | 2018-2022 Ximin Luo <infinity0@debian.org> | |
57 | 2018-2022 kpcyrd <git@rxv.cc> | |
55 | 2018-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
56 | 2018-2023 Ximin Luo <infinity0@debian.org> | |
57 | 2018-2023 kpcyrd <git@rxv.cc> | |
58 | 58 | License: MIT or Apache-2.0 |
59 | 59 | |
60 | 60 | License: Apache-2.0 |
0 | rust-test-dir (0.2.0-4) unstable; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package test_dir 0.2.0 from crates.io using debcargo 2.6.0 | |
4 | * Use CARGO_TARGET_DIR instead of /tmp, it's safer. | |
5 | + unfortunately we can't use CARGO_TARGET_TMPDIR because it's not available | |
6 | to unit tests. | |
7 | ||
8 | -- Peter Michael Green <plugwash@debian.org> Sat, 11 Feb 2023 08:05:41 +0000 | |
9 | ||
10 | rust-test-dir (0.2.0-3) unstable; urgency=medium | |
11 | ||
12 | * Team upload. | |
13 | * Patch to create test dirs in /tmp to avoid permission error | |
14 | (Closes: #1030948) | |
15 | ||
16 | -- Blair Noctis <n@sail.ng> Sat, 11 Feb 2023 07:03:14 +0000 | |
17 | ||
0 | 18 | rust-test-dir (0.2.0-2) unstable; urgency=medium |
1 | 19 | |
2 | 20 | * Team upload. |
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: 2019 Rafał Pachołek |
16 | 16 | License: UNKNOWN-LICENSE; FIXME (overlay) |
17 | 17 | Comment: |
20 | 20 | |
21 | 21 | Files: debian/* |
22 | 22 | Copyright: |
23 | 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
24 | 2022 Ben Westover <me@benthetechguy.net> | |
23 | 2022-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
24 | 2022-2023 Ben Westover <me@benthetechguy.net> | |
25 | 25 | License: MIT |
26 | 26 | |
27 | 27 | License: MIT |
0 | write-test-files-in-cargo-target-dir.patch |
0 | Index: test-dir/src/lib.rs | |
1 | =================================================================== | |
2 | --- test-dir.orig/src/lib.rs | |
3 | +++ test-dir/src/lib.rs | |
4 | @@ -313,6 +313,9 @@ mod tests { | |
5 | fn test_testdir_current_rnd_dir() { | |
6 | let path; | |
7 | { | |
8 | + if let Some(cargo_target_dir) = option_env!("CARGO_TARGET_DIR") { | |
9 | + std::env::set_current_dir(cargo_target_dir).unwrap(); | |
10 | + } | |
11 | let dir = TestDir::current_rnd(); | |
12 | ||
13 | // Dir created | |
14 | @@ -332,6 +335,9 @@ mod tests { | |
15 | fn test_testdir_current_dir() { | |
16 | let path; | |
17 | { | |
18 | + if let Some(cargo_target_dir) = option_env!("CARGO_TARGET_DIR") { | |
19 | + std::env::set_current_dir(cargo_target_dir).unwrap(); | |
20 | + } | |
21 | let dir = TestDir::current("a/b/c"); | |
22 | ||
23 | // Dir created |
0 | rust-unindent (0.2.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Team upload. | |
3 | * Package unindent 0.2.0 from crates.io using debcargo 2.6.0 | |
4 | * Patch to fix an ambiguous (mod) name error | |
5 | ||
6 | -- Blair Noctis <n@sail.ng> Fri, 10 Feb 2023 14:17:57 +0000 | |
7 | ||
0 | 8 | rust-unindent (0.1.8-1) unstable; urgency=medium |
1 | 9 | |
2 | 10 | * Team upload. |
13 | 13 | |
14 | 14 | Files: debian/* |
15 | 15 | Copyright: |
16 | 2020-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
17 | 2020-2022 Sylvestre Ledru <sylvestre@debian.org> | |
16 | 2020-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
17 | 2020-2023 Sylvestre Ledru <sylvestre@debian.org> | |
18 | 18 | License: MIT or Apache-2.0 |
19 | 19 | |
20 | 20 | License: Apache-2.0 |
0 | unambiguous-mod-unindent.patch |
0 | Description: Fix "ambiguous name" error when testing as a separate crate | |
1 | Bug: https://github.com/dtolnay/indoc/issues/58 | |
2 | --- a/src/lib.rs | |
3 | +++ b/src/lib.rs | |
4 | @@ -56,4 +56,4 @@ | |
5 | ||
6 | mod unindent; | |
7 | ||
8 | -pub use unindent::*; | |
9 | +pub use crate::unindent::*; |
0 | rust-unsafe-libyaml (0.2.5-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
1 | ||
2 | * Package unsafe-libyaml 0.2.5 from crates.io using debcargo 2.6.0 | |
3 | ||
4 | -- Blair Noctis <n@sail.ng> Fri, 10 Feb 2023 15:40:17 +0000 |
0 | Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ | |
1 | Upstream-Name: unsafe-libyaml | |
2 | Upstream-Contact: David Tolnay <dtolnay@gmail.com> | |
3 | Source: https://github.com/dtolnay/unsafe-libyaml | |
4 | ||
5 | Files: * | |
6 | Copyright: 2022 David Tolnay <dtolnay@gmail.com> | |
7 | License: MIT | |
8 | ||
9 | Files: debian/* | |
10 | Copyright: | |
11 | 2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
12 | 2023 Blair Noctis <n@sail.ng> | |
13 | License: MIT | |
14 | ||
15 | License: MIT | |
16 | Permission is hereby granted, free of charge, to any person obtaining a copy | |
17 | of this software and associated documentation files (the "Software"), to deal | |
18 | in the Software without restriction, including without limitation the rights | |
19 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |
20 | copies of the Software, and to permit persons to whom the Software is | |
21 | furnished to do so, subject to the following conditions: | |
22 | . | |
23 | The above copyright notice and this permission notice shall be included in all | |
24 | copies or substantial portions of the Software. | |
25 | . | |
26 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |
27 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |
28 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | |
29 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | |
30 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | |
31 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | |
32 | SOFTWARE. |
0 | Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ | |
1 | Upstream-Name: unsafe-libyaml | |
2 | Upstream-Contact: David Tolnay <dtolnay@gmail.com> | |
3 | Source: https://github.com/dtolnay/unsafe-libyaml | |
4 | ||
5 | Files: * | |
6 | Copyright: FIXME (overlay) UNKNOWN-YEARS David Tolnay <dtolnay@gmail.com> | |
7 | License: MIT | |
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: debian/* | |
15 | Copyright: | |
16 | 2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
17 | 2023 Blair Noctis <n@sail.ng> | |
18 | License: MIT | |
19 | ||
20 | License: MIT | |
21 | Permission is hereby granted, free of charge, to any person obtaining a copy | |
22 | of this software and associated documentation files (the "Software"), to deal | |
23 | in the Software without restriction, including without limitation the rights | |
24 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |
25 | copies of the Software, and to permit persons to whom the Software is | |
26 | furnished to do so, subject to the following conditions: | |
27 | . | |
28 | The above copyright notice and this permission notice shall be included in all | |
29 | copies or substantial portions of the Software. | |
30 | . | |
31 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |
32 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |
33 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | |
34 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | |
35 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | |
36 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | |
37 | SOFTWARE. |
0 | overlay = "." | |
1 | uploaders = ["Blair Noctis <n@sail.ng>"] | |
2 | ||
3 | # test bins in src/bin | |
4 | bin = false | |
5 | ||
6 | [packages.lib] | |
7 | # Git source has 0.2.5 published with a "unsafe-libyaml-test-suite" pointing | |
8 | # to `tests/data` (commit b47a144ecd), but the one published on crates.io | |
9 | # doesn't have this. This test crate has been published on crates.io but later | |
10 | # yanked. | |
11 | test_is_broken = true |
0 | rust-webbrowser (0.5.5-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium | |
0 | rust-webbrowser (0.8.7-1) unstable; urgency=medium | |
1 | 1 | |
2 | * Package webbrowser 0.8.7 from crates.io using debcargo 2.6.0 | |
3 | * Disable tests that depend on actix-web and actix-files | |
4 | * Add test_depends on firefox-esr | |
5 | ||
6 | [ Blair Noctis ] | |
7 | * Package webbrowser 0.8.7 from crates.io using debcargo 2.6.0 | |
8 | (Closes: #1031017) | |
9 | * Patch to remove dep on actix-web, actix-files, not yet in Debian | |
10 | * Patch to remove deps for other platforms | |
11 | * Remove d/rules and dep on xdg-util, problem addressed upstream | |
12 | ||
13 | [ Nick Black ] | |
2 | 14 | * Team upload. |
3 | 15 | * package.lib -> packages.lib |
4 | 16 | * Package webbrowser 0.5.5 from crates.io using debcargo 2.4.2 |
5 | 17 | |
6 | -- Nick Black <dankamongmen@gmail.com> Sun, 30 Aug 2020 08:19:18 -0400 | |
18 | -- Peter Michael Green <plugwash@debian.org> Sat, 11 Feb 2023 05:34:11 +0000 | |
7 | 19 | |
8 | 20 | rust-webbrowser (0.5.2-2) unstable; urgency=medium |
9 | 21 |
3 | 3 | Source: https://github.com/amodm/webbrowser-rs |
4 | 4 | |
5 | 5 | Files: * |
6 | Copyright: 2015-2019 Amod Malviya @amodm | |
6 | Copyright: 2015-2023 Amod Malviya @amodm | |
7 | 7 | License: MIT or Apache-2.0 |
8 | 8 | |
9 | 9 | Files: debian/* |
10 | 10 | Copyright: |
11 | 2019-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
11 | 2019-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
12 | 12 | 2019-2020 Ximin Luo <infinity0@debian.org> |
13 | 13 | License: MIT or Apache-2.0 |
14 | 14 |
11 | 11 | be correct information so you should review and fix this before uploading to |
12 | 12 | the archive. |
13 | 13 | |
14 | Files: ./LICENSE-APACHE | |
15 | Copyright: 2015 Amod Malviya | |
14 | Files: LICENSE-APACHE | |
15 | Copyright: 2015-2022 Amod Malviya | |
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: ./LICENSE-MIT | |
22 | Copyright: 2015 Amod Malviya | |
21 | Files: LICENSE-MIT | |
22 | Copyright: 2015-2022 Amod Malviya | |
23 | 23 | License: UNKNOWN-LICENSE; FIXME (overlay) |
24 | 24 | Comment: |
25 | 25 | FIXME (overlay): These notices are extracted from files. Please review them |
27 | 27 | |
28 | 28 | Files: debian/* |
29 | 29 | Copyright: |
30 | 2019-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
31 | 2019-2020 Ximin Luo <infinity0@debian.org> | |
30 | 2019-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> | |
31 | 2019-2023 Ximin Luo <infinity0@debian.org> | |
32 | 32 | License: MIT or Apache-2.0 |
33 | 33 | |
34 | 34 | License: Apache-2.0 |
1 | 1 | uploaders = ["Ximin Luo <infinity0@debian.org>"] |
2 | 2 | |
3 | 3 | [packages.lib] |
4 | depends = ["xdg-utils"] | |
4 | test_depends = ["firefox-esr"] |
0 | --- a/Cargo.toml | |
1 | +++ b/Cargo.toml | |
2 | @@ -47,7 +47,7 @@ | |
3 | version = "0.8" | |
4 | ||
5 | [dev-dependencies.serial_test] | |
6 | -version = "0.10" | |
7 | +version = "0.9" | |
8 | ||
9 | [dev-dependencies.tokio] | |
10 | version = "1" |
0 | --- a/Cargo.toml | |
1 | +++ b/Cargo.toml | |
2 | @@ -64,24 +64,3 @@ | |
3 | [target."cfg(any(target_os = \"linux\", target_os = \"freebsd\", target_os = \"netbsd\", target_os = \"openbsd\", target_os = \"haiku\"))".dependencies.dirs] | |
4 | version = "4.0" | |
5 | ||
6 | -[target."cfg(target_arch = \"wasm32\")".dependencies.web-sys] | |
7 | -version = "0.3" | |
8 | -features = ["Window"] | |
9 | - | |
10 | -[target."cfg(target_os = \"android\")".dependencies.jni] | |
11 | -version = "0.20" | |
12 | - | |
13 | -[target."cfg(target_os = \"android\")".dependencies.ndk-context] | |
14 | -version = "0.1" | |
15 | - | |
16 | -[target."cfg(target_os = \"android\")".dev-dependencies.ndk-glue] | |
17 | -version = ">= 0.3, <= 0.7" | |
18 | - | |
19 | -[target."cfg(target_os = \"ios\")".dependencies.objc] | |
20 | -version = "0.2.7" | |
21 | - | |
22 | -[target."cfg(target_os = \"ios\")".dependencies.raw-window-handle] | |
23 | -version = "0.5.0" | |
24 | - | |
25 | -[target."cfg(target_os = \"macos\")".dependencies.core-foundation] | |
26 | -version = "0.9" |
0 | Index: webbrowser/Cargo.toml | |
1 | =================================================================== | |
2 | --- webbrowser.orig/Cargo.toml | |
3 | +++ webbrowser/Cargo.toml | |
4 | @@ -31,12 +31,6 @@ version = "0.4" | |
5 | [dependencies.url] | |
6 | version = "2" | |
7 | ||
8 | -[dev-dependencies.actix-files] | |
9 | -version = "0.6" | |
10 | - | |
11 | -[dev-dependencies.actix-web] | |
12 | -version = "4" | |
13 | - | |
14 | [dev-dependencies.crossbeam-channel] | |
15 | version = "0.5" | |
16 | ||
17 | Index: webbrowser/tests/common.rs | |
18 | =================================================================== | |
19 | --- webbrowser.orig/tests/common.rs | |
20 | +++ webbrowser/tests/common.rs | |
21 | @@ -1,5 +1,5 @@ | |
22 | -use actix_files as fs; | |
23 | -use actix_web::{web, App, HttpRequest, HttpResponse, HttpServer, Responder}; | |
24 | +//use actix_files as fs; | |
25 | +//use actix_web::{web, App, HttpRequest, HttpResponse, HttpServer, Responder}; | |
26 | use crossbeam_channel as cbc; | |
27 | use rand::RngCore; | |
28 | use std::{io::Write, path::PathBuf, sync::Arc}; | |
29 | @@ -11,7 +11,7 @@ struct AppState { | |
30 | tx: Arc<cbc::Sender<String>>, | |
31 | } | |
32 | ||
33 | -async fn log_handler(req: HttpRequest, data: web::Data<AppState>) -> impl Responder { | |
34 | +/*async fn log_handler(req: HttpRequest, data: web::Data<AppState>) -> impl Responder { | |
35 | if data.tx.send(req.uri().to_string()).is_err() { | |
36 | panic!("channel send failed"); | |
37 | } | |
38 | @@ -25,9 +25,9 @@ async fn log_handler(req: HttpRequest, d | |
39 | .content_type("text/html; charset=utf-8") | |
40 | .body(format!("<html><body><p>URI: {}</p><script type=\"text/javascript>window.close();</script></body></html>", req.uri())) | |
41 | } | |
42 | -} | |
43 | +}*/ | |
44 | ||
45 | -async fn delayed_response(req: HttpRequest) -> impl Responder { | |
46 | +/*async fn delayed_response(req: HttpRequest) -> impl Responder { | |
47 | let qs = req.query_string(); | |
48 | let ms: u64 = qs | |
49 | .replace("ms=", "") | |
50 | @@ -40,9 +40,9 @@ async fn delayed_response(req: HttpReque | |
51 | "<html><body><p>Delayed by {}ms</p></body></html>", | |
52 | qs | |
53 | )) | |
54 | -} | |
55 | +}*/ | |
56 | ||
57 | -pub async fn check_request_received_using<F>(uri: String, host: &str, op: F) | |
58 | +/*pub async fn check_request_received_using<F>(uri: String, host: &str, op: F) | |
59 | where | |
60 | F: FnOnce(&str), | |
61 | { | |
62 | @@ -89,17 +89,17 @@ where | |
63 | ||
64 | // stop the server | |
65 | server_handle.stop(true).await; | |
66 | -} | |
67 | +}*/ | |
68 | ||
69 | -#[allow(dead_code)] | |
70 | +/*#[allow(dead_code)] | |
71 | pub async fn check_request_received(browser: Browser, uri: String) { | |
72 | check_request_received_using(uri, "127.0.0.1", |url| { | |
73 | open_browser(browser, url).expect("failed to open browser"); | |
74 | }) | |
75 | .await; | |
76 | -} | |
77 | +}*/ | |
78 | ||
79 | -#[allow(dead_code)] | |
80 | +/*#[allow(dead_code)] | |
81 | pub async fn check_local_file<F>(browser: Browser, html_dir: Option<PathBuf>, url_op: F) | |
82 | where | |
83 | F: FnOnce(&PathBuf) -> String, | |
84 | @@ -126,13 +126,13 @@ where | |
85 | }) | |
86 | .await; | |
87 | let _ = std::fs::remove_file(&pb); | |
88 | -} | |
89 | +}*/ | |
90 | ||
91 | -#[allow(dead_code)] | |
92 | +/*#[allow(dead_code)] | |
93 | pub async fn check_browser(browser: Browser, platform: &str) { | |
94 | check_request_received(browser, format!("/{}", platform)).await; | |
95 | check_request_received(browser, format!("/{}/😀😀😀", platform)).await; | |
96 | -} | |
97 | +}*/ | |
98 | ||
99 | const URI_PNG_1PX: &str = "/img/1px.png"; | |
100 | ||
101 | Index: webbrowser/tests/test_unix.rs | |
102 | =================================================================== | |
103 | --- webbrowser.orig/tests/test_unix.rs | |
104 | +++ webbrowser/tests/test_unix.rs | |
105 | @@ -9,11 +9,11 @@ mod tests { | |
106 | use serial_test::serial; | |
107 | use webbrowser::Browser; | |
108 | ||
109 | - #[tokio::test(flavor = "multi_thread", worker_threads = 2)] | |
110 | + /*#[tokio::test(flavor = "multi_thread", worker_threads = 2)] | |
111 | #[serial] | |
112 | async fn test_open_default() { | |
113 | check_browser(Browser::Default, TEST_PLATFORM).await; | |
114 | - } | |
115 | + }*/ | |
116 | ||
117 | #[test] | |
118 | fn test_existence_default() { | |
119 | @@ -25,7 +25,7 @@ mod tests { | |
120 | assert!(!Browser::Safari.exists(), "should not have found Safari"); | |
121 | } | |
122 | ||
123 | - #[cfg(not(feature = "hardened"))] | |
124 | + /*#[cfg(not(feature = "hardened"))] | |
125 | #[tokio::test(flavor = "multi_thread", worker_threads = 2)] | |
126 | #[serial] | |
127 | async fn test_local_file_abs_path() { | |
128 | @@ -60,7 +60,7 @@ mod tests { | |
129 | .to_string() | |
130 | }) | |
131 | .await; | |
132 | - } | |
133 | + }*/ | |
134 | ||
135 | #[cfg(feature = "hardened")] | |
136 | #[test] | |
137 | Index: webbrowser/tests/test_wasm.rs | |
138 | =================================================================== | |
139 | --- webbrowser.orig/tests/test_wasm.rs | |
140 | +++ webbrowser/tests/test_wasm.rs | |
141 | @@ -5,14 +5,14 @@ mod common; | |
142 | mod tests { | |
143 | const TEST_PLATFORM: &str = "wasm32"; | |
144 | ||
145 | - use super::common::check_request_received_using; | |
146 | + //use super::common::check_request_received_using; | |
147 | use std::fs; | |
148 | use std::path::PathBuf; | |
149 | ||
150 | // to run this test, run it as: | |
151 | // cargo test --test test_wasm32 -- --ignored | |
152 | // | |
153 | - #[ignore] | |
154 | + /*#[ignore] | |
155 | #[tokio::test(flavor = "multi_thread", worker_threads = 2)] | |
156 | async fn test_wasm32() { | |
157 | let uri = &format!("/{}", TEST_PLATFORM); | |
158 | @@ -43,5 +43,5 @@ mod tests { | |
159 | status.expect("browser open failed"); | |
160 | }) | |
161 | .await; | |
162 | - } | |
163 | + }*/ | |
164 | } |
0 | --- a/Cargo.toml | |
1 | +++ b/Cargo.toml | |
2 | @@ -59,7 +59,6 @@ | |
3 | [features] | |
4 | disable-wsl = [] | |
5 | hardened = [] | |
6 | -wasm-console = ["web-sys/console"] | |
7 | ||
8 | [target."cfg(any(target_os = \"linux\", target_os = \"freebsd\", target_os = \"netbsd\", target_os = \"openbsd\", target_os = \"haiku\"))".dependencies.dirs] | |
9 | version = "4.0" |
0 | relax-deps.patch | |
1 | remove-other-platform-deps.patch | |
2 | remove-wasm-feature.patch | |
3 | remove-unavailable-actix-deps.patch |