update pve-xtermjs to 4.16.0-3

2025-12-06 00:13:41 +00:00 · 2023-06-30 19:48:36 +00:00
parent 687af006c9
commit 392ef5cab7
3 changed files with 67 additions and 99 deletions
--- a/build.sh
+++ b/build.sh
@@ -355,16 +355,15 @@ fi

 [ "${BUILD_PACKAGE}" = "client" ] && exit 0

-PVE_XTERMJS_VER="4.16.0-2"
-PVE_XTERMJS_GIT="8dcff86a32c3ba8754b84e8aabb01369ef3de407"
-PROXMOX_XTERMJS_GIT="41862eeb95b70201c47dfd27fca37879e23be3ff"
+PVE_XTERMJS_VER="4.16.0-3"
+PVE_XTERMJS_GIT="99c9d214258a496227e15f0803fb163925be65c8"
+PROXMOX_XTERMJS_GIT="2a070da0651677411a245f1714895235b1caf584"
 if [ ! -e "${PACKAGES}/pve-xtermjs_${PVE_XTERMJS_VER}_${PACKAGE_ARCH}.deb" ]; then
 	git_clone_or_fetch https://git.proxmox.com/git/proxmox.git
 	git_clean_and_checkout ${PROXMOX_XTERMJS_GIT} proxmox
 	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"
-	patch -p1 -d pve-xtermjs/ < "${PATCHES}/pve-xtermjs-fix_already_registered.patch"
 	[[ "${BUILD_PROFILES}" =~ cross ]] && \
 		patch -p1 -d pve-xtermjs/ < "${PATCHES}/pve-xtermjs-cross.patch"
 	cd pve-xtermjs/
--- a/patches/pve-xtermjs-arm.patch
+++ b/patches/pve-xtermjs-arm.patch
@@ -12,25 +12,26 @@ index 3b5b6e4..b08ce29 100644
 -replace-with = "debian-packages"
 +replace-with = "vendor"
 diff --git a/Cargo.toml b/Cargo.toml
-index 60c3ae0..8464181 100644
+index b9479be..0d417f4 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -16,3 +16,8 @@ curl = "0.4"
- clap = "2.33"
+@@ -19,3 +19,9 @@ clap = "3"
 proxmox-io = "1"
- proxmox-sys = "0.2"
-+zstd-sys = { features = [ "pkg-config" ] }
+ proxmox-lang = "1.1"
+ proxmox-sys = "0.5"
+
 +
 +[patch.crates-io]
 +proxmox-io = { path = "../proxmox/proxmox-io" }
+proxmox-lang = { path = "../proxmox/proxmox-lang" }
 +proxmox-sys = { path = "../proxmox/proxmox-sys" }
 diff --git a/Makefile b/Makefile
-index cd583fb..6c15792 100644
+index 01488d1..cb0ceb7 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -35,6 +35,14 @@ $(SUBDIRS):
- cargo-build:
- 	cargo build $(CARGO_BUILD_ARGS)
+@@ -46,6 +46,14 @@ $(TERMPROXY_BIN): .do-cargo-build
+ .PHONY: cargo-build
+ cargo-build: .do-cargo-build
 
 +.PHONY: cargo-vendor
 +cargo-vendor:
@@ -40,83 +41,49 @@ index cd583fb..6c15792 100644
 +	sed -i "s#\"rust-toolchain[^,]\+,##"  vendor/endian_trait/.cargo-checksum.json
 +	sed -i "s#\"rust-toolchain[^,]\+,##"  vendor/endian_trait_derive/.cargo-checksum.json
 +
- .PHONY: build
- build:
- 	rm -rf build
-@@ -53,9 +61,10 @@ build:
- 
+ update-dcontrol:
+ 	rm -rf $(BUILDDIR)
+ 	$(MAKE) $(BUILDDIR)
+@@ -74,9 +82,10 @@ $(ORIG_SRC_TAR): $(BUILDDIR)
 .PHONY: deb
- deb: ${DEB}
-$(DEB): build
-	cd build; dpkg-buildpackage -b -uc -us --no-pre-clean
-	lintian ${DEB}
+ deb: $(DEB)
+ $(DBG_DEB): $(DEB)
+-$(DEB): $(BUILDDIR)
+-	cd $(BUILDDIR); dpkg-buildpackage -b -uc -us
+-	lintian $(DEB)
 +$(DEB): cargo-vendor
 +	echo "git clone git://git.proxmox.com/git/pve-xtermjs.git\\ngit checkout ${GITVERSION}" > debian/SOURCE
 +	DEB_CARGO_PACKAGE=$(PACKAGE) dpkg-buildpackage -b -uc -us --no-pre-clean
-+	lintian ../${DEB}
- 	@echo ${DEB}
+	lintian ../$(DEB)
+ 	@echo $(DEB)
 
 .PHONY: dsc
