diff --git a/build-dlm_controld-disable-annobin-plugin.patch b/build-dlm_controld-disable-annobin-plugin.patch new file mode 100644 index 0000000000000000000000000000000000000000..8ac62d35d795653df8cfd7520719a988fc4b9448 --- /dev/null +++ b/build-dlm_controld-disable-annobin-plugin.patch @@ -0,0 +1,37 @@ +From 346f9e3dd25cbdc2a45b9d97720405daf2696e04 Mon Sep 17 00:00:00 2001 +From: Fabio M. Di Nitto +Date: Apr 18 2023 05:31:00 +0000 +Subject: build: dlm_controld disable annobin plugin + + +annobin plugin is not universally available and has several +prerequisite before it can be enabled. + +For reference: +https://github.com/kronosnet/kronosnet/commit/9a8fd89bf52c8381f7c46f427a024eb3d70d0ccf +https://github.com/kronosnet/kronosnet/commit/e95bd0d2d1b996894f76e12716c66a3bbc637cc6 + +Signed-off-by: Fabio M. Di Nitto + +--- + dlm_controld/Makefile | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile +index 2d37975..76f4b39 100644 +--- a/dlm_controld/Makefile ++++ b/dlm_controld/Makefile +@@ -47,7 +47,9 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ + + BIN_CFLAGS += $(CFLAGS) -fPIE -DPIE + BIN_CFLAGS += -I../include -I../libdlm +-LIB_CFLAGS += $(CFLAGS) -fPIC -fplugin=annobin ++LIB_CFLAGS += $(CFLAGS) -fPIC ++# Temporary disable annobin plugin ++# LIB_CFLAGS += -fplugin=annobin + + BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,relro -Wl,-z,now -pie + BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum -luuid +-- +2.33.0 + diff --git a/dlm.spec b/dlm.spec index e67ebcb5180078513d3b9ed85a4e062f0ea02dfb..7eba224e23f29c0041507cf28ca9c7d5122ce5cf 100644 --- a/dlm.spec +++ b/dlm.spec @@ -1,6 +1,6 @@ Name: dlm Version: 4.2.0 -Release: 5 +Release: 6 License: GPLv2 and GPLv2+ and LGPLv2+ Group: System Environment/Kernel Summary: dlm control daemon and tool @@ -17,6 +17,7 @@ Patch0001: 0030-dlm_controld-remove-unnecessary-header-include.patch Patch0002: fix-various-deadcode-issues.patch Patch0003: update-Linux-kernel-implementations.patch Patch0004: Revert-treewide-add-fcf-protection-full-to-CFLAGS.patch +Patch0005: build-dlm_controld-disable-annobin-plugin.patch Requires: %{name}-lib = %{version}-%{release} Requires: corosync >= 3.1.0 @@ -100,6 +101,9 @@ install -Dm 0644 init/dlm.sysconfig %{buildroot}/etc/sysconfig/dlm %{_libdir}/pkgconfig/*.pc %changelog +* Fri Mar 08 2024 zouzhimin - 4.2.0-6 +- build: dlm_controld disable annobin plugin + * Wed Mar 06 2024 zouzhimin - 4.2.0-5 - Revert "treewide: add -fcf-protection=full to CFLAGS"