proxmox-backup-client: 2.2.1 -> 2.4.1
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
This commit is contained in:
Christoph Heiss
parent
b1f77073bc
commit
95e1d46d8d
|
|
@ -0,0 +1,182 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Lamprecht <thomas@lamprecht.org>
|
||||
Date: Wed, 18 May 2022 08:41:14 +0200
|
||||
Subject: [PATCH] re-route dependencies not available on crates.io to git repos
|
||||
|
||||
Signed-off-by: Thomas Lamprecht <thomas@lamprecht.org>
|
||||
---
|
||||
Cargo.toml | 130 +++++++++--------------------------------------------
|
||||
1 file changed, 21 insertions(+), 109 deletions(-)
|
||||
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 0c86cd1b..7d5c282b 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -41,9 +41,6 @@ members = [
|
||||
|
||||
"proxmox-backup-banner",
|
||||
"proxmox-backup-client",
|
||||
- "proxmox-file-restore",
|
||||
- "proxmox-restore-daemon",
|
||||
- "proxmox-rrd",
|
||||
|
||||
"pxar-bin",
|
||||
]
|
||||
@@ -101,7 +98,6 @@ proxmox-rrd = { path = "proxmox-rrd" }
|
||||
|
||||
# regular crates
|
||||
anyhow = "1.0"
|
||||
-apt-pkg-native = "0.3.2"
|
||||
base64 = "0.13"
|
||||
bitflags = "1.2.1"
|
||||
bytes = "1.0"
|
||||
@@ -114,7 +110,6 @@ flate2 = "1.0"
|
||||
foreign-types = "0.3"
|
||||
futures = "0.3"
|
||||
h2 = { version = "0.3", features = [ "stream" ] }
|
||||
-handlebars = "3.0"
|
||||
hex = "0.4.3"
|
||||
http = "0.2"
|
||||
hyper = { version = "0.14", features = [ "full" ] }
|
||||
@@ -152,120 +147,37 @@ walkdir = "2"
|
||||
xdg = "2.2"
|
||||
zstd = { version = "0.6", features = [ "bindgen" ] }
|
||||
|
||||
-[dependencies]
|
||||
-anyhow.workspace = true
|
||||
-apt-pkg-native.workspace = true
|
||||
-base64.workspace = true
|
||||
-bitflags.workspace = true
|
||||
-bytes.workspace = true
|
||||
-cidr.workspace = true
|
||||
-crc32fast.workspace = true
|
||||
-crossbeam-channel.workspace = true
|
||||
-endian_trait.workspace = true
|
||||
-flate2.workspace = true
|
||||
-futures.workspace = true
|
||||
-h2.workspace = true
|
||||
-handlebars.workspace = true
|
||||
-hex.workspace = true
|
||||
-http.workspace = true
|
||||
-hyper.workspace = true
|
||||
-lazy_static.workspace = true
|
||||
-libc.workspace = true
|
||||
-log.workspace = true
|
||||
-nix.workspace = true
|
||||
-nom.workspace = true
|
||||
-num-traits.workspace = true
|
||||
-once_cell.workspace = true
|
||||
-openssl.workspace = true
|
||||
-pam-sys.workspace = true
|
||||
-pam.workspace = true
|
||||
-percent-encoding.workspace = true
|
||||
-regex.workspace = true
|
||||
-rustyline.workspace = true
|
||||
-serde.workspace = true
|
||||
-serde_json.workspace = true
|
||||
-siphasher.workspace = true
|
||||
-syslog.workspace = true
|
||||
-termcolor.workspace = true
|
||||
-thiserror.workspace = true
|
||||
-tokio = { workspace = true, features = [ "fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "time" ] }
|
||||
-tokio-openssl.workspace = true
|
||||
-tokio-stream.workspace = true
|
||||
-tokio-util = { workspace = true, features = [ "codec" ] }
|
||||
-tower-service.workspace = true
|
||||
-udev.workspace = true
|
||||
-url.workspace = true
|
||||
-walkdir.workspace = true
|
||||
-xdg.workspace = true
|
||||
-zstd.workspace = true
|
||||
-
|
||||
#valgrind_request = { git = "https://github.com/edef1c/libvalgrind_request", version = "1.1.0", optional = true }
|
||||
|
||||
-proxmox-async.workspace = true
|
||||
-proxmox-auth-api = { workspace = true, features = [ "api", "pam-authenticator" ] }
|
||||
-proxmox-compression.workspace = true
|
||||
-proxmox-http = { workspace = true, features = [ "client-trait", "proxmox-async", "rate-limited-stream" ] } # pbs-client doesn't use these
|
||||
-proxmox-io.workspace = true
|
||||
-proxmox-lang.workspace = true
|
||||
-proxmox-ldap.workspace = true
|
||||
-proxmox-metrics.workspace = true
|
||||
-proxmox-rest-server = { workspace = true, features = [ "rate-limited-stream" ] }
|
||||
-proxmox-router = { workspace = true, features = [ "cli", "server"] }
|
||||
-proxmox-schema = { workspace = true, features = [ "api-macro" ] }
|
||||
-proxmox-section-config.workspace = true
|
||||
-proxmox-serde = { workspace = true, features = [ "serde_json" ] }
|
||||
-proxmox-shared-memory.workspace = true
|
||||
-proxmox-sortable-macro.workspace = true
|
||||
-proxmox-subscription.workspace = true
|
||||
-proxmox-sys = { workspace = true, features = [ "timer" ] }
|
||||
-proxmox-tfa.workspace = true
|
||||
-proxmox-time.workspace = true
|
||||
-proxmox-uuid.workspace = true
|
||||
-
|
||||
-pathpatterns.workspace = true
|
||||
-proxmox-acme-rs.workspace = true
|
||||
-proxmox-apt.workspace = true
|
||||
-proxmox-openid.workspace = true
|
||||
-pxar.workspace = true
|
||||
-
|
||||
-pbs-api-types.workspace = true
|
||||
-pbs-buildcfg.workspace = true
|
||||
-pbs-client.workspace = true
|
||||
-pbs-config.workspace = true
|
||||
-pbs-datastore.workspace = true
|
||||
-pbs-key-config.workspace = true
|
||||
-pbs-tape.workspace = true
|
||||
-pbs-tools.workspace = true
|
||||
-proxmox-rrd.workspace = true
|
||||
-
|
||||
# Local path overrides
|
||||
# NOTE: You must run `cargo update` after changing this for it to take effect!
|
||||
[patch.crates-io]
|
||||
#proxmox-acme-rs = { path = "../proxmox-acme-rs" }
|
||||
-#proxmox-async = { path = "../proxmox/proxmox-async" }
|
||||
-#proxmox-auth-api = { path = "../proxmox/proxmox-auth-api" }
|
||||
-#proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
|
||||
-#proxmox-compression = { path = "../proxmox/proxmox-compression" }
|
||||
-#proxmox-fuse = { path = "../proxmox-fuse" }
|
||||
-#proxmox-http = { path = "../proxmox/proxmox-http" }
|
||||
-#proxmox-io = { path = "../proxmox/proxmox-io" }
|
||||
-#proxmox-lang = { path = "../proxmox/proxmox-lang" }
|
||||
-#proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" }
|
||||
-#proxmox-router = { path = "../proxmox/proxmox-router" }
|
||||
-#proxmox-schema = { path = "../proxmox/proxmox-schema" }
|
||||
-#proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
|
||||
-#proxmox-serde = { path = "../proxmox/proxmox-serde" }
|
||||
-#proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
|
||||
-#proxmox-subscription = { path = "../proxmox/proxmox-subscription" }
|
||||
-#proxmox-sys = { path = "../proxmox/proxmox-sys" }
|
||||
-#proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
|
||||
-#proxmox-time = { path = "../proxmox/proxmox-time" }
|
||||
-#proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
|
||||
+proxmox-async = { path = "../proxmox/proxmox-async" }
|
||||
+proxmox-auth-api = { path = "../proxmox/proxmox-auth-api" }
|
||||
+proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
|
||||
+proxmox-compression = { path = "../proxmox/proxmox-compression" }
|
||||
+proxmox-fuse = { path = "../proxmox-fuse" }
|
||||
+proxmox-http = { path = "../proxmox/proxmox-http" }
|
||||
+proxmox-io = { path = "../proxmox/proxmox-io" }
|
||||
+proxmox-lang = { path = "../proxmox/proxmox-lang" }
|
||||
+proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" }
|
||||
+proxmox-router = { path = "../proxmox/proxmox-router" }
|
||||
+proxmox-schema = { path = "../proxmox/proxmox-schema" }
|
||||
+proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
|
||||
+proxmox-serde = { path = "../proxmox/proxmox-serde" }
|
||||
+proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
|
||||
+proxmox-sortable-macro = { path = "../proxmox/proxmox-sortable-macro" }
|
||||
+proxmox-subscription = { path = "../proxmox/proxmox-subscription" }
|
||||
+proxmox-sys = { path = "../proxmox/proxmox-sys" }
|
||||
+proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
|
||||
+proxmox-time = { path = "../proxmox/proxmox-time" }
|
||||
+proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
|
||||
|
||||
#proxmox-apt = { path = "../proxmox-apt" }
|
||||
#proxmox-openid = { path = "../proxmox-openid-rs" }
|
||||
|
||||
-#pxar = { path = "../pxar" }
|
||||
+pxar = { path = "../pxar" }
|
||||
|
||||
[features]
|
||||
default = []
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,40 +1,43 @@
|
|||
{ lib, fetchgit, rustPlatform, pkg-config, openssl, fuse3, libuuid, acl, libxcrypt }:
|
||||
{
|
||||
lib, fetchgit, rustPlatform, pkg-config, openssl, fuse3, libuuid, acl,
|
||||
libxcrypt, git,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "proxmox-backup-client";
|
||||
version = "2.2.1";
|
||||
version = "2.4.1";
|
||||
|
||||
srcs = [
|
||||
(fetchgit {
|
||||
url = "git://git.proxmox.com/git/proxmox-backup.git";
|
||||
rev = "v${version}";
|
||||
name = pname;
|
||||
hash = "sha256-uOKQe/BzO69f/ggEPoZQ2Rn3quytQrUeH7be19QV3KI=";
|
||||
name = "proxmox-backup";
|
||||
hash = "sha256-DWzNRi675ZP9HGc/uPvnV/FBTJUNZ4K5RtU9NFRQCcA=";
|
||||
})
|
||||
(fetchgit {
|
||||
url = "git://git.proxmox.com/git/proxmox.git";
|
||||
rev = "43b4440ef015d846161657490b18cf6ac7600fc4";
|
||||
rev = "5df815f660e4f3793e974eb8130224538350bb12";
|
||||
name = "proxmox";
|
||||
hash = "sha256-05Z+IRRIioFGn+iAYG04DyNsgw9gQrJ6qAArpCwoIb0=";
|
||||
hash = "sha256-Vn1poqkIWcR2rNiAr+ENLNthgk3pMCivzXnUX9hvZBw=";
|
||||
})
|
||||
(fetchgit {
|
||||
url = "git://git.proxmox.com/git/proxmox-fuse.git";
|
||||
rev = "d162ef9039878b871e2aa11b7d9a373ae512e2d1";
|
||||
rev = "93099f76b6bbbc8a0bbaca9b459a1ce4dc5e0a79";
|
||||
name = "proxmox-fuse";
|
||||
hash = "sha256-w33ViWpBkCkMAhZVXiOdqnGOn/tddNRgzn71WioTnBU=";
|
||||
hash = "sha256-3l0lAZVFQC0MYaqZvB+S+ihb1fTkEgs5i9q463+cbvQ=";
|
||||
})
|
||||
(fetchgit {
|
||||
url = "git://git.proxmox.com/git/pxar.git";
|
||||
rev = "6f3f889e98c5f4e60c3b2c6bce73bd506b548c21";
|
||||
rev = "6ad046f9f92b40413f59cc5f4c23d2bafdf141f2";
|
||||
name = "pxar";
|
||||
hash = "sha256-GtNq6+O1xnxuR7b4TTWLFxcsejRyadSlk85H8C+yUGA=";
|
||||
hash = "sha256-I9kk27oN9BDQpnLDWltjZMrh2yJitCpcD/XAhkmtJUg=";
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = pname;
|
||||
sourceRoot = "proxmox-backup";
|
||||
|
||||
cargoPatches = [
|
||||
./re-route-dependencies.patch
|
||||
./0001-re-route-dependencies-not-available-on-crates.io-to-.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -50,14 +53,13 @@ rustPlatform.buildRustPackage rec {
|
|||
"--package=proxmox-backup-client"
|
||||
"--bin=proxmox-backup-client"
|
||||
"--bin=dump-catalog-shell-cli"
|
||||
|
||||
"--package=pxar-bin"
|
||||
"--bin=pxar"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
|
||||
nativeBuildInputs = [ git pkg-config rustPlatform.bindgenHook ];
|
||||
buildInputs = [ openssl fuse3 libuuid acl libxcrypt ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -66,5 +68,6 @@ rustPlatform.buildRustPackage rec {
|
|||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ cofob christoph-heiss ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = pname;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,148 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Lamprecht <thomas@lamprecht.org>
|
||||
Date: Wed, 18 May 2022 08:41:14 +0200
|
||||
Subject: [PATCH] re-route dependencies not available on crates.io to git repos
|
||||
|
||||
Signed-off-by: Thomas Lamprecht <thomas@lamprecht.org>
|
||||
---
|
||||
Cargo.toml | 112 +++++++-------------------------------------------
|
||||
1 file changed, 15 insertions(+), 97 deletions(-)
|
||||
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 41980292..e7daaad5 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -25,94 +25,12 @@ members = [
|
||||
"pbs-config",
|
||||
"pbs-datastore",
|
||||
"pbs-fuse-loop",
|
||||
- "proxmox-rest-server",
|
||||
- "proxmox-rrd",
|
||||
- "pbs-tape",
|
||||
"pbs-tools",
|
||||
|
||||
- "proxmox-backup-banner",
|
||||
"proxmox-backup-client",
|
||||
- "proxmox-file-restore",
|
||||
- "proxmox-restore-daemon",
|
||||
"pxar-bin",
|
||||
]
|
||||
|
||||
-[lib]
|
||||
-name = "proxmox_backup"
|
||||
-path = "src/lib.rs"
|
||||
-
|
||||
-[dependencies]
|
||||
-apt-pkg-native = "0.3.2"
|
||||
-base64 = "0.13"
|
||||
-bitflags = "1.2.1"
|
||||
-bytes = "1.0"
|
||||
-cidr = "0.2.1"
|
||||
-crc32fast = "1"
|
||||
-endian_trait = { version = "0.6", features = ["arrays"] }
|
||||
-flate2 = "1.0"
|
||||
-anyhow = "1.0"
|
||||
-thiserror = "1.0"
|
||||
-futures = "0.3"
|
||||
-h2 = { version = "0.3", features = [ "stream" ] }
|
||||
-handlebars = "3.0"
|
||||
-hex = "0.4.3"
|
||||
-http = "0.2"
|
||||
-hyper = { version = "0.14", features = [ "full" ] }
|
||||
-lazy_static = "1.4"
|
||||
-libc = "0.2"
|
||||
-log = "0.4.17"
|
||||
-nix = "0.19.1"
|
||||
-num-traits = "0.2"
|
||||
-once_cell = "1.3.1"
|
||||
-openssl = "0.10.38" # currently patched!
|
||||
-pam = "0.7"
|
||||
-pam-sys = "0.5"
|
||||
-percent-encoding = "2.1"
|
||||
-regex = "1.5.5"
|
||||
-rustyline = "7"
|
||||
-serde = { version = "1.0", features = ["derive"] }
|
||||
-serde_json = "1.0"
|
||||
-siphasher = "0.3"
|
||||
-syslog = "4.0"
|
||||
-tokio = { version = "1.6", features = [ "fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "time" ] }
|
||||
-tokio-openssl = "0.6.1"
|
||||
-tokio-stream = "0.1.0"
|
||||
-tokio-util = { version = "0.6", features = [ "codec", "io" ] }
|
||||
-tower-service = "0.3.0"
|
||||
-udev = "0.4"
|
||||
-url = "2.1"
|
||||
-#valgrind_request = { git = "https://github.com/edef1c/libvalgrind_request", version = "1.1.0", optional = true }
|
||||
-walkdir = "2"
|
||||
-xdg = "2.2"
|
||||
-nom = "5.1"
|
||||
-crossbeam-channel = "0.5"
|
||||
-
|
||||
-# Used only by examples currently:
|
||||
-zstd = { version = "0.6", features = [ "bindgen" ] }
|
||||
-
|
||||
-pathpatterns = "0.1.2"
|
||||
-pxar = { version = "0.10.1", features = [ "tokio-io" ] }
|
||||
-
|
||||
-proxmox-http = { version = "0.6.1", features = [ "client", "http-helpers", "websocket" ] }
|
||||
-proxmox-io = "1"
|
||||
-proxmox-lang = "1.1"
|
||||
-proxmox-router = { version = "1.2.2", features = [ "cli" ] }
|
||||
-proxmox-schema = { version = "1.3.1", features = [ "api-macro" ] }
|
||||
-proxmox-section-config = "1"
|
||||
-proxmox-tfa = { version = "2", features = [ "api", "api-types" ] }
|
||||
-proxmox-time = "1.1.2"
|
||||
-proxmox-uuid = "1"
|
||||
-proxmox-serde = "0.1"
|
||||
-proxmox-shared-memory = "0.2"
|
||||
-proxmox-sys = { version = "0.2", features = [ "sortable-macro" ] }
|
||||
-proxmox-compression = "0.1"
|
||||
-
|
||||
-
|
||||
-proxmox-acme-rs = "0.4"
|
||||
-proxmox-apt = "0.8.0"
|
||||
-proxmox-async = "0.4"
|
||||
-proxmox-openid = "0.9.0"
|
||||
-
|
||||
pbs-api-types = { path = "pbs-api-types" }
|
||||
pbs-buildcfg = { path = "pbs-buildcfg" }
|
||||
pbs-client = { path = "pbs-client" }
|
||||
@@ -126,22 +44,23 @@ pbs-tape = { path = "pbs-tape" }
|
||||
# Local path overrides
|
||||
# NOTE: You must run `cargo update` after changing this for it to take effect!
|
||||
[patch.crates-io]
|
||||
-#proxmox = { path = "../proxmox/proxmox" }
|
||||
-#proxmox-async = { path = "../proxmox/proxmox-async" }
|
||||
-#proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
|
||||
-#proxmox-fuse = { path = "../proxmox-fuse" }
|
||||
-#proxmox-http = { path = "../proxmox/proxmox-http" }
|
||||
-#proxmox-io = { path = "../proxmox/proxmox-io" }
|
||||
-#proxmox-lang = { path = "../proxmox/proxmox-lang" }
|
||||
-#proxmox-router = { path = "../proxmox/proxmox-router" }
|
||||
-#proxmox-schema = { path = "../proxmox/proxmox-schema" }
|
||||
-#proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
|
||||
-#proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
|
||||
-#proxmox-sys = { path = "../proxmox/proxmox-sys" }
|
||||
+proxmox-async = { path = "../proxmox/proxmox-async" }
|
||||
+proxmox-compression = { path = "../proxmox/proxmox-compression" }
|
||||
+proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
|
||||
+proxmox-fuse = { path = "../proxmox-fuse" }
|
||||
+proxmox-http = { path = "../proxmox/proxmox-http" }
|
||||
+proxmox-io = { path = "../proxmox/proxmox-io" }
|
||||
+proxmox-lang = { path = "../proxmox/proxmox-lang" }
|
||||
+proxmox-router = { path = "../proxmox/proxmox-router" }
|
||||
+proxmox-schema = { path = "../proxmox/proxmox-schema" }
|
||||
+proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
|
||||
+proxmox-serde = { path = "../proxmox/proxmox-serde" }
|
||||
+proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
|
||||
+proxmox-sys = { path = "../proxmox/proxmox-sys" }
|
||||
#proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
|
||||
-#proxmox-time = { path = "../proxmox/proxmox-time" }
|
||||
-#proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
|
||||
-#pxar = { path = "../pxar" }
|
||||
+proxmox-time = { path = "../proxmox/proxmox-time" }
|
||||
+proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
|
||||
+pxar = { path = "../pxar" }
|
||||
|
||||
[features]
|
||||
default = []
|
||||
Loading…
Reference in New Issue
Block a user