Your message dated Thu, 18 Jan 2024 21:19:51 +0000
with message-id <e1rqznj-0057ie...@fasolo.debian.org>
and subject line Bug#1061120: fixed in rust-ahash-0.7 0.7.7-2
has caused the Debian Bug report #1061120,
regarding rust-ahash-0.7 autopkgtest failure
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.)


-- 
1061120: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061120
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: rust-ahash-0.7
Version: 0.7.7-1
Severity: serious

The autopkgtests for rust-ahash-0.7 are failing, this is blocking the
migration of rust-ahash-0.7 to testing which is in turn blocking the
migration of at least one rc bug fix to testing.

There are two issues, the first is that the autopkgtests are trying
to test a "runtime-rng" feature, but no such feature exists. My guess
is that there was some confusion between versions of ahash. I removed
the tests and the corresponding provides.

The second issue is more subtle. The "atomic-polyfill" feature
enables the dependency on the atomic-polyfill crate. However the
dependency on the atomic-polyfill crate is disabled on linux
(among many other targets). Disabling of a dependency on a target
overrides enabling the dependency in a feature. However the code
is not aware of this. The result is that building on Linux with
the atomic-polyfill feature enabled fails.

I see three possible routes for dealing with this.

1. Add target guards to the imports in the code, matching those
   in Cargo.toml
2. Remove the target restrictions from the atomic-polyfill dependency
3. Simply accept that the atomic-polyfill feature is broken on linux
   and stop testing it (this would also mean not having an "all features"
   test.

My patch implements the first option but I don't have a strong
preference for any of them.
diff -Nru rust-ahash-0.7-0.7.7/debian/changelog 
rust-ahash-0.7-0.7.7/debian/changelog
--- rust-ahash-0.7-0.7.7/debian/changelog       2023-12-30 10:22:55.000000000 
+0000
+++ rust-ahash-0.7-0.7.7/debian/changelog       2024-01-18 17:11:34.000000000 
+0000
@@ -1,3 +1,13 @@
+rust-ahash-0.7 (0.7.7-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix autopkgtests
+    + Remove provides and autopkgtests for feature runtime-rng which does not
+      exist.
+    + Only import atomic-polyfill on platforms where the dependency is enabled
+
+ -- Peter Michael Green <plugw...@debian.org>  Thu, 18 Jan 2024 17:11:34 +0000
+
 rust-ahash-0.7 (0.7.7-1) unstable; urgency=medium
 
   [ upstream ]
diff -Nru rust-ahash-0.7-0.7.7/debian/control 
rust-ahash-0.7-0.7.7/debian/control
--- rust-ahash-0.7-0.7.7/debian/control 2023-12-30 10:18:50.000000000 +0000
+++ rust-ahash-0.7-0.7.7/debian/control 2024-01-18 17:11:27.000000000 +0000
@@ -40,7 +40,6 @@
  librust-ahash-0.7+atomic-polyfill-dev (= ${binary:Version}),
  librust-ahash-0.7+compile-time-rng-dev (= ${binary:Version}),
  librust-ahash-0.7+default-dev (= ${binary:Version}),
- librust-ahash-0.7+runtime-rng-dev (= ${binary:Version}),
  librust-ahash-0.7+serde-dev (= ${binary:Version}),
  librust-ahash-0.7+std-dev (= ${binary:Version}),
  librust-ahash-0.7.7-dev (= ${binary:Version}),
diff -Nru rust-ahash-0.7-0.7.7/debian/patches/1002_atomic_polyfill.patch 
rust-ahash-0.7-0.7.7/debian/patches/1002_atomic_polyfill.patch
--- rust-ahash-0.7-0.7.7/debian/patches/1002_atomic_polyfill.patch      
1970-01-01 00:00:00.000000000 +0000
+++ rust-ahash-0.7-0.7.7/debian/patches/1002_atomic_polyfill.patch      
2024-01-18 17:11:34.000000000 +0000
@@ -0,0 +1,23 @@
+Description: limit atomic-polyfill import architectures
+ The atomic-polyfill dependency is target limited, but the import
+ is not. This leads to import errors when building with the
+ atomic-polyfill feature enabled (or building with --all-features).
+
+ This patch makes the imports reflect the dependency
+Author: Peter Michael Green <plugw...@debian.org>
+Last-Update: 2024-01-18
+
+--- rust-ahash-0.7-0.7.7.orig/src/random_state.rs
++++ rust-ahash-0.7-0.7.7/src/random_state.rs
+@@ -29,9 +29,9 @@ extern crate alloc;
+ #[cfg(feature = "std")]
+ extern crate std as alloc;
+ 
+-#[cfg(feature = "atomic-polyfill")]
++#[cfg(all(feature = "atomic-polyfill",not(any(target_os = "linux", target_os 
= "android", target_os = "windows", target_os = "macos", target_os = "ios", 
target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = 
"dragonfly", target_os = "solaris", target_os = "illumos", target_os = 
"fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", 
target_os = "vxworks", target_os = "emscripten", target_os = "wasi"))))]
+ use atomic_polyfill as atomic;
+-#[cfg(not(feature = "atomic-polyfill"))]
++#[cfg(not(all(feature = "atomic-polyfill",not(any(target_os = "linux", 
target_os = "android", target_os = "windows", target_os = "macos", target_os = 
"ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", 
target_os = "dragonfly", target_os = "solaris", target_os = "illumos", 
target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = 
"haiku", target_os = "vxworks", target_os = "emscripten", target_os = 
"wasi")))))]
+ use core::sync::atomic;
+ 
+ use alloc::boxed::Box;
diff -Nru rust-ahash-0.7-0.7.7/debian/patches/series 
rust-ahash-0.7-0.7.7/debian/patches/series
--- rust-ahash-0.7-0.7.7/debian/patches/series  2023-12-30 09:53:32.000000000 
+0000
+++ rust-ahash-0.7-0.7.7/debian/patches/series  2024-01-18 17:11:34.000000000 
+0000
@@ -1,3 +1,4 @@
 020220518~4c340f5.patch
 1001_criterion.patch
 1001_rand.patch
