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

update pve-xtermjs to 4.16.0-3

Browse Source
This commit is contained in:
Wolfgang
2023-06-30 19:48:36 +00:00
parent 687af006c9
commit 392ef5cab7
3 changed files with 67 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build.sh
View File

@@ -355,16 +355,15 @@ fi
[ "${BUILD_PACKAGE}" = "client" ] && exit 0 [ "${BUILD_PACKAGE}" = "client" ] && exit 0
PVE_XTERMJS_VER="4.16.0-2" PVE_XTERMJS_VER="4.16.0-3"
PVE_XTERMJS_GIT="8dcff86a32c3ba8754b84e8aabb01369ef3de407" PVE_XTERMJS_GIT="99c9d214258a496227e15f0803fb163925be65c8"
PROXMOX_XTERMJS_GIT="41862eeb95b70201c47dfd27fca37879e23be3ff" PROXMOX_XTERMJS_GIT="2a070da0651677411a245f1714895235b1caf584"
if [ ! -e "${PACKAGES}/pve-xtermjs_${PVE_XTERMJS_VER}_${PACKAGE_ARCH}.deb" ]; then if [ ! -e "${PACKAGES}/pve-xtermjs_${PVE_XTERMJS_VER}_${PACKAGE_ARCH}.deb" ]; then
git_clone_or_fetch https://git.proxmox.com/git/proxmox.git git_clone_or_fetch https://git.proxmox.com/git/proxmox.git
git_clean_and_checkout ${PROXMOX_XTERMJS_GIT} proxmox git_clean_and_checkout ${PROXMOX_XTERMJS_GIT} proxmox
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"
patch -p1 -d pve-xtermjs/ < "${PATCHES}/pve-xtermjs-fix_already_registered.patch"
[[ "${BUILD_PROFILES}" =~ cross ]] && \ [[ "${BUILD_PROFILES}" =~ cross ]] && \
patch -p1 -d pve-xtermjs/ < "${PATCHES}/pve-xtermjs-cross.patch" patch -p1 -d pve-xtermjs/ < "${PATCHES}/pve-xtermjs-cross.patch"
cd pve-xtermjs/ cd pve-xtermjs/

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

