Your message dated Thu, 07 Nov 2024 18:13:30 +0000
with message-id <e1t970c-000gxr...@fasolo.debian.org>
and subject line Bug#1085459: fixed in trippy 0.11.0+dfsg-4
has caused the Debian Bug report #1085459,
regarding trippy - upcoming rust-nix update
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
1085459: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1085459
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
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
--- End Message ---
--- Begin Message ---
Source: trippy
Source-Version: 0.11.0+dfsg-4
Done: Blair Noctis <n...@debian.org>
We believe that the bug you reported is fixed in the latest version of
trippy, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 1085...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Blair Noctis <n...@debian.org> (supplier of updated trippy package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Thu, 07 Nov 2024 17:38:29 +0000
Source: trippy
Architecture: source
Version: 0.11.0+dfsg-4
Distribution: unstable
Urgency: medium
Maintainer: Blair Noctis <n...@debian.org>
Changed-By: Blair Noctis <n...@debian.org>
Closes: 1085459
Changes:
trippy (0.11.0+dfsg-4) unstable; urgency=medium
.
* Drop downgrade-nix-0.27.patch in sync with nix 0.29, Closes: #1085459
Checksums-Sha1:
669189f26a9110d35350a719b232ab2b878a208e 2382 trippy_0.11.0+dfsg-4.dsc
3a1931e0fe9af2aece4613ce18c437d50f0e5c1a 5628
trippy_0.11.0+dfsg-4.debian.tar.xz
8406dde4671f1d8c1e7310279236ee639b4dac1d 28787
trippy_0.11.0+dfsg-4_amd64.buildinfo
Checksums-Sha256:
2371493e8e266f618ec4d7c650d1be0bef39bdb530019cd64beeb950df9569cc 2382
trippy_0.11.0+dfsg-4.dsc
79cfc2dc5088e9414f1122297699bab39540e2347c09c51929e22710bdf7d895 5628
trippy_0.11.0+dfsg-4.debian.tar.xz
3210c07e254a7d1e9544317b341a4bf6e34e2630ff4a89d90a403d9fcc244912 28787
trippy_0.11.0+dfsg-4_amd64.buildinfo
Files:
e69e2bba2e42a31c1d5ef736e6371680 2382 net optional trippy_0.11.0+dfsg-4.dsc
6782021f7464bf790bb398f4ab789336 5628 net optional
trippy_0.11.0+dfsg-4.debian.tar.xz
d0ffbfb3e7007cd1dc91a5001c75de0b 28787 net optional
trippy_0.11.0+dfsg-4_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iIYEARYKAC4WIQScTWEJ927Sl0a/hB7sV97Kb1Pv6QUCZyz85BAcbmN0c0BkZWJp
YW4ub3JnAAoJEOxX3spvU+/pvOwBALW+f85tlooTkLGs934OVRDM73Ma0RRgTiuM
blupkF7jAP9LCp9RhD9BREcuTqMWK1a4qVvhz7K9ytmDYs8tMUbPAQ==
=+5DX
-----END PGP SIGNATURE-----
pgpT8b7ezE6gu.pgp
Description: PGP signature
--- End Message ---