blake3 - fix test dependencies so the autopkgtest can run.

diff --git a/src/blake3/debian/changelog b/src/blake3/debian/changelog
index aba9d3ee9c6ac81b886e7e90817161b88eb3ad8a..1f31c0c02628fe02da1496862ffe39fa55df8cb1 100644 (file)
--- a/src/blake3/debian/changelog
+++ b/src/blake3/debian/changelog
@@ -2,6 +2,10 @@ rust-blake3 (1.2.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
 
   * Team upload.
   * Package blake3 1.2.0 from crates.io using debcargo 2.5.0
+  * Eliminate dev-dependency on rust-page-size which is not currently
+    in Debian, use a fixed value of 65536 (a multiple of all common
+    page sizes) in the bench instead.
+  * Adjust dependencies to match what is in Debian.
 
  -- Peter Michael Green <plugwash@debian.org>  Sat, 18 Dec 2021 23:35:21 +0000
 

diff --git a/src/blake3/debian/patches/eliminate-page-size b/src/blake3/debian/patches/eliminate-page-size
new file mode 100644 (file)
index 0000000..641648f
--- /dev/null
+++ b/src/blake3/debian/patches/eliminate-page-size
@@ -0,0 +1,27 @@
+Index: blake3/Cargo.toml
+===================================================================
+--- blake3.orig/Cargo.toml
++++ blake3/Cargo.toml
+@@ -48,9 +48,6 @@ optional = true
+ [dev-dependencies.hex]
+ version = "0.4.2"
+ 
+-[dev-dependencies.page_size]
+-version = "0.4.1"
+-
+ [dev-dependencies.rand]
+ version = ">= 0.7, < 0.9"
+ 
+Index: blake3/benches/bench.rs
+===================================================================
+--- blake3.orig/benches/bench.rs
++++ blake3/benches/bench.rs
+@@ -25,7 +25,7 @@ pub struct RandomInput {
+ impl RandomInput {
+     pub fn new(b: &mut Bencher, len: usize) -> Self {
+         b.bytes += len as u64;
+-        let page_size: usize = page_size::get();
++        let page_size: usize = 65536;// page_size::get();
+         let mut buf = vec![0u8; len + page_size];
+         let mut rng = rand::thread_rng();
+         rng.fill_bytes(&mut buf);

diff --git a/src/blake3/debian/patches/fix-deps b/src/blake3/debian/patches/fix-deps
index ed2721b6df82e48186d9118075fa52d549611f6a..a8a6e830d64afdb3cb94142a61a71de7b4c8ffba 100644 (file)
--- a/src/blake3/debian/patches/fix-deps
+++ b/src/blake3/debian/patches/fix-deps
@@ -24,3 +24,16 @@ Index: blake3/Cargo.toml
  optional = true
  [dev-dependencies.hex]
  version = "0.4.2"
+@@ -52,10 +52,10 @@ version = "0.4.2"
+ version = "0.4.1"
+ 
+ [dev-dependencies.rand]
+-version = "0.8.0"
++version = ">= 0.7, < 0.9"
+ 
+ [dev-dependencies.rand_chacha]
+-version = "0.3.0"
++version = ">= 0.2, <0.4"
+ [build-dependencies.cc]
+ version = "1.0.4"
+ 

diff --git a/src/blake3/debian/patches/series b/src/blake3/debian/patches/series
index be482e1b06eca014708b3e11c76ccd6c121bf74a..6f2cf6d1817146e0369b9278b58d24095a5188d8 100644 (file)
--- a/src/blake3/debian/patches/series
+++ b/src/blake3/debian/patches/series
@@ -1,2 +1,3 @@
 fix-deps
 fix-build.rs
+eliminate-page-size