tags 999575 +patch
thanks
The attatched patch fixes up the dependencies so that elan will build
successfully both in current sid and in sid after the upcoming rand
transition enters sid.
diff -Nru elan-1.0.6/debian/changelog elan-1.0.6/debian/changelog
--- elan-1.0.6/debian/changelog 2021-05-10 20:15:09.000000000 +0000
+++ elan-1.0.6/debian/changelog 2022-01-22 14:24:59.000000000 +0000
@@ -1,3 +1,15 @@
+elan (1.0.6-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Relax cargo dependencies on itertools and rand ( Closes: 999575 ).
+ * Remove cargo dependency on the "vendored" feature of the openssl crate,
+ it has been removed in current Debian packaging of that crate (and was a
+ no-op before that)
+ * Change Debian dependency to depend on librust-semver-0.9-dev
+ instead of librust-semver-dev.
+
+ -- Peter Michael Green <plugw...@debian.org> Sat, 22 Jan 2022 14:24:59 +0000
+
elan (1.0.6-1) unstable; urgency=medium
* Initial release (Closes: #991801)
diff -Nru elan-1.0.6/debian/control elan-1.0.6/debian/control
--- elan-1.0.6/debian/control 2021-05-10 20:15:09.000000000 +0000
+++ elan-1.0.6/debian/control 2022-01-22 14:24:59.000000000 +0000
@@ -32,7 +32,7 @@
librust-curl-dev,
librust-walkdir-dev,
librust-openssl-dev,
- librust-semver-dev,
+ librust-semver-0.9-dev,
librust-backtrace-dev,
librust-aho-corasick-dev,
librust-thread-local-dev,
diff -Nru elan-1.0.6/debian/patches/dependencies.patch
elan-1.0.6/debian/patches/dependencies.patch
--- elan-1.0.6/debian/patches/dependencies.patch 2021-05-10
20:15:09.000000000 +0000
+++ elan-1.0.6/debian/patches/dependencies.patch 2022-01-22
14:24:59.000000000 +0000
@@ -2,21 +2,23 @@
Forwarded: not-needed
Author: Christopher Hoskin <mans0...@debian.org>
Last-Update: 2021-08-02
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -29,34 +29,28 @@
+Index: elan-1.0.6/Cargo.toml
+===================================================================
+--- elan-1.0.6.orig/Cargo.toml
++++ elan-1.0.6/Cargo.toml
+@@ -29,34 +29,28 @@ elan-utils = { path = "src/elan-utils" }
download = { path = "src/download" }
clap = "2.33.3"
error-chain = "0.12.4"
-itertools = "0.10.0"
-libc = "0.2.82"
-+itertools = "0.9.0"
++itertools = ">= 0.9.0"
markdown = "0.3.0"
-rand = "0.8.2"
-regex = "1.4.3"
-remove_dir_all = "0.6.1"
+libc = "0.2.80"
-+rand = "0.7.3"
++rand = ">= 0.7.3"
+regex = "1.3.7"
+remove_dir_all = "0.5.1"
same-file = "1.0.6"
@@ -57,9 +59,11 @@
[lib]
name = "elan"
---- a/src/download/Cargo.toml
-+++ b/src/download/Cargo.toml
-@@ -15,8 +15,8 @@
+Index: elan-1.0.6/src/download/Cargo.toml
+===================================================================
+--- elan-1.0.6.orig/src/download/Cargo.toml
++++ elan-1.0.6/src/download/Cargo.toml
+@@ -15,8 +15,8 @@ reqwest-backend = ["reqwest", "env_proxy
[dependencies]
error-chain = "0.12.4"
@@ -70,9 +74,11 @@
openssl = { version = "0.10", features = ["vendored"], optional = true }
env_proxy = { version = "0.4.1", optional = true }
lazy_static = { version = "1.4.0", optional = true }
---- a/src/elan-dist/Cargo.toml
-+++ b/src/elan-dist/Cargo.toml
-@@ -9,28 +9,23 @@
+Index: elan-1.0.6/src/elan-dist/Cargo.toml
+===================================================================
+--- elan-1.0.6.orig/src/elan-dist/Cargo.toml
++++ elan-1.0.6/src/elan-dist/Cargo.toml
+@@ -9,28 +9,23 @@ build = "build.rs"
license = "MIT OR Apache-2.0"
[dependencies]
@@ -83,7 +89,7 @@
-tar = "0.4.33"
-flate2 = "1.0.14"
+regex = "1.3.7"
-+itertools = "0.9.0"
++itertools = ">= 0.9.0"
+url = "2.1.1"
+tar = "0.4.26"
+flate2 = "1.0.13"
@@ -113,9 +119,11 @@
[lib]
name = "elan_dist"
---- a/src/elan-utils/Cargo.toml
-+++ b/src/elan-utils/Cargo.toml
-@@ -10,20 +10,15 @@
+Index: elan-1.0.6/src/elan-utils/Cargo.toml
+===================================================================
+--- elan-1.0.6.orig/src/elan-utils/Cargo.toml
++++ elan-1.0.6/src/elan-utils/Cargo.toml
+@@ -10,20 +10,15 @@ license = "MIT OR Apache-2.0"
[dependencies]
download = { path = "../download" }
error-chain = "0.12.4"
@@ -123,7 +131,7 @@
-rand = "0.8.3"
-remove_dir_all = "0.7.0"
+libc = "0.2.80"
-+rand = "0.7.3"
++rand = ">= 0.7.3"
+remove_dir_all = "0.5.1"
scopeguard = "1.1.0"
-semver = "0.11.0"
@@ -131,13 +139,14 @@
-toml = "0.5.8"
-url = "2.2.1"
-curl = "0.4.34"
+-openssl = { version = "0.10", features = ["vendored"] }
+-regex = "1.4.3"
+semver = "0.9.0"
+sha2 = "0.9.2"
+toml = "0.5.5"
+url = "2.1.1"
+curl = "0.4.33"
- openssl = { version = "0.10", features = ["vendored"] }
--regex = "1.4.3"
++openssl = { version = "0.10" }
+regex = "1.3.7"
dirs = "3.0.1"
-
