update patches for 2.4.1

Signed-off-by: Thomas Lamprecht <thomas@lamprecht.org>

2 files changed, 157 insertions, 130 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 0105e0e11a86..5f1d234e8c6a 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
@@ -5,153 +5,177 @@ 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(-)
+ Cargo.toml | 130 +++++++++--------------------------------------------
+ 1 file changed, 21 insertions(+), 109 deletions(-)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index 38e9c1f2..6d37c792 100644
+index 0c86cd1b..7d5c282b 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -25,96 +25,13 @@ members = [
-     "pbs-config",
-     "pbs-datastore",
-     "pbs-fuse-loop",
--    "proxmox-rrd",
--    "pbs-tape",
-     "pbs-tools",
+@@ -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" }
  
--[lib]
--name = "proxmox_backup"
--path = "src/lib.rs"
--
--[dependencies]
+ # regular crates
+ anyhow = "1.0"
 -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" ] }
+ 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" ] }
--lazy_static = "1.4"
--libc = "0.2"
--log = "0.4.17"
--nix = "0.24"
--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 = "9"
--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.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 = "7"
--crossbeam-channel = "0.5"
--
--# Used only by examples currently:
--zstd = { version = "0.6", features = [ "bindgen" ] }
--
--pathpatterns = "0.1.2"
--pxar = { version = "0.10.2", features = [ "tokio-io" ] }
+ 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
 -
--proxmox-http = { version = "0.7", features = [ "client", "client-trait", "http-helpers", "proxmox-async", "websocket" ] }
--proxmox-io = "1"
--proxmox-lang = "1.1"
--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.1", features = [ "api", "api-types" ] }
--proxmox-time = "1.1.2"
--proxmox-uuid = "1"
--proxmox-serde = { version = "0.1.1", features = [ "serde_json" ] }
--proxmox-shared-memory = "0.2"
--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"
+ #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
 -
--proxmox-acme-rs = "0.4"
--proxmox-apt = "0.9.0"
--proxmox-async = "0.4"
--proxmox-openid = "0.9.0"
+-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
 -
- pbs-api-types = { path = "pbs-api-types" }
- pbs-buildcfg = { path = "pbs-buildcfg" }
- pbs-client = { path = "pbs-client" }
-@@ -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-acme-rs = { path = "../proxmox-acme-rs" }
- #proxmox-apt = { path = "../proxmox-apt" }
 -#proxmox-async = { path = "../proxmox/proxmox-async" }
--#proxmox-compression = { path = "../proxmox/proxmox-compression" }
+-#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-openid = { path = "../proxmox-openid-rs" }
--#proxmox-router = { path = "../proxmox/proxmox-rest-server" }
+-#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-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-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-metrics = { path = "../proxmox/proxmox-metrics" }
-+#proxmox-openid = { path = "../proxmox-openid-rs" }
++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-serde = { path = "../proxmox/proxmox-serde" }
 +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]
diff --git a/0002-docs-drop-all-but-client-man-pages.patch b/0002-docs-drop-all-but-client-man-pages.patch
index 392f5755f56a..da83e14988cd 100644
--- a/0002-docs-drop-all-but-client-man-pages.patch
+++ b/0002-docs-drop-all-but-client-man-pages.patch
@@ -5,14 +5,45 @@ Subject: [PATCH] docs: drop all but client man pages
 
 Signed-off-by: Thomas Lamprecht <thomas@lamprecht.org>
 ---
- docs/conf.py | 18 ------------------
- 1 file changed, 18 deletions(-)
+ docs/Makefile | 16 ----------------
+ docs/conf.py  | 19 -------------------
+ 2 files changed, 35 deletions(-)
 
+diff --git a/docs/Makefile b/docs/Makefile
+index b06badff..94130228 100644
+--- a/docs/Makefile
++++ b/docs/Makefile
+@@ -1,25 +1,9 @@
+ include ../defines.mk
+ 
+ GENERATED_SYNOPSIS := 						\
+-	proxmox-tape/synopsis.rst				\
+ 	proxmox-backup-client/synopsis.rst			\
+ 	proxmox-backup-client/catalog-shell-synopsis.rst 	\
+-	proxmox-backup-manager/synopsis.rst			\
+-	proxmox-backup-debug/synopsis.rst			\
+-	proxmox-file-restore/synopsis.rst			\
+ 	pxar/synopsis.rst					\
+-	pmtx/synopsis.rst					\
+-	pmt/synopsis.rst					\
+-	config/media-pool/config.rst				\
+-	config/tape/config.rst					\
+-	config/tape-job/config.rst				\
+-	config/user/config.rst					\
+-	config/remote/config.rst				\
+-	config/sync/config.rst					\
+-	config/verification/config.rst				\
+-	config/acl/roles.rst					\
+-	config/datastore/config.rst				\
+-	config/domains/config.rst
+ 
+ MAN1_PAGES := 				\
+ 	pxar.1				\
 diff --git a/docs/conf.py b/docs/conf.py
-index 59f27c42..deeb63bf 100644
+index 8944926e..deeb63bf 100644
 --- a/docs/conf.py
 +++ b/docs/conf.py
-@@ -93,25 +93,7 @@ rst_epilog += f"\n..  |pbs-copyright| replace:: Copyright (C) {copyright}"
+@@ -93,26 +93,7 @@ rst_epilog += f"\n..  |pbs-copyright| replace:: Copyright (C) {copyright}"
  man_pages = [
      # CLI
      ('proxmox-backup-client/man1', 'proxmox-backup-client', 'Command line tool for Backup and Restore', [author], 1),
@@ -28,6 +59,7 @@ index 59f27c42..deeb63bf 100644
 -    # configs
 -    ('config/acl/man5', 'acl.cfg', 'Access Control Configuration', [author], 5),
 -    ('config/datastore/man5', 'datastore.cfg', 'Datastore Configuration', [author], 5),
+-    ('config/domains/man5', 'domains.cfg', 'Realm Configuration', [author], 5),
 -    ('config/media-pool/man5', 'media-pool.cfg', 'Media Pool Configuration', [author], 5),
 -    ('config/remote/man5', 'remote.cfg', 'Remote Server Configuration', [author], 5),
 -    ('config/sync/man5', 'sync.cfg', 'Synchronization Job Configuration', [author], 5),
@@ -38,32 +70,3 @@ index 59f27c42..deeb63bf 100644
  ]
  
  
-diff --git a/docs/Makefile b/docs/Makefile
-index b1ce4f7a..87cfe324 100644
---- a/docs/Makefile
-+++ b/docs/Makefile
-@@ -1,24 +1,9 @@
- include ../defines.mk
- 
- GENERATED_SYNOPSIS := 						\
--	proxmox-tape/synopsis.rst				\
- 	proxmox-backup-client/synopsis.rst			\
- 	proxmox-backup-client/catalog-shell-synopsis.rst 	\
--	proxmox-backup-manager/synopsis.rst			\
--	proxmox-backup-debug/synopsis.rst			\
--	proxmox-file-restore/synopsis.rst			\
- 	pxar/synopsis.rst					\
--	pmtx/synopsis.rst					\
--	pmt/synopsis.rst					\
--	config/media-pool/config.rst				\
--	config/tape/config.rst					\
--	config/tape-job/config.rst				\
--	config/user/config.rst					\
--	config/remote/config.rst				\
--	config/sync/config.rst					\
--	config/verification/config.rst				\
--	config/acl/roles.rst					\
--	config/datastore/config.rst
- 
- MAN1_PAGES := 				\
- 	pxar.1				\