mirror of
https://github.com/wofferl/proxmox-backup-arm64
synced 2025-12-06 00:13:41 +00:00
update proxmox-backup-3.2.3-1
This commit is contained in:
22
patches/pbs3/proxmox-arm64.patch
Normal file
22
patches/pbs3/proxmox-arm64.patch
Normal file
@@ -0,0 +1,22 @@
|
||||
diff --git a/proxmox-sys/src/crypt.rs b/proxmox-sys/src/crypt.rs
|
||||
index 3313f668..c254e761 100644
|
||||
--- a/proxmox-sys/src/crypt.rs
|
||||
+++ b/proxmox-sys/src/crypt.rs
|
||||
@@ -71,7 +71,7 @@ pub fn crypt(password: &[u8], salt: &[u8]) -> Result<String, Error> {
|
||||
// > output field of their data argument, and crypt writes an invalid hash to its static
|
||||
// > storage area. This string will be shorter than 13 characters, will begin with a ‘*’,
|
||||
// > and will not compare equal to setting.
|
||||
- if data.output.first().is_none() || Some(&('*' as i8)) == data.output.first() {
|
||||
+ if data.output.first().is_none() || Some(&('*' as u8)) == data.output.first() {
|
||||
bail!("internal error: crypt_r returned invalid hash");
|
||||
}
|
||||
CStr::from_ptr(&data.output as *const _)
|
||||
@@ -133,7 +133,7 @@ pub fn crypt_gensalt(prefix: &str, count: u64, rbytes: &[u8]) -> Result<String,
|
||||
// while it states that this is "in addition" to returning a null pointer, this isn't how
|
||||
// `crypt_r` seems to behave (sometimes only setting an invalid hash) so add this here too just
|
||||
// in case.
|
||||
- if output.first().is_none() || Some(&('*' as i8)) == output.first() {
|
||||
+ if output.first().is_none() || Some(&('*' as u8)) == output.first() {
|
||||
bail!("internal error: crypt_gensalt_rn could not create a valid salt");
|
||||
}
|
||||
|
||||
27
patches/pbs3/proxmox-backup-acme.patch
Normal file
27
patches/pbs3/proxmox-backup-acme.patch
Normal file
@@ -0,0 +1,27 @@
|
||||
diff --git a/src/acme/client.rs b/src/acme/client.rs
|
||||
index 96cee0fe..fb452b35 100644
|
||||
--- a/src/acme/client.rs
|
||||
+++ b/src/acme/client.rs
|
||||
@@ -11,7 +11,7 @@ use nix::sys::stat::Mode;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use proxmox_acme::account::AccountCreator;
|
||||
-use proxmox_acme::account::AccountData as AcmeAccountData;
|
||||
+use proxmox_acme::types::AccountData as AcmeAccountData;
|
||||
use proxmox_acme::order::{Order, OrderData};
|
||||
use proxmox_acme::Request as AcmeRequest;
|
||||
use proxmox_acme::{Account, Authorization, Challenge, Directory, Error, ErrorResponse};
|
||||
diff --git a/src/api2/config/acme.rs b/src/api2/config/acme.rs
|
||||
index 4fa276f6..f18a517f 100644
|
||||
--- a/src/api2/config/acme.rs
|
||||
+++ b/src/api2/config/acme.rs
|
||||
@@ -16,7 +16,8 @@ use proxmox_router::{
|
||||
use proxmox_schema::{api, param_bail};
|
||||
use proxmox_sys::{task_log, task_warn};
|
||||
|
||||
-use proxmox_acme::account::AccountData as AcmeAccountData;
|
||||
+use proxmox_acme::types::AccountData as AcmeAccountData;
|
||||
+
|
||||
use proxmox_acme::Account;
|
||||
|
||||
use pbs_api_types::{Authid, PRIV_SYS_MODIFY};
|
||||
@@ -1,12 +1,12 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 0317dd5e..ad2d1dfd 100644
|
||||
index 03e93876..aab32c74 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -4,32 +4,21 @@ include defines.mk
|
||||
PACKAGE := proxmox-backup
|
||||
ARCH := $(DEB_BUILD_ARCH)
|
||||
|
||||
-SUBDIRS := etc www docs
|
||||
-SUBDIRS := etc www docs templates
|
||||
+SUBDIRS := docs
|
||||
|
||||
# Binaries usable by users
|
||||
@@ -82,7 +82,7 @@ index 0317dd5e..ad2d1dfd 100644
|
||||
touch "$@"
|
||||
|
||||
|
||||
@@ -191,25 +160,26 @@ lint:
|
||||
@@ -191,27 +160,28 @@ lint:
|
||||
cargo clippy -- -A clippy::all -D clippy::correctness
|
||||
|
||||
install: $(COMPILED_BINS)
|
||||
@@ -111,10 +111,13 @@ index 0317dd5e..ad2d1dfd 100644
|
||||
- $(MAKE) -C www install
|
||||
+ #$(MAKE) -C www install
|
||||
$(MAKE) -C docs install
|
||||
- $(MAKE) -C templates install
|
||||
+ #$(MAKE) -C templates install
|
||||
|
||||
.PHONY: upload
|
||||
upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
|
||||
diff --git a/debian/control b/debian/control
|
||||
index 30d11db0..57cf3c25 100644
|
||||
index 51cd9899..57cf3c25 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -20,7 +20,7 @@ Build-Depends: bash-completion,
|
||||
@@ -126,7 +129,7 @@ index 30d11db0..57cf3c25 100644
|
||||
rsync,
|
||||
texlive-fonts-extra <!nodoc>,
|
||||
texlive-fonts-recommended <!nodoc>,
|
||||
@@ -160,56 +34,9 @@ Vcs-Browser: https://git.proxmox.com/?p=proxmox-backup.git;a=summary
|
||||
@@ -34,56 +34,9 @@ Vcs-Browser: https://git.proxmox.com/?p=proxmox-backup.git;a=summary
|
||||
Homepage: https://www.proxmox.com
|
||||
Rules-Requires-Root: binary-targets
|
||||
|
||||
@@ -206,10 +209,10 @@ index 79c1ad76..95b1b1bf 100755
|
||||
override_dh_fixperms:
|
||||
dh_fixperms --exclude sg-tape-cmd
|
||||
diff --git a/docs/Makefile b/docs/Makefile
|
||||
index b06badff..32b51556 100644
|
||||
index d6c61c86..245badbd 100644
|
||||
--- a/docs/Makefile
|
||||
+++ b/docs/Makefile
|
||||
@@ -1,49 +1,15 @@
|
||||
@@ -1,53 +1,15 @@
|
||||
include ../defines.mk
|
||||
|
||||
GENERATED_SYNOPSIS := \
|
||||
@@ -223,6 +226,8 @@ index b06badff..32b51556 100644
|
||||
- pmtx/synopsis.rst \
|
||||
- pmt/synopsis.rst \
|
||||
- config/media-pool/config.rst \
|
||||
- config/notifications/config.rst \
|
||||
- config/notifications-priv/config.rst \
|
||||
- config/tape/config.rst \
|
||||
- config/tape-job/config.rst \
|
||||
- config/user/config.rst \
|
||||
@@ -256,7 +261,9 @@ index b06badff..32b51556 100644
|
||||
- sync.cfg.5 \
|
||||
- verification.cfg.5 \
|
||||
- datastore.cfg.5 \
|
||||
- domains.cfg.5
|
||||
- domains.cfg.5 \
|
||||
- notifications.cfg.5 \
|
||||
- notifications-priv.cfg.5 \
|
||||
+ proxmox-backup-client.1
|
||||
+
|
||||
+MAN5_PAGES :=
|
||||
|
||||
Reference in New Issue
Block a user