Add v2.3.2

scripts/strip-cargo.bash

@@ -7,14 +7,22 @@ for package in *; do
     rm -v "$package/.cargo/config"
   fi
 
-  # remove ex.: librust-anyhow-1+default-dev
   if [[ -f "$package/debian/control" ]]; then
     echo "Stripping '$package/debian/control'..."
-    sed -i 's/librust-.*-dev[^,]*/libstd-rust-dev/g' "$package/debian/control"
+
+    # remove ex.: librust-anyhow-1+default-dev (when it ends with `,`)
+    sed -i '/^\s*librust-.*-dev[^,]*,/d' "$package/debian/control"
+
+    # in some cases just replace to `libstd-rust-dev`
+    sed -i 's/^\s*librust-.*-dev[^,]*/ libstd-rust-dev/g' "$package/debian/control"
+
+    # change `cargo:native (>= 0.65.0-1),` to `cargo:native <!nocheck>`
+    sed -i 's/cargo:native\s*(>=.*)/cargo:native <!nocheck>/g' "$package/debian/control"
   fi
 
   git -C "$package" add .
   if ! git -C "$package" diff --cached --exit-code --quiet; then
+    git -C "$package" diff --cached | cat
     git -C "$package" commit -m "strip-cargo.bash"
   fi
 done

versions/v2.3.2/clone.bash

@@ -0,0 +1,56 @@
+#!/bin/bash
+
+set -eo pipefail
+
+SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+
+if [[ "$1" == "show-sha" ]]; then
+  VERSION="${2:-master}"
+  VERSION_DATE=""
+
+  tmp_dir=$(mktemp -d -t ci-XXXXXXXXXX)
+  cd "$tmp_dir/"
+  trap 'cd ; rm -rf $tmp_dir' EXIT
+
+  perform() {
+    git clone "git://git.proxmox.com/git/$1.git" 2>/dev/null
+    if [[ -z "$VERSION_TIMESTAMP" ]]; then
+      REVISION=$(git -C "$1" rev-parse "$VERSION")
+      VERSION_TIMESTAMP=$(git -C "$1" log -1 --format=%ct "$VERSION")
+    else
+      while read TIMESTAMP REVISION; do
+        if [[ $TIMESTAMP -le $VERSION_TIMESTAMP ]]; then
+          break
+        fi
+      done < <(git -C "$1" log --format="%ct %H")
+    fi
+
+    CHANGE_TIME=$(git -C "$1" log -1 --format="%cd" $REVISION)
+
+    echo "$1 $REVISION # $CHANGE_TIME"
+  }
+else
+  if [[ -n "$1" ]]; then
+    cd "$1"
+  fi
+
+  perform() {
+    if [[ ! -d "$1" ]]; then
+      git clone "git://git.proxmox.com/git/$1.git"
+    else
+      git -C "$1" fetch
+    fi
+    git -C "$1" checkout "$2" -f
+    git -C "$1" clean -fdx
+  }
+fi
+
+if [[ ! -e "$SCRIPT_DIR/versions" ]]; then
+  echo "Missing 'versions' file."
+  exit 1
+fi
+
+while read REPO COMMIT_SHA REST; do
+  echo "$REPO $COMMIT_SHA..." 1>&2
+  perform "$REPO" "$COMMIT_SHA"
+done < "$SCRIPT_DIR/versions"

versions/v2.3.2/server/proxmox-backup~cargo-config.patch

@@ -0,0 +1,50 @@
+commit 1b425b8fd31147524f81c549ccbf0318a75f1c9e
+Author: Kamil Trzciński <ayufan@ayufan.eu>
+Date:   Sat May 1 14:40:06 2021 +0200
+
+    Support local compile
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 2804632c..2854259b 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -105,7 +105,7 @@ pbs-tools = { path = "pbs-tools" }
+
+ # Local path overrides
+ # NOTE: You must run `cargo update` after changing this for it to take effect!
+-[patch.crates-io]
++#[patch.crates-io]
+ #proxmox-acme-rs = { path = "../proxmox-acme-rs" }
+ #proxmox-apt = { path = "../proxmox-apt" }
+ #proxmox-async = { path = "../proxmox/proxmox-async" }
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -134,3 +134,28 @@ pbs-tape = { path = "pbs-tape" }
+ [features]
+ default = []
+ #valgrind = ["valgrind_request"]
++
++[patch.crates-io]
++proxmox-acme-rs = { path = "../proxmox-acme-rs" }
++proxmox-apt = { path = "../proxmox-apt" }
++proxmox-async = { path = "../proxmox/proxmox-async" }
++proxmox-compression = { path = "../proxmox/proxmox-compression" }
++proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
++proxmox-fuse = { path = "../proxmox-fuse" }
++proxmox-http = { path = "../proxmox/proxmox-http" }
++proxmox-io = { path = "../proxmox/proxmox-io" }
++proxmox-lang = { path = "../proxmox/proxmox-lang" }
++proxmox-openid = { path = "../proxmox-openid-rs" }
++proxmox-router = { path = "../proxmox/proxmox-router" }
++proxmox-schema = { path = "../proxmox/proxmox-schema" }
++proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
++proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
++proxmox-sys = { path = "../proxmox/proxmox-sys" }
++proxmox-serde = { path = "../proxmox/proxmox-serde" }
++proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
++proxmox-time = { path = "../proxmox/proxmox-time" }
++proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
++pxar = { path = "../pxar" }
++proxmox-metrics = { path = "../proxmox/proxmox-metrics" }
++proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" }
++proxmox-subscription = { path = "../proxmox/proxmox-subscription" }

