Merge pull request #16 from MAFLO321/update

update proxmox-backup to 2.2.6-1
This commit is contained in:
Wolfgang
2022-09-17 22:27:28 +02:00
committed by GitHub
2 changed files with 35 additions and 26 deletions

View File

@@ -106,14 +106,14 @@ else
echo "proxmox-widget-toolkit up-to-date"
fi
PROXMOX_BACKUP_VER="2.2.5-1"
PROXMOX_BACKUP_GIT="c5cd99b15bcf2f93cabcaab5cfea6488daff23a8"
PATHPATTERNS_GIT="916e41c50e75a718ab7b1b95dc770eed9cd7a403"
PROXMOX_BACKUP_VER="2.2.6-1"
PROXMOX_BACKUP_GIT="c4861c5afd77285d09e1adab002d9eb54c033566"
PATHPATTERNS_GIT="fda9f89ee0f2229f2863f6e9cfb4fed3b9ce0614"
PROXMOX_ACME_RS_GIT="abc0bdd09d5c3501534510d49da0ae8fa5c05c05"
PROXMOX_APT_GIT="c7b17de1b5fec5807921efc9565917c3d6b09417"
PROXMOX_APT_GIT="0a9685ed4aa6899dbbe77f2e8458594d8332104d"
PROMXOX_FUSE_GIT="6dcf34d2fd516aeca57a62ee4657526552ab4630"
PROXMOX_GIT="6e4a43d6837aec3fa3a5f70740716bbf77c296ef"
PROXMOX_OPENID_GIT="0ec392e425a946b018c64e98a4181a22e0e25a2c"
PROXMOX_GIT="2ae95b5f4e9870113dab8fea1df631299559d4a4"
PROXMOX_OPENID_GIT="ce6def219262b5c1f6dbe5440f9f90038bafb3d8"
PXAR_GIT="b203d38bcd399f852f898d24403f3d592e5f75f8"
if [ ! -e "${PACKAGES}/proxmox-backup-server_${PROXMOX_BACKUP_VER}_arm64.deb" ]; then
git_clone_or_fetch https://git.proxmox.com/git/proxmox.git

View File

