- updated to 4.1.2

diff --git a/make_tarball/0001-re-route-dependencies-not-available-on-crates.io-to-.patch b/make_tarball/0001-re-route-dependencies-not-available-on-crates.io-to-.patch
index dfbc82a7614c5ba2e8aad6aec4ecb524ea5439f6..23f023952fc7673ced49ed5fa13dffeb198214d8 100644 (file)
--- a/make_tarball/0001-re-route-dependencies-not-available-on-crates.io-to-.patch
+++ b/make_tarball/0001-re-route-dependencies-not-available-on-crates.io-to-.patch
@@ -10,7 +10,7 @@ diff --git a/Cargo.toml b/Cargo.toml
  
      "pxar-bin",
  ]
  
      "pxar-bin",
  ]

-@@ -115,7 +113,6 @@
+@@ -118,7 +116,6 @@

  # regular crates
  anyhow = "1.0"
  async-trait = "0.1.56"
  # regular crates
  anyhow = "1.0"
  async-trait = "0.1.56"


@@ -18,7 +18,7 @@ diff --git a/Cargo.toml b/Cargo.toml
  bitflags = "2.4"
  bytes = "1.0"
  cidr = "0.3"
  bitflags = "2.4"
  bytes = "1.0"
  cidr = "0.3"

-@@ -128,7 +125,6 @@
+@@ -131,7 +128,6 @@

  foreign-types = "0.3"
  futures = "0.3"
  h2 = { version = "0.4", features = [ "stream" ] }
  foreign-types = "0.3"
  futures = "0.3"
  h2 = { version = "0.4", features = [ "stream" ] }


@@ -26,7 +26,7 @@ diff --git a/Cargo.toml b/Cargo.toml
  hex = "0.4.3"
  hickory-resolver = { version = "0.24.1", default-features = false, features = [ "system-config", "tokio-runtime" ] }
  http-body-util = "0.1"
  hex = "0.4.3"
  hickory-resolver = { version = "0.24.1", default-features = false, features = [ "system-config", "tokio-runtime" ] }
  http-body-util = "0.1"

-@@ -165,145 +161,53 @@
+@@ -168,158 +164,62 @@

  zstd = "0.13"
  zstd-safe = "7"
  
  zstd = "0.13"
  zstd-safe = "7"
  


@@ -92,6 +92,7 @@ diff --git a/Cargo.toml b/Cargo.toml
 -proxmox-notify = { workspace = true, features = [ "pbs-context" ] }
 -proxmox-openid.workspace = true
 -proxmox-product-config.workspace = true
 -proxmox-notify = { workspace = true, features = [ "pbs-context" ] }
 -proxmox-openid.workspace = true
 -proxmox-product-config.workspace = true

+-proxmox-rate-limiter = { workspace = true, features = [ "shared-rate-limiter" ] }

 -proxmox-rest-server = { workspace = true, features = [ "rate-limited-stream" ] }
 -proxmox-router = { workspace = true, features = [ "cli", "server"] }
 -proxmox-s3-client.workspace = true
 -proxmox-rest-server = { workspace = true, features = [ "rate-limited-stream" ] }
 -proxmox-router = { workspace = true, features = [ "cli", "server"] }
 -proxmox-s3-client.workspace = true


@@ -106,12 +107,14 @@ diff --git a/Cargo.toml b/Cargo.toml
 -proxmox-systemd.workspace = true
 -proxmox-tfa.workspace = true
 -proxmox-time.workspace = true
 -proxmox-systemd.workspace = true
 -proxmox-tfa.workspace = true
 -proxmox-time.workspace = true

+-proxmox-upgrade-checks.workspace = true

 -proxmox-uuid.workspace = true
 -proxmox-worker-task.workspace = true
 -pbs-api-types.workspace = true
 -
 -# in their respective repo
 -proxmox-acme.workspace = true
 -proxmox-uuid.workspace = true
 -proxmox-worker-task.workspace = true
 -pbs-api-types.workspace = true
 -
 -# in their respective repo
 -proxmox-acme.workspace = true

+-proxmox-acme-api.workspace = true

 -pxar.workspace = true
 -
 -# proxmox-backup workspace/internal crates
 -pxar.workspace = true
 -
 -# proxmox-backup workspace/internal crates


