Merge ~maxgmr/ubuntu/+source/rust-ognibuild:merge-lp2136182 into ubuntu/+source/rust-ognibuild:ubuntu/devel

[Max Gilmour]

This fixes LP: #2136182. The autopkgtests were failing because one of the unit tests opens a socket, which isn't available in the restricted autopkgtest environment.

I addressed this by disabling this test, just like the other two tests that open sockets, which were disabled earlier.

PPA: https://launchpad.net/~maxgmr/+archive/ubuntu/resolute-merges/+packages?field.name_filter=rust-ognibuild&field.status_filter=published&field.series_filter=

Passing amd64 autopkgtest log: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-maxgmr-resolute-merges/resolute/amd64/r/rust-ognibuild/20251217_201005_faf9f@/log.gz

Lintian:
W: rust-ognibuild source: missing-debian-watch-file-standard [debian/watch]
W: rust-ognibuild source: patch-file-present-but-not-mentioned-in-series [debian/patches/bump-tempfile]
W: rust-ognibuild source: patch-file-present-but-not-mentioned-in-series [debian/patches/debian-analyzer-0.160.5.patch]
W: rust-ognibuild source: patch-file-present-but-not-mentioned-in-series [debian/patches/disable-oversensitive-test]
W: rust-ognibuild source: patch-file-present-but-not-mentioned-in-series ... use "--tag-display-limit 0" to see all (or pipe to a file/program)

[Max Gilmour (maxgmr)]

The updated patch has been forwarded to Debian here: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1123556

[Jeremy Bícha (jbicha)]

Thanks, I'm uploading this for you to Debian and we'll sync it over.

diff --git a/debian/changelog b/debian/changelog
index 735c155..8790706 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rust-ognibuild (0.2.6-1ubuntu1) resolute; urgency=medium
+
+  * d/p/disable-broken-tests: (LP: #2136182) Disable test which tries to open
+    socket
+
+ -- Max Gilmour <[e-mail]>  Tue, 16 Dec 2025 10:48:40 -0800
+
 rust-ognibuild (0.2.6-1) unstable; urgency=medium
 
   * Package ognibuild 0.2.6 from crates.io using debcargo 2.7.11
diff --git a/debian/control b/debian/control
index 29521f3..ecaae54 100644
--- a/debian/control
+++ b/debian/control
@@ -51,7 +51,8 @@ Build-Depends-Arch: cargo:native,
  librust-url-2+default-dev (>= 2.5.4-~~),
  librust-whoami-1-dev (>= 1.5-~~),
  librust-xmltree-0.10+default-dev
-Maintainer: Debian Rust Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Rust Maintainers <[e-mail]>
 Uploaders:
  Jelmer Vernooij <[e-mail]>
 Standards-Version: 4.7.2
diff --git a/debian/patches/disable-broken-tests b/debian/patches/disable-broken-tests
index 2887889..7731f59 100644
--- a/debian/patches/disable-broken-tests
+++ b/debian/patches/disable-broken-tests
@@ -1,8 +1,14 @@
-Index: ognibuild/src/debian/build_deps.rs
-===================================================================
---- ognibuild.orig/src/debian/build_deps.rs
-+++ ognibuild/src/debian/build_deps.rs
-@@ -136,6 +136,7 @@ mod tests {
+--- a/src/debian/build_deps.rs
++++ b/src/debian/build_deps.rs
+@@ -126,6 +126,7 @@
+     use tempfile::TempDir;
+ 
+     #[test]
++    #[ignore]
+     fn test_build_dependency_tie_breaker_from_session() {
+         let _temp_dir = TempDir::new().unwrap();
+         let session = PlainSession::new();
+@@ -136,6 +137,7 @@
      }
  
      #[test]
@@ -10,7 +16,7 @@ Index: ognibuild/src/debian/build_deps.rs
      fn test_build_dependency_tie_breaker_count_empty() {
          let _temp_dir = TempDir::new().unwrap();
          let session = PlainSession::new();
-@@ -147,6 +148,7 @@ mod tests {
+@@ -147,6 +149,7 @@
      }
  
      #[test]
@@ -18,11 +24,9 @@ Index: ognibuild/src/debian/build_deps.rs
      fn test_build_dependency_tie_breaker_break_tie_empty() {
          let _temp_dir = TempDir::new().unwrap();
          let session = PlainSession::new();
-Index: ognibuild/src/session/plain.rs
-===================================================================
---- ognibuild.orig/src/session/plain.rs
-+++ ognibuild/src/session/plain.rs
-@@ -380,6 +380,7 @@ mod tests {
+--- a/src/session/plain.rs
++++ b/src/session/plain.rs
+@@ -380,6 +380,7 @@
      }
  
      #[cfg(feature = "breezy")]