diff --git a/0001-Revert-treewide-add-fcf-protection-full-to-CFLAGS.patch b/0001-Revert-treewide-add-fcf-protection-full-to-CFLAGS.patch new file mode 100644 index 0000000000000000000000000000000000000000..6675f9036ef1910748e0867f0c0bc57f835e406f --- /dev/null +++ b/0001-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-4.1.0.tar.gz b/dlm-4.1.0.tar.gz deleted file mode 100644 index 8dc2b23045b13b838175daf5320295d446a9a77e..0000000000000000000000000000000000000000 Binary files a/dlm-4.1.0.tar.gz and /dev/null differ diff --git a/dlm-4.2.0.tar.gz b/dlm-4.2.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..02fdb3af46547e82f2189645c2512c132c325323 Binary files /dev/null and b/dlm-4.2.0.tar.gz differ diff --git a/dlm.spec b/dlm.spec index cf729056b838aa75d61e387707c6521c72203b04..d9201d400b1b637688f40e2a7ee87c4bcfd5f814 100644 --- a/dlm.spec +++ b/dlm.spec @@ -1,27 +1,30 @@ Name: dlm -Version: 4.1.0 -Release: 2 +Version: 4.2.0 +Release: 1%{?dist} License: GPLv2 and GPLv2+ and LGPLv2+ Group: System Environment/Kernel Summary: dlm control daemon and tool URL: https://pagure.io/dlm +BuildRequires: gcc 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 BuildRequires: systemd-devel -Source0: https://releases.pagure.org/dlm/%{name}-%{version}.tar.gz -Patch0001: 0030-dlm_controld-remove-unnecessary-header-include.patch +BuildRequires: make +Source0: https://releases.pagure.org/dlm/%{name}-%{version}.tar.gz + +Patch0: 0001-Revert-treewide-add-fcf-protection-full-to-CFLAGS.patch +Patch1: 0030-dlm_controld-remove-unnecessary-header-include.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(preun):systemd-units Requires(postun): systemd-units Conflicts: cman - %description The kernel dlm requires a user daemon to control membership. @@ -48,12 +51,12 @@ developing applications that use %{name}. %autosetup -n %{name}-%{version} -p1 %build -CFLAGS+=$RPM_OPT_FLAGS make -CFLAGS+=$RPM_OPT_FLAGS make -C fence +%set_build_flags +%make_build +%make_build -C fence %install -rm -rf $RPM_BUILD_ROOT -make install LIBDIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT +%make_install LIBDIR=%{_libdir} make -C fence install LIBDIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install -Dm 0644 init/dlm.service %{buildroot}%{_unitdir}/dlm.service @@ -84,18 +87,22 @@ install -Dm 0644 init/dlm.sysconfig %{buildroot}/etc/sysconfig/dlm %{_mandir}/man3/*dlm* %config(noreplace) %{_sysconfdir}/sysconfig/dlm -%files lib + +%files lib %defattr(-,root,root,-) %{_prefix}/lib/udev/rules.d/*-dlm.rules %{_libdir}/libdlm*.so.* -%files devel +%files devel %defattr(-,root,root,-) %{_libdir}/libdlm*.so %{_includedir}/libdlm*.h %{_libdir}/pkgconfig/*.pc %changelog +* Wed Jul 26 2023 konglidong - 4.2.0-1 +- update to 4.2.0 + * Tue Jul 18 2023 chenchen - 4.1.0-2 - dlm_controld: remove unnecessary header include