+1002_atomic_polyfill.patch
diff -Nru rust-ahash-0.7-0.7.7/debian/tests/control 
rust-ahash-0.7-0.7.7/debian/tests/control
--- rust-ahash-0.7-0.7.7/debian/tests/control   2023-12-30 10:13:51.000000000 
+0000
+++ rust-ahash-0.7-0.7.7/debian/tests/control   2024-01-18 17:11:00.000000000 
+0000
@@ -80,22 +80,6 @@
 Restrictions: allow-stderr
 
 Test-Command: /usr/share/cargo/bin/cargo-auto-test ahash 0.7.7
- --all-targets --no-default-features --features runtime-rng
-Features: test-name=rust-ahash:runtime-rng
-Depends:
- dh-cargo (>= 18),
- librust-ahash-0.7+runtime-rng-dev,
- librust-criterion-0.5+default-dev,
- librust-fnv-1+default-dev,
- librust-fxhash-0.2+default-dev,
- librust-hex-0.4+default-dev (>= 0.4.2),
- librust-no-panic-0.1+default-dev,
- librust-rand-0.8+default-dev,
- librust-seahash-4+default-dev,
- librust-serde-json-1+default-dev (>= 1.0.59),
-Restrictions: allow-stderr
-
-Test-Command: /usr/share/cargo/bin/cargo-auto-test ahash 0.7.7
  --all-targets --no-default-features --features serde
 Features: test-name=rust-ahash:serde
 Depends:

--- End Message ---
--- Begin Message ---
Source: rust-ahash-0.7
Source-Version: 0.7.7-2
Done: Jonas Smedegaard <d...@jones.dk>

