jgaunt/proxmox-backup-arm64
1
0
Fork 0
mirror of https://github.com/wofferl/proxmox-backup-arm64 synced 2025-12-15 15:53:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update pve-xtermjs to 5.5.0-2 and proxmox-termproxy to 1.1.0

Browse Source 
Signed-off-by: Wolfgang <github@linux-dude.de>
This commit is contained in:
Wolfgang
2025-04-07 21:47:01 +00:00
parent 3362b1b96f
commit ab3e451ed7
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build.sh
View File

@@ -362,11 +362,11 @@ fi
[ "${BUILD_PACKAGE}" = "client" ] && exit 0 [ "${BUILD_PACKAGE}" = "client" ] && exit 0
PVE_XTERMJS_VER="5.3.0-3" PVE_XTERMJS_VER="5.5.0-2"
PVE_XTERMJS_GIT="3301e28678e6a26187e8731d920b2b7686c35cad" PVE_XTERMJS_GIT="a29b36079fbaf18586615e26bb615992d1007c7e"
PROXMOX_XTERMJS_GIT="04e2d0e5c329b59c4ece59d77079443e39029883" PROXMOX_XTERMJS_GIT="deb32a6c4a21bea0d72059de0835fde504296bf0"
PROXMOX_TERMPROXY_VER="1.0.1" PROXMOX_TERMPROXY_VER="1.1.0"
if [ ! -e "${PACKAGES}/pve-xtermjs_${PVE_XTERMJS_VER}_all.deb" ]; then if [ ! -e "${PACKAGES}/proxmox-termproxy_${PROXMOX_TERMPROXY_VER}_${PACKAGE_ARCH}.deb" ]; then
git_clone_or_fetch https://git.proxmox.com/git/pve-xtermjs.git git_clone_or_fetch https://git.proxmox.com/git/pve-xtermjs.git
git_clean_and_checkout ${PVE_XTERMJS_GIT} pve-xtermjs git_clean_and_checkout ${PVE_XTERMJS_GIT} pve-xtermjs
patch -p1 -d pve-xtermjs/ <"${PATCHES}/pve-xtermjs-arm.patch" patch -p1 -d pve-xtermjs/ <"${PATCHES}/pve-xtermjs-arm.patch"

30
patches/pve-xtermjs-arm.patch
View File

@@ -1,8 +1,8 @@
diff --git a/.cargo/config b/.cargo/config diff --git a/.cargo/config.toml b/.cargo/config.toml
index 3b5b6e4..4df5be2 100644 index 7b442dc..6a5ba20 100644
--- a/.cargo/config --- a/.cargo/config.toml
+++ b/.cargo/config +++ b/.cargo/config.toml
@@ -1,5 +1,5 @@ @@ -1,8 +1,8 @@
[source] [source]
-[source.debian-packages] -[source.debian-packages]
-directory = "/usr/share/cargo/registry" -directory = "/usr/share/cargo/registry"
@@ -11,14 +11,17 @@ index 3b5b6e4..4df5be2 100644
[source.crates-io] [source.crates-io]
-replace-with = "debian-packages" -replace-with = "debian-packages"
+replace-with = "vendor" +replace-with = "vendor"
[profile.release]
debug = true
diff --git a/termproxy/Cargo.toml b/termproxy/Cargo.toml diff --git a/termproxy/Cargo.toml b/termproxy/Cargo.toml
index a49d6b0..6f02e0a 100644 index a66e1d6..421f656 100644
--- a/termproxy/Cargo.toml --- a/termproxy/Cargo.toml
+++ b/termproxy/Cargo.toml +++ b/termproxy/Cargo.toml
@@ -23,3 +23,7 @@ pico-args = "0.4" @@ -23,3 +23,7 @@ pico-args = "0.5"
proxmox-io = "1" proxmox-io = "1"
proxmox-lang = "1.1" proxmox-lang = "1.1"
ureq = { version = "2.4", default-features = false, features = [ "gzip" ] } form_urlencoded = "1.1"
+ +
+[patch.crates-io] +[patch.crates-io]
+proxmox-io = { path = "../proxmox/proxmox-io" } +proxmox-io = { path = "../proxmox/proxmox-io" }
@@ -56,10 +59,10 @@ index d7655b9..b351396 100644
.PHONY: dsc .PHONY: dsc
diff --git a/termproxy/debian/control b/termproxy/debian/control diff --git a/termproxy/debian/control b/termproxy/debian/control
index 383bdbe..583a584 100644 index 32ceaf4..583a584 100644
--- a/termproxy/debian/control --- a/termproxy/debian/control
+++ b/termproxy/debian/control +++ b/termproxy/debian/control
@@ -1,20 +1,8 @@ @@ -1,21 +1,8 @@
Source: proxmox-termproxy Source: proxmox-termproxy
Section: admin Section: admin
Priority: optional Priority: optional
@@ -67,13 +70,14 @@ index 383bdbe..583a584 100644
- debhelper-compat (= 13), - debhelper-compat (= 13),
- dh-cargo (>= 25), - dh-cargo (>= 25),
- librust-anyhow-1+default-dev, - librust-anyhow-1+default-dev,
- librust-clap-4+default-dev, - librust-libc-0.2+default-dev (>= 0.2.107-~~),
- librust-mio-0.8+default-dev, - librust-mio-0.8+default-dev,
- librust-mio-0.8+net-dev, - librust-mio-0.8+net-dev,
- librust-mio-0.8+os-ext-dev, - librust-mio-0.8+os-ext-dev,
- librust-nix-0.26+default-dev (>= 0.26.1-~~),
- librust-pico-args-0.5+default-dev,
- librust-proxmox-io-1+default-dev, - librust-proxmox-io-1+default-dev,
- librust-proxmox-lang-1+default-dev (>= 1.1-~~), - librust-proxmox-lang-1+default-dev (>= 1.1-~~),
- librust-proxmox-sys-0.5+default-dev,
- librust-ureq-2+gzip-dev (>= 2.4-~~), - librust-ureq-2+gzip-dev (>= 2.4-~~),
+Build-Depends: debhelper-compat (= 13), +Build-Depends: debhelper-compat (= 13),
libstd-rust-dev, libstd-rust-dev,
@@ -81,7 +85,7 @@ index 383bdbe..583a584 100644
Maintainer: Proxmox Support Team <support@proxmox.com> Maintainer: Proxmox Support Team <support@proxmox.com>
Standards-Version: 4.6.1 Standards-Version: 4.6.1
Vcs-Git: git://git.proxmox.com/git/pve-xtermjs.git Vcs-Git: git://git.proxmox.com/git/pve-xtermjs.git
@@ -26,7 +14,7 @@ Package: proxmox-termproxy @@ -27,7 +14,7 @@ Package: proxmox-termproxy
Architecture: any Architecture: any
Multi-Arch: allowed Multi-Arch: allowed
Depends: ${misc:Depends}, ${shlibs:Depends}, Depends: ${misc:Depends}, ${shlibs:Depends},