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

update proxmox-termproxy-2.0.2

Browse Source 
Signed-off-by: Wolfgang <github@linux-dude.de>
This commit is contained in:
Wolfgang
2025-07-28 16:42:58 +00:00
parent 839f3b7b76
commit 738f3c7283
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.sh
View File

@@ -386,9 +386,9 @@ fi
[ "${BUILD_PACKAGE}" = "client" ] && exit 0 [ "${BUILD_PACKAGE}" = "client" ] && exit 0
PVE_XTERMJS_VER="5.5.0-2" PVE_XTERMJS_VER="5.5.0-2"
PVE_XTERMJS_GIT="a29b36079fbaf18586615e26bb615992d1007c7e" PVE_XTERMJS_GIT="c69379f49db91429eb01ea56b47f2a2832fec8e7"
PROXMOX_XTERMJS_GIT="deb32a6c4a21bea0d72059de0835fde504296bf0" PROXMOX_XTERMJS_GIT="deb32a6c4a21bea0d72059de0835fde504296bf0"
PROXMOX_TERMPROXY_VER="1.1.0" PROXMOX_TERMPROXY_VER="2.0.2"
if [ ! -e "${PACKAGES}/proxmox-termproxy_${PROXMOX_TERMPROXY_VER}_${PACKAGE_ARCH}.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

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

@@ -15,19 +15,19 @@ index 7b442dc..6a5ba20 100644
[profile.release] [profile.release]
debug = true debug = true
diff --git a/termproxy/Cargo.toml b/termproxy/Cargo.toml diff --git a/termproxy/Cargo.toml b/termproxy/Cargo.toml
index a66e1d6..421f656 100644 index d0325f4..6721965 100644
--- a/termproxy/Cargo.toml --- a/termproxy/Cargo.toml
+++ b/termproxy/Cargo.toml +++ b/termproxy/Cargo.toml
@@ -23,3 +23,7 @@ pico-args = "0.5" @@ -22,3 +22,7 @@ nix = { version = "0.29", features = ["fs", "ioctl", "process", "term"] }
pico-args = "0.5"
proxmox-io = "1" proxmox-io = "1"
proxmox-lang = "1.1" form_urlencoded = "1.2"
form_urlencoded = "1.1"
+ +
+[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-lang = { path = "../proxmox/proxmox-lang" }
diff --git a/termproxy/Makefile b/termproxy/Makefile diff --git a/termproxy/Makefile b/termproxy/Makefile
index d7655b9..b351396 100644 index 5622380..6209365 100644
--- a/termproxy/Makefile --- a/termproxy/Makefile
+++ b/termproxy/Makefile +++ b/termproxy/Makefile
@@ -35,6 +35,13 @@ $(TERMPROXY_BIN): .do-cargo-build @@ -35,6 +35,13 @@ $(TERMPROXY_BIN): .do-cargo-build
@@ -44,25 +44,26 @@ index d7655b9..b351396 100644
.PHONY: cargo-build .PHONY: cargo-build
cargo-build: .do-cargo-build cargo-build: .do-cargo-build
@@ -54,9 +61,10 @@ $(ORIG_SRC_TAR): $(BUILDDIR) @@ -53,10 +60,10 @@ $(ORIG_SRC_TAR): $(BUILDDIR)
.PHONY: deb .PHONY: deb
deb: $(DEB) deb: $(DEB)
$(DBG_DEB): $(DEB) -$(DEB) $(DBG_DEB) &: $(BUILDDIR)
-$(DEB): $(BUILDDIR)
- cd $(BUILDDIR); dpkg-buildpackage -b -uc -us - cd $(BUILDDIR); dpkg-buildpackage -b -uc -us
- lintian $(DEB) - lintian $(DEB)
+$(DEB): cargo-vendor - @echo $(DEB)
+$(DEB) $(DBG_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)
.PHONY: dsc .PHONY: dsc
dsc:
diff --git a/termproxy/debian/control b/termproxy/debian/control diff --git a/termproxy/debian/control b/termproxy/debian/control
index 32ceaf4..583a584 100644 index 1a26f1c..583a584 100644
--- a/termproxy/debian/control --- a/termproxy/debian/control
+++ b/termproxy/debian/control +++ b/termproxy/debian/control
@@ -1,21 +1,8 @@ @@ -1,20 +1,8 @@
Source: proxmox-termproxy Source: proxmox-termproxy
Section: admin Section: admin
Priority: optional Priority: optional
@@ -70,22 +71,21 @@ index 32ceaf4..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-form-urlencoded-dev,
- librust-libc-0.2+default-dev (>= 0.2.107-~~), - librust-libc-0.2+default-dev (>= 0.2.107-~~),
- librust-mio-0.8+default-dev, - librust-mio-1+default-dev,
- librust-mio-0.8+net-dev, - librust-mio-1+net-dev,
- librust-mio-0.8+os-ext-dev, - librust-mio-1+os-ext-dev,
- librust-nix-0.26+default-dev (>= 0.26.1-~~), - librust-nix-0.29+default-dev (>= 0.26.1-~~),
- librust-pico-args-0.5+default-dev, - 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-ureq-2+gzip-dev (>= 2.4-~~),
+Build-Depends: debhelper-compat (= 13), +Build-Depends: debhelper-compat (= 13),
libstd-rust-dev, libstd-rust-dev,
- rustc:native, - rustc:native,
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
@@ -27,7 +14,7 @@ Package: proxmox-termproxy @@ -26,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},