diff --git a/.gear/0001-ALT-set-correct-context-not-None.patch b/.gear/0001-ALT-set-correct-context-not-None.patch new file mode 100644 index 00000000..0439354f --- /dev/null +++ b/.gear/0001-ALT-set-correct-context-not-None.patch @@ -0,0 +1,29 @@ +From 3e04ed627631c0891a825c7011353f7ca863abf8 Mon Sep 17 00:00:00 2001 +From: Alexander Burmatov +Date: Fri, 6 Sep 2024 16:01:29 +0300 +Subject: [PATCH] ALT: set correct context (not None) + +--- + pve-rs/vendor/proxmox-notify/src/context/mod.rs | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/pve-rs/vendor/proxmox-notify/src/context/mod.rs b/pve-rs/vendor/proxmox-notify/src/context/mod.rs +index c0a5a13b..aeaed9c9 100644 +--- a/pve-rs/vendor/proxmox-notify/src/context/mod.rs ++++ b/pve-rs/vendor/proxmox-notify/src/context/mod.rs +@@ -32,8 +32,10 @@ pub trait Context: Send + Sync + Debug { + ) -> Result, Error>; + } + +-#[cfg(not(test))] +-static CONTEXT: Mutex> = Mutex::new(None); ++#[cfg(feature = "pbs-context")] ++static CONTEXT: Mutex> = Mutex::new(Some(&pbs::PBSContext)); ++#[cfg(feature = "pve-context")] ++static CONTEXT: Mutex> = Mutex::new(Some(&pve::PVEContext)); + #[cfg(test)] + static CONTEXT: Mutex> = Mutex::new(Some(&test::TestContext)); + +-- +2.42.2 + diff --git a/.gear/proxmox-perl-rs.spec b/.gear/proxmox-perl-rs.spec index 48fc6303..00920b74 100644 --- a/.gear/proxmox-perl-rs.spec +++ b/.gear/proxmox-perl-rs.spec @@ -3,7 +3,7 @@ Name: proxmox-perl-rs Version: 0.3.3 -Release: alt2 +Release: alt3 Summary: PVE and PMG common parts which have been ported to Rust License: AGPL-3.0+ Group: Development/Other @@ -11,6 +11,7 @@ URL: https://www.proxmox.com Vcs: git://git.proxmox.com/git/proxmox-perl-rs.git Source: %name-%version.tar Patch: %name-%version.patch +Patch1: 0001-ALT-set-correct-context-not-None.patch Source1: genpackage.pl ExclusiveArch: x86_64 aarch64 @@ -18,6 +19,7 @@ ExclusiveArch: x86_64 aarch64 BuildRequires(pre): rpm-macros-rust BuildRequires: rpm-build-rust clang-devel perl-devel BuildRequires: libssl-devel libacl-devel libuuid-devel +BuildRequires: cargo-vendor-checksum BuildRequires: /proc %set_perl_req_method relaxed @@ -37,7 +39,7 @@ Provides: proxmox-rs-perl = %EVR %package -n libpve-rs-perl Summary: PVE parts which have been ported to Rust -Version: 0.8.8 +Version: 0.8.9 Group: Development/Other Provides: pve-perl-rs = %EVR Provides: pve-rs-perl = %EVR @@ -58,6 +60,17 @@ Provides: pmg-rs-perl = %EVR %prep %setup %patch -p1 +%patch1 -p1 +pushd pve-rs +sed -i 's/PL_use_safe_putenv = on ? TRUE : FALSE;//' vendor/perlmod/src/glue.c +cargo-vendor-checksum --vendor vendor -f perlmod/src/glue.c +%ifarch aarch64 +sed -i 's/mut i8/mut u8/' vendor/proxmox-sys/src/fs/dir.rs +# Checksum update for patched files +cargo-vendor-checksum --vendor vendor -f proxmox-sys/src/fs/dir.rs +%endif +cargo-vendor-checksum --vendor vendor -f proxmox-notify/src/context/mod.rs +popd %build export BUILD_MODE=release @@ -107,6 +120,11 @@ LD_LIBRARY_PATH='$LD_LIBRARY_PATH:../target/release' make check %changelog +* Fri Sep 06 2024 Alexander Burmatov 0.3.3-alt3 +- some notifications fixes (thx andy@) +- Update: + + libpve-rs-perl 0.8.9 + * Wed Apr 03 2024 Andrew A. Vasilyev 0.3.3-alt2 - update cargo vendor diff --git a/.gear/rules b/.gear/rules index 8f67e1e9..ece42faa 100644 --- a/.gear/rules +++ b/.gear/rules @@ -2,3 +2,4 @@ spec: .gear/proxmox-perl-rs.spec tar: upstream:. diff: upstream:. . name=@name@-@version@.patch copy?: .gear/*.pl +copy?: .gear/*.patch diff --git a/.gear/tags/list b/.gear/tags/list index 51294113..5c347dcd 100644 --- a/.gear/tags/list +++ b/.gear/tags/list @@ -1 +1 @@ -27a7f2e2529770de8802ce92bc096a67c18b9fa6 upstream +cd0e7b8cd2f3e4ece77e0331fb881d87b91a1c18 upstream