pmg: load SslProbe in Proxmox/Lib/PMG.pm

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

diff --git a/pmg-rs/Fixup.pm b/pmg-rs/Fixup.pm
new file mode 100644 (file)
index 0000000..13e1069
--- /dev/null
+++ b/pmg-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/pmg-rs/Makefile b/pmg-rs/Makefile
index d738337cf6222a035e247950c0af1a341ff1016f..b234cfd802d45595dcd74c97a5267b2f13d01c1b 100644 (file)
--- a/pmg-rs/Makefile
+++ b/pmg-rs/Makefile
@@ -41,9 +41,10 @@ endif
 all: PMG
        cargo build $(CARGO_BUILD_ARGS)
 
-PMG: Proxmox/Lib/PMG.pm
-Proxmox/Lib/PMG.pm:
+Proxmox PMG: Proxmox/Lib/PMG.pm
+Proxmox/Lib/PMG.pm: Fixup.pm
        $(PERLMOD_GENPACKAGE) $(PERLMOD_PACKAGES)
+       sed -i -e '/package Proxmox/rFixup.pm' Proxmox/Lib/PMG.pm
 
 .PHONY: install
 install: target/release/libpmg_rs.so Proxmox/Lib/PMG.pm PMG
@@ -56,6 +57,7 @@ install: target/release/libpmg_rs.so Proxmox/Lib/PMG.pm PMG
 
 distclean: clean
 clean:
+       rm -rf PMG Proxmox
        cargo clean
        rm -f *.deb *.dsc *.tar.* *.build *.buildinfo *.changes Cargo.lock
        rm -rf $(PACKAGE)-[0-9]*/
@@ -75,7 +77,7 @@ $(BUILDDIR): src debian common/src Cargo.toml Makefile .cargo/config
        rm -rf $(BUILDDIR) $(BUILDDIR).tmp
        mkdir $(BUILDDIR).tmp
        mkdir $(BUILDDIR).tmp/common
-       cp -a -t $(BUILDDIR).tmp src debian Cargo.toml Makefile .cargo
+       cp -a -t $(BUILDDIR).tmp src debian Cargo.toml Makefile .cargo Fixup.pm
        cp -a -t $(BUILDDIR).tmp/common common/src
        mv $(BUILDDIR).tmp $(BUILDDIR)
 

diff --git a/pmg-rs/debian/control b/pmg-rs/debian/control
index c35bca2e3459ea5561f65a5f22784fd1d8e159ce..6d9628b64101fa3208246bbe004c352997013e83 100644 (file)
--- a/pmg-rs/debian/control
+++ b/pmg-rs/debian/control
@@ -45,6 +45,7 @@ Architecture: any
 Depends: ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends},
+         libproxmox-rs-perl (>= 0.3.3),
 Description: Components of Proxmox Mail Gateway which have been ported to Rust.
  Contains parts of Proxmox Mail Gateway which have been ported to, or newly
  implemented in the Rust programming language.