diff options
author | Thomas Lamprecht | 2023-11-30 14:40:11 +0100 |
---|---|---|
committer | Thomas Lamprecht | 2023-11-30 14:40:11 +0100 |
commit | 33ef762d3b3a8a0300117efada8d957f6d0cfa07 (patch) | |
tree | c7b29d8afabd442e54ac057fdd11a6c8108298cd | |
parent | 83a1f4dfcb04bd181b11954b1d9f5ddfcb72b3d0 (diff) | |
download | aur-33ef762d3b3a8a0300117efada8d957f6d0cfa07.tar.gz |
update to 3.1.2
Signed-off-by: Thomas Lamprecht <thomas@lamprecht.org>
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | 0001-re-route-dependencies-not-available-on-crates.io-to-.patch | 50 | ||||
-rw-r--r-- | 0002-docs-drop-all-but-client-man-pages.patch | 3 | ||||
-rw-r--r-- | PKGBUILD | 6 |
4 files changed, 42 insertions, 25 deletions
@@ -1,6 +1,6 @@ pkgbase = proxmox-backup-client pkgdesc = Client for Proxmox Backup Server - pkgver = 3.0.1 + pkgver = 3.1.2 pkgrel = 1 url = https://pbs.proxmox.com arch = x86_64 @@ -17,10 +17,11 @@ pkgbase = proxmox-backup-client depends = fuse3 depends = gcc-libs depends = openssl - source = proxmox-backup-client-3.0.1::git://git.proxmox.com/git/proxmox-backup.git#tag=v3.0.1 - source = proxmox::git://git.proxmox.com/git/proxmox.git#commit=2a070da0651677411a245f1714895235b1caf584 + source = proxmox-backup-client-3.1.2::git://git.proxmox.com/git/proxmox-backup.git#tag=v3.1.2 + source = proxmox::git://git.proxmox.com/git/proxmox.git#commit=50b79198f83659e77b810fe0eedaa79b140744db source = proxmox-fuse::git://git.proxmox.com/git/proxmox-fuse.git source = pxar::git://git.proxmox.com/git/pxar.git + source = pathpatterns::git://git.proxmox.com/git/pathpatterns.git source = 0001-re-route-dependencies-not-available-on-crates.io-to-.patch source = 0002-docs-drop-all-but-client-man-pages.patch source = elf-strip-unused-dependencies.sh @@ -31,5 +32,6 @@ pkgbase = proxmox-backup-client sha512sums = SKIP sha512sums = SKIP sha512sums = SKIP + sha512sums = SKIP pkgname = proxmox-backup-client 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 47e4610dd5ca..6d06ab87be01 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 @@ -22,10 +22,10 @@ index 0c86cd1b..7d5c282b 100644 "pxar-bin", ] -@@ -102,7 +99,6 @@ proxmox-rrd = { path = "proxmox-rrd" } - +@@ -103,7 +100,6 @@ proxmox-rrd = { path = "proxmox-rrd" } # regular crates anyhow = "1.0" + async-trait = "0.1.56" -apt-pkg-native = "0.3.2" base64 = "0.13" bitflags = "1.2.1" @@ -38,12 +38,13 @@ index 0c86cd1b..7d5c282b 100644 hex = "0.4.3" http = "0.2" hyper = { version = "0.14", features = [ "full" ] } -@@ -151,119 +146,38 @@ walkdir = "2" +@@ -152,128 +148,41 @@ walkdir = "2" xdg = "2.2" - zstd = { version = "0.6", features = [ "bindgen" ] } + zstd = { version = "0.12", features = [ "bindgen" ] } -[dependencies] -anyhow.workspace = true +-async-trait.workspace = true -apt-pkg-native.workspace = true -base64.workspace = true -bitflags.workspace = true @@ -89,6 +90,8 @@ index 0c86cd1b..7d5c282b 100644 - #valgrind_request = { git = "https://github.com/edef1c/libvalgrind_request", version = "1.1.0", optional = true } +-# proxmox workspace +-proxmox-apt.workspace = true -proxmox-async.workspace = true -proxmox-auth-api = { workspace = true, features = [ "api", "pam-authenticator" ] } -proxmox-compression.workspace = true @@ -98,6 +101,7 @@ index 0c86cd1b..7d5c282b 100644 -proxmox-lang.workspace = true -proxmox-ldap.workspace = true -proxmox-metrics.workspace = true +-proxmox-openid.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" ] } @@ -111,12 +115,12 @@ index 0c86cd1b..7d5c282b 100644 -proxmox-time.workspace = true -proxmox-uuid.workspace = true - +-# in their respective repo -pathpatterns.workspace = true -proxmox-acme-rs.workspace = true --proxmox-apt.workspace = true --proxmox-openid.workspace = true -pxar.workspace = true - +-# proxmox-backup workspace/internal crates -pbs-api-types.workspace = true -pbs-buildcfg.workspace = true -pbs-client.workspace = true @@ -130,35 +134,43 @@ index 0c86cd1b..7d5c282b 100644 # 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/proxmox-apt" } -#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-human-byte = { path = "../proxmox/proxmox-human-byte" } -#proxmox-io = { path = "../proxmox/proxmox-io" } -#proxmox-lang = { path = "../proxmox/proxmox-lang" } +-#proxmox-ldap = { path = "../proxmox/proxmox-ldap" } +-#proxmox-metrics = { path = "../proxmox/proxmox-metrics" } ++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-human-byte = { path = "../proxmox/proxmox-human-byte" } ++proxmox-io = { path = "../proxmox/proxmox-io" } ++proxmox-lang = { path = "../proxmox/proxmox-lang" } ++proxmox-ldap = { path = "../proxmox/proxmox-ldap" } ++proxmox-metrics = { path = "../proxmox/proxmox-metrics" } + #proxmox-openid = { path = "../proxmox/proxmox-openid" } -#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-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-human-byte = { path = "../proxmox/proxmox-human-byte" } -+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" } @@ -172,10 +184,10 @@ index 0c86cd1b..7d5c282b 100644 +proxmox-time = { path = "../proxmox/proxmox-time" } +proxmox-uuid = { path = "../proxmox/proxmox-uuid" } - #proxmox-apt = { path = "../proxmox-apt" } - #proxmox-openid = { path = "../proxmox-openid-rs" } - + #proxmox-acme-rs = { path = "../proxmox-acme-rs" } +-#pathpatterns = {path = "../pathpatterns" } -#pxar = { path = "../pxar" } ++pathpatterns = {path = "../pathpatterns" } +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 da83e14988cd..12b89dfeb748 100644 --- a/0002-docs-drop-all-but-client-man-pages.patch +++ b/0002-docs-drop-all-but-client-man-pages.patch @@ -43,7 +43,7 @@ diff --git a/docs/conf.py b/docs/conf.py index 8944926e..deeb63bf 100644 --- a/docs/conf.py +++ b/docs/conf.py -@@ -93,26 +93,7 @@ rst_epilog += f"\n.. |pbs-copyright| replace:: Copyright (C) {copyright}" +@@ -93,27 +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), @@ -56,6 +56,7 @@ index 8944926e..deeb63bf 100644 ('pxar/man1', 'pxar', 'Proxmox File Archive CLI Tool', [author], 1), - ('pmt/man1', 'pmt', 'Control Linux Tape Devices', [author], 1), - ('pmtx/man1', 'pmtx', 'Control SCSI media changer devices (tape autoloaders)', [author], 1), +- ('pbs2to3/man1', 'pbs2to3', 'Proxmox Backup Server upgrade checker script for 2.4+ to current 3.x major upgrades', [author], 1), - # configs - ('config/acl/man5', 'acl.cfg', 'Access Control Configuration', [author], 5), - ('config/datastore/man5', 'datastore.cfg', 'Datastore Configuration', [author], 5), @@ -1,7 +1,7 @@ # Maintainer: Dominik Csapak <dominik.csapak@gmail.com> # Maintainer: Thomas Lamprecht <thomas@lamprecht.org> pkgname=proxmox-backup-client -pkgver=3.0.1 +pkgver=3.1.2 pkgrel=1 pkgdesc="Client for Proxmox Backup Server" arch=('x86_64' 'aarch64') @@ -16,9 +16,10 @@ depends=( makedepends=('cargo' 'clang' 'git' 'llvm' 'patchelf' 'python-docutils' 'python-sphinx') source=( "$pkgname-$pkgver::git://git.proxmox.com/git/proxmox-backup.git#tag=v$pkgver" - "proxmox::git://git.proxmox.com/git/proxmox.git#commit=2a070da0651677411a245f1714895235b1caf584" + "proxmox::git://git.proxmox.com/git/proxmox.git#commit=50b79198f83659e77b810fe0eedaa79b140744db" "proxmox-fuse::git://git.proxmox.com/git/proxmox-fuse.git" "pxar::git://git.proxmox.com/git/pxar.git" + "pathpatterns::git://git.proxmox.com/git/pathpatterns.git" "0001-re-route-dependencies-not-available-on-crates.io-to-.patch" "0002-docs-drop-all-but-client-man-pages.patch" "elf-strip-unused-dependencies.sh" @@ -33,6 +34,7 @@ sha512sums=( 'SKIP' 'SKIP' 'SKIP' + 'SKIP' ) _apply() { |