diff -Nru rust-ptyprocess-0.4.1/debian/cargo-checksum.json rust-ptyprocess-0.4.1/debian/cargo-checksum.json --- rust-ptyprocess-0.4.1/debian/cargo-checksum.json 2023-12-24 14:05:02.000000000 +0000 +++ rust-ptyprocess-0.4.1/debian/cargo-checksum.json 2024-02-25 20:23:57.000000000 +0000 @@ -1 +1 @@ -{"package":"7e05aef7befb11a210468a2d77d978dde2c6381a0381e33beb575e91f57fe8cf","files":{}} +{"package":"Could not get crate checksum","files":{}} diff -Nru rust-ptyprocess-0.4.1/debian/changelog rust-ptyprocess-0.4.1/debian/changelog --- rust-ptyprocess-0.4.1/debian/changelog 2023-12-24 14:05:02.000000000 +0000 +++ rust-ptyprocess-0.4.1/debian/changelog 2024-04-01 05:15:37.000000000 +0000 @@ -1,3 +1,17 @@ +rust-ptyprocess (0.4.1-2build1) noble; urgency=medium + + * No-change rebuild for CVE-2024-3094 + + -- William Grant Mon, 01 Apr 2024 16:15:37 +1100 + +rust-ptyprocess (0.4.1-2) experimental; urgency=medium + + * Team upload. + * Package ptyprocess 0.4.1 from crates.io using debcargo 2.6.1 + * Add patch for nix 0.27 + + -- Peter Michael Green Sun, 25 Feb 2024 20:23:57 +0000 + rust-ptyprocess (0.4.1-1) unstable; urgency=medium * Package ptyprocess 0.4.1 from crates.io using debcargo 2.6.1 diff -Nru rust-ptyprocess-0.4.1/debian/control rust-ptyprocess-0.4.1/debian/control --- rust-ptyprocess-0.4.1/debian/control 2023-12-24 14:05:02.000000000 +0000 +++ rust-ptyprocess-0.4.1/debian/control 2024-04-01 05:15:37.000000000 +0000 @@ -6,8 +6,14 @@ cargo:native , rustc:native , libstd-rust-dev , - librust-nix-0.26+default-dev -Maintainer: Debian Rust Maintainers + librust-nix-0.27+default-dev , + librust-nix-0.27+feature-dev , + librust-nix-0.27+fs-dev , + librust-nix-0.27+ioctl-dev , + librust-nix-0.27+signal-dev , + librust-nix-0.27+term-dev +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Rust Maintainers Uploaders: Alexander Kjäll Standards-Version: 4.6.2 @@ -22,7 +28,12 @@ Multi-Arch: same Depends: ${misc:Depends}, - librust-nix-0.26+default-dev + librust-nix-0.27+default-dev, + librust-nix-0.27+feature-dev, + librust-nix-0.27+fs-dev, + librust-nix-0.27+ioctl-dev, + librust-nix-0.27+signal-dev, + librust-nix-0.27+term-dev Provides: librust-ptyprocess+default-dev (= ${binary:Version}), librust-ptyprocess-0-dev (= ${binary:Version}), diff -Nru rust-ptyprocess-0.4.1/debian/copyright rust-ptyprocess-0.4.1/debian/copyright --- rust-ptyprocess-0.4.1/debian/copyright 2023-12-24 14:05:02.000000000 +0000 +++ rust-ptyprocess-0.4.1/debian/copyright 2024-02-25 20:23:57.000000000 +0000 @@ -9,7 +9,7 @@ Files: debian/* Copyright: - 2023 Debian Rust Maintainers + 2023-2024 Debian Rust Maintainers 2023 Alexander Kjäll License: MIT diff -Nru rust-ptyprocess-0.4.1/debian/copyright.debcargo.hint rust-ptyprocess-0.4.1/debian/copyright.debcargo.hint --- rust-ptyprocess-0.4.1/debian/copyright.debcargo.hint 2023-12-24 14:05:02.000000000 +0000 +++ rust-ptyprocess-0.4.1/debian/copyright.debcargo.hint 2024-02-25 20:23:57.000000000 +0000 @@ -21,8 +21,8 @@ Files: debian/* Copyright: - 2023 Debian Rust Maintainers - 2023 Alexander Kjäll + 2023-2024 Debian Rust Maintainers + 2023-2024 Alexander Kjäll License: MIT License: MIT diff -Nru rust-ptyprocess-0.4.1/debian/patches/nix-0.27.patch rust-ptyprocess-0.4.1/debian/patches/nix-0.27.patch --- rust-ptyprocess-0.4.1/debian/patches/nix-0.27.patch 1970-01-01 00:00:00.000000000 +0000 +++ rust-ptyprocess-0.4.1/debian/patches/nix-0.27.patch 2024-02-25 20:23:57.000000000 +0000 @@ -0,0 +1,86 @@ +Index: ptyprocess/Cargo.toml +=================================================================== +--- ptyprocess.orig/Cargo.toml ++++ ptyprocess/Cargo.toml +@@ -31,4 +31,5 @@ license = "MIT" + repository = "https://github.com/zhiburt/ptyprocess" + + [dependencies.nix] +-version = "0.26" ++version = "0.27" ++features = ["signal", "fs", "term", "feature", "ioctl"] +Index: ptyprocess/src/lib.rs +=================================================================== +--- ptyprocess.orig/src/lib.rs ++++ ptyprocess/src/lib.rs +@@ -53,6 +53,8 @@ use nix::{ioctl_write_ptr_bad, Result}; + use signal::Signal::SIGKILL; + use std::fs::File; + use std::os::unix::prelude::{AsRawFd, CommandExt, FromRawFd, RawFd}; ++use std::os::fd::BorrowedFd; ++use std::os::fd::AsFd; + use std::process::{self, Command}; + use std::thread; + use std::time::{self, Duration}; +@@ -245,7 +247,7 @@ impl PtyProcess { + + /// The function returns true if an echo setting is setup. + pub fn get_echo(&self) -> Result { +- termios::tcgetattr(self.master.as_raw_fd()) ++ termios::tcgetattr(self.master.as_fd()) + .map(|flags| flags.local_flags.contains(termios::LocalFlags::ECHO)) + } + +@@ -467,6 +469,12 @@ impl AsRawFd for Master { + } + } + ++impl AsFd for Master { ++ fn as_fd(&self) -> BorrowedFd<'_> { ++ unsafe { BorrowedFd::borrow_raw(self.fd.as_raw_fd()) } ++ } ++} ++ + #[cfg(target_os = "linux")] + fn get_slave_name(fd: &PtyMaster) -> Result { + nix::pty::ptsname_r(fd) +@@ -584,18 +592,18 @@ fn redirect_std_streams(fd: RawFd) -> Re + fn set_echo(fd: RawFd, on: bool) -> Result<()> { + // Set echo off + // Even though there may be something left behind https://stackoverflow.com/a/59034084 +- let mut flags = termios::tcgetattr(fd)?; ++ let mut flags = termios::tcgetattr(unsafe {BorrowedFd::borrow_raw(fd)})?; + match on { + true => flags.local_flags |= termios::LocalFlags::ECHO, + false => flags.local_flags &= !termios::LocalFlags::ECHO, + } + +- termios::tcsetattr(fd, termios::SetArg::TCSANOW, &flags)?; ++ termios::tcsetattr(unsafe {BorrowedFd::borrow_raw(fd)}, termios::SetArg::TCSANOW, &flags)?; + Ok(()) + } + + pub fn set_raw(fd: RawFd) -> Result<()> { +- let mut flags = termios::tcgetattr(fd)?; ++ let mut flags = termios::tcgetattr(unsafe {BorrowedFd::borrow_raw(fd)})?; + + #[cfg(not(target_os = "macos"))] + { +@@ -624,7 +632,7 @@ pub fn set_raw(fd: RawFd) -> Result<()> + flags.control_chars[VTIME] = 0; + } + +- termios::tcsetattr(fd, termios::SetArg::TCSANOW, &flags)?; ++ termios::tcsetattr(unsafe { BorrowedFd::borrow_raw(fd) }, termios::SetArg::TCSANOW, &flags)?; + Ok(()) + } + +@@ -647,7 +655,7 @@ fn get_eof_char() -> u8 { + } + + fn get_term_char(fd: RawFd, char: SpecialCharacterIndices) -> Result { +- let flags = termios::tcgetattr(fd)?; ++ let flags = termios::tcgetattr(unsafe {BorrowedFd::borrow_raw(fd)})?; + let b = flags.control_chars[char as usize]; + Ok(b) + } diff -Nru rust-ptyprocess-0.4.1/debian/patches/series rust-ptyprocess-0.4.1/debian/patches/series --- rust-ptyprocess-0.4.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ rust-ptyprocess-0.4.1/debian/patches/series 2024-02-25 20:23:57.000000000 +0000 @@ -0,0 +1 @@ +nix-0.27.patch