update nix to 0.26

it's the version currently shipped by bookworm, so let's unify this widely-used
dependency to make bootstrapping easier.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/Cargo.toml b/Cargo.toml
index cfc81e0e1d156cb4157cca26da20dbbea2654694..7d96d14b5006de15a6f073636f5ae629dedf421a 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -50,7 +50,7 @@ hyper = "0.14.5"
 lazy_static = "1.4"
 libc = "0.2.107"
 log = "0.4.17"
-nix = "0.24.1"
+nix = "0.26.1"
 once_cell = "1.3.1"
 openssl = "0.10"
 percent-encoding = "2.1"

diff --git a/proxmox-rest-server/debian/control b/proxmox-rest-server/debian/control
index d2118df4a394fd4fbd7d97e6df25407cd254008a..3392a93534666b018ce4ced5beb920609b6e608f 100644 (file)
--- a/proxmox-rest-server/debian/control
+++ b/proxmox-rest-server/debian/control
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 12),
  librust-lazy-static-1+default-dev (>= 1.4-~~) <!nocheck>,
  librust-libc-0.2+default-dev (>= 0.2.107-~~) <!nocheck>,
  librust-log-0.4+default-dev (>= 0.4.17-~~) <!nocheck>,
- librust-nix-0.24+default-dev (>= 0.24.1-~~) <!nocheck>,
+ librust-nix-0.26+default-dev (>= 0.26.1-~~) <!nocheck>,
  librust-once-cell-1+default-dev (>= 1.3.1-~~) <!nocheck>,
  librust-percent-encoding-2+default-dev (>= 2.1-~~) <!nocheck>,
  librust-proxmox-async-0.4+default-dev (>= 0.4.1-~~) <!nocheck>,
@@ -64,7 +64,7 @@ Depends:
  librust-lazy-static-1+default-dev (>= 1.4-~~),
  librust-libc-0.2+default-dev (>= 0.2.107-~~),
  librust-log-0.4+default-dev (>= 0.4.17-~~),
- librust-nix-0.24+default-dev (>= 0.24.1-~~),
+ librust-nix-0.26+default-dev (>= 0.26.1-~~),
  librust-once-cell-1+default-dev (>= 1.3.1-~~),
  librust-percent-encoding-2+default-dev (>= 2.1-~~),
  librust-proxmox-async-0.4+default-dev (>= 0.4.1-~~),

diff --git a/proxmox-router/debian/control b/proxmox-router/debian/control
index 2e866aa860ae4cfd29e54f405589726a00e6f6bb..7f753271de2f7c4201505bfdb69cd6b59085570b 100644 (file)
--- a/proxmox-router/debian/control
+++ b/proxmox-router/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 12),
  librust-hyper-0.14+default-dev (>= 0.14.5-~~) <!nocheck>,
  librust-hyper-0.14+full-dev (>= 0.14.5-~~) <!nocheck>,
  librust-libc-0.2+default-dev (>= 0.2.107-~~) <!nocheck>,
- librust-nix-0.24+default-dev (>= 0.24.1-~~) <!nocheck>,
+ librust-nix-0.26+default-dev (>= 0.26.1-~~) <!nocheck>,
  librust-percent-encoding-2+default-dev (>= 2.1-~~) <!nocheck>,
  librust-proxmox-async-0.4+default-dev (>= 0.4.1-~~) <!nocheck>,
  librust-proxmox-lang-1+default-dev (>= 1.1-~~) <!nocheck>,
@@ -35,7 +35,7 @@ Multi-Arch: same
 Depends:
  ${misc:Depends},
  librust-anyhow-1+default-dev,
- librust-nix-0.24+default-dev (>= 0.24.1-~~),
+ librust-nix-0.26+default-dev (>= 0.26.1-~~),
  librust-percent-encoding-2+default-dev (>= 2.1-~~),
  librust-proxmox-async-0.4+default-dev (>= 0.4.1-~~),
  librust-proxmox-lang-1+default-dev (>= 1.1-~~),

diff --git a/proxmox-schema/debian/control b/proxmox-schema/debian/control
index cd605f103a2299a0bf1edbeee624050a985c6405..7a690041d4b3fdd50563a5a672514c90ce3ba6ad 100644 (file)
--- a/proxmox-schema/debian/control
+++ b/proxmox-schema/debian/control
@@ -71,7 +71,7 @@ Depends:
  ${misc:Depends},
  librust-proxmox-schema-dev (= ${binary:Version}),
  librust-libc-0.2+default-dev (>= 0.2.107-~~),
- librust-nix-0.24+default-dev (>= 0.24.1-~~)
+ librust-nix-0.26+default-dev (>= 0.26.1-~~)
 Provides:
  librust-proxmox-schema-1+upid-api-impl-dev (= ${binary:Version}),
  librust-proxmox-schema-1.3+upid-api-impl-dev (= ${binary:Version}),