@@ -131,54 +134,60 @@ diff --git a/Cargo.toml b/Cargo.toml
 -#pbs-api-types = { path = "../proxmox/pbs-api-types" }
 +pbs-api-types = { path = "../proxmox/pbs-api-types" }
  #proxmox-acme = { path = "../proxmox/proxmox-acme" }
 -#pbs-api-types = { path = "../proxmox/pbs-api-types" }
 +pbs-api-types = { path = "../proxmox/pbs-api-types" }
  #proxmox-acme = { path = "../proxmox/proxmox-acme" }

+ #proxmox-acme-api = { path = "../proxmox/proxmox-acme-api" }
+ #proxmox-api-macro = { path = "../proxmox/proxmox-api-macro" }

  #proxmox-apt = { path = "../proxmox/proxmox-apt" }
  #proxmox-apt = { path = "../proxmox/proxmox-apt" }

--#proxmox-apt-api-types = { path = "../proxmox/proxmox-apt-api-types" }
+ #proxmox-apt-api-types = { path = "../proxmox/proxmox-apt-api-types" }

 -#proxmox-async = { path = "../proxmox/proxmox-async" }
 -#proxmox-auth-api = { path = "../proxmox/proxmox-auth-api" }
 -#proxmox-base64 = { path = "../proxmox/proxmox-base64" }
 -#proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
 -#proxmox-compression = { path = "../proxmox/proxmox-compression" }
 -#proxmox-async = { path = "../proxmox/proxmox-async" }
 -#proxmox-auth-api = { path = "../proxmox/proxmox-auth-api" }
 -#proxmox-base64 = { path = "../proxmox/proxmox-base64" }
 -#proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
 -#proxmox-compression = { path = "../proxmox/proxmox-compression" }

--#proxmox-config-digest = { path = "../proxmox/proxmox-config-digest" }
-+proxmox-apt-api-types = { path = "../proxmox/proxmox-apt-api-types" }

 +proxmox-async = { path = "../proxmox/proxmox-async" }
 +proxmox-auth-api = { path = "../proxmox/proxmox-auth-api" }
 +proxmox-base64 = { path = "../proxmox/proxmox-base64" }
 +proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
 +proxmox-compression = { path = "../proxmox/proxmox-compression" }
 +proxmox-async = { path = "../proxmox/proxmox-async" }
 +proxmox-auth-api = { path = "../proxmox/proxmox-auth-api" }
 +proxmox-base64 = { path = "../proxmox/proxmox-base64" }
 +proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
 +proxmox-compression = { path = "../proxmox/proxmox-compression" }

-+proxmox-config-digest = { path = "../proxmox/proxmox-config-digest" }
+ #proxmox-config-digest = { path = "../proxmox/proxmox-config-digest" }

  #proxmox-daemon = { path = "../proxmox/proxmox-daemon" }
  #proxmox-daemon = { path = "../proxmox/proxmox-daemon" }

--#proxmox-fuse = { path = "../proxmox-fuse" }

 -#proxmox-http = { path = "../proxmox/proxmox-http" }
 -#proxmox-http = { path = "../proxmox/proxmox-http" }

++proxmox-http = { path = "../proxmox/proxmox-http" }
+ #proxmox-http-error = { path = "../proxmox/proxmox-http-error" }

 -#proxmox-human-byte = { path = "../proxmox/proxmox-human-byte" }
 -#proxmox-io = { path = "../proxmox/proxmox-io" }
 -#proxmox-lang = { path = "../proxmox/proxmox-lang" }
 -#proxmox-human-byte = { path = "../proxmox/proxmox-human-byte" }
 -#proxmox-io = { path = "../proxmox/proxmox-io" }
 -#proxmox-lang = { path = "../proxmox/proxmox-lang" }

--#proxmox-log = { path = "../proxmox/proxmox-log" }
-+proxmox-fuse = { path = "../proxmox-fuse" }
-+proxmox-http = { path = "../proxmox/proxmox-http" }

 +proxmox-human-byte = { path = "../proxmox/proxmox-human-byte" }
 +proxmox-io = { path = "../proxmox/proxmox-io" }
 +proxmox-lang = { path = "../proxmox/proxmox-lang" }
 +proxmox-human-byte = { path = "../proxmox/proxmox-human-byte" }
 +proxmox-io = { path = "../proxmox/proxmox-io" }
 +proxmox-lang = { path = "../proxmox/proxmox-lang" }

