Compare commits

...

No commits in common. "c8" and "c9-beta" have entirely different histories.
c8 ... c9-beta

4 changed files with 61 additions and 41 deletions

View File

@ -0,0 +1 @@
8f72eb0d945136a243761c823e9c8ab7f1c14139 SOURCES/corosync-qdevice-3.0.2.tar.gz

View File

@ -0,0 +1 @@
u coroqnetd - 'User for corosync-qnetd' - -

View File

@ -11,12 +11,13 @@
Name: corosync-qdevice Name: corosync-qdevice
Summary: The Corosync Cluster Engine Qdevice Summary: The Corosync Cluster Engine Qdevice
Version: 3.0.2 Version: 3.0.2
Release: 2%{?gitver}%{?dist} Release: 3%{?gitver}%{?dist}
License: BSD License: BSD
URL: https://github.com/corosync/corosync-qdevice URL: https://github.com/corosync/corosync-qdevice
Source0: https://github.com/corosync/corosync-qdevice/releases/download/v%{version}%{?gittarver}/%{name}-%{version}%{?gittarver}.tar.gz Source0: https://github.com/corosync/corosync-qdevice/releases/download/v%{version}%{?gittarver}/%{name}-%{version}%{?gittarver}.tar.gz
Source1: corosync-qnetd.sysusers.conf
Patch0: bz2181322-1-qdevice-Destroy-non-blocking-client-on-failure.patch Patch0: bz2180045-1-qdevice-Destroy-non-blocking-client-on-failure.patch
# Runtime bits # Runtime bits
Requires: corosync >= 2.4.0 Requires: corosync >= 2.4.0
@ -43,11 +44,13 @@ BuildRequires: nss-devel
%if %{with runautogen} %if %{with runautogen}
BuildRequires: autoconf automake libtool BuildRequires: autoconf automake libtool
%endif %endif
BuildRequires: make
BuildRequires: systemd-rpm-macros
%prep %prep
%setup -q -n %{name}-%{version}%{?gittarver} %setup -q -n %{name}-%{version}%{?gittarver}
%patch0 -p1 -b .bz2181322-1 %patch0 -p1 -b .bz2180045-1
%build %build
%if %{with runautogen} %if %{with runautogen}
@ -67,10 +70,10 @@ BuildRequires: autoconf automake libtool
--with-systemddir=%{_unitdir} \ --with-systemddir=%{_unitdir} \
--docdir=%{_docdir} --docdir=%{_docdir}
make %{_smp_mflags} %make_build
%install %install
make install DESTDIR=%{buildroot} %make_install
## tree fixup ## tree fixup
# drop docs and html docs for now # drop docs and html docs for now
@ -91,6 +94,8 @@ sed -i -e 's/^COROSYNC_QNETD_RUNAS=""$/COROSYNC_QNETD_RUNAS="coroqnetd"/' \
%{buildroot}%{_sysconfdir}/sysconfig/corosync-qnetd %{buildroot}%{_sysconfdir}/sysconfig/corosync-qnetd
%endif %endif
install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/corosync-qnetd.conf
%description %description
This package contains the Corosync Cluster Engine Qdevice, script for creating This package contains the Corosync Cluster Engine Qdevice, script for creating
NSS certificates and an init script. NSS certificates and an init script.
@ -152,21 +157,19 @@ The Corosync Cluster Engine Qdevice
%package -n corosync-qnetd %package -n corosync-qnetd
Summary: The Corosync Cluster Engine Qdevice Network Daemon Summary: The Corosync Cluster Engine Qdevice Network Daemon
Requires: nss-tools Requires: nss-tools
Requires(pre): shadow-utils
%if %{with systemd} %if %{with systemd}
%{?systemd_requires} %{?systemd_requires}
%endif %endif
%{?sysusers_requires_compat}
%description -n corosync-qnetd %description -n corosync-qnetd
This package contains the Corosync Cluster Engine Qdevice Network Daemon, This package contains the Corosync Cluster Engine Qdevice Network Daemon,
script for creating NSS certificates and an init script. script for creating NSS certificates and an init script.
%pre -n corosync-qnetd %pre -n corosync-qnetd
getent group coroqnetd >/dev/null || groupadd -r coroqnetd %sysusers_create_compat %{SOURCE1}
getent passwd coroqnetd >/dev/null || \
useradd -r -g coroqnetd -d / -s /sbin/nologin -c "User for corosync-qnetd" coroqnetd
exit 0
%post -n corosync-qnetd %post -n corosync-qnetd
%if %{with systemd} && 0%{?systemd_post:1} %if %{with systemd} && 0%{?systemd_post:1}
@ -208,67 +211,82 @@ fi
%{_mandir}/man8/corosync-qnetd-tool.8* %{_mandir}/man8/corosync-qnetd-tool.8*
%{_mandir}/man8/corosync-qnetd-certutil.8* %{_mandir}/man8/corosync-qnetd-certutil.8*
%{_mandir}/man8/corosync-qnetd.8* %{_mandir}/man8/corosync-qnetd.8*
%{_sysusersdir}/corosync-qnetd.conf
%changelog %changelog
* Thu Mar 23 2023 Jan Friesse <jfriesse@redhat.com> - 3.0.2-2 * Tue Feb 18 2025 Jan Friesse <jfriesse@redhat.com> - 3.0.2-3
- Resolves: rhbz#2181322 - Resolves: RHEL-7637
- qdevice: Destroy non blocking client on failure (rhbz#2181322) - Add support for sysusers.d functionality (RHEL-7637)
- merge upstream commit 4331c7d5650a8bf44c16512419f1954d0ef96df5 (rhbz#2181322)
* Thu Mar 23 2023 Jan Friesse <jfriesse@redhat.com> - 3.0.2-2
- Resolves: rhbz#2180045
- qdevice: Destroy non blocking client on failure (rhbz#2180045)
- merge upstream commit 4331c7d5650a8bf44c16512419f1954d0ef96df5 (rhbz#2180045)
* Thu Nov 03 2022 Jan Friesse <jfriesse@redhat.com> - 3.0.2-1 * Thu Nov 03 2022 Jan Friesse <jfriesse@redhat.com> - 3.0.2-1
- Resolves: rhbz#2135862 - Resolves: rhbz#2135863
- New upstream release - New upstream release
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.0.1-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.0.1-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Nov 23 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.1-1 * Mon Nov 23 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.1-1
- Resolves: rhbz#1752386
- Resolves: rhbz#1879351
- New upstream release - New upstream release
* Fri Apr 24 2020 Jan Friesse <jfriesse@redhat.com> 3.0.0-4 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-10
- Resolves: rhbz#1827256 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
- Add explicit corosync-qdevice and corosync-qnetd dependency for revdeps CI test * Wed Jul 22 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.0-9
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
* Mon May 13 2019 Jan Friesse <jfriesse@redhat.com> 3.0.0-3 * Wed May 13 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.0-8
- Related: rhbz#1682124 - Really rebuild for the new libqb
- Add gating tests * Wed May 13 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.0-7
- Rebuild for new libqb
* Wed Dec 12 2018 Jan Friesse <jfriesse@redhat.com> - 3.0.0-2 * Thu Mar 26 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.0-6
- Resolves: rhbz#1600919 - Add CI tests
- Enable gating
- Fix spec file 2.93.0-1 entry removal * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed Mar 20 2019 Jan Friesse <jfriesse@redhat.com> - 3.0.0-3
- Add license and use install -p
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Dec 12 2018 Jan Friesse <jfriesse@redhat.com> - 3.0.0-1 * Wed Dec 12 2018 Jan Friesse <jfriesse@redhat.com> - 3.0.0-1
- Resolves: rhbz#1600919
- New upstream release - New upstream release
* Fri Nov 23 2018 Jan Friesse <jfriesse@redhat.com> - 2.93.0-1 * Fri Nov 23 2018 Jan Friesse <jfriesse@redhat.com> - 2.93.0-1
- Related: rhbz#1600919
- New upstream release - New upstream release
* Tue Sep 18 2018 Jan Friesse <jfriesse@redhat.com> 2.92.0-2
- Related: rhbz#1615945
- Rebuild for new LibQB
* Thu Aug 09 2018 Jan Friesse <jfriesse@redhat.com> - 2.92.0-1 * Thu Aug 09 2018 Jan Friesse <jfriesse@redhat.com> - 2.92.0-1
- New upstream release - New upstream release
* Mon Jul 30 2018 Florian Weimer <fweimer@redhat.com> - 2.91.0-2 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.91.0-2
- Rebuild with fixed binutils - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Apr 27 2018 Jan Friesse <jfriesse@redhat.com> - 2.91.0-1 * Fri Apr 27 2018 Jan Friesse <jfriesse@redhat.com> - 2.91.0-1
- New upstream release - New upstream release
* Fri Apr 06 2018 Jan Friesse <jfriesse@redhat.com> - 2.90.0-5
- Import from Fedora
* Thu Mar 22 2018 Jan Friesse <jfriesse@redhat.com> - 2.90.0-4 * Thu Mar 22 2018 Jan Friesse <jfriesse@redhat.com> - 2.90.0-4
- Rebuild for new Corosync - Rebuild for new Corosync