From 86706cc049a7f9695dfd2a7886da8d635e99162b Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Thu, 7 Dec 2023 09:42:16 +0100 Subject: [PATCH] pmg: load SslProbe in Proxmox/Lib/PMG.pm Signed-off-by: Wolfgang Bumiller --- pmg-rs/Fixup.pm | 4 ++++ pmg-rs/Makefile | 8 +++++--- pmg-rs/debian/control | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 pmg-rs/Fixup.pm diff --git a/pmg-rs/Fixup.pm b/pmg-rs/Fixup.pm new file mode 100644 index 00000000..13e10696 --- /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 d738337c..b234cfd8 100644 --- 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 c35bca2e..6d9628b6 100644 --- 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.