-+proxmox-log = { path = "../proxmox/proxmox-log" }

  #proxmox-ldap = { path = "../proxmox/proxmox-ldap" }
  #proxmox-ldap = { path = "../proxmox/proxmox-ldap" }

+-#proxmox-log = { path = "../proxmox/proxmox-log" }
++proxmox-log = { path = "../proxmox/proxmox-log" }

  #proxmox-metrics = { path = "../proxmox/proxmox-metrics" }
  #proxmox-network-api = { path = "../proxmox/proxmox-network-api" }
  #proxmox-metrics = { path = "../proxmox/proxmox-metrics" }
  #proxmox-network-api = { path = "../proxmox/proxmox-network-api" }

+ #proxmox-network-types = { path = "../proxmox/proxmox-network-types" }

 -#proxmox-notify = { path = "../proxmox/proxmox-notify" }
 +proxmox-notify = { path = "../proxmox/proxmox-notify" }
  #proxmox-openid = { path = "../proxmox/proxmox-openid" }
 -#proxmox-notify = { path = "../proxmox/proxmox-notify" }
 +proxmox-notify = { path = "../proxmox/proxmox-notify" }
  #proxmox-openid = { path = "../proxmox/proxmox-openid" }

+ #proxmox-product-config = { path = "../proxmox/proxmox-product-config" }
+-#proxmox-rate-limiter = { path = "../proxmox/proxmox-rate-limiter" }
++proxmox-rate-limiter = { path = "../proxmox/proxmox-rate-limiter" }

  #proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" }
 -#proxmox-router = { path = "../proxmox/proxmox-router" }
 +proxmox-router = { path = "../proxmox/proxmox-router" }
  #proxmox-rrd = { path = "../proxmox/proxmox-rrd" }
  #proxmox-rrd-api-types = { path = "../proxmox/proxmox-rrd-api-types" }
  #proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" }
 -#proxmox-router = { path = "../proxmox/proxmox-router" }
 +proxmox-router = { path = "../proxmox/proxmox-router" }
  #proxmox-rrd = { path = "../proxmox/proxmox-rrd" }
  #proxmox-rrd-api-types = { path = "../proxmox/proxmox-rrd-api-types" }

+-#proxmox-s3-client = { path = "../proxmox/proxmox-s3-client" }

 -#proxmox-schema = { path = "../proxmox/proxmox-schema" }
 -#proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
 -#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-s3-client = { path = "../proxmox/proxmox-s3-client" }
 +proxmox-schema = { path = "../proxmox/proxmox-schema" }
 +proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
 +proxmox-s3-client = { path = "../proxmox/proxmox-s3-client" }
 +proxmox-schema = { path = "../proxmox/proxmox-schema" }
 +proxmox-section-config = { path = "../proxmox/proxmox-section-config" }

+ #proxmox-sendmail = { path = "../proxmox/proxmox-sendmail" }
+-#proxmox-serde = { path = "../proxmox/proxmox-serde" }

 +proxmox-serde = { path = "../proxmox/proxmox-serde" }
 +proxmox-serde = { path = "../proxmox/proxmox-serde" }

+ #proxmox-shared-cache = { path = "../proxmox/proxmox-shared-cache" }
+-#proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
+-#proxmox-sortable-macro = { path = "../proxmox/proxmox-sortable-macro" }

 +proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
 +proxmox-sortable-macro = { path = "../proxmox/proxmox-sortable-macro" }
  #proxmox-subscription = { path = "../proxmox/proxmox-subscription" }
 +proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
 +proxmox-sortable-macro = { path = "../proxmox/proxmox-sortable-macro" }
  #proxmox-subscription = { path = "../proxmox/proxmox-subscription" }