@@ -12,25 +12,26 @@ index 3b5b6e4..b08ce29 100644
-replace-with = "debian-packages" -replace-with = "debian-packages"
+replace-with = "vendor" +replace-with = "vendor"
diff --git a/Cargo.toml b/Cargo.toml diff --git a/Cargo.toml b/Cargo.toml
index 60c3ae0..8464181 100644 index b9479be..0d417f4 100644
--- a/Cargo.toml --- a/Cargo.toml
+++ b/Cargo.toml +++ b/Cargo.toml
@@ -16,3 +16,8 @@ curl = "0.4" @@ -19,3 +19,9 @@ clap = "3"
clap = "2.33"
proxmox-io = "1" proxmox-io = "1"
proxmox-sys = "0.2" proxmox-lang = "1.1"
+zstd-sys = { features = [ "pkg-config" ] } proxmox-sys = "0.5"
+
+ +
+[patch.crates-io] +[patch.crates-io]
+proxmox-io = { path = "../proxmox/proxmox-io" } +proxmox-io = { path = "../proxmox/proxmox-io" }
+proxmox-lang = { path = "../proxmox/proxmox-lang" }
+proxmox-sys = { path = "../proxmox/proxmox-sys" } +proxmox-sys = { path = "../proxmox/proxmox-sys" }
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index cd583fb..6c15792 100644 index 01488d1..cb0ceb7 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -35,6 +35,14 @@ $(SUBDIRS): @@ -46,6 +46,14 @@ $(TERMPROXY_BIN): .do-cargo-build
cargo-build: .PHONY: cargo-build
cargo build $(CARGO_BUILD_ARGS) cargo-build: .do-cargo-build
+.PHONY: cargo-vendor +.PHONY: cargo-vendor
+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/.cargo-checksum.json
+ sed -i "s#\"rust-toolchain[^,]\+,##" vendor/endian_trait_derive/.cargo-checksum.json + sed -i "s#\"rust-toolchain[^,]\+,##" vendor/endian_trait_derive/.cargo-checksum.json
+ +
.PHONY: build update-dcontrol:
build: rm -rf $(BUILDDIR)
rm -rf build $(MAKE) $(BUILDDIR)
@@ -53,9 +61,10 @@ build: @@ -74,9 +82,10 @@ $(ORIG_SRC_TAR): $(BUILDDIR)
.PHONY: deb .PHONY: deb
deb: ${DEB} deb: $(DEB)
-$(DEB): build $(DBG_DEB): $(DEB)
- cd build; dpkg-buildpackage -b -uc -us --no-pre-clean -$(DEB): $(BUILDDIR)
- lintian ${DEB} - cd $(BUILDDIR); dpkg-buildpackage -b -uc -us
- lintian $(DEB)
+$(DEB): cargo-vendor +$(DEB): cargo-vendor
+ echo "git clone git://git.proxmox.com/git/pve-xtermjs.git\\ngit checkout ${GITVERSION}" > debian/SOURCE + 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 + DEB_CARGO_PACKAGE=$(PACKAGE) dpkg-buildpackage -b -uc -us --no-pre-clean
+ lintian ../${DEB} + lintian ../$(DEB)
@echo ${DEB} @echo $(DEB)
.PHONY: dsc .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 diff --git a/debian/control b/debian/control
new file mode 100644 index fd052c2..65433dd 100644
index 0000000..d59a66c --- a/debian/control
--- /dev/null
+++ b/debian/control +++ b/debian/control
@@ -0,0 +1,30 @@ @@ -1,20 +1,8 @@
+Source: rust-termproxy Source: rust-termproxy
+Section: admin Section: admin
+Priority: optional Priority: optional
+Build-Depends: debhelper (>= 12), -Build-Depends: cargo:native,
+ libzstd-dev - debhelper-compat (= 13),
+Maintainer: Proxmox Support Team <support@proxmox.com> - dh-cargo (>= 25),
+Standards-Version: 4.5.1 - librust-anyhow-1+default-dev,
+Vcs-Git: git://git.proxmox.com/git/pve-xtermjs.git - librust-clap-3+default-dev,
+Vcs-Browser: https://git.proxmox.com/?p=pve-xtermjs.git;a=summary - librust-mio-0.8+default-dev,
+Homepage: https://www.proxmox.com - librust-mio-0.8+net-dev,
+Rules-Requires-Root: no - librust-mio-0.8+os-ext-dev,
+ - librust-proxmox-io-1+default-dev,
+Package: pve-xtermjs - librust-proxmox-lang-1+default-dev (>= 1.1-~~),
+Architecture: any - librust-proxmox-sys-0.5+default-dev,
+Multi-Arch: allowed - librust-ureq-2+gzip-dev (>= 2.4-~~),
+Depends: +Build-Depends: debhelper-compat (= 13),
+ ${misc:Depends}, libstd-rust-dev,
+ ${shlibs:Depends}, - rustc:native,
+ ${cargo:Depends} Maintainer: Proxmox Support Team <support@proxmox.com>
+Recommends: Standards-Version: 4.6.1
+ ${cargo:Recommends} Vcs-Git: git://git.proxmox.com/git/pve-xtermjs.git
+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.
diff --git a/debian/install b/debian/install diff --git a/debian/install b/debian/install
index 04be689..0e69d82 100644 index 04be689..0e69d82 100644
--- a/debian/install --- a/debian/install
@@ -126,18 +93,23 @@ index 04be689..0e69d82 100644
+src/www/* /usr/share/pve-xtermjs/ +src/www/* /usr/share/pve-xtermjs/
+target/release/termproxy /usr/bin/ +target/release/termproxy /usr/bin/
diff --git a/debian/rules b/debian/rules diff --git a/debian/rules b/debian/rules
index 2b62edd..436684e 100755 index 6049291..c9fdaf4 100755
--- a/debian/rules --- a/debian/rules
+++ b/debian/rules +++ b/debian/rules
@@ -1,7 +1,7 @@ @@ -1,7 +1,6 @@
#!/usr/bin/make -f #!/usr/bin/make -f
%: include /usr/share/dpkg/pkg-info.mk
- dh $@ --buildsystem cargo -include /usr/share/rustc/architecture.mk
+ dh $@
override_dh_auto_build: export BUILD_MODE=release
dh_auto_build
@@ -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 diff --git a/debian/rules.debcargo.hint b/debian/rules.debcargo.hint
index 92c239b..4aaf62a 100755 index 92c239b..4aaf62a 100755
--- a/debian/rules.debcargo.hint --- a/debian/rules.debcargo.hint

17
patches/pve-xtermjs-cross.patch
View File

@@ -1,22 +1,19 @@
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index cd583fb..4f709be 100644 index 01488d1..b398856 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -15,12 +15,12 @@ FITADDONTGZ=xterm-addon-fit-${FITADDONVER}.tgz @@ -22,9 +22,9 @@ DSC=rust-$(CRATENAME)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
SRCDIR=src CARGO ?= cargo
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
ifeq ($(BUILD_MODE), release) ifeq ($(BUILD_MODE), release)
CARGO_BUILD_ARGS += --release CARGO_BUILD_ARGS += --release
-COMPILEDIR := target/release -COMPILEDIR := target/release
+COMPILEDIR := target/aarch64-unknown-linux-gnu/release +COMPILEDIR := target/aarch64-unknown-linux-gnu/release
else else
COMPILEDIR := target/debug -COMPILEDIR := target/debug
+COMPILEDIR := target/aarch64-unknown-linux-gnu/debug
endif endif
PREFIX = /usr
diff --git a/debian/install b/debian/install diff --git a/debian/install b/debian/install
index 0e69d82..bb555a8 100644 index 0e69d82..bb555a8 100644
--- a/debian/install --- a/debian/install