We believe that the bug you reported is fixed in the latest version of
rust-ahash-0.7, 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 1061...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Jonas Smedegaard <d...@jones.dk> (supplier of updated rust-ahash-0.7 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, 18 Jan 2024 20:56:45 +0100
Source: rust-ahash-0.7
Architecture: source
Version: 0.7.7-2
Distribution: unstable
Urgency: medium
Maintainer: Jonas Smedegaard <d...@jones.dk>
Changed-By: Jonas Smedegaard <d...@jones.dk>
Closes: 1061120
Changes:
 rust-ahash-0.7 (0.7.7-2) unstable; urgency=medium
 .
   * add patch 1002 to limit atomic-polyfill import architectures;
     hopefully closes: bug#1061120, thanks to Peter Green
   * update dh-cargo fork
   * update copyright info: update coverage
   * stop provide or autopkgtest hidden feature runtime-png;
     thanks to Peter Green (see bug#1061120)
Checksums-Sha1:
 64dfb55469d285a1f4e1c6c0baf0d9dd5dc5cbd4 3023 rust-ahash-0.7_0.7.7-2.dsc
 45f3d1a84961c1543095987002d5cf8a0923336e 18188 
rust-ahash-0.7_0.7.7-2.debian.tar.xz
 420c2d012e13844d9596471b76cd38c272eece8f 19782 
rust-ahash-0.7_0.7.7-2_amd64.buildinfo
Checksums-Sha256:
 92daf5ec907f16fabf2ff14071b688a77d7a2f65231afb27e0a9e9a8afae748f 3023 
rust-ahash-0.7_0.7.7-2.dsc
 441b9641d8a51f6a850a4ccecbe41912014e7497585de6a00cf1a0b5ae90bbec 18188 
rust-ahash-0.7_0.7.7-2.debian.tar.xz
 5e1b8b4a44edef6e04a4d075af88e43bb6e94ef765eaad95ba98db4067ca8b1d 19782 
rust-ahash-0.7_0.7.7-2_amd64.buildinfo
Files:
 aa89e68625e55e46fec481bc19de6f5e 3023 rust optional rust-ahash-0.7_0.7.7-2.dsc
 34ddaafd6a2538aea38fd86eebfdb78f 18188 rust optional 
rust-ahash-0.7_0.7.7-2.debian.tar.xz
 e0423489c72ff957fc401734adbc34c9 19782 rust optional 
rust-ahash-0.7_0.7.7-2_amd64.buildinfo

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEn+Ppw2aRpp/1PMaELHwxRsGgASEFAmWpkOcACgkQLHwxRsGg
ASGlMw//fXdnzVu4wq2aVbDIDGUp+b6YVqKCR/9l6Q0+6li4y7kTSEK0l+R2eBUu
h8l0EEpv1J/BChGMhzUpfLhXu4RZbkVxkBNA18qCLcMcd+FtIjGgCmlAo0cGBq3N
BG8viVO5cN9G+MR/64wWYAVynf6dMFsootx7oGbtvhQ41xJJCUj9QWgHxZ0K6jxM
sM4CQDoJW2Kj0rBL7bUmYcI32ibwmNgZkzTUnm2N0s9AetxITM0VfZZQPWdcdHOz
Hn/X5yVhE4hGzfAPRZfZCQ/Ho/sAH5wkbqVmt3weaVtXyjS0pmyK4DNRAl2IskRP
zZEfEUeoG3WnvkwE6iBqJvHwbK/dQy+E0UbQaE2+iDa7Vo3I4PymgDeOgQrHM96F
ongBtXGcyhlWybkbTWCJlGADm5XLzutop4CgkVzOyjVi+5BtOCcGLYxHKpQQdX2L
hgNAalNu663/AQ3RC68oeHeQMgazN0DwMAjULs3XZ7wPkEmw8ce2C5Y7sEWrp4Si
VwaxjHuJVdISYoBxsTwHPEmxbvAfp1Uk8PrezSZcu8j1vIRLNDVjWQ/GCqd0dlUP
Ys1x+k6ZAZokSxXlVDyOVlbScS3cj6YQ3ILTBH87hLVEWueP3HS95iHhvM5JDFcJ
Exq1bYU4Arjv2fqUTAEgdLwZjsW6RLA0+ohNRSoWKEGsKAFG9yU=
=aGRa
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to