@@ -188,14 +197,17 @@ diff --git a/Cargo.toml b/Cargo.toml
 +proxmox-systemd = { path = "../proxmox/proxmox-systemd" }
  #proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
 -#proxmox-time = { path = "../proxmox/proxmox-time" }
 +proxmox-systemd = { path = "../proxmox/proxmox-systemd" }
  #proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
 -#proxmox-time = { path = "../proxmox/proxmox-time" }

++proxmox-time = { path = "../proxmox/proxmox-time" }
+ #proxmox-upgrade-checks = { path = "../proxmox/proxmox-upgrade-checks" }

 -#proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
 -#proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" }
 -#proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
 -#proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" }

-+proxmox-time = { path = "../proxmox/proxmox-time" }

 +proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
 +proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" }
  
 +proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
 +proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" }
  

+-#proxmox-fuse = {path = "../proxmox-fuse" }

 -#pathpatterns = {path = "../pathpatterns" }
 -#pxar = { path = "../pxar" }
 -#pathpatterns = {path = "../pathpatterns" }
 -#pxar = { path = "../pxar" }

++proxmox-fuse = {path = "../proxmox-fuse" }

 +pathpatterns = {path = "../pathpatterns" }
 +pxar = { path = "../pxar" }
  
 +pathpatterns = {path = "../pathpatterns" }
 +pxar = { path = "../pxar" }
  

diff --git a/make_tarball/make_tarball.sh b/make_tarball/make_tarball.sh
index b7136d22d60a2055fc1d096186e6152e36c09055..3a1c6124d304144a2b482d4bc28266e0dc052023 100755 (executable)
--- a/make_tarball/make_tarball.sh
+++ b/make_tarball/make_tarball.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
 # Name and version of package
 #!/bin/bash
 
 # Name and version of package

-package="proxmox-backup-client-4.0.14"
+package="proxmox-backup-client-4.1.2"

 
 # Source URLs
 source_repos=(
 
 # Source URLs
 source_repos=(

-  "git://git.proxmox.com/git/proxmox-backup.git#commit=8b1b5f8e4d8216a0c45146b426dbfaff01ac0068"
-  "git://git.proxmox.com/git/proxmox.git#commit=84a58afe23a35454a1abbeb6c436ee49d2888d18"
+  "git://git.proxmox.com/git/proxmox-backup.git#commit=ef5bf28fe5c2b64d407ce4f34c4f92fcc2e87dc7"
+  "git://git.proxmox.com/git/proxmox.git#commit=bcb9c3e726d2864a2f5058261d34c6eb2de2f82c"

   "git://git.proxmox.com/git/proxmox-fuse.git"
   "git://git.proxmox.com/git/pathpatterns.git"
   "git://git.proxmox.com/git/pxar.git"
   "git://git.proxmox.com/git/proxmox-fuse.git"
   "git://git.proxmox.com/git/pathpatterns.git"
   "git://git.proxmox.com/git/pxar.git"

diff --git a/proxmox-backup-client.spec b/proxmox-backup-client.spec
index a413e90274c2575e82c3e6b075ff76c956e8ae06..9990d7f42fd6d3f510e02cab4a05520211c2b3d2 100644 (file)
--- a/proxmox-backup-client.spec
+++ b/proxmox-backup-client.spec
@@ -1,13 +1,13 @@
 #
 Summary:       Proxmox Backup Client
 Name:          proxmox-backup-client
 #
 Summary:       Proxmox Backup Client
 Name:          proxmox-backup-client

-Version:       4.0.14
+Version:       4.1.2

 Release:       1
 License:       AGPL v3
 Group:         Networking/Utilities
 # Created by bundled make_tarball.sh
 Source0:       %{name}-%{version}.tar.xz
 Release:       1
 License:       AGPL v3
 Group:         Networking/Utilities
 # Created by bundled make_tarball.sh
 Source0:       %{name}-%{version}.tar.xz

-# Source0-md5: bdf7bac1552036f78ba61c5162aff361
+# Source0-md5: b8b55a5e925a51a154ac8272e019013c

 URL:           https://pbs.proxmox.com/docs/backup-client.html
 BuildRequires: cargo
 BuildRequires: clang
 URL:           https://pbs.proxmox.com/docs/backup-client.html
 BuildRequires: cargo
 BuildRequires: clang