From 16c41f1a91e32ff189395e3bd8ef515850673422 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Thu, 7 Dec 2023 09:51:02 +0100 Subject: [PATCH] pve: load SslProbe in Proxmox/Lib/PVE.pm Signed-off-by: Wolfgang Bumiller --- pve-rs/Fixup.pm | 4 ++++ pve-rs/Makefile | 6 ++++-- pve-rs/debian/control | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 pve-rs/Fixup.pm diff --git a/pve-rs/Fixup.pm b/pve-rs/Fixup.pm new file mode 100644 index 0000000..13e1069 --- /dev/null +++ b/pve-rs/Fixup.pm @@ -0,0 +1,4 @@ +# BEGIN Fixup.pm +# This is prepended to the current PMG.pm to force-include the temporary `openssl-probe` fixup. +use Proxmox::Lib::SslProbe; +# END Fixup.pm diff --git a/pve-rs/Makefile b/pve-rs/Makefile index de35c69..045f555 100644 --- a/pve-rs/Makefile +++ b/pve-rs/Makefile @@ -45,9 +45,10 @@ all: PVE 's@^sub libdirs.*$$@sub libdirs { return ("./target/$(TARGET_DIR)", "./../target/$(TARGET_DIR)"); }@' \ Proxmox/Lib/PVE.pm >test/Proxmox/Lib/PVE.pm -PVE: Proxmox/Lib/PVE.pm -Proxmox/Lib/PVE.pm: +Proxmox PVE: Proxmox/Lib/PVE.pm +Proxmox/Lib/PVE.pm: Fixup.pm $(PERLMOD_GENPACKAGE) $(PERLMOD_PACKAGES) + sed -i -e '/package Proxmox/rFixup.pm' Proxmox/Lib/PMG.pm check: all $(MAKE) -C test test @@ -62,6 +63,7 @@ install: target/release/libpve_rs.so Proxmox/Lib/PVE.pm PVE find $(PM_DIR) \! -type d -print -exec install -Dm644 '{}' $(DESTDIR)$(PERL_INSTALLVENDORLIB)'/{}' ';' clean: + rm -rf PVE Proxmox cargo clean rm -f *.deb *.dsc *.tar.* *.build *.buildinfo *.changes Cargo.lock rm -rf $(PACKAGE)-[0-9]*/ diff --git a/pve-rs/debian/control b/pve-rs/debian/control index 75de26e..ae5e4eb 100644 --- a/pve-rs/debian/control +++ b/pve-rs/debian/control @@ -45,7 +45,10 @@ Rules-Requires-Root: no Package: libpve-rs-perl Architecture: any -Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, +Depends: ${misc:Depends}, + ${perl:Depends}, + ${shlibs:Depends}, + libproxmox-rs-perl (>= 0.3.3), Breaks: libpve-access-control (<< 7.1-3), libpve-common-perl (<< 7.1-4), pve-manager (<< 7.1-11),