Adding upstream version 0.70.1+ds1.upstream/0.70.1+ds1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 53 insertions, 0 deletions

diff --git a/vendor/flate2/debian/patches/disable-cloudflare-zlib.patch b/vendor/flate2/debian/patches/disable-cloudflare-zlib.patch
new file mode 100644
index 0000000..594a268
--- /dev/null
+++ b/vendor/flate2/debian/patches/disable-cloudflare-zlib.patch
@@ -0,0 +1,20 @@
+Index: flate2/Cargo.toml
+===================================================================
+--- flate2.orig/Cargo.toml
++++ flate2/Cargo.toml
+@@ -46,10 +46,6 @@ rustdoc-args = [
+     "docsrs",
+ ]
+ 
+-[dependencies.cloudflare-zlib-sys]
+-version = "0.3.0"
+-optional = true
+-
+ [dependencies.crc32fast]
+ version = "1.2.0"
+ 
+@@ -80,4 +76,0 @@ version = "0.8"
+-cloudflare_zlib = [
+-    "any_zlib",
+-    "cloudflare-zlib-sys",
+-]
diff --git a/vendor/flate2/debian/patches/disable-zlib-ng.patch b/vendor/flate2/debian/patches/disable-zlib-ng.patch
new file mode 100644
index 0000000..d986a45
--- /dev/null
+++ b/vendor/flate2/debian/patches/disable-zlib-ng.patch
@@ -0,0 +1,30 @@
+Index: flate2/Cargo.toml
+===================================================================
+--- flate2.orig/Cargo.toml
++++ flate2/Cargo.toml
+@@ -49,10 +49,6 @@ rustdoc-args = [
+ [dependencies.crc32fast]
+ version = "1.2.0"
+ 
+-[dependencies.libz-ng-sys]
+-version = "1.1.8"
+-optional = true
+-
+ [dependencies.libz-sys]
+ version = "1.1.8"
+ optional = true
+@@ -84,14 +80,6 @@ zlib-default = [
+     "any_zlib",
+     "libz-sys/default",
+ ]
+-zlib-ng = [
+-    "any_zlib",
+-    "libz-ng-sys",
+-]
+-zlib-ng-compat = [
+-    "zlib",
+-    "libz-sys/zlib-ng",
+-]
+ 
+ [target."cfg(all(target_arch = \"wasm32\", not(target_os = \"emscripten\")))".dependencies.miniz_oxide]
+ version = "0.7.1"
diff --git a/vendor/flate2/debian/patches/series b/vendor/flate2/debian/patches/series
new file mode 100644
index 0000000..2ac15cd
--- /dev/null
+++ b/vendor/flate2/debian/patches/series
@@ -0,0 +1,3 @@
+disable-cloudflare-zlib.patch
+disable-zlib-ng.patch
+#eliminate-any-zlib.patch