-diff --git a/debian/cargo-checksum.json b/debian/cargo-checksum.json
-new file mode 100644
-index 0000000..e69de29
-diff --git a/debian/changelog b/debian/changelog
-index 19bc1d1..1bd362a 100644
--- a/debian/changelog
-+++ b/debian/changelog
-@@ -1,3 +1,9 @@
-+rust-termproxy (4.16.0-2) bullseye; urgency=medium
-+
-+  * fix Connection closed (Code: 1000) error - WARN: I/O source already registered with a `Registry`
-+
-+ -- Wolfgang <pbs@linux-dude.de>  Tue, 14 Mar 2023 21:01:43 +0100
-+
- rust-termproxy (4.16.0-1) bullseye; urgency=medium
- 
-   * upgrade xterm.js from 4.12.0 to 4.16.0
-diff --git a/debian/compat b/debian/compat
-new file mode 100644
-index 0000000..f599e28
--- /dev/null
-+++ b/debian/compat
-@@ -0,0 +1 @@
-+10
 diff --git a/debian/control b/debian/control
-new file mode 100644
-index 0000000..d59a66c
--- /dev/null
+index fd052c2..65433dd 100644
+--- a/debian/control
 +++ b/debian/control
-@@ -0,0 +1,30 @@
-+Source: rust-termproxy
-+Section: admin
-+Priority: optional
-+Build-Depends: debhelper (>= 12),
-+ libzstd-dev
-+Maintainer: Proxmox Support Team <support@proxmox.com>
-+Standards-Version: 4.5.1
-+Vcs-Git: git://git.proxmox.com/git/pve-xtermjs.git
-+Vcs-Browser: https://git.proxmox.com/?p=pve-xtermjs.git;a=summary
-+Homepage: https://www.proxmox.com
-+Rules-Requires-Root: no
-+
-+Package: pve-xtermjs
-+Architecture: any
-+Multi-Arch: allowed
-+Depends:
-+ ${misc:Depends},
-+ ${shlibs:Depends},
-+ ${cargo:Depends}
-+Recommends:
-+ ${cargo:Recommends}
-+Suggests:
-+ ${cargo:Suggests}
-+Provides:
-+ ${cargo:Provides}
-+Built-Using: ${cargo:Built-Using}
-+XB-X-Cargo-Built-Using: ${cargo:X-Cargo-Built-Using}
-+Description: HTML/JS Shell client for Proxmox projects
-+ This package provides an xterm.js client/proxy for Proxmoxprojects'  Hosts,
-+ Proxmox VE containers or Proxmox VE VM's serial-terminals.
+@@ -1,20 +1,8 @@
+ Source: rust-termproxy
+ Section: admin
+ Priority: optional
+-Build-Depends: cargo:native,
+-               debhelper-compat (= 13),
+-               dh-cargo (>= 25),
+-               librust-anyhow-1+default-dev,
+-               librust-clap-3+default-dev,
+-               librust-mio-0.8+default-dev,
+-               librust-mio-0.8+net-dev,
+-               librust-mio-0.8+os-ext-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,
+-               rustc:native,
+ Maintainer: Proxmox Support Team <support@proxmox.com>
+ Standards-Version: 4.6.1
+ Vcs-Git: git://git.proxmox.com/git/pve-xtermjs.git
 diff --git a/debian/install b/debian/install
 index 04be689..0e69d82 100644
 --- a/debian/install
@@ -126,18 +93,23 @@ index 04be689..0e69d82 100644
 +src/www/*			/usr/share/pve-xtermjs/
 +target/release/termproxy	/usr/bin/
 diff --git a/debian/rules b/debian/rules
-index 2b62edd..436684e 100755
+index 6049291..c9fdaf4 100755
 --- a/debian/rules
 +++ b/debian/rules
-@@ -1,7 +1,7 @@
+@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
- %:
-	dh $@ --buildsystem cargo
-+	dh $@
+ include /usr/share/dpkg/pkg-info.mk
+-include /usr/share/rustc/architecture.mk
 
- override_dh_auto_build:
- 	dh_auto_build
+ export BUILD_MODE=release
+ 
+@@ -23,5 +23,4 @@ override_dh_auto_build:
+ 
+ override_dh_auto_configure:
+ 	rm -f Cargo.lock
+-	/usr/share/cargo/bin/cargo prepare-debian $(CURDIR)/debian/cargo_registry --link-from-system
+ 	dh_auto_configure
 diff --git a/debian/rules.debcargo.hint b/debian/rules.debcargo.hint
 index 92c239b..4aaf62a 100755
 --- a/debian/rules.debcargo.hint
--- a/patches/pve-xtermjs-cross.patch
+++ b/patches/pve-xtermjs-cross.patch
@@ -1,22 +1,19 @@
 diff --git a/Makefile b/Makefile
-index cd583fb..4f709be 100644
+index 01488d1..b398856 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -15,12 +15,12 @@ FITADDONTGZ=xterm-addon-fit-${FITADDONVER}.tgz
- SRCDIR=src
- GITVERSION:=$(shell git rev-parse HEAD)
- 
-DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
-+DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_HOST_ARCH}.deb
- DSC=rust-${CRATENAME}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
- 
+@@ -22,9 +22,9 @@ DSC=rust-$(CRATENAME)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
+ CARGO ?= cargo
 ifeq ($(BUILD_MODE), release)
 CARGO_BUILD_ARGS += --release
 -COMPILEDIR := target/release
 +COMPILEDIR := target/aarch64-unknown-linux-gnu/release
 else
- COMPILEDIR := target/debug
+-COMPILEDIR := target/debug
+COMPILEDIR := target/aarch64-unknown-linux-gnu/debug
 endif
+
+ PREFIX = /usr
 diff --git a/debian/install b/debian/install
 index 0e69d82..bb555a8 100644
 --- a/debian/install