pve: load SslProbe in Proxmox/Lib/PVE.pm

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/pve-rs/Fixup.pm b/pve-rs/Fixup.pm
new file mode 100644 (file)
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 de35c699e0dc7fe3066d122d965a1121bb6fd55d..045f5556e5d92a4ba3dbec9334b088a979980de7 100644 (file)
--- 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 75de26e5c1933b055a53cc5c48c73d32d43ee5fa..ae5e4eb890ed6ae39b998f504d3e2ecea335db6d 100644 (file)
--- 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),