diff --git a/build.sh b/build.sh index dd70547..c8ed1d1 100755 --- a/build.sh +++ b/build.sh @@ -362,11 +362,11 @@ fi [ "${BUILD_PACKAGE}" = "client" ] && exit 0 -PVE_XTERMJS_VER="5.3.0-3" -PVE_XTERMJS_GIT="3301e28678e6a26187e8731d920b2b7686c35cad" -PROXMOX_XTERMJS_GIT="04e2d0e5c329b59c4ece59d77079443e39029883" -PROXMOX_TERMPROXY_VER="1.0.1" -if [ ! -e "${PACKAGES}/pve-xtermjs_${PVE_XTERMJS_VER}_all.deb" ]; then +PVE_XTERMJS_VER="5.5.0-2" +PVE_XTERMJS_GIT="a29b36079fbaf18586615e26bb615992d1007c7e" +PROXMOX_XTERMJS_GIT="deb32a6c4a21bea0d72059de0835fde504296bf0" +PROXMOX_TERMPROXY_VER="1.1.0" +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_clean_and_checkout ${PVE_XTERMJS_GIT} pve-xtermjs patch -p1 -d pve-xtermjs/ <"${PATCHES}/pve-xtermjs-arm.patch" diff --git a/patches/pve-xtermjs-arm.patch b/patches/pve-xtermjs-arm.patch index a2d698e..1207247 100644 --- a/patches/pve-xtermjs-arm.patch +++ b/patches/pve-xtermjs-arm.patch @@ -1,8 +1,8 @@ -diff --git a/.cargo/config b/.cargo/config -index 3b5b6e4..4df5be2 100644 ---- a/.cargo/config -+++ b/.cargo/config -@@ -1,5 +1,5 @@ +diff --git a/.cargo/config.toml b/.cargo/config.toml +index 7b442dc..6a5ba20 100644 +--- a/.cargo/config.toml ++++ b/.cargo/config.toml +@@ -1,8 +1,8 @@ [source] -[source.debian-packages] -directory = "/usr/share/cargo/registry" @@ -11,14 +11,17 @@ index 3b5b6e4..4df5be2 100644 [source.crates-io] -replace-with = "debian-packages" +replace-with = "vendor" + + [profile.release] + debug = true diff --git a/termproxy/Cargo.toml b/termproxy/Cargo.toml -index a49d6b0..6f02e0a 100644 +index a66e1d6..421f656 100644 --- a/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-lang = "1.1" - ureq = { version = "2.4", default-features = false, features = [ "gzip" ] } + form_urlencoded = "1.1" + +[patch.crates-io] +proxmox-io = { path = "../proxmox/proxmox-io" } @@ -56,10 +59,10 @@ index d7655b9..b351396 100644 .PHONY: dsc diff --git a/termproxy/debian/control b/termproxy/debian/control -index 383bdbe..583a584 100644 +index 32ceaf4..583a584 100644 --- a/termproxy/debian/control +++ b/termproxy/debian/control -@@ -1,20 +1,8 @@ +@@ -1,21 +1,8 @@ Source: proxmox-termproxy Section: admin Priority: optional @@ -67,13 +70,14 @@ index 383bdbe..583a584 100644 - debhelper-compat (= 13), - dh-cargo (>= 25), - 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+net-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-lang-1+default-dev (>= 1.1-~~), -- librust-proxmox-sys-0.5+default-dev, - librust-ureq-2+gzip-dev (>= 2.4-~~), +Build-Depends: debhelper-compat (= 13), libstd-rust-dev, @@ -81,7 +85,7 @@ index 383bdbe..583a584 100644 Maintainer: Proxmox Support Team Standards-Version: 4.6.1 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 Multi-Arch: allowed Depends: ${misc:Depends}, ${shlibs:Depends},