libslirp: bump version and drop/rebase patches

Drop unneeded patches and rebase changes to Cargo.toml for new package
version.

libslirp requires a higher patch version of mio than what is in the
Debian archive (0.6.19 vs 0.6.16). Local testing shows that libslirp
still works with the lower patch version, so no need to bump mio and its
dependencies.

Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>

diff --git a/src/libslirp/debian/changelog b/src/libslirp/debian/changelog
index 73c1a29dfe199a60c07a3400b6bbf237ff336438..7e2d5eca8255ab7f1e4a911e01c35c1b895b9416 100644 (file)
--- a/src/libslirp/debian/changelog
+++ b/src/libslirp/debian/changelog
@@ -1,5 +1,7 @@
-rust-libslirp (4.0.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+rust-libslirp (4.3.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
 
-  * Package libslirp 4.0.0 from crates.io using debcargo 2.4.2
+  * Team upload.
+  * Package libslirp 4.3.0 from crates.io using debcargo 2.4.3
+
+ -- Christopher Obbard <chris.obbard@collabora.com>  Thu, 29 Oct 2020 10:03:13 +0000
 
- -- Andrej Shadura <andrewsh@debian.org>  Mon, 06 Apr 2020 12:12:30 +0200

diff --git a/src/libslirp/debian/patches/enable-all-by-default.patch b/src/libslirp/debian/patches/enable-all-by-default.patch
deleted file mode 100644 (file)
index fb5aa8c..0000000
--- a/src/libslirp/debian/patches/enable-all-by-default.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-enable all but dbus and systemd by default
-
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -81,3 +81,4 @@
- 
- [features]
- all = ["mio", "mio-extras", "ipnetwork", "structopt", "slab", "libc", "dbus", "nix", "libsystemd", "url", "lazy_static"]
-+default = ["mio", "mio-extras", "ipnetwork", "structopt", "slab", "libc", "nix", "url", "lazy_static"]

diff --git a/src/libslirp/debian/patches/relax-deps.patch b/src/libslirp/debian/patches/relax-deps.patch
index 14cee7a28791906ad38fdb3daaa2dae9c11c70b8..6aaec00f662452c77a4f1f1f475bb914266e7053 100644 (file)
--- a/src/libslirp/debian/patches/relax-deps.patch
+++ b/src/libslirp/debian/patches/relax-deps.patch
@@ -1,14 +1,5 @@
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -35,7 +35,7 @@
- optional = true
- 
- [dependencies.ipnetwork]
--version = "0.16"
-+version = "0.14"
- optional = true
- 
- [dependencies.lazy_static]
 @@ -54,7 +54,7 @@
  optional = true
  
@@ -18,17 +9,3 @@
  optional = true
  
  [dependencies.mio-extras]
-@@ -62,11 +62,11 @@
- optional = true
- 
- [dependencies.nix]
--version = "0.17"
-+version = "0.16"
- optional = true
- 
- [dependencies.slab]
--version = "0.4.0"
-+version = "0.4"
- optional = true
- 
- [dependencies.structopt]

diff --git a/src/libslirp/debian/patches/series b/src/libslirp/debian/patches/series
index 5bf371a56288e6db7e9b6052b11ca73a9883aa6f..bdddf05ae546555b06f7432fa9bd69cb4590599a 100644 (file)
--- a/src/libslirp/debian/patches/series
+++ b/src/libslirp/debian/patches/series
@@ -1,2 +1 @@
-enable-all-by-default.patch
 relax-deps.patch