@@ -25,10 +25,10 @@ index 3b5b6e48..50908c05 100644
+[source.vendored-sources]
+directory = "vendor"
diff --git a/Cargo.toml b/Cargo.toml
index e946b9bb..908d5919 100644
index 628fdd1a..ab1fe720 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -127,26 +127,27 @@ pbs-tape = { path = "pbs-tape" }
@@ -128,26 +128,28 @@ 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]
@@ -67,6 +67,7 @@ index e946b9bb..908d5919 100644
+proxmox-schema = { path = "../proxmox/proxmox-schema" }
+proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
+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" }
@@ -77,10 +78,10 @@ index e946b9bb..908d5919 100644
[features]
default = []
diff --git a/debian/control b/debian/control
index 3f513cdf..dcafaf1e 100644
index 6456f007..dcafaf1e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,116 +2,7 @@ Source: rust-proxmox-backup
@@ -2,124 +2,7 @@ Source: rust-proxmox-backup
Section: admin
Priority: optional
Build-Depends: debhelper (>= 12),
@@ -114,7 +115,7 @@ index 3f513cdf..dcafaf1e 100644
- librust-libc-0.2+default-dev,
- librust-log-0.4+default-dev (>= 0.4.17-~~),
- librust-nix-0.24+default-dev,
- librust-nom-5+default-dev (>= 5.1-~~),
- librust-nom-7+default-dev,
- librust-num-traits-0.2+default-dev,
- librust-once-cell-1+default-dev (>= 1.3.1-~~),
- librust-openssl-0.10+default-dev (>= 0.10.38-~~),
@@ -124,35 +125,43 @@ index 3f513cdf..dcafaf1e 100644
- librust-percent-encoding-2+default-dev (>= 2.1-~~),
- librust-pin-project-lite-0.2+default-dev,
- librust-proxmox-acme-rs-0.4+default-dev,
- librust-proxmox-apt-0.8+default-dev,
- librust-proxmox-apt-0.9+default-dev,
- librust-proxmox-async-0.4+default-dev,
- librust-proxmox-borrow-1+default-dev,
- librust-proxmox-compression-0.1+default-dev (>= 0.1.1-~~),
- librust-proxmox-fuse-0.1+default-dev (>= 0.1.3-~~),
- librust-proxmox-http-0.6+client-dev (>= 0.6.3-~~),
- librust-proxmox-http-0.6+default-dev (>= 0.6.3-~~),
- librust-proxmox-http-0.6+http-helpers-dev (>= 0.6.3-~~),
- librust-proxmox-http-0.6+websocket-dev (>= 0.6.3-~~),
- librust-proxmox-http-0.7+client-dev,
- librust-proxmox-http-0.7+client-trait-dev,
- librust-proxmox-http-0.7+default-dev,
- librust-proxmox-http-0.7+http-helpers-dev,
- librust-proxmox-http-0.7+proxmox-async-dev,
- librust-proxmox-http-0.7+websocket-dev,
- librust-proxmox-io-1+default-dev (>= 1.0.1-~~),
- librust-proxmox-io-1+tokio-dev (>= 1.0.1-~~),
- librust-proxmox-lang-1+default-dev (>= 1.1-~~),
- librust-proxmox-metrics-0.2+default-dev,
- librust-proxmox-openid-0.9+default-dev,
- librust-proxmox-router-1+cli-dev (>= 1.2.4-~~),
- librust-proxmox-router-1+default-dev (>= 1.2.4-~~),
- librust-proxmox-router-1+cli-dev (>= 1.3.0-~~),
- librust-proxmox-router-1+default-dev (>= 1.3.0-~~),
- librust-proxmox-router-1+server-dev (>= 1.3.0-~~),
- librust-proxmox-schema-1+api-macro-dev (>= 1.3.1-~~),
- librust-proxmox-schema-1+default-dev (>= 1.3.1-~~),
- librust-proxmox-schema-1+upid-api-impl-dev (>= 1.3.1-~~),
- librust-proxmox-section-config-1+default-dev,
- librust-proxmox-serde-0.1+default-dev (>= 0.1.1~~),
- librust-proxmox-serde-0.1+serde-json-dev (>= 0.1.1~~),
- librust-proxmox-serde-0.1+default-dev (>= 0.1.1-~~),
- librust-proxmox-serde-0.1+serde-json-dev (>= 0.1.1-~~),
- librust-proxmox-shared-memory-0.2+default-dev,
- librust-proxmox-sys-0.3+default-dev (>= 0.3.1-~~),
- librust-proxmox-sys-0.3+logrotate-dev (>= 0.3.1-~~),
- librust-proxmox-sys-0.3+sortable-macro-dev (>= 0.3.1-~~),
- librust-proxmox-tfa-2+api-dev,
- librust-proxmox-tfa-2+api-types-dev,
- librust-proxmox-tfa-2+default-dev,
- librust-proxmox-subscription-0.3+api-types-dev,
- librust-proxmox-subscription-0.3+default-dev,
- librust-proxmox-sys-0.4+acl-dev,
- librust-proxmox-sys-0.4+crypt-dev,
- librust-proxmox-sys-0.4+default-dev,
- librust-proxmox-sys-0.4+logrotate-dev,
- librust-proxmox-sys-0.4+sortable-macro-dev,
- librust-proxmox-sys-0.4+timer-dev,
- librust-proxmox-tfa-2+api-dev (>= 2.1-~~),
- librust-proxmox-tfa-2+api-types-dev (>= 2.1-~~),
- librust-proxmox-tfa-2+default-dev (>= 2.1-~~),
- librust-proxmox-time-1+default-dev (>= 1.1.2-~~),
- librust-proxmox-uuid-1+default-dev,
- librust-proxmox-uuid-1+serde-dev,