Bug#1012284: elan - FTBFS unsatisfiable cargo dependencies
Another dependency just got updated. Debdiff to make the package build with
what is currently in sid attatched.
As before I have tested the package builds but not beyond that.diff -Nru elan-1.3.1/debian/changelog elan-1.3.1/debian/changelog
--- elan-1.3.1/debian/changelog 2022-02-24 04:54:40.0 +
+++ elan-1.3.1/debian/changelog 2022-06-23 13:14:20.0 +
@@ -1,3 +1,14 @@
+elan (1.3.1-3.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix dependencies (Closes: 1012284)
++ update cargo dependencies on remove_dir_all to allow 0.7
++ update cargo dependencies on sha2 to allow version 0.10
++ update cargo dependency on wait-timeout to allow version 0.2
++ fix debian dependency on time so it can't be satisfied by time-0.1
package.
+
+ -- Peter Michael Green Thu, 23 Jun 2022 13:14:20 +
+
elan (1.3.1-3) unstable; urgency=medium
* Update dependency patch for rand 0.8.3
diff -Nru elan-1.3.1/debian/control elan-1.3.1/debian/control
--- elan-1.3.1/debian/control 2022-01-27 08:26:12.0 +
+++ elan-1.3.1/debian/control 2022-06-23 13:14:20.0 +
@@ -20,7 +20,7 @@
librust-tar-dev,
librust-tempfile-dev,
librust-term-dev,
- librust-time-dev,
+ librust-time-0.3+default-dev (>= 0.3.4),
librust-toml-dev,
librust-url-dev,
librust-wait-timeout-dev,
diff -Nru
elan-1.3.1/debian/patches/0003-Revert-feat-support-tar.zst-archives.patch
elan-1.3.1/debian/patches/0003-Revert-feat-support-tar.zst-archives.patch
--- elan-1.3.1/debian/patches/0003-Revert-feat-support-tar.zst-archives.patch
2022-02-24 04:53:47.0 +
+++ elan-1.3.1/debian/patches/0003-Revert-feat-support-tar.zst-archives.patch
2022-06-02 22:59:07.0 +
@@ -11,10 +11,10 @@
src/elan-dist/src/manifestation.rs | 25 +++---
5 files changed, 15 insertions(+), 70 deletions(-)
-diff --git a/Cargo.lock b/Cargo.lock
-index 8b600ee..74a7d41 100644
a/Cargo.lock
-+++ b/Cargo.lock
+Index: elan-1.3.1/Cargo.lock
+===
+--- elan-1.3.1.orig/Cargo.lock
elan-1.3.1/Cargo.lock
@@ -394,7 +394,6 @@ dependencies = [
"winapi 0.3.9",
"winreg 0.8.0",
@@ -23,11 +23,10 @@
]
[[package]]
-@@ -777,15 +776,6 @@ version = "0.4.8"
- source = "registry+https://github.com/rust-lang/crates.io-index;
+@@ -778,15 +777,6 @@ source = "registry+https://github.com/ru
checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
--[[package]]
+ [[package]]
-name = "jobserver"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index;
@@ -36,9 +35,10 @@
- "libc",
-]
-
- [[package]]
+-[[package]]
name = "js-sys"
version = "0.3.55"
+ source = "registry+https://github.com/rust-lang/crates.io-index;
@@ -1873,32 +1863,3 @@ dependencies = [
"thiserror",
"time 0.1.43",
@@ -72,10 +72,10 @@
- "cc",
- "libc",
-]
-diff --git a/src/elan-dist/Cargo.toml b/src/elan-dist/Cargo.toml
-index 576f7bf..2bba186 100644
a/src/elan-dist/Cargo.toml
-+++ b/src/elan-dist/Cargo.toml
+Index: elan-1.3.1/src/elan-dist/Cargo.toml
+===
+--- elan-1.3.1.orig/src/elan-dist/Cargo.toml
elan-1.3.1/src/elan-dist/Cargo.toml
@@ -14,7 +14,6 @@ itertools = "0.10.0"
url = "2.2.1"
tar = "0.4.33"
@@ -83,11 +83,11 @@
-zstd = "0.9"
walkdir = "2.3.1"
toml = "0.5.8"
- sha2 = "^0.9.2"
-diff --git a/src/elan-dist/src/component/package.rs
b/src/elan-dist/src/component/package.rs
-index c51e76d..8f70d4a 100644
a/src/elan-dist/src/component/package.rs
-+++ b/src/elan-dist/src/component/package.rs
+ sha2 = ">= 0.9.2, <0.11"
+Index: elan-1.3.1/src/elan-dist/src/component/package.rs
+===
+--- elan-1.3.1.orig/src/elan-dist/src/component/package.rs
elan-1.3.1/src/elan-dist/src/component/package.rs
@@ -4,7 +4,6 @@
extern crate filetime;
@@ -96,10 +96,15 @@
extern crate tar;
use errors::*;
-@@ -145,18 +144,3 @@ impl<'a> TarGzPackage<'a> {
- Self::unpack(file, into)
+@@ -140,21 +139,6 @@ impl<'a> TarGzPackage<'a> {
+
+ TarPackage::unpack(stream, path)
}
- }
+-pub fn unpack_file(path: , into: ) -> Result<()> {
+-let file = File::open(path).chain_err(||
ErrorKind::ExtractingPackage)?;
+-Self::unpack(file, into)
+-}
+-}
-
-#[derive(Debug)]
-pub struct TarZstdPackage<'a>(TarPackage<'a>);
@@ -110,15 +115,13 @@
-
-TarPackage::unpack(stream, path)
-}
--pub fn unpack_file(path: , into: ) -> Result<()> {
--let file = File::open(path).chain_err(||
ErrorKind::ExtractingPackage)?;
--Self::unpack(file, into)
--}
--}
-diff --git a/src/elan-dist/src/download.rs b/src/elan-dist/src/download.rs
-index bd6cf92..7737958 100644
a/src/elan-dist/src/download.rs
-+++ b/src/elan-dist/src/download.rs
+ pub fn unpack_file(path: ,
Bug#1012284: elan - FTBFS unsatisfiable cargo dependencies
Package: elan
Version: 1.3.1-3
Severity: serious
Tags: patch
A number of rust crates have been updated recently, as a result your
package no longer builds, I have updated the patches to relax the
dependencies and was able to succesfully build the package, I have not
tested it beyond that.
From: Christopher Hoskin
Date: Wed, 26 Jan 2022 19:46:47 +
Subject: Revert "feat: support tar.zst archives"
This reverts commit 3241c307cfcff08f02ae9856aa505c05fc14fcd7.
---
Cargo.lock | 39 --
src/elan-dist/Cargo.toml | 1 -
src/elan-dist/src/component/package.rs | 16 --
src/elan-dist/src/download.rs | 4 ++--
src/elan-dist/src/manifestation.rs | 25 +++---
5 files changed, 15 insertions(+), 70 deletions(-)
Index: elan-1.3.1/Cargo.lock
===
--- elan-1.3.1.orig/Cargo.lock
+++ elan-1.3.1/Cargo.lock
@@ -394,7 +394,6 @@ dependencies = [
"winapi 0.3.9",
"winreg 0.8.0",
"zip",
- "zstd",
]
[[package]]
@@ -778,15 +777,6 @@ source = "registry+https://github.com/ru
checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
[[package]]
-name = "jobserver"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index;
-checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
-dependencies = [
- "libc",
-]
-
-[[package]]
name = "js-sys"
version = "0.3.55"
source = "registry+https://github.com/rust-lang/crates.io-index;
@@ -1873,32 +1863,3 @@ dependencies = [
"thiserror",
"time 0.1.43",
]
-
-[[package]]
-name = "zstd"
-version = "0.9.0+zstd.1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index;
-checksum = "07749a5dc2cb6b36661290245e350f15ec3bbb304e493db54a1d354480522ccd"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "4.1.1+zstd.1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index;
-checksum = "c91c90f2c593b003603e5e0493c837088df4469da25aafff8bce42ba48caf079"
-dependencies = [
- "libc",
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "1.6.1+zstd.1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index;
-checksum = "615120c7a2431d16cf1cf979e7fc31ba7a5b5e5707b29c8a99e5dbf8a8392a33"
-dependencies = [
- "cc",
- "libc",
-]
Index: elan-1.3.1/src/elan-dist/Cargo.toml
===
--- elan-1.3.1.orig/src/elan-dist/Cargo.toml
+++ elan-1.3.1/src/elan-dist/Cargo.toml
@@ -14,7 +14,6 @@ itertools = "0.10.0"
url = "2.2.1"
tar = "0.4.33"
flate2 = "1.0.14"
-zstd = "0.9"
walkdir = "2.3.1"
toml = "0.5.8"
sha2 = ">= 0.9.2, <0.11"
Index: elan-1.3.1/src/elan-dist/src/component/package.rs
===
--- elan-1.3.1.orig/src/elan-dist/src/component/package.rs
+++ elan-1.3.1/src/elan-dist/src/component/package.rs
@@ -4,7 +4,6 @@
extern crate filetime;
extern crate flate2;
-extern crate zstd;
extern crate tar;
use errors::*;
@@ -140,21 +139,6 @@ impl<'a> TarGzPackage<'a> {
TarPackage::unpack(stream, path)
}
-pub fn unpack_file(path: , into: ) -> Result<()> {
-let file = File::open(path).chain_err(|| ErrorKind::ExtractingPackage)?;
-Self::unpack(file, into)
-}
-}
-
-#[derive(Debug)]
-pub struct TarZstdPackage<'a>(TarPackage<'a>);
-
-impl<'a> TarZstdPackage<'a> {
-pub fn unpack(stream: R, path: ) -> Result<()> {
-let stream = zstd::stream::read::Decoder::new(stream)?;
-
-TarPackage::unpack(stream, path)
-}
pub fn unpack_file(path: , into: ) -> Result<()> {
let file = File::open(path).chain_err(|| ErrorKind::ExtractingPackage)?;
Self::unpack(file, into)
Index: elan-1.3.1/src/elan-dist/src/download.rs
===
--- elan-1.3.1.orig/src/elan-dist/src/download.rs
+++ elan-1.3.1/src/elan-dist/src/download.rs
@@ -99,9 +99,9 @@ impl<'a> DownloadCfg<'a> {
Ok(())
}
-pub fn download_and_check(, url_str: ) -> Result> {
+pub fn download_and_check(, url_str: , ext: ) -> Result> {
let url = utils::parse_url(url_str)?;
-let file = self.temp_cfg.new_file()?;
+let file = self.temp_cfg.new_file_with_ext("", ext)?;
utils::download_file(, , None, &|n| (self.notify_handler)(n.into()))?;
Index: elan-1.3.1/src/elan-dist/src/manifestation.rs
===
--- elan-1.3.1.orig/src/elan-dist/src/manifestation.rs
+++ elan-1.3.1/src/elan-dist/src/manifestation.rs
@@ -1,6 +1,6 @@
//! Manifest a particular Lean version by installing it from a distribution server.
-use component::{TarGzPackage, TarZstdPackage, ZipPackage};
+use component::{TarGzPackage, ZipPackage};
use download::DownloadCfg;
use elan_utils::utils;
use errors::*;
@@