versions/v2.3.2/server/proxmox-backup~hide-shell.patch

@@ -0,0 +1,17 @@
+diff --git a/www/NavigationTree.js b/www/NavigationTree.js
+index 576d05ab..7ba9955a 100644
+--- a/www/NavigationTree.js
++++ b/www/NavigationTree.js
+@@ -77,12 +77,6 @@ Ext.define('PBS.store.NavigationStore', {
+ 		expanded: true,
+ 		leaf: false,
+ 		children: [
+-		    {
+-			text: gettext('Shell'),
+-			iconCls: 'fa fa-terminal',
+-			path: 'pbsXtermJsConsole',
+-			leaf: true,
+-		    },
+ 		    {
+ 			text: gettext('Storage / Disks'),
+ 			iconCls: 'fa fa-hdd-o',

versions/v2.3.2/server/proxmox-backup~multi-arch.patch

@@ -0,0 +1,58 @@
+commit 1b425b8fd31147524f81c549ccbf0318a75f1c9e
+Author: Kamil Trzciński <ayufan@ayufan.eu>
+Date:   Sat May 1 14:40:06 2021 +0200
+
+    Support local compile
+
+diff --git a/debian/proxmox-backup-file-restore.install b/debian/proxmox-backup-file-restore.install
+old mode 100644
+new mode 100755
+index d952836e..e6888c5f
+--- a/debian/proxmox-backup-file-restore.install
++++ b/debian/proxmox-backup-file-restore.install
+@@ -1,4 +1,5 @@
++#! /usr/bin/dh-exec
+ usr/bin/proxmox-file-restore
+ usr/share/man/man1/proxmox-file-restore.1
+ usr/share/zsh/vendor-completions/_proxmox-file-restore
+-usr/lib/x86_64-linux-gnu/proxmox-backup/file-restore/proxmox-restore-daemon
++usr/lib/${DEB_HOST_MULTIARCH}/proxmox-backup/file-restore/proxmox-restore-daemon
+diff --git a/debian/proxmox-backup-server.install b/debian/proxmox-backup-server.install
+old mode 100644
+new mode 100755
+index cebf84a3..fa96f93e
+--- a/debian/proxmox-backup-server.install
++++ b/debian/proxmox-backup-server.install
+@@ -1,14 +1,15 @@
++#! /usr/bin/dh-exec
+ etc/proxmox-backup-proxy.service /lib/systemd/system/
+ etc/proxmox-backup.service /lib/systemd/system/
+ etc/proxmox-backup-banner.service /lib/systemd/system/
+ etc/proxmox-backup-daily-update.service /lib/systemd/system/
+ etc/proxmox-backup-daily-update.timer /lib/systemd/system/
+ etc/pbs-enterprise.list /etc/apt/sources.list.d/
+-usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-api
+-usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-proxy
+-usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-banner
+-usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-daily-update
+-usr/lib/x86_64-linux-gnu/proxmox-backup/sg-tape-cmd
++usr/lib/${DEB_HOST_MULTIARCH}/proxmox-backup/proxmox-backup-api
++usr/lib/${DEB_HOST_MULTIARCH}/proxmox-backup/proxmox-backup-proxy
++usr/lib/${DEB_HOST_MULTIARCH}/proxmox-backup/proxmox-backup-banner
++usr/lib/${DEB_HOST_MULTIARCH}/proxmox-backup/proxmox-daily-update
++usr/lib/${DEB_HOST_MULTIARCH}/proxmox-backup/sg-tape-cmd
+ usr/sbin/proxmox-backup-debug
+ usr/sbin/proxmox-backup-manager
+ usr/bin/pmtx
+diff --git a/debian/rules b/debian/rules
+index 4fc6de8f..fcbf7e93 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -2,6 +2,7 @@
+ # See debhelper(7) (uncomment to enable)
+ # output every command that modifies files on the build system.
+ DH_VERBOSE = 1
++DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) 
+
+ include /usr/share/dpkg/pkg-info.mk
+ include /usr/share/rustc/architecture.mk

versions/v2.3.2/server/proxmox-backup~no-cargo.patch

@@ -0,0 +1,19 @@
+commit 1b425b8fd31147524f81c549ccbf0318a75f1c9e
+Author: Kamil Trzciński <ayufan@ayufan.eu>
+Date:   Sat May 1 14:40:06 2021 +0200
+
+    Support local compile
+
+diff --git a/debian/rules b/debian/rules
+index 4fc6de8f..fcbf7e93 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -21,7 +22,7 @@ export DEB_CARGO_PACKAGE=proxmox-backup
+ 	dh $@ --with=bash-completion
+
+ override_dh_auto_configure:
+-	$(CARGO) prepare-debian $(CURDIR)/debian/cargo_registry --link-from-system
++	#$(CARGO) prepare-debian --help $(CURDIR)/debian/cargo_registry --link-from-system
+ 	dh_auto_configure
+
+ override_dh_auto_build:

versions/v2.3.2/server/proxmox-mini-journalreader.patch

@@ -0,0 +1,13 @@
+diff --git a/src/Makefile b/src/Makefile
+index ea8af24..d7f1351 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -2,7 +2,7 @@ PROGRAM=mini-journalreader
+ SOURCES=mini-journalreader.c
+
+ LIBS := libsystemd
+-CFLAGS += -Werror -Wall -Wextra -Wl,-z,relro -g -O2
++CFLAGS += -Wall -Wextra -Wl,-z,relro -g -O2
+ CFLAGS += -fstack-protector-strong -D_FORTIFY_SOURCE=2
+ CFLAGS += $(shell pkg-config --cflags ${LIBS})
+ LFLAGS += $(shell pkg-config --libs ${LIBS})

versions/v2.3.2/server/proxmox~fix-ksm-pages_sharing.patch

@@ -0,0 +1,17 @@
+diff --git a/proxmox-sys/src/sys/linux/procfs/mod.rs b/proxmox-sys/src/sys/linux/procfs/mod.rs
+index 5784e0e..089a798 100644
+--- a/proxmox-sys/src/linux/procfs/mod.rs
++++ b/proxmox-sys/src/linux/procfs/mod.rs
+@@ -455,8 +456,10 @@ pub fn read_meminfo() -> Result<ProcFsMemInfo, Error> {
+
+     meminfo.swapused = meminfo.swaptotal - meminfo.swapfree;
+
+-    let spages_line = file_read_firstline("/sys/kernel/mm/ksm/pages_sharing")?;
+-    meminfo.memshared = spages_line.trim_end().parse::<u64>()? * 4096;
++    match file_read_firstline("/sys/kernel/mm/ksm/pages_sharing") {
++        Ok(spages_line) => meminfo.memshared = spages_line.trim_end().parse::<u64>()? * 4096,
++        Err(_) => meminfo.memshared = 0,
++    }
+
+     Ok(meminfo)
+ }

versions/v2.3.2/server/proxmox~fix-result-ok.patch

@@ -0,0 +1,30 @@
+diff --git a/proxmox-router/src/cli/command.rs b/proxmox-router/src/cli/command.rs
+index 906ec0c..2a396e2 100644
+--- a/proxmox-router/src/cli/command.rs
++++ b/proxmox-router/src/cli/command.rs
+@@ -2,6 +2,7 @@ use anyhow::*;
+ use serde_json::Value;
+ use std::cell::RefCell;
+ use std::sync::Arc;
++use std::result::Result::Ok;
+
+ use proxmox_schema::*;
+ use proxmox_schema::format::DocumentationFormat;
+diff --git a/proxmox-sys/src/linux/procfs/mod.rs b/proxmox-sys/src/linux/procfs/mod.rs
+index 5784e0e..e503b5f 100644
+--- a/proxmox-sys/src/linux/procfs/mod.rs
++++ b/proxmox-sys/src/linux/procfs/mod.rs
+@@ -1,3 +1,4 @@
++use std::result::Result::Ok;
+ use std::collections::HashSet;
+ use std::convert::TryFrom;
+ use std::fmt;
+diff --git a/proxmox/src/sys/linux/tty.rs b/proxmox-sys/src/sys/linux/tty.rs
+index 0b4a3c1..e7a7847 100644
+--- a/proxmox-sys/src/linux/tty.rs
++++ b/proxmox-sys/src/linux/tty.rs
+@@ -1,3 +1,4 @@
++use std::result::Result::Ok;
+ use std::io::{self, Read, Write};
+ use std::mem::MaybeUninit;
+ use std::os::unix::io::AsRawFd;