Skip to content

Commit d95f07f

Browse files
committed
Add v4.0.5
1 parent c1bd7b5 commit d95f07f

20 files changed

+141
-266
lines changed

dockerfiles/Dockerfile.build

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG ARCH=
2-
FROM ${ARCH}debian:bookworm AS toolchain
2+
FROM ${ARCH}debian:trixie AS toolchain
33

44
RUN apt-get -y update && \
55
apt-get -y install \
@@ -36,6 +36,7 @@ ADD /scripts /src/scripts
3636
ADD /repos /src/repos
3737

3838
RUN ./scripts/repo.bash pve-eslint make_dinstall
39+
RUN ./scripts/repo.bash proxmox-biome make_dinstall
3940
RUN ./scripts/repo.bash proxmox-widget-toolkit make_dinstall
4041
RUN ./scripts/repo.bash perlmod "dpkg_build perlmod-bin" "dpkg_install"
4142
RUN ./scripts/repo.bash proxmox-perl-rs "make_deb common/pkg" "make_deb pve-rs" dpkg_install
@@ -50,7 +51,7 @@ RUN ./scripts/repo.bash proxmox-backup make_deb
5051

5152
#=================================
5253

53-
FROM ${ARCH}debian:bookworm AS deb_env
54+
FROM ${ARCH}debian:trixie AS deb_env
5455

5556
# Generate release package
5657
COPY --from=builder /src/release/ /release/
@@ -63,7 +64,7 @@ RUN /dockerfiles/scripts/bundle-server.bash
6364

6465
#=================================
6566

66-
FROM ${ARCH}debian:bookworm
67+
FROM ${ARCH}debian:trixie
6768

6869
# Copy packages
6970
COPY --from=deb_env /release/ /release/

dockerfiles/Dockerfile.client

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG ARCH=
2-
FROM ${ARCH}debian:bookworm AS builder
2+
FROM ${ARCH}debian:trixie AS builder
33

44
RUN apt-get -y update && \
55
apt-get -y install \
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/Cargo.toml b/Cargo.toml
2+
index ea413328..b2980c73 100644
3+
--- a/Cargo.toml
4+
+++ b/Cargo.toml
5+
@@ -160,7 +160,7 @@ udev = "0.9"
6+
url = "2.1"
7+
walkdir = "2"
8+
xdg = "2.2"
9+
-zstd = "0.13"
10+
+zstd = { version = "0.13", default-features = false, features = ["pkg-config"] }
11+
zstd-safe = "7"
12+
13+
[dependencies]

repos/patches/proxmox-backup/no-cargo.patch renamed to repos/patches/proxmox-backup/debian-cargo-config.patch

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
diff --git a/debian/rules b/debian/rules
2-
index c8d814af..51bc30cc 100755
2+
index aa4571ff..0fbb29e7 100755
33
--- a/debian/rules
44
+++ b/debian/rules
5-
@@ -28,7 +28,7 @@ endif
5+
@@ -38,9 +38,9 @@ endif
66
override_dh_auto_configure:
77
@perl -ne 'if (/^version\s*=\s*"(\d+(?:\.\d+)+)"/) { my $$v_cargo = $$1; my $$v_deb = "$(DEB_VERSION_UPSTREAM)"; \
88
die "ERROR: d/changelog <-> Cargo.toml version mismatch: $$v_cargo != $$v_deb\n" if $$v_cargo ne $$v_deb; exit(0); }' Cargo.toml
99
- $(CARGO) prepare-debian $(CURDIR)/debian/cargo_registry --link-from-system
1010
+ #$(CARGO) prepare-debian --help $(CURDIR)/debian/cargo_registry --link-from-system
11+
# add a new config for static building, sync with Makefile!
12+
- cp debian/cargo_home/config.toml debian/cargo_home/config.static.toml
13+
+ mkdir -p $(CARGO_HOME); touch $(CARGO_HOME)/config.toml; cp $(CARGO_HOME)/config.toml debian/cargo_home/config.static.toml
14+
sed -ri -e 's!^(rustflags = .*)\]$$!\1, "-C", "target-feature=+crt-static", "-L", "$(STATIC_COMPILEDIR)/deps-stubs/"\]!' debian/cargo_home/config.static.toml
1115
# `cargo build` and `cargo install` have different config precedence, symlink
1216
# the wrapper config into a place where `build` picks it up as well..
13-
# https://doc.rust-lang.org/cargo/commands/cargo-install.html#configuration-discovery

repos/patches/proxmox-backup/fix-cargo.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
diff --git a/debian/rules b/debian/rules
2-
index 70cec475..2fead34f 100755
2+
index ab48cce1..0a540d4f 100755
33
--- a/debian/rules
44
+++ b/debian/rules
5-
@@ -8,7 +8,7 @@ include /usr/share/rustc/architecture.mk
6-
7-
export BUILD_MODE=release
5+
@@ -18,7 +18,7 @@ STATIC_COMPILEDIR := $(STATIC_TARGET_DIR)/$(DEB_HOST_RUST_TYPE)/debug
6+
endif
7+
# end sync with Makefile!
88

