diff --git a/Revert-treewide-add-fcf-protection-full-to-CFLAGS.patch b/Revert-treewide-add-fcf-protection-full-to-CFLAGS.patch new file mode 100644 index 0000000000000000000000000000000000000000..6675f9036ef1910748e0867f0c0bc57f835e406f --- /dev/null +++ b/Revert-treewide-add-fcf-protection-full-to-CFLAGS.patch @@ -0,0 +1,70 @@ +From 4cfb7b21a88f0ae32d97ea4cbb0c7419b88f397d Mon Sep 17 00:00:00 2001 +From: Alexander Aring +Date: Wed, 12 Oct 2022 12:44:03 -0400 +Subject: [PATCH] Revert "treewide: add -fcf-protection=full to CFLAGS" + +This reverts commit 215aedf1fdff58c62fe596284948590965acc85c. +--- + dlm_controld/Makefile | 2 +- + dlm_tool/Makefile | 2 +- + fence/Makefile | 2 +- + libdlm/Makefile | 4 ++-- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile +index ec8c360cc853..9cf7152f60ab 100644 +--- a/dlm_controld/Makefile ++++ b/dlm_controld/Makefile +@@ -43,7 +43,7 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ + -Wno-sign-compare -Wno-unused-parameter -Wp,-D_FORTIFY_SOURCE=2 \ + -fexceptions -fasynchronous-unwind-tables -fdiagnostics-show-option \ + -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong \ +- -fstack-clash-protection -fcf-protection=full ++ -fstack-clash-protection + + BIN_CFLAGS += $(CFLAGS) -fPIE -DPIE + BIN_CFLAGS += -I../include -I../libdlm +diff --git a/dlm_tool/Makefile b/dlm_tool/Makefile +index 57629c731771..1c3d61d5c860 100644 +--- a/dlm_tool/Makefile ++++ b/dlm_tool/Makefile +@@ -15,7 +15,7 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ + -Wno-sign-compare -Wno-unused-parameter -Wp,-D_FORTIFY_SOURCE=2 \ + -fexceptions -fasynchronous-unwind-tables -fdiagnostics-show-option \ + -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong \ +- -fstack-clash-protection -fcf-protection=full ++ -fstack-clash-protection + + CFLAGS += -fPIE -DPIE + CFLAGS += -I../include -I../libdlm -I../dlm_controld +diff --git a/fence/Makefile b/fence/Makefile +index 446f4eaac9f9..ee4dfb886d4c 100644 +--- a/fence/Makefile ++++ b/fence/Makefile +@@ -15,7 +15,7 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ + -Wno-sign-compare -Wno-unused-parameter -Wp,-D_FORTIFY_SOURCE=2 \ + -fexceptions -fasynchronous-unwind-tables -fdiagnostics-show-option \ + -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong \ +- -fstack-clash-protection -fcf-protection=full ++ -fstack-clash-protection + + CFLAGS += -fPIE -DPIE + CFLAGS += -I../include +diff --git a/libdlm/Makefile b/libdlm/Makefile +index 823fdaa94073..5069ccf1f7f9 100644 +--- a/libdlm/Makefile ++++ b/libdlm/Makefile +@@ -80,8 +80,8 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ + -fdiagnostics-show-option \ + -fPIC + +-LIB_CFLAGS += $(CFLAGS) -D_REENTRANT -fcf-protection=full +-LLT_CFLAGS += $(CFLAGS) -fcf-protection=full ++LIB_CFLAGS += $(CFLAGS) -D_REENTRANT ++LLT_CFLAGS += $(CFLAGS) + + LIB_LDFLAGS += $(LDFLAGS) -lpthread -Wl,-z,now + LLT_LDFLAGS += $(LDFLAGS) -Wl,-z,now +-- +2.7.5 + diff --git a/dlm.spec b/dlm.spec index b5408aaf42584fb936db445bbf0ef1c9ca47b9c3..e67ebcb5180078513d3b9ed85a4e062f0ea02dfb 100644 --- a/dlm.spec +++ b/dlm.spec @@ -1,12 +1,12 @@ Name: dlm Version: 4.2.0 -Release: 4 +Release: 5 License: GPLv2 and GPLv2+ and LGPLv2+ Group: System Environment/Kernel Summary: dlm control daemon and tool URL: https://pagure.io/dlm BuildRequires: glibc-kernheaders -BuildRequires: corosynclib-devel >= 1.99.9 +BuildRequires: corosynclib-devel >= 3.1.0 BuildRequires: pacemaker-libs-devel >= 1.1.7 BuildRequires: libxml2-devel BuildRequires: systemd-units @@ -16,9 +16,10 @@ Source0: https://releases.pagure.org/dlm/%{name}-%{version}.tar.gz 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 Requires: %{name}-lib = %{version}-%{release} -Requires: corosync >= 1.99.9 +Requires: corosync >= 3.1.0 Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -49,12 +50,6 @@ developing applications that use %{name}. %prep %autosetup -n %{name}-%{version} -p1 -%ifarch aarch64 riscv64 -sed -i 's/-fcf-protection=full//g' libdlm/Makefile -sed -i 's/-fcf-protection=full//g' dlm_controld/Makefile -sed -i 's/-fcf-protection=full//g' dlm_tool/Makefile -sed -i 's/-fcf-protection=full//g' fence/Makefile -%endif %build CFLAGS+=$RPM_OPT_FLAGS make @@ -105,6 +100,9 @@ install -Dm 0644 init/dlm.sysconfig %{buildroot}/etc/sysconfig/dlm %{_libdir}/pkgconfig/*.pc %changelog +* Wed Mar 06 2024 zouzhimin - 4.2.0-5 +- Revert "treewide: add -fcf-protection=full to CFLAGS" + * Tue Mar 05 2024 zouzhimin - 4.2.0-4 - dlm_controld: update Linux kernel implementations