diff --git a/Manifest b/Manifest index 95c96ca..b733377 100644 --- a/Manifest +++ b/Manifest @@ -7,6 +7,7 @@ AUX proxmox-backup-client-2.1.2-compile.patch 2816 SHA256 b1ec7c641d58b647a8d994 AUX proxmox-backup-client-2.1.3-compile.patch 7870 SHA256 05ea413029dcac0a4e5244fa00196d007ed7dfb538c75d831110c48df4784997 SHA512 a5d5d9110a9b7775f0de5714e308865004189884c720cde6108f1d9676c9892072b8adfbfdd31a2a1ecedd3a367a5b74a7c68570f08392a2af379ad8ed76b16c WHIRLPOOL 24433dcea6d6cb346c9066078de3663a336c39e13c93a2f17c3ad2d74fdfbbbafec73a13f1435f9565f3358c98c04179f5601ce077682bd3cddb1e9b0f07e86f AUX proxmox-backup-client-3.0.4-compile.patch 21770 SHA256 ecfe92b4d609a5dcd55e2bf949221c72af5aa2bddd5650b7263f9888f634f23d SHA512 0165b84c827b9368c8ff2e997dec578d928ad69ef082717a12098476e44cbb91cee611a557dcaa97ef014801e342dcdcc64863fdda9351fc15f8157ae384034b WHIRLPOOL 4ab02fc5900486be65de58dcad4ccfc63e16865cfbec9368799d72b9f2035d1f5fb9d1b0206197201a073040492ea92bcdbaf3b5878c4395c7a0570fdbc9382b AUX proxmox-backup-client-3.1.2-compile.patch 21036 SHA256 fdebe3bc304841a88d3a3b65984020fa142d613e6c63ed99abe8b4e96eb305f8 SHA512 ddccc44f525137fbd62fa6f60249164a102f1627e2033c311cb2ab255f6c5b92942f28e962e9f1035b63ecb1f2b2a440d211cc7cc452e2d819702be6846201e2 WHIRLPOOL e81ca0426c5d029ddac396cb35f396d2f77046cb79a684091a8dcdb02f837e689995c5890b34243b71bd301e8869674e34f595e2b124700882e4e4abb980505b +AUX proxmox-backup-client-3.1.4-compile.patch 20751 SHA256 c94c3abe4e0feb11d9365854a8ed78fb81542ce9f6c2dbccb0300331e6ca9aa0 SHA512 52a1f4ea7d2ed0386d82ce3b48665d5a70eea6a09b4d377beec517e4f8cd6afe4c5fe40128425a88feb896aae57ddb77de901d90a269f44f9d9f24398e847840 WHIRLPOOL dc6ec1aee31b5534ac51d37a42cab2b982cbfbe25db1c14f676eb8156a9c40e51f2b4ee1d9492141571e2096bd961ee84aad121d0d104a63ad8ccaf9d892164a DIST addr2line-0.14.1.crate 31201 SHA256 a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7 SHA512 f665deccae566ec2754cd43fc1d8fc05db11320af54d0561a612faad769234e8b3b8c0235f90f86027a4db9b7ef2915c86398005c949e2c096fac8e53f3f441e WHIRLPOOL 4fa6cae6970c64a0baeebdc63c032bcc2f9601dcf6e0ab843e256ecff183c2993290f14e5106160e95690b40f882574a891da497ec9ca73743cf8c07d285e6a0 DIST addr2line-0.17.0.crate 32260 SHA256 b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b SHA512 ef3bbd7c6d1dfdd0b47e3be1fb4c8b15ed61a769bed7e80dce80461a1ee13ef21c75e62e9a66328504f862341f1e808abec5790ac79784e18655afcc16206b95 WHIRLPOOL 204eb8261c5f670848c75585e624761fe93023a7a450b11203cd98d3d09320a29b6560b6d72e2e642b96a205d4a3de25f0ac14d01c1dfa0491c97d61f2d14bbd DIST addr2line-0.21.0.crate 40807 SHA256 8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb SHA512 afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b WHIRLPOOL 1b84e354101ccd35b7fe37273488a86c47f7759c4e88531ed61477566f3972d1ed12557827cd2ce16dec4abc28865bdba2ce651ba6bd41a447b4c1232c2ab816 @@ -598,4 +599,5 @@ EBUILD proxmox-backup-client-2.1.2.ebuild 7036 SHA256 59e8c4fcd4bc345ac871352fa9 EBUILD proxmox-backup-client-2.1.3.ebuild 6861 SHA256 040bdb00c672d3b2d1979632a3936bc6a3e25b14faf7de26dfdbefd486fc60e5 SHA512 a817e046f64d293da236f8c312cf7a86fe6cdf0f34fd3b399909aa7acc4dc3e480668bf257bf605cb31a3fcf86fff617cab10ee93ff977460cfa9e13834e8115 WHIRLPOOL 38721754c21e1ac8cf538f3180b076b1d658853c95f87d1b2c35492c7a81f4ba83d69298b6390863e761ecfaaa8a3fe48a30d4a2b6511329745a93af21bfd0a3 EBUILD proxmox-backup-client-3.0.4.ebuild 7348 SHA256 2cccbfaf675e8d20986a3d8853d4a6eaf0640d512f73b510cb0047da2dcb2a20 SHA512 5eba9585503bff4afd0365f03b6cc8edabd14daa91c04f2143edd86ce288e773b213b74354ff0fc16eed223d82ee29d5b51ab7be1d0a8815631b8b4d47d4a70c WHIRLPOOL 649575efa7669b7a863a2e04c82b905c078dcec6b669f5711c696179d597a85746d2a7c2f5cac8454e549ec45c4e00bb172030f5cbd08bd1aba9d12cbb2a6023 EBUILD proxmox-backup-client-3.1.2.ebuild 7630 SHA256 98d4cf8b74d0595e7d89838de84f6c86dfc61fd795c457eaddc73e4ca6332e9f SHA512 bff3ae060ba3688cf9541a787ce10e638d853610814939571c87b1b6853dcb1d9f8f5c8c957c08f47b82d5acf0a338c9278b0f94bbfda9e967ca3dc3f79775b0 WHIRLPOOL c2c79b58611e004d7b9f2181601a47802ab0bfc8abc09ef0e68a33be85bc2665b61e75f1c040ee9fe959000cf2178e112c7595e6470dfdd7422b872d9c3c9e3b +EBUILD proxmox-backup-client-3.1.4.ebuild 7630 SHA256 a9cae0031a36f89d372c04bee8a95f8bf4b30fca093415ce36260598af9b01ff SHA512 384953796b6f1dc946f31f222ce0a512d43e3f905aa5c4417bb6c00da036ef1a8f5082cbc3fd8bf6b0e38c4f557f7673e29a4ed120bd063bb4e17457f2670d16 WHIRLPOOL cb07a83564b18f81c6ea048f305774bc9710c098993edb3dff9e6cd1358a20d1d5365f0b914ceb15bec92db4a8b47fb90bd9ef03219cc5c708db7e05bb7475bf MISC README.md 42 SHA256 5a859a683a425ec9dda124ae94c30c9e19f95fc086f2f846441e34506173989d SHA512 0074edaf3905e7093fd03286609c4830d11a5508ed69185d1eb8f57bfb0f46698ae85e7db80bff7b81af6b30a19e201e83344f6305686879d6524c6e20fa4b81 WHIRLPOOL d9eb53e956bce4109deb4c1de2816fe4b0fb3706678e69194bf6836c7a97b75434fa66a9a3e6069fedda428be386d2844963c563b85a7c2b77d6c15872157b84 diff --git a/files/proxmox-backup-client-3.1.4-compile.patch b/files/proxmox-backup-client-3.1.4-compile.patch new file mode 100644 index 0000000..d281b5b --- /dev/null +++ b/files/proxmox-backup-client-3.1.4-compile.patch @@ -0,0 +1,503 @@ +diff --git a/.cargo/config b/.cargo/config +index 3b5b6e48..b028b13e 100644 +--- a/.cargo/config ++++ b/.cargo/config +@@ -1,5 +1,17 @@ +-[source] +-[source.debian-packages] +-directory = "/usr/share/cargo/registry" + [source.crates-io] +-replace-with = "debian-packages" ++replace-with = "vendored-sources" ++ ++[source."git://git.proxmox.com/git/pathpatterns.git"] ++git = "git://git.proxmox.com/git/pathpatterns.git" ++replace-with = "vendored-sources" ++ ++[source."git://git.proxmox.com/git/proxmox-fuse.git"] ++git = "git://git.proxmox.com/git/proxmox-fuse.git" ++replace-with = "vendored-sources" ++ ++[source."git://git.proxmox.com/git/pxar.git"] ++git = "git://git.proxmox.com/git/pxar.git" ++replace-with = "vendored-sources" ++ ++[source.vendored-sources] ++directory = "../cargo_home/gentoo" +diff --git a/Cargo.toml b/Cargo.toml +index 0642273a..400ff76d 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -243,36 +243,36 @@ proxmox-rrd.workspace = true + # NOTE: You must run `cargo update` after changing this for it to take effect! + [patch.crates-io] + +-#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-openid = { path = "../proxmox/proxmox-openid" } +-#proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" } +-#proxmox-router = { path = "../proxmox/proxmox-router" } +-#proxmox-rrd = { path = "../proxmox/proxmox-rrd" } +-#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-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-openid = { path = "../proxmox/proxmox-openid" } ++proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" } ++proxmox-router = { path = "../proxmox/proxmox-router" } ++proxmox-rrd = { path = "../proxmox/proxmox-rrd" } ++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-acme = { path = "../proxmox/proxmox-acme" } +-#pathpatterns = {path = "../pathpatterns" } +-#pxar = { path = "../pxar" } ++proxmox-acme = { path = "../proxmox/proxmox-acme" } ++pathpatterns = {path = "../pathpatterns" } ++pxar = { path = "../pxar" } + + [features] + default = [] +diff --git a/Makefile b/Makefile +index 0317dd5e..2968cbb0 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,32 +4,21 @@ include defines.mk + PACKAGE := proxmox-backup + ARCH := $(DEB_BUILD_ARCH) + +-SUBDIRS := etc www docs ++SUBDIRS := docs + + # Binaries usable by users + USR_BIN := \ + proxmox-backup-client \ +- proxmox-file-restore \ +- pxar \ +- proxmox-tape \ +- pmtx \ +- pmt ++ pxar + + # Binaries usable by admins +-USR_SBIN := \ +- proxmox-backup-manager \ +- proxmox-backup-debug ++USR_SBIN := + + # Binaries for services: +-SERVICE_BIN := \ +- proxmox-backup-api \ +- proxmox-backup-banner \ +- proxmox-backup-proxy \ +- proxmox-daily-update ++SERVICE_BIN := + + # Single file restore daemon +-RESTORE_BIN := \ +- proxmox-restore-daemon ++RESTORE_BIN := + + SUBCRATES != cargo metadata --no-deps --format-version=1 \ + | jq -r .workspace_members'[]' \ +@@ -61,8 +50,7 @@ RESTORE_DEB=proxmox-backup-file-restore_$(DEB_VERSION)_$(ARCH).deb + RESTORE_DBG_DEB=proxmox-backup-file-restore-dbgsym_$(DEB_VERSION)_$(ARCH).deb + DOC_DEB=$(PACKAGE)-docs_$(DEB_VERSION)_all.deb + +-DEBS=$(SERVER_DEB) $(SERVER_DBG_DEB) $(CLIENT_DEB) $(CLIENT_DBG_DEB) \ +- $(RESTORE_DEB) $(RESTORE_DBG_DEB) ++DEBS=${CLIENT_DEB} ${CLIENT_DBG_DEB} + + DSC = rust-$(PACKAGE)_$(DEB_VERSION).dsc + +@@ -159,30 +147,11 @@ cargo-build: + $(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do-cargo-build + .do-cargo-build: + $(CARGO) build $(CARGO_BUILD_ARGS) \ +- --package proxmox-backup-banner \ +- --bin proxmox-backup-banner \ + --package proxmox-backup-client \ + --bin proxmox-backup-client \ + --bin dump-catalog-shell-cli \ +- --bin proxmox-backup-debug \ +- --package proxmox-file-restore \ +- --bin proxmox-file-restore \ + --package pxar-bin \ +- --bin pxar \ +- --package pbs-tape \ +- --bin pmt \ +- --bin pmtx \ +- --package proxmox-restore-daemon \ +- --bin proxmox-restore-daemon \ +- --package proxmox-backup \ +- --bin docgen \ +- --bin proxmox-backup-api \ +- --bin proxmox-backup-manager \ +- --bin proxmox-backup-proxy \ +- --bin proxmox-daily-update \ +- --bin proxmox-file-restore \ +- --bin proxmox-tape \ +- --bin sg-tape-cmd ++ --bin pxar + touch "$@" + + +@@ -191,25 +160,26 @@ lint: + cargo clippy -- -A clippy::all -D clippy::correctness + + install: $(COMPILED_BINS) ++ @echo "$(DESTDIR)" + install -dm755 $(DESTDIR)$(BINDIR) + install -dm755 $(DESTDIR)$(ZSH_COMPL_DEST) + $(foreach i,$(USR_BIN), \ +- install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(BINDIR)/ ; \ ++ install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)/$(BINDIR)/ ; \ + install -m644 zsh-completions/_$(i) $(DESTDIR)$(ZSH_COMPL_DEST)/ ;) + install -dm755 $(DESTDIR)$(SBINDIR) + $(foreach i,$(USR_SBIN), \ + install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(SBINDIR)/ ; \ + install -m644 zsh-completions/_$(i) $(DESTDIR)$(ZSH_COMPL_DEST)/ ;) +- install -m755 $(COMPILEDIR)/pbs2to3 $(DESTDIR)$(SBINDIR)/ ++ #install -m755 $(COMPILEDIR)/pbs2to3 $(DESTDIR)$(SBINDIR)/ + install -dm755 $(DESTDIR)$(LIBEXECDIR)/proxmox-backup + install -dm755 $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/file-restore + $(foreach i,$(RESTORE_BIN), \ + install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/file-restore/ ;) + # install sg-tape-cmd as setuid binary +- install -m4755 -o root -g root $(COMPILEDIR)/sg-tape-cmd $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/sg-tape-cmd ++ #install -m4755 -o root -g root $(COMPILEDIR)/sg-tape-cmd $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/sg-tape-cmd + $(foreach i,$(SERVICE_BIN), \ + install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/ ;) +- $(MAKE) -C www install ++ #$(MAKE) -C www install + $(MAKE) -C docs install + + .PHONY: upload +diff --git a/debian/control b/debian/control +index 09186e40..4fefdf57 100644 +--- a/debian/control ++++ b/debian/control +@@ -14,129 +14,6 @@ Build-Depends: bash-completion, + latexmk , + libacl1-dev, + libfuse3-dev, +- librust-anyhow-1+default-dev, +- librust-apt-pkg-native-0.3+default-dev (>= 0.3.2-~~), +- librust-async-trait-0.1+default-dev (>= 0.1.56-~~), +- librust-base64-0.13+default-dev, +- librust-bitflags-1+default-dev (>= 1.2.1-~~), +- librust-bytes-1+default-dev, +- librust-cidr-0.2+default-dev (>= 0.2.1-~~), +- librust-crc32fast-1+default-dev, +- librust-crossbeam-channel-0.5+default-dev, +- librust-endian-trait-0.6+arrays-dev, +- librust-endian-trait-0.6+default-dev, +- librust-env-logger-0.10+default-dev, +- librust-flate2-1+default-dev, +- librust-foreign-types-0.3+default-dev, +- librust-futures-0.3+default-dev, +- librust-h2-0.3+default-dev, +- librust-h2-0.3+stream-dev, +- librust-handlebars-3+default-dev, +- librust-hex-0.4+default-dev (>= 0.4.3-~~), +- librust-hex-0.4+serde-dev (>= 0.4.3-~~), +- librust-http-0.2+default-dev, +- librust-hyper-0.14+default-dev, +- librust-hyper-0.14+full-dev, +- librust-lazy-static-1+default-dev (>= 1.4-~~), +- librust-libc-0.2+default-dev, +- librust-log-0.4+default-dev (>= 0.4.17-~~), +- librust-nix-0.26+default-dev (>= 0.26.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.40-~~), +- librust-pathpatterns-0.3+default-dev, +- librust-percent-encoding-2+default-dev (>= 2.1-~~), +- librust-pin-project-lite-0.2+default-dev, +- librust-proxmox-acme-0.5+default-dev, +- librust-proxmox-apt-0.10+default-dev (>= 0.10.5-~~), +- librust-proxmox-async-0.4+default-dev, +- librust-proxmox-auth-api-0.3+api-dev, +- librust-proxmox-auth-api-0.3+api-types-dev, +- librust-proxmox-auth-api-0.3+default-dev, +- librust-proxmox-auth-api-0.3+pam-authenticator-dev, +- librust-proxmox-borrow-1+default-dev, +- librust-proxmox-compression-0.2+default-dev, +- librust-proxmox-fuse-0.1+default-dev (>= 0.1.3-~~), +- librust-proxmox-http-0.9+client-dev, +- librust-proxmox-http-0.9+client-trait-dev, +- librust-proxmox-http-0.9+default-dev, +- librust-proxmox-http-0.9+http-helpers-dev, +- librust-proxmox-http-0.9+proxmox-async-dev, +- librust-proxmox-http-0.9+rate-limited-stream-dev, +- librust-proxmox-http-0.9+rate-limiter-dev, +- librust-proxmox-http-0.9+websocket-dev, +- librust-proxmox-human-byte-0.1+default-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-ldap-0.2+default-dev (>= 0.2.1-~~), +- librust-proxmox-metrics-0.3+default-dev, +- librust-proxmox-openid-0.10+default-dev, +- librust-proxmox-rest-server-0.5+default-dev (>= 0.5.1-~~), +- librust-proxmox-rest-server-0.5+rate-limited-stream-dev (>= 0.5.1-~~), +- librust-proxmox-rest-server-0.5+templates-dev (>= 0.5.1-~~), +- librust-proxmox-router-2+cli-dev, +- librust-proxmox-router-2+default-dev, +- librust-proxmox-router-2+server-dev, +- librust-proxmox-rrd-0.1+default-dev, +- librust-proxmox-schema-2+api-macro-dev, +- librust-proxmox-schema-2+default-dev, +- librust-proxmox-section-config-2+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-shared-memory-0.3+default-dev, +- librust-proxmox-sortable-macro-0.1+default-dev (>= 0.1.2-~~), +- librust-proxmox-subscription-0.4+api-types-dev (>= 0.4.2-~~), +- librust-proxmox-subscription-0.4+default-dev (>= 0.4.2-~~), +- librust-proxmox-sys-0.5+acl-dev (>= 0.5.3-~~), +- librust-proxmox-sys-0.5+crypt-dev (>= 0.5.3-~~), +- librust-proxmox-sys-0.5+default-dev (>= 0.5.3-~~), +- librust-proxmox-sys-0.5+logrotate-dev (>= 0.5.3-~~), +- librust-proxmox-sys-0.5+timer-dev (>= 0.5.3-~~), +- librust-proxmox-tfa-4+api-dev (>= 4.0.4-~~), +- librust-proxmox-tfa-4+api-types-dev (>= 4.0.4-~~), +- librust-proxmox-tfa-4+default-dev (>= 4.0.4-~~), +- librust-proxmox-time-1+default-dev (>= 1.1.6-~~), +- librust-proxmox-uuid-1+default-dev, +- librust-proxmox-uuid-1+serde-dev, +- librust-pxar-0.10+default-dev (>= 0.10.2-~~), +- librust-regex-1+default-dev (>= 1.5.5-~~), +- librust-rustyline-9+default-dev, +- librust-serde-1+default-dev, +- librust-serde-1+derive-dev, +- librust-serde-json-1+default-dev, +- librust-serde-plain-1+default-dev, +- librust-siphasher-0.3+default-dev, +- librust-syslog-6+default-dev, +- librust-tar-0.4+default-dev, +- librust-termcolor-1+default-dev (>= 1.1.2-~~), +- librust-thiserror-1+default-dev, +- librust-tokio-1+default-dev (>= 1.6-~~), +- librust-tokio-1+fs-dev (>= 1.6-~~), +- librust-tokio-1+io-std-dev (>= 1.6-~~), +- librust-tokio-1+io-util-dev (>= 1.6-~~), +- librust-tokio-1+macros-dev (>= 1.6-~~), +- librust-tokio-1+net-dev (>= 1.6-~~), +- librust-tokio-1+parking-lot-dev (>= 1.6-~~), +- librust-tokio-1+process-dev (>= 1.6-~~), +- librust-tokio-1+rt-dev (>= 1.6-~~), +- librust-tokio-1+rt-multi-thread-dev (>= 1.6-~~), +- librust-tokio-1+signal-dev (>= 1.6-~~), +- librust-tokio-1+sync-dev (>= 1.6-~~), +- librust-tokio-1+time-dev (>= 1.6-~~), +- librust-tokio-openssl-0.6+default-dev (>= 0.6.1-~~), +- librust-tokio-stream-0.1+default-dev, +- librust-tokio-util-0.7+codec-dev, +- librust-tokio-util-0.7+default-dev, +- librust-tokio-util-0.7+io-dev, +- librust-tower-service-0.3+default-dev, +- librust-udev-0.4+default-dev, +- librust-url-2+default-dev (>= 2.1-~~), +- librust-walkdir-2+default-dev, +- librust-xdg-2+default-dev (>= 2.2-~~), +- librust-zstd-0.12+bindgen-dev, +- librust-zstd-0.12+default-dev, + libsgutils2-dev, + libstd-rust-dev, + libsystemd-dev (>= 246-~~), +@@ -160,56 +37,9 @@ Vcs-Browser: https://git.proxmox.com/?p=proxmox-backup.git;a=summary + Homepage: https://www.proxmox.com + Rules-Requires-Root: binary-targets + +-Package: proxmox-backup-server +-Architecture: any +-Depends: fonts-font-awesome, +- gdisk, +- libjs-extjs (>= 7~), +- libjs-qrcodejs (>= 1.20201119), +- libproxmox-acme-plugins, +- libsgutils2-1.46-2, +- libzstd1 (>= 1.3.8), +- lvm2, +- openssh-server, +- pbs-i18n, +- postfix | mail-transport-agent, +- proxmox-backup-docs, +- proxmox-mini-journalreader, +- proxmox-widget-toolkit (>= 3.5.2), +- pve-xtermjs (>= 4.7.0-1), +- sg3-utils, +- smartmontools, +- ${misc:Depends}, +- ${shlibs:Depends}, +-Recommends: ifupdown2, +- proxmox-mail-forward, +- proxmox-offline-mirror-helper, +- zfsutils-linux, +-Description: Proxmox Backup Server daemon with tools and GUI +- This package contains the Proxmox Backup Server daemons and related +- tools. This includes a web-based graphical user interface. +- + Package: proxmox-backup-client + Architecture: any + Depends: qrencode, ${misc:Depends}, ${shlibs:Depends}, + Description: Proxmox Backup Client tools + This package contains the Proxmox Backup client, which provides a + simple command line tool to create and restore backups. +- +-Package: proxmox-backup-docs +-Build-Profiles: +-Section: doc +-Depends: fonts-font-awesome, libjs-extjs, libjs-mathjax, ${misc:Depends}, +-Architecture: all +-Description: Proxmox Backup Documentation +- This package contains the Proxmox Backup Documentation files. +- +-Package: proxmox-backup-file-restore +-Architecture: any +-Depends: ${misc:Depends}, ${shlibs:Depends}, +-Recommends: proxmox-backup-restore-image, pve-qemu-kvm (>= 5.0.0-9), +-Breaks: proxmox-backup-restore-image (<< 0.3.1), +-Description: Proxmox Backup single file restore tools for pxar and block device backups +- This package contains the Proxmox Backup single file restore client for +- restoring individual files and folders from both host/container and VM/block +- device backups. It includes a block device restore driver using QEMU. +diff --git a/debian/rules b/debian/rules +index 54a3c22b..95b1b1bf 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -4,12 +4,9 @@ + DH_VERBOSE = 1 + + include /usr/share/dpkg/pkg-info.mk +-include /usr/share/rustc/architecture.mk + + export BUILD_MODE=release + +-CARGO=/usr/share/cargo/bin/cargo +- + export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS + export DEB_HOST_RUST_TYPE DEB_HOST_GNU_TYPE + export CARGO_HOME = $(CURDIR)/debian/cargo_home +@@ -27,7 +24,6 @@ endif + override_dh_auto_configure: + @perl -ne 'if (/^version\s*=\s*"(\d+(?:\.\d+)+)"/) { my $$v_cargo = $$1; my $$v_deb = "$(DEB_VERSION_UPSTREAM)"; \ + die "ERROR: d/changelog <-> Cargo.toml version mismatch: $$v_cargo != $$v_deb\n" if $$v_cargo ne $$v_deb; exit(0); }' Cargo.toml +- $(CARGO) prepare-debian $(CURDIR)/debian/cargo_registry --link-from-system + dh_auto_configure + + override_dh_auto_build: +@@ -41,12 +37,13 @@ override_dh_missing: + override_dh_auto_install: + dh_auto_install -- \ + PROXY_USER=backup \ +- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) ++ LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \ ++ DESTDIR=$(PWD)/debian/tmp + +-override_dh_installsystemd: +- dh_installsystemd -pproxmox-backup-server proxmox-backup-daily-update.timer ++#override_dh_installsystemd: ++# dh_installsystemd -pproxmox-backup-server proxmox-backup-daily-update.timer + # note: we start/try-reload-restart services manually in postinst +- dh_installsystemd --no-start --no-restart-after-upgrade --no-stop-on-upgrade ++# dh_installsystemd --no-start --no-restart-after-upgrade --no-stop-on-upgrade + + override_dh_fixperms: + dh_fixperms --exclude sg-tape-cmd +diff --git a/docs/Makefile b/docs/Makefile +index 0d0963f3..32b51556 100644 +--- a/docs/Makefile ++++ b/docs/Makefile +@@ -1,49 +1,15 @@ + 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 ++ pxar/synopsis.rst + + MAN1_PAGES := \ + pxar.1 \ +- pmtx.1 \ +- pmt.1 \ +- proxmox-tape.1 \ +- proxmox-backup-proxy.1 \ +- proxmox-backup-client.1 \ +- proxmox-backup-manager.1 \ +- proxmox-file-restore.1 \ +- proxmox-backup-debug.1 \ +- pbs2to3.1 \ +- +-MAN5_PAGES := \ +- media-pool.cfg.5 \ +- tape.cfg.5 \ +- tape-job.cfg.5 \ +- acl.cfg.5 \ +- user.cfg.5 \ +- remote.cfg.5 \ +- sync.cfg.5 \ +- verification.cfg.5 \ +- datastore.cfg.5 \ +- domains.cfg.5 ++ proxmox-backup-client.1 ++ ++MAN5_PAGES := + + PRUNE_SIMULATOR_FILES := \ + prune-simulator/index.html \ diff --git a/proxmox-backup-client-3.1.4.ebuild b/proxmox-backup-client-3.1.4.ebuild new file mode 100644 index 0000000..c2e163a --- /dev/null +++ b/proxmox-backup-client-3.1.4.ebuild @@ -0,0 +1,352 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Auto-Generated by cargo-ebuild 0.5.4-r1 + +EAPI=8 + +CRATES=" + addr2line@0.21.0 + adler@1.0.2 + aho-corasick@1.1.2 + android-tzdata@0.1.1 + android_system_properties@0.1.5 + anyhow@1.0.75 + apt-pkg-native@0.3.2 + async-trait@0.1.74 + autocfg@1.1.0 + backtrace@0.3.69 + base32@0.4.0 + base64@0.13.1 + base64@0.21.4 + bindgen@0.68.1 + bitflags@1.3.2 + bitflags@2.4.1 + block-buffer@0.10.4 + bumpalo@3.14.0 + bytes@1.5.0 + cc@1.0.83 + cexpr@0.6.0 + cfg-if@1.0.0 + chrono@0.4.31 + cidr@0.2.2 + clang-sys@1.6.1 + clipboard-win@4.5.0 + core-foundation@0.9.3 + core-foundation-sys@0.8.4 + cpufeatures@0.2.10 + crc32fast@1.3.2 + crossbeam-channel@0.5.8 + crossbeam-utils@0.8.16 + crypto-common@0.1.6 + darling@0.13.4 + darling_core@0.13.4 + darling_macro@0.13.4 + deranged@0.3.9 + digest@0.10.7 + dirs-next@2.0.0 + dirs-sys-next@0.1.2 + either@1.9.0 + endian-type@0.1.2 + endian_trait@0.6.0 + endian_trait_derive@0.6.0 + env_logger@0.10.0 + errno@0.3.5 + error-chain@0.12.4 + error-code@2.3.1 + fastrand@2.0.1 + fd-lock@3.0.13 + filetime@0.2.22 + flate2@1.0.28 + fmt2io@0.2.0 + fnv@1.0.7 + foreign-types@0.3.2 + foreign-types-shared@0.1.1 + form_urlencoded@1.2.0 + futures@0.3.28 + futures-channel@0.3.28 + futures-core@0.3.28 + futures-executor@0.3.28 + futures-io@0.3.28 + futures-macro@0.3.28 + futures-sink@0.3.28 + futures-task@0.3.28 + futures-util@0.3.28 + generic-array@0.14.7 + getrandom@0.2.10 + gimli@0.28.0 + glob@0.3.1 + h2@0.3.21 + half@1.8.2 + handlebars@3.5.5 + hashbrown@0.12.3 + hermit-abi@0.3.3 + hex@0.4.3 + home@0.5.5 + hostname@0.3.1 + http@0.2.9 + http-body@0.4.5 + httparse@1.8.0 + httpdate@1.0.3 + humantime@2.1.0 + hyper@0.14.27 + iana-time-zone@0.1.58 + iana-time-zone-haiku@0.1.2 + ident_case@1.0.1 + idna@0.4.0 + indexmap@1.9.3 + is-terminal@0.4.9 + itertools@0.10.5 + itoa@1.0.9 + jobserver@0.1.27 + js-sys@0.3.64 + lazy_static@1.4.0 + lazycell@1.3.0 + lber@0.4.2 + ldap3@0.11.3 + libc@0.2.149 + libloading@0.7.4 + libudev-sys@0.1.4 + linux-raw-sys@0.4.10 + lock_api@0.4.11 + log@0.4.20 + match_cfg@0.1.0 + memchr@2.6.4 + memoffset@0.6.5 + memoffset@0.7.1 + minimal-lexical@0.2.1 + miniz_oxide@0.7.1 + mio@0.8.8 + native-tls@0.2.11 + nibble_vec@0.1.0 + nix@0.23.2 + nix@0.26.4 + nom@7.1.3 + num-bigint@0.4.4 + num-integer@0.1.45 + num-traits@0.2.17 + num_cpus@1.16.0 + num_threads@0.1.6 + oauth2@4.4.2 + object@0.32.1 + once_cell@1.18.0 + openidconnect@2.5.1 + openssl@0.10.57 + openssl-macros@0.1.1 + openssl-probe@0.1.5 + openssl-sys@0.9.93 + ordered-float@2.10.1 + pam-sys@0.5.6 + parking_lot@0.12.1 + parking_lot_core@0.9.9 + peeking_take_while@0.1.2 + percent-encoding@2.3.0 + pest@2.7.4 + pest_derive@2.7.4 + pest_generator@2.7.4 + pest_meta@2.7.4 + pin-project-lite@0.2.13 + pin-utils@0.1.0 + pkg-config@0.3.27 + powerfmt@0.2.0 + ppv-lite86@0.2.17 + proc-macro2@0.2.3 + proc-macro2@1.0.69 + quick-error@2.0.1 + quote@0.4.2 + quote@1.0.33 + radix_trie@0.2.1 + rand@0.8.5 + rand_chacha@0.3.1 + rand_core@0.6.4 + redox_syscall@0.2.16 + redox_syscall@0.3.5 + redox_syscall@0.4.1 + redox_users@0.4.3 + regex@1.10.2 + regex-automata@0.4.3 + regex-syntax@0.8.2 + rfc822-like@0.2.1 + ring@0.16.20 + rustc-demangle@0.1.23 + rustc-hash@1.1.0 + rustix@0.38.20 + rustyline@9.1.2 + ryu@1.0.15 + same-file@1.0.6 + schannel@0.1.22 + scopeguard@1.2.0 + security-framework@2.9.2 + security-framework-sys@2.9.1 + serde@1.0.189 + serde-value@0.7.0 + serde_cbor@0.11.2 + serde_derive@1.0.189 + serde_json@1.0.107 + serde_path_to_error@0.1.14 + serde_plain@1.0.2 + serde_with@1.14.0 + serde_with_macros@1.5.2 + sha2@0.10.8 + shlex@1.2.0 + signal-hook-registry@1.4.1 + siphasher@0.3.11 + slab@0.4.9 + smallvec@1.11.1 + smawk@0.3.2 + socket2@0.4.10 + socket2@0.5.5 + spin@0.5.2 + str-buf@1.0.6 + strsim@0.10.0 + subtle@2.5.0 + syn@0.12.15 + syn@1.0.109 + syn@2.0.38 + syslog@6.1.0 + tar@0.4.40 + tempfile@3.8.0 + termcolor@1.3.0 + textwrap@0.16.0 + thiserror@1.0.50 + thiserror-impl@1.0.50 + time@0.3.30 + time-core@0.1.2 + time-macros@0.2.15 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + tokio@1.33.0 + tokio-macros@2.1.0 + tokio-native-tls@0.3.1 + tokio-openssl@0.6.3 + tokio-stream@0.1.14 + tokio-util@0.7.9 + tower-service@0.3.2 + tracing@0.1.40 + tracing-attributes@0.1.27 + tracing-core@0.1.32 + try-lock@0.2.4 + typenum@1.17.0 + ucd-trie@0.1.6 + udev@0.4.0 + unicode-bidi@0.3.13 + unicode-ident@1.0.12 + unicode-linebreak@0.1.5 + unicode-normalization@0.1.22 + unicode-segmentation@1.10.1 + unicode-width@0.1.11 + unicode-xid@0.1.0 + untrusted@0.7.1 + ureq@2.8.0 + url@2.4.1 + utf8parse@0.2.1 + vcpkg@0.2.15 + version_check@0.9.4 + walkdir@2.4.0 + want@0.3.1 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen@0.2.87 + wasm-bindgen-backend@0.2.87 + wasm-bindgen-macro@0.2.87 + wasm-bindgen-macro-support@0.2.87 + wasm-bindgen-shared@0.2.87 + web-sys@0.3.64 + webauthn-rs@0.3.2 + which@4.4.2 + winapi@0.3.9 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.6 + winapi-x86_64-pc-windows-gnu@0.4.0 + windows-core@0.51.1 + windows-sys@0.48.0 + windows-targets@0.48.5 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_msvc@0.48.5 + windows_i686_gnu@0.48.5 + windows_i686_msvc@0.48.5 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_msvc@0.48.5 + xattr@1.0.1 + xdg@2.5.2 + zstd@0.12.4 + zstd-safe@6.0.6 + zstd-sys@2.0.9+zstd.1.5.5 +" + +inherit cargo +inherit git-r3 + +DESCRIPTION="Proxmox Backup Client" +HOMEPAGE="https://git.proxmox.com/?p=proxmox-backup.git" +SRC_URI="${CARGO_CRATE_URIS}" +# License set may be more restrictive as OR is not respected +# use cargo-license for a more accurate license picture +LICENSE="0BSD AGPL-3 AGPL-3+ Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 ISC MIT MITNFA MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB" +SLOT="0" +KEYWORDS="amd64" + +DEPEND="" +RDEPEND="${DEPEND}" +BDEPEND="" + +# rust does not use *FLAGS from make.conf, silence portage warning +# update with proper path to binaries this crate installs, omit leading / +QA_FLAGS_IGNORED="usr/bin/${PN}" + +PATCHES=( + "${FILESDIR}/${P}-compile.patch" +) + +src_unpack() { + # version 0.10.2-1 + EGIT_REPO_URI="https://git.proxmox.com/git/pxar.git" + EGIT_COMMIT="29cbeed3e1b52f5eef455cdfa8b5e93f4e3e88f5" + EGIT_CHECKOUT_DIR=${WORKDIR}/pxar + git-r3_src_unpack + # version 0.3.0-1 + EGIT_REPO_URI="https://git.proxmox.com/git/pathpatterns.git" + EGIT_COMMIT="281894a5b66099e919d167cd5f0644fff6aca234" + EGIT_CHECKOUT_DIR=${WORKDIR}/pathpatterns + git-r3_src_unpack + EGIT_REPO_URI="https://git.proxmox.com/git/proxmox.git" + EGIT_COMMIT="440c7e33611f9004943837eba5ee21640d54d170" + EGIT_CHECKOUT_DIR=${WORKDIR}/proxmox + git-r3_src_unpack + # version 0.1.4 + EGIT_REPO_URI="https://git.proxmox.com/git/proxmox-fuse.git" + EGIT_COMMIT="8d57fb64f044ea3dcfdef77ed5f1888efdab0708" + EGIT_CHECKOUT_DIR=${WORKDIR}/proxmox-fuse + git-r3_src_unpack + # version 0.4.0 + EGIT_REPO_URI="https://git.proxmox.com/git/proxmox-acme-rs.git" + EGIT_COMMIT="abc0bdd09d5c3501534510d49da0ae8fa5c05c05" # 0.4.0 + EGIT_CHECKOUT_DIR=${WORKDIR}/proxmox-acme-rs + git-r3_src_unpack + # version 3.1.4-1 + EGIT_REPO_URI="https://git.proxmox.com/git/proxmox-backup.git" + EGIT_COMMIT="470550897ae0ce1972c297d27f107c3344d72125" + EGIT_CHECKOUT_DIR=${WORKDIR}/${P} + git-r3_src_unpack + cargo_src_unpack +} + +src_compile() { + cargo_src_compile --package pxar-bin --bin pxar --package proxmox-backup-client --bin proxmox-backup-client +} + +src_test() { + cargo_src_test --package pxar-bin --bin pxar --package proxmox-backup-client --bin proxmox-backup-client +} + +src_install() { + debian/scripts/elf-strip-unused-dependencies.sh target/release/proxmox-backup-client + debian/scripts/elf-strip-unused-dependencies.sh target/release/pxar + + dobin target/release/pxar + dobin target/release/proxmox-backup-client + + insinto /usr/share/bash-completion/completions/ + newins debian/proxmox-backup-client.bc proxmox-backup-client + newins debian/pxar.bc pxar +}