Compare commits

..

No commits in common. "imports/c9/dlm-4.2.0-2.el9" and "c8" have entirely different histories.

4 changed files with 36 additions and 122 deletions

View File

@ -1 +1 @@
9239bf86ecd26fd532528fbcd64712d79e389ff3 SOURCES/dlm-4.2.0.tar.gz 821112426f474123d090c570153d67468c4e0c11 SOURCES/dlm-4.1.0.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/dlm-4.2.0.tar.gz SOURCES/dlm-4.1.0.tar.gz

View File

@ -1,70 +0,0 @@
From 4cfb7b21a88f0ae32d97ea4cbb0c7419b88f397d Mon Sep 17 00:00:00 2001
From: Alexander Aring <aahringo@redhat.com>
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

View File

@ -1,28 +1,27 @@
Name: dlm Name: dlm
Version: 4.2.0 Version: 4.1.0
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv2 and GPLv2+ and LGPLv2+ License: GPLv2 and GPLv2+ and LGPLv2+
# For a breakdown of the licensing, see README.license # For a breakdown of the licensing, see README.license
Group: System Environment/Kernel
Summary: dlm control daemon and tool Summary: dlm control daemon and tool
URL: https://pagure.io/dlm URL: https://pagure.io/dlm
BuildRequires: gcc
BuildRequires: glibc-kernheaders BuildRequires: glibc-kernheaders
BuildRequires: corosynclib-devel >= 3.1.0 BuildRequires: corosynclib-devel >= 1.99.9
BuildRequires: pacemaker-libs-devel >= 1.1.7 BuildRequires: pacemaker-libs-devel >= 1.1.7
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: systemd-units BuildRequires: systemd-units
BuildRequires: systemd-devel BuildRequires: systemd-devel
BuildRequires: make
Source0: https://releases.pagure.org/dlm/%{name}-%{version}.tar.gz Source0: https://releases.pagure.org/dlm/%{name}-%{version}.tar.gz
Patch0: 0001-Revert-treewide-add-fcf-protection-full-to-CFLAGS.patch # Patch0: 0001-foo.patch
%if 0%{?rhel} && 0%{?rhel} <= 7 %if 0%{?rhel} && 0%{?rhel} <= 7
ExclusiveArch: i686 x86_64 ExclusiveArch: i686 x86_64
%endif %endif
Requires: %{name}-lib = %{version}-%{release} Requires: %{name}-lib = %{version}-%{release}
Requires: corosync >= 3.1.0 Requires: corosync >= 1.99.9
%{?fedora:Requires: kernel-modules-extra} %{?fedora:Requires: kernel-modules-extra}
Requires(post): systemd-units Requires(post): systemd-units
Requires(preun): systemd-units Requires(preun): systemd-units
@ -34,13 +33,13 @@ The kernel dlm requires a user daemon to control membership.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .backup0 # %patch0 -p1 -b .0001-foo.patch
%build %build
# upstream does not require configure # upstream does not require configure
# upstream does not support _smp_mflags # upstream does not support _smp_mflags
CFLAGS=$RPM_OPT_FLAGS make CFLAGS+=$RPM_OPT_FLAGS make
CFLAGS=$RPM_OPT_FLAGS make -C fence CFLAGS+=$RPM_OPT_FLAGS make -C fence
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -60,6 +59,7 @@ install -Dm 0644 init/dlm.sysconfig %{buildroot}/etc/sysconfig/dlm
%systemd_postun_with_restart dlm.service %systemd_postun_with_restart dlm.service
%files %files
%defattr(-,root,root,-)
%doc README.license %doc README.license
%{_unitdir}/dlm.service %{_unitdir}/dlm.service
%{_sbindir}/dlm_controld %{_sbindir}/dlm_controld
@ -72,20 +72,25 @@ install -Dm 0644 init/dlm.sysconfig %{buildroot}/etc/sysconfig/dlm
%package lib %package lib
Summary: Library for %{name} Summary: Library for %{name}
Group: System Environment/Libraries
Conflicts: clusterlib Conflicts: clusterlib
%description lib %description lib
The %{name}-lib package contains the libraries needed to use the dlm The %{name}-lib package contains the libraries needed to use the dlm
from userland applications. from userland applications.
%ldconfig_scriptlets lib %post lib -p /sbin/ldconfig
%postun lib -p /sbin/ldconfig
%files lib %files lib
/usr/lib/udev/rules.d/*-dlm.rules %defattr(-,root,root,-)
%{_prefix}/lib/udev/rules.d/*-dlm.rules
%{_libdir}/libdlm*.so.* %{_libdir}/libdlm*.so.*
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}-lib = %{version}-%{release} Requires: %{name}-lib = %{version}-%{release}
Conflicts: clusterlib-devel Conflicts: clusterlib-devel
@ -94,56 +99,35 @@ The %{name}-devel package contains libraries and header files for
developing applications that use %{name}. developing applications that use %{name}.
%files devel %files devel
%defattr(-,root,root,-)
%{_libdir}/libdlm*.so %{_libdir}/libdlm*.so
%{_includedir}/libdlm*.h %{_includedir}/libdlm*.h
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%changelog %changelog
* Fri Oct 14 2022 David Teigland <teigland@redhat.com> - 4.2.0-2 * Wed Jan 13 2021 David Teigland <teigland@redhat.com> - 4.1.0-1
- rebuild with tests - update to 4.1.0
* Wed Oct 12 2022 David Teigland <teigland@redhat.com> - 4.2.0-1 * Wed Jan 06 2021 David Teigland <teigland@redhat.com> - 4.0.9-4
- new upstream version - dlm_controld: use new quorum api to detect missed failures
* Tue Feb 15 2022 David Teigland <teigland@redhat.com> - 4.1.1-2 * Wed Jun 12 2019 David Teigland <teigland@redhat.com> - 4.0.9-3
- compiler warnings and makefile flags - kick gating system
* Mon Nov 15 2021 David Teigland <teigland@redhat.com> - 4.1.1-1 * Wed Jun 12 2019 David Teigland <teigland@redhat.com> - 4.0.9-2
- new upstream version - try to kick gating system
* Wed Aug 25 2021 David Teigland <teigland@redhat.com> - 4.0.9-7 * Tue Jun 11 2019 David Teigland <teigland@redhat.com> - 4.0.9-1
- fix pacemaker header - update to 4.0.9
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.0.9-6 * Wed Jan 23 2019 David Teigland <teigland@redhat.com> - 4.0.6-10
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - dlm_controld: ignore unwanted uevent strings
Related: rhbz#1991688
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 4.0.9-5 * Tue Oct 02 2018 David Teigland <teigland@redhat.com> - 4.0.6-9
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - update makefile gcc flags
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.9-4 * Thu Aug 09 2018 David Teigland <teigland@redhat.com> - 4.0.6-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Work around glibc regression for major/minor header
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Jul 31 2019 David Teigland <teigland@redhat.com> - 4.0.9-1
- New upstream realease
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sat Mar 24 2018 Richard W.M. Jones <rjones@redhat.com> - 4.0.6-8
- Fixes for glibc 2.27, required for riscv64.
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-7 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild