diff options
-rw-r--r-- | 0001-re-route-dependencies-not-available-on-crates.io-to-.patch | 54 |
1 files changed, 32 insertions, 22 deletions
diff --git a/0001-re-route-dependencies-not-available-on-crates.io-to-.patch b/0001-re-route-dependencies-not-available-on-crates.io-to-.patch index a4d053f274e7..0105e0e11a86 100644 --- a/0001-re-route-dependencies-not-available-on-crates.io-to-.patch +++ b/0001-re-route-dependencies-not-available-on-crates.io-to-.patch @@ -9,19 +9,18 @@ Signed-off-by: Thomas Lamprecht <thomas@lamprecht.org> 1 file changed, 15 insertions(+), 97 deletions(-) diff --git a/Cargo.toml b/Cargo.toml -index 41980292..e7daaad5 100644 +index 38e9c1f2..6d37c792 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -25,94 +25,12 @@ members = [ +@@ -25,96 +25,13 @@ members = [ "pbs-config", "pbs-datastore", "pbs-fuse-loop", -- "proxmox-rest-server", - "proxmox-rrd", - "pbs-tape", "pbs-tools", -- "proxmox-backup-banner", + "proxmox-backup-banner", "proxmox-backup-client", - "proxmox-file-restore", - "proxmox-restore-daemon", @@ -52,7 +51,7 @@ index 41980292..e7daaad5 100644 -lazy_static = "1.4" -libc = "0.2" -log = "0.4.17" --nix = "0.19.1" +-nix = "0.24" -num-traits = "0.2" -once_cell = "1.3.1" -openssl = "0.10.38" # currently patched! @@ -60,7 +59,7 @@ index 41980292..e7daaad5 100644 -pam-sys = "0.5" -percent-encoding = "2.1" -regex = "1.5.5" --rustyline = "7" +-rustyline = "9" -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" -siphasher = "0.3" @@ -68,61 +67,73 @@ index 41980292..e7daaad5 100644 -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" ] } +-tokio-util = { version = "0.7", 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" +-nom = "7" -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" ] } +-pxar = { version = "0.10.2", features = [ "tokio-io" ] } - --proxmox-http = { version = "0.6.1", features = [ "client", "http-helpers", "websocket" ] } +-proxmox-http = { version = "0.7", features = [ "client", "client-trait", "http-helpers", "proxmox-async", "websocket" ] } -proxmox-io = "1" -proxmox-lang = "1.1" --proxmox-router = { version = "1.2.2", features = [ "cli" ] } +-proxmox-metrics = "0.2" +-proxmox-router = { version = "1.3.0", features = [ "cli" ] } -proxmox-schema = { version = "1.3.1", features = [ "api-macro" ] } -proxmox-section-config = "1" --proxmox-tfa = { version = "2", features = [ "api", "api-types" ] } +-proxmox-tfa = { version = "2.1", features = [ "api", "api-types" ] } -proxmox-time = "1.1.2" -proxmox-uuid = "1" --proxmox-serde = "0.1" +-proxmox-serde = { version = "0.1.1", features = [ "serde_json" ] } -proxmox-shared-memory = "0.2" --proxmox-sys = { version = "0.2", features = [ "sortable-macro" ] } +-proxmox-subscription = { version = "0.3", features = [ "api-types" ] } +-proxmox-sys = { version = "0.4.1", features = [ "sortable-macro", "timer" ] } -proxmox-compression = "0.1" +-proxmox-rest-server = "0.2" - - -proxmox-acme-rs = "0.4" --proxmox-apt = "0.8.0" +-proxmox-apt = "0.9.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" } +@@ -127,27 +44,27 @@ 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-acme-rs = { path = "../proxmox-acme-rs" } + #proxmox-apt = { path = "../proxmox-apt" } -#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-openid = { path = "../proxmox-openid-rs" } +-#proxmox-router = { 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-shared-memory = { path = "../proxmox/proxmox-shared-memory" } -#proxmox-sys = { path = "../proxmox/proxmox-sys" } +-#proxmox-serde = { path = "../proxmox/proxmox-serde" } +-#proxmox-tfa = { path = "../proxmox/proxmox-tfa" } +-#proxmox-time = { path = "../proxmox/proxmox-time" } +-#proxmox-uuid = { path = "../proxmox/proxmox-uuid" } +-#pxar = { path = "../pxar" } +proxmox-async = { path = "../proxmox/proxmox-async" } +proxmox-compression = { path = "../proxmox/proxmox-compression" } +proxmox-borrow = { path = "../proxmox/proxmox-borrow" } @@ -130,16 +141,15 @@ index 41980292..e7daaad5 100644 +proxmox-http = { path = "../proxmox/proxmox-http" } +proxmox-io = { path = "../proxmox/proxmox-io" } +proxmox-lang = { path = "../proxmox/proxmox-lang" } ++proxmox-metrics = { path = "../proxmox/proxmox-metrics" } ++#proxmox-openid = { path = "../proxmox-openid-rs" } +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-serde = { path = "../proxmox/proxmox-serde" } ++proxmox-tfa = { path = "../proxmox/proxmox-tfa" } +proxmox-time = { path = "../proxmox/proxmox-time" } +proxmox-uuid = { path = "../proxmox/proxmox-uuid" } +pxar = { path = "../pxar" } |