99
-export CARGO=/usr/share/cargo/bin/cargo
1010
+export CARGO=/usr/bin/cargo
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
diff --git a/www/panel/NodeInfo.js b/www/panel/NodeInfo.js
2-
index 9d741e45..5196f64b 100644
2+
index a8673f6b..1ead89bd 100644
33
--- a/www/panel/NodeInfo.js
44
+++ b/www/panel/NodeInfo.js
55
@@ -150,7 +150,7 @@ Ext.define('PBS.NodeInfoPanel', {
6-
return data.kversion;
7-
}
8-
let kernel = data['current-kernel'];
9-
- let buildDate = kernel.version.match(/\((.+)\)\s*$/)?.[1] ?? 'unknown';
10-
+ let buildDate = kernel.version;
11-
return `${kernel.sysname} ${kernel.release} (${buildDate})`;
12-
},
13-
value: '',
6+
return data.kversion;
7+
}
8+
let kernel = data['current-kernel'];
9+
- let buildDate = kernel.version.match(/\((.+)\)\s*$/)?.[1] ?? 'unknown';
10+
+ let buildDate = kernel.version;
11+
return `${kernel.sysname} ${kernel.release} (${buildDate})`;
12+
},
13+
value: '',
Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
diff --git a/www/NavigationTree.js b/www/NavigationTree.js
2-
index f10b0cd6..67ea1141 100644
2+
index 649692c8..cec8d5a9 100644
33
--- a/www/NavigationTree.js
44
+++ b/www/NavigationTree.js
5-
@@ -89,12 +89,6 @@ Ext.define('PBS.store.NavigationStore', {
6-
expanded: true,
7-
leaf: false,
8-
children: [
9-
- {
10-
- text: gettext('Shell'),
11-
- iconCls: 'fa fa-terminal',
12-
- path: 'pbsXtermJsConsole',
13-
- leaf: true,
14-
- },
15-
{
16-
text: gettext('Storage / Disks'),
17-
iconCls: 'fa fa-hdd-o',
5+
@@ -95,12 +95,6 @@ Ext.define('PBS.store.NavigationStore', {
6+
expanded: true,
7+
leaf: false,
8+
children: [
9+
- {
10+
- text: gettext('Shell'),
11+
- iconCls: 'fa fa-terminal',
12+
- path: 'pbsXtermJsConsole',
13+
- leaf: true,
14+
- },
15+
{
16+
text: gettext('Storage / Disks'),
17+
iconCls: 'fa fa-hdd-o',

repos/patches/proxmox-backup/multi-arch.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ index 409988a3..8b4034bd
1414
diff --git a/debian/proxmox-backup-server.install b/debian/proxmox-backup-server.install
1515
old mode 100644
1616
new mode 100755
17-
index 71b185be..8d1ddc28
17+
index 40d8459f..466bd621
1818
--- a/debian/proxmox-backup-server.install
1919
+++ b/debian/proxmox-backup-server.install
2020
@@ -1,3 +1,4 @@
2121
+#! /usr/bin/dh-exec
22-
etc/pbs-enterprise.list /etc/apt/sources.list.d/
23-
etc/proxmox-backup-banner.service /lib/systemd/system/
24-
etc/proxmox-backup-daily-update.service /lib/systemd/system/
25-
@@ -8,11 +9,11 @@ etc/[email protected] /lib/systemd/system/
22+
etc/pbs-enterprise.sources /etc/apt/sources.list.d/
23+
etc/proxmox-backup-banner.service /usr/lib/systemd/system/
24+
etc/proxmox-backup-daily-update.service /usr/lib/systemd/system/
25+
@@ -8,11 +9,11 @@ etc/[email protected] /usr/lib/systemd/system/
2626
usr/bin/pmt
2727
usr/bin/pmtx
2828
usr/bin/proxmox-tape
@@ -36,11 +36,11 @@ index 71b185be..8d1ddc28
3636
+usr/lib/${DEB_HOST_MULTIARCH}/proxmox-backup/proxmox-backup-proxy
3737
+usr/lib/${DEB_HOST_MULTIARCH}/proxmox-backup/proxmox-daily-update
3838
+usr/lib/${DEB_HOST_MULTIARCH}/proxmox-backup/sg-tape-cmd
39-
usr/sbin/pbs2to3
39+
usr/sbin/pbs3to4
4040
usr/sbin/proxmox-backup-debug
4141
usr/sbin/proxmox-backup-manager
4242
diff --git a/debian/rules b/debian/rules
43-
index 2fead34f..c8d814af 100755
43+
index 0a540d4f..aa4571ff 100755
4444
--- a/debian/rules
4545
+++ b/debian/rules
4646
@@ -2,6 +2,7 @@

repos/patches/proxmox-backup/revert-h2-legacy.patch

Lines changed: 0 additions & 175 deletions
This file was deleted.

repos/patches/proxmox-backup/revert-h2-to-0.3-to-fix-http-err.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)