Package: trippy
Version: 0.11.0+dfsg-2
I hope to update rust-nix to 0.29 soon.
For trippy, upstream uses 0.29, so this is just a matter of dropping
some patching and updating the Debian build-dependncy.
Debdiff is attatched. The new version of rust-nix is available in
experimental.
diff -Nru trippy-0.11.0+dfsg/debian/changelog
trippy-0.11.0+dfsg/debian/changelog
--- trippy-0.11.0+dfsg/debian/changelog 2024-10-07 12:04:46.000000000 +0000
+++ trippy-0.11.0+dfsg/debian/changelog 2024-10-19 16:11:36.000000000 +0000
@@ -1,3 +1,12 @@
+trippy (0.11.0+dfsg-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop downgrade-nix-0.27.patch
+ * Stop patching nix dependency in relax-deps.patch
+ * Update Debian build-dependency for nix crate to match Cargo dependency.
+
+ -- Peter Michael Green <plugw...@debian.org> Sat, 19 Oct 2024 16:11:36 +0000
+
trippy (0.11.0+dfsg-2) unstable; urgency=medium
* Adjust relax-deps.patch, Closes: #1084384
diff -Nru trippy-0.11.0+dfsg/debian/control trippy-0.11.0+dfsg/debian/control
--- trippy-0.11.0+dfsg/debian/control 2024-10-07 11:59:48.000000000 +0000
+++ trippy-0.11.0+dfsg/debian/control 2024-10-19 16:11:36.000000000 +0000
@@ -31,7 +31,7 @@
librust-itertools-dev,
librust-maxminddb-dev,
librust-mockall-dev,
- librust-nix-dev,
+ librust-nix-0.29-dev,
librust-parking-lot-dev,
librust-paste-dev,
librust-petgraph-dev,
diff -Nru trippy-0.11.0+dfsg/debian/patches/downgrade-nix-0.27.patch
trippy-0.11.0+dfsg/debian/patches/downgrade-nix-0.27.patch
--- trippy-0.11.0+dfsg/debian/patches/downgrade-nix-0.27.patch 2024-10-07
11:59:48.000000000 +0000
+++ trippy-0.11.0+dfsg/debian/patches/downgrade-nix-0.27.patch 1970-01-01
00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-Forwarded: not-needed
-Last-Update: 2024-09-10
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/crates/trippy-core/src/net/platform/unix.rs
-+++ b/crates/trippy-core/src/net/platform/unix.rs
-@@ -117,3 +117,3 @@
- .as_sockaddr_in()
-- .map(|sock_addr| IpAddr::V4(sock_addr.ip())),
-+ .map(|sock_addr| IpAddr::V4(sock_addr.ip().into())),
- _ => None,
-@@ -385,3 +385,4 @@
- let mut read = FdSet::new();
-- read.insert(self.inner.as_fd());
-+ let fd = self.inner.as_fd();
-+ read.insert(&fd);
- let readable = nix::sys::select::select(
-@@ -405,3 +406,4 @@
- let mut write = FdSet::new();
-- write.insert(self.inner.as_fd());
-+ let fd = self.inner.as_fd();
-+ write.insert(&fd);
- let writable = nix::sys::select::select(
-@@ -469,3 +471,3 @@
- err.map(|e| match e.raw_os_error() {
-- Some(errno) if Error::from_raw(errno) ==
Error::ECONNREFUSED => {
-+ Some(errno) if Error::from_i32(errno) ==
Error::ECONNREFUSED => {
- SocketError::ConnectionRefused
diff -Nru trippy-0.11.0+dfsg/debian/patches/relax-deps.patch
trippy-0.11.0+dfsg/debian/patches/relax-deps.patch
--- trippy-0.11.0+dfsg/debian/patches/relax-deps.patch 2024-10-07
12:04:46.000000000 +0000
+++ trippy-0.11.0+dfsg/debian/patches/relax-deps.patch 2024-10-19
16:10:52.000000000 +0000
@@ -18,9 +18,6 @@
@@ -53 +53 @@
-ipnetwork = "0.20.0"
+ipnetwork = "0.17"
-@@ -57 +57 @@
--nix = { version = "0.29.0", default-features = false }
-+nix = { version = "0.27.0", default-features = false }
@@ -60 +60 @@
-petgraph = "0.6.5"
+petgraph = "0.6.4"
diff -Nru trippy-0.11.0+dfsg/debian/patches/series
trippy-0.11.0+dfsg/debian/patches/series
--- trippy-0.11.0+dfsg/debian/patches/series 2024-10-07 12:04:46.000000000
+0000
+++ trippy-0.11.0+dfsg/debian/patches/series 2024-10-19 16:11:36.000000000
+0000
@@ -1,5 +1,4 @@
disable-deps.patch
relax-deps.patch
-downgrade-nix-0.27.patch
fix-tracing-subscriber-features.patch
disable-tracing-chrome.patch