diff --git a/proxmox-shared-memory/debian/control b/proxmox-shared-memory/debian/control
index 9c9a4796b18bc5729ed0c9c889880865d1e316d6..2456189835e60eac032e9ac7ce8fe41e380bc95c 100644 (file)
--- a/proxmox-shared-memory/debian/control
+++ b/proxmox-shared-memory/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 12),
  libstd-rust-dev <!nocheck>,
  librust-anyhow-1+default-dev <!nocheck>,
  librust-libc-0.2+default-dev (>= 0.2.107-~~) <!nocheck>,
- librust-nix-0.24+default-dev (>= 0.24.1-~~) <!nocheck>,
+ librust-nix-0.26+default-dev (>= 0.26.1-~~) <!nocheck>,
  librust-proxmox-sys-0.4+default-dev (>= 0.4.1-~~) <!nocheck>
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Standards-Version: 4.6.1
@@ -24,7 +24,7 @@ Depends:
  ${misc:Depends},
  librust-anyhow-1+default-dev,
  librust-libc-0.2+default-dev (>= 0.2.107-~~),
- librust-nix-0.24+default-dev (>= 0.24.1-~~),
+ librust-nix-0.26+default-dev (>= 0.26.1-~~),
  librust-proxmox-sys-0.4+default-dev (>= 0.4.1-~~)
 Provides:
  librust-proxmox-shared-memory+default-dev (= ${binary:Version}),

diff --git a/proxmox-sys/debian/control b/proxmox-sys/debian/control
index fd2d7a5680a86d11bb312069c1563af533dca680..45077e57f3d1bd227f4ff14f91510fe2856078c3 100644 (file)
--- a/proxmox-sys/debian/control
+++ b/proxmox-sys/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 12),
  librust-lazy-static-1+default-dev (>= 1.4-~~) <!nocheck>,
  librust-libc-0.2+default-dev (>= 0.2.107-~~) <!nocheck>,
  librust-log-0.4+default-dev (>= 0.4.17-~~) <!nocheck>,
- librust-nix-0.24+default-dev (>= 0.24.1-~~) <!nocheck>,
+ librust-nix-0.26+default-dev (>= 0.26.1-~~) <!nocheck>,
  librust-proxmox-io-1+default-dev <!nocheck>,
  librust-proxmox-lang-1+default-dev (>= 1.1-~~) <!nocheck>,
  librust-proxmox-time-1+default-dev (>= 1.1.4-~~) <!nocheck>,
@@ -38,7 +38,7 @@ Depends:
  librust-lazy-static-1+default-dev (>= 1.4-~~),
  librust-libc-0.2+default-dev (>= 0.2.107-~~),
  librust-log-0.4+default-dev (>= 0.4.17-~~),
- librust-nix-0.24+default-dev (>= 0.24.1-~~),
+ librust-nix-0.26+default-dev (>= 0.26.1-~~),
  librust-proxmox-io-1+default-dev,
  librust-proxmox-lang-1+default-dev (>= 1.1-~~),
  librust-proxmox-time-1+default-dev (>= 1.1.4-~~),

diff --git a/proxmox-sys/src/mmap.rs b/proxmox-sys/src/mmap.rs
index a112ef213df61e7e2c1a2a49f2dcbc34af11f7db..1ce19e5c3da476425359dddf3f38458d1645a5b6 100644 (file)
--- a/proxmox-sys/src/mmap.rs
+++ b/proxmox-sys/src/mmap.rs
@@ -2,9 +2,11 @@
 
 use std::convert::TryFrom;
 use std::mem::MaybeUninit;
+use std::num::NonZeroUsize;
 use std::os::unix::io::RawFd;
-use std::{io, mem, ptr};
+use std::{io, mem};
 
+use anyhow::format_err;
 use nix::sys::mman;
 
 use proxmox_lang::error::io_err_other;
@@ -32,12 +34,14 @@ impl<T> Mmap<T> {
         prot: mman::ProtFlags,
         flags: mman::MapFlags,
     ) -> io::Result<Self> {
-        let byte_len = count * mem::size_of::<T>();
+        let byte_len = NonZeroUsize::new(count * mem::size_of::<T>())
+            .ok_or(io_err_other(format_err!("mapped length must not be zero")))?;
+
         // libc::size_t vs usize
         #[allow(clippy::useless_conversion)]
         let data = mman::mmap(
-            ptr::null_mut(),
-            libc::size_t::try_from(byte_len).map_err(io_err_other)?,
+            None,
+            byte_len,
             prot,
             flags,
             fd,