diff -Nru rust-ctrlc-3.2.2/Cargo.lock rust-ctrlc-3.2.3/Cargo.lock --- rust-ctrlc-3.2.2/Cargo.lock 1970-01-01 00:00:01.000000000 +0000 +++ rust-ctrlc-3.2.3/Cargo.lock 1970-01-01 00:00:01.000000000 +0000 @@ -3,6 +3,12 @@ version = 3 [[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -16,7 +22,7 @@ [[package]] name = "ctrlc" -version = "3.2.2" +version = "3.2.3" dependencies = [ "nix", "winapi", @@ -24,16 +30,17 @@ [[package]] name = "libc" -version = "0.2.124" +version = "0.2.131" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50" +checksum = "04c3b4822ccebfa39c02fc03d1534441b22ead323fa0f48bb7ddd8e6ba076a40" [[package]] name = "nix" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9" +checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb" dependencies = [ + "autocfg", "bitflags", "cfg-if", "libc", diff -Nru rust-ctrlc-3.2.2/Cargo.toml rust-ctrlc-3.2.3/Cargo.toml --- rust-ctrlc-3.2.2/Cargo.toml 1970-01-01 00:00:01.000000000 +0000 +++ rust-ctrlc-3.2.3/Cargo.toml 1970-01-01 00:00:01.000000000 +0000 @@ -12,14 +12,21 @@ [package] edition = "2018" name = "ctrlc" -version = "3.2.2" +version = "3.2.3" authors = ["Antti Keränen "] -exclude = ["/.travis.yml", "/appveyor.yml"] +exclude = [ + "/.travis.yml", + "/appveyor.yml", +] description = "Easy Ctrl-C handler for Rust projects" homepage = "https://github.com/Detegr/rust-ctrlc" documentation = "http://detegr.github.io/doc/ctrlc" readme = "README.md" -keywords = ["ctrlc", "signal", "SIGINT"] +keywords = [ + "ctrlc", + "signal", + "SIGINT", +] categories = ["os"] license = "MIT/Apache-2.0" repository = "https://github.com/Detegr/rust-ctrlc.git" @@ -31,13 +38,28 @@ [features] termination = [] + [target."cfg(unix)".dependencies.nix] -version = "0.24" -features = ["fs", "signal"] +version = "0.25" +features = [ + "fs", + "signal", +] default-features = false + [target."cfg(windows)".dependencies.winapi] version = "0.3" -features = ["consoleapi", "handleapi", "synchapi", "winbase"] +features = [ + "consoleapi", + "handleapi", + "synchapi", + "winbase", +] + [target."cfg(windows)".dev-dependencies.winapi] version = "0.3" -features = ["fileapi", "processenv", "winnt"] +features = [ + "fileapi", + "processenv", + "winnt", +] diff -Nru rust-ctrlc-3.2.2/Cargo.toml.orig rust-ctrlc-3.2.3/Cargo.toml.orig --- rust-ctrlc-3.2.2/Cargo.toml.orig 1973-11-29 21:33:09.000000000 +0000 +++ rust-ctrlc-3.2.3/Cargo.toml.orig 1973-11-29 21:33:09.000000000 +0000 @@ -1,6 +1,6 @@ [package] name = "ctrlc" -version = "3.2.2" +version = "3.2.3" authors = ["Antti Keränen "] description = "Easy Ctrl-C handler for Rust projects" documentation = "http://detegr.github.io/doc/ctrlc" @@ -14,7 +14,7 @@ readme = "README.md" [target.'cfg(unix)'.dependencies] -nix = { version = "0.24", default-features = false, features = ["fs", "signal"]} +nix = { version = "0.25", default-features = false, features = ["fs", "signal"]} [target.'cfg(windows)'.dependencies] winapi = { version = "0.3", features = ["consoleapi", "handleapi", "synchapi", "winbase"] } diff -Nru rust-ctrlc-3.2.2/.cargo_vcs_info.json rust-ctrlc-3.2.3/.cargo_vcs_info.json --- rust-ctrlc-3.2.2/.cargo_vcs_info.json 1970-01-01 00:00:01.000000000 +0000 +++ rust-ctrlc-3.2.3/.cargo_vcs_info.json 1970-01-01 00:00:01.000000000 +0000 @@ -1,6 +1,6 @@ { "git": { - "sha1": "f585c8940efaf1fa7451b00fdcffe0fdf43c615a" + "sha1": "08abf10d65095dc3b4ff5025be1c312e167108a3" }, "path_in_vcs": "" } \ No newline at end of file diff -Nru rust-ctrlc-3.2.2/debian/cargo-checksum.json rust-ctrlc-3.2.3/debian/cargo-checksum.json --- rust-ctrlc-3.2.2/debian/cargo-checksum.json 2022-06-07 21:44:31.000000000 +0000 +++ rust-ctrlc-3.2.3/debian/cargo-checksum.json 2022-08-22 07:46:41.000000000 +0000 @@ -1 +1 @@ -{"package":"b37feaa84e6861e00a1f5e5aa8da3ee56d605c9992d33e082786754828e20865","files":{}} +{"package":"Could not get crate checksum","files":{}} diff -Nru rust-ctrlc-3.2.2/debian/changelog rust-ctrlc-3.2.3/debian/changelog --- rust-ctrlc-3.2.2/debian/changelog 2022-06-07 21:44:31.000000000 +0000 +++ rust-ctrlc-3.2.3/debian/changelog 2022-08-22 07:46:41.000000000 +0000 @@ -1,3 +1,11 @@ +rust-ctrlc (3.2.3-1) unstable; urgency=medium + + * Team upload. + * Package ctrlc 3.2.3 from crates.io using debcargo 2.5.0 + * relax nix dep + + -- Sylvestre Ledru Mon, 22 Aug 2022 09:46:41 +0200 + rust-ctrlc (3.2.2-3) unstable; urgency=medium * Team upload. diff -Nru rust-ctrlc-3.2.2/debian/control rust-ctrlc-3.2.3/debian/control --- rust-ctrlc-3.2.2/debian/control 2022-06-07 21:44:31.000000000 +0000 +++ rust-ctrlc-3.2.3/debian/control 2022-08-22 07:46:41.000000000 +0000 @@ -6,8 +6,8 @@ cargo:native , rustc:native , libstd-rust-dev , - librust-nix-0.24+fs-dev , - librust-nix-0.24+signal-dev , + librust-nix-0+fs-dev , + librust-nix-0+signal-dev , librust-winapi-0.3+consoleapi-dev , librust-winapi-0.3+default-dev , librust-winapi-0.3+handleapi-dev , @@ -28,8 +28,8 @@ Multi-Arch: same Depends: ${misc:Depends}, - librust-nix-0.24+fs-dev, - librust-nix-0.24+signal-dev, + librust-nix-0+fs-dev, + librust-nix-0+signal-dev, librust-winapi-0.3+consoleapi-dev, librust-winapi-0.3+default-dev, librust-winapi-0.3+handleapi-dev, @@ -44,9 +44,9 @@ librust-ctrlc-3.2-dev (= ${binary:Version}), librust-ctrlc-3.2+default-dev (= ${binary:Version}), librust-ctrlc-3.2+termination-dev (= ${binary:Version}), - librust-ctrlc-3.2.2-dev (= ${binary:Version}), - librust-ctrlc-3.2.2+default-dev (= ${binary:Version}), - librust-ctrlc-3.2.2+termination-dev (= ${binary:Version}) + librust-ctrlc-3.2.3-dev (= ${binary:Version}), + librust-ctrlc-3.2.3+default-dev (= ${binary:Version}), + librust-ctrlc-3.2.3+termination-dev (= ${binary:Version}) Description: Easy Ctrl-C handler for Rust projects - Rust source code This package contains the source for the Rust ctrlc crate, packaged by debcargo for use with cargo and dh-cargo. diff -Nru rust-ctrlc-3.2.2/debian/patches/relax-nix.diff rust-ctrlc-3.2.3/debian/patches/relax-nix.diff --- rust-ctrlc-3.2.2/debian/patches/relax-nix.diff 1970-01-01 00:00:00.000000000 +0000 +++ rust-ctrlc-3.2.3/debian/patches/relax-nix.diff 2022-08-22 07:46:41.000000000 +0000 @@ -0,0 +1,13 @@ +Index: ctrlc/Cargo.toml +=================================================================== +--- ctrlc.orig/Cargo.toml ++++ ctrlc/Cargo.toml +@@ -40,7 +40,7 @@ harness = false + termination = [] + + [target."cfg(unix)".dependencies.nix] +-version = "0.25" ++version = "0" + features = [ + "fs", + "signal", diff -Nru rust-ctrlc-3.2.2/debian/patches/series rust-ctrlc-3.2.3/debian/patches/series --- rust-ctrlc-3.2.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ rust-ctrlc-3.2.3/debian/patches/series 2022-08-22 07:46:41.000000000 +0000 @@ -0,0 +1 @@ +relax-nix.diff diff -Nru rust-ctrlc-3.2.2/debian/tests/control rust-ctrlc-3.2.3/debian/tests/control --- rust-ctrlc-3.2.2/debian/tests/control 2022-06-07 21:44:31.000000000 +0000 +++ rust-ctrlc-3.2.3/debian/tests/control 2022-08-22 07:46:41.000000000 +0000 @@ -1,19 +1,19 @@ -Test-Command: /usr/share/cargo/bin/cargo-auto-test ctrlc 3.2.2 --all-targets --all-features +Test-Command: /usr/share/cargo/bin/cargo-auto-test ctrlc 3.2.3 --all-targets --all-features Features: test-name=rust-ctrlc:@ Depends: dh-cargo (>= 18), librust-winapi-0.3+default-dev, librust-winapi-0.3+fileapi-dev, librust-winapi-0.3+processenv-dev, librust-winapi-0.3+winnt-dev, @ Restrictions: allow-stderr, skip-not-installable -Test-Command: /usr/share/cargo/bin/cargo-auto-test ctrlc 3.2.2 --all-targets +Test-Command: /usr/share/cargo/bin/cargo-auto-test ctrlc 3.2.3 --all-targets Features: test-name=librust-ctrlc-dev:default Depends: dh-cargo (>= 18), librust-winapi-0.3+default-dev, librust-winapi-0.3+fileapi-dev, librust-winapi-0.3+processenv-dev, librust-winapi-0.3+winnt-dev, @ Restrictions: allow-stderr, skip-not-installable -Test-Command: /usr/share/cargo/bin/cargo-auto-test ctrlc 3.2.2 --all-targets --no-default-features --features termination +Test-Command: /usr/share/cargo/bin/cargo-auto-test ctrlc 3.2.3 --all-targets --no-default-features --features termination Features: test-name=librust-ctrlc-dev:termination Depends: dh-cargo (>= 18), librust-winapi-0.3+default-dev, librust-winapi-0.3+fileapi-dev, librust-winapi-0.3+processenv-dev, librust-winapi-0.3+winnt-dev, @ Restrictions: allow-stderr, skip-not-installable -Test-Command: /usr/share/cargo/bin/cargo-auto-test ctrlc 3.2.2 --all-targets --no-default-features +Test-Command: /usr/share/cargo/bin/cargo-auto-test ctrlc 3.2.3 --all-targets --no-default-features Features: test-name=librust-ctrlc-dev: Depends: dh-cargo (>= 18), librust-winapi-0.3+default-dev, librust-winapi-0.3+fileapi-dev, librust-winapi-0.3+processenv-dev, librust-winapi-0.3+winnt-dev, @ Restrictions: allow-stderr, skip-not-installable diff -Nru rust-ctrlc-3.2.2/src/lib.rs rust-ctrlc-3.2.3/src/lib.rs --- rust-ctrlc-3.2.2/src/lib.rs 1973-11-29 21:33:09.000000000 +0000 +++ rust-ctrlc-3.2.3/src/lib.rs 1973-11-29 21:33:09.000000000 +0000 @@ -89,7 +89,7 @@ where F: FnMut() -> () + 'static + Send, { - if INIT.compare_and_swap(false, true, Ordering::SeqCst) { + if INIT.compare_exchange(false, true, Ordering::SeqCst, Ordering::SeqCst).map_or_else(|e| e, |a| a) { return Err(Error::MultipleHandlers); } diff -Nru rust-ctrlc-3.2.2/src/platform/unix/mod.rs rust-ctrlc-3.2.3/src/platform/unix/mod.rs --- rust-ctrlc-3.2.2/src/platform/unix/mod.rs 1973-11-29 21:33:09.000000000 +0000 +++ rust-ctrlc-3.2.3/src/platform/unix/mod.rs 1973-11-29 21:33:09.000000000 +0000 @@ -26,9 +26,9 @@ } } -// pipe2(2) is not available on macOS or iOS, so we need to use pipe(2) and fcntl(2) +// pipe2(2) is not available on macOS, iOS or Haiku, so we need to use pipe(2) and fcntl(2) #[inline] -#[cfg(any(target_os = "ios", target_os = "macos"))] +#[cfg(any(target_os = "ios", target_os = "macos", target_os = "haiku"))] fn pipe2(flags: nix::fcntl::OFlag) -> nix::Result<(RawFd, RawFd)> { use nix::fcntl::{fcntl, FcntlArg, FdFlag, OFlag}; @@ -59,7 +59,7 @@ } #[inline] -#[cfg(not(any(target_os = "ios", target_os = "macos")))] +#[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "haiku")))] fn pipe2(flags: nix::fcntl::OFlag) -> nix::Result<(RawFd, RawFd)> { unistd::pipe2(flags) } @@ -99,6 +99,7 @@ signal::SigSet::empty(), ); + #[allow(unused_variables)] let sigint_old = match signal::sigaction(signal::Signal::SIGINT, &new_action) { Ok(old) => old, Err(e) => return Err(close_pipe(e)),