.corosync-qdevice.metadata

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

SOURCES/bz2181322-1-qdevice-Destroy-non-blocking-client-on-failure.patch

@@ -0,0 +1,41 @@
+From 4331c7d5650a8bf44c16512419f1954d0ef96df5 Mon Sep 17 00:00:00 2001
+From: Jan Friesse <jfriesse@redhat.com>
+Date: Mon, 20 Mar 2023 11:01:46 +0100
+Subject: [PATCH] qdevice: Destroy non blocking client on failure
+
+This fixes regression introduced in patch
+8217e33e86bca79dc307e112f0c0c4a278f9a568 which made qdevice assert when
+PR_GetError in nss_sock_non_blocking_client_try_next called by
+qdevice_model_net_pre_poll_loop returns error other than
+PR_IN_PROGRESS_ERROR. This is usually not happening - only way to get
+such error seems to be to ifdown ALL network interfaces other than
+loopback and returned error is then PR_NETWORK_UNREACHABLE_ERROR
+(-5980).
+
+Fix is rather simple (and present in pre
+8217e33e86bca79dc307e112f0c0c4a278f9a568) - just call
+nss_sock_non_blocking_client_destroy.
+
+Signed-off-by: Jan Friesse <jfriesse@redhat.com>
+---
+ qdevices/qdevice-model-net.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/qdevices/qdevice-model-net.c b/qdevices/qdevice-model-net.c
+index afcc649..f63e4bd 100644
+--- a/qdevices/qdevice-model-net.c
++++ b/qdevices/qdevice-model-net.c
+@@ -211,6 +211,10 @@ qdevice_model_net_pre_poll_loop(struct qdevice_instance *instance)
+ 	res = nss_sock_non_blocking_client_try_next(&net_instance->non_blocking_client);
+ 	if (res == -1) {
+ 		log_nss(LOG_ERR, "Can't connect to qnetd host");
++		/*
++		 * To prevent adding non_blocking_client into loop but still keep loop running
++		 */
++		nss_sock_non_blocking_client_destroy(&net_instance->non_blocking_client);
+ 	}
+ 
+ 	res = qdevice_net_socket_add_to_main_poll_loop(net_instance);
+-- 
+2.39.1
+

SPECS/corosync-qdevice.spec

@@ -11,11 +11,13 @@
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
 Version: 3.0.2
-Release: 1%{?gitver}%{?dist}
+Release: 2%{?gitver}%{?dist}
 License: BSD
 URL: https://github.com/corosync/corosync-qdevice
 Source0: https://github.com/corosync/corosync-qdevice/releases/download/v%{version}%{?gittarver}/%{name}-%{version}%{?gittarver}.tar.gz
 
+Patch0: bz2181322-1-qdevice-Destroy-non-blocking-client-on-failure.patch
+
 # Runtime bits
 Requires: corosync >= 2.4.0
 Requires: corosynclib >= 2.4.0
@@ -41,11 +43,12 @@ BuildRequires: nss-devel
 %if %{with runautogen}
 BuildRequires: autoconf automake libtool
 %endif
-BuildRequires: make
 
 %prep
 %setup -q -n %{name}-%{version}%{?gittarver}
 
+%patch0 -p1 -b .bz2181322-1
+
 %build
 %if %{with runautogen}
 ./autogen.sh
@@ -64,10 +67,10 @@ BuildRequires: make
 	--with-systemddir=%{_unitdir} \
 	--docdir=%{_docdir}
 
-%make_build
+make %{_smp_mflags}
 
 %install
-%make_install
+make install DESTDIR=%{buildroot}
 
 ## tree fixup
 # drop docs and html docs for now
@@ -207,68 +210,65 @@ fi
 %{_mandir}/man8/corosync-qnetd.8*
 
 %changelog
+* Thu Mar 23 2023 Jan Friesse <jfriesse@redhat.com> - 3.0.2-2
+- Resolves: rhbz#2181322
+
+- qdevice: Destroy non blocking client on failure (rhbz#2181322)
+- merge upstream commit 4331c7d5650a8bf44c16512419f1954d0ef96df5 (rhbz#2181322)
+
 * Thu Nov 03 2022 Jan Friesse <jfriesse@redhat.com> - 3.0.2-1
-- Resolves: rhbz#2135863
+- Resolves: rhbz#2135862
 
 - 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
+- Resolves: rhbz#1752386
+- Resolves: rhbz#1879351
+
 - New upstream release
 
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-10
+* Fri Apr 24 2020 Jan Friesse <jfriesse@redhat.com> 3.0.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+- Resolves: rhbz#1827256
 
-* Wed Jul 22 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.0-9
+- Add explicit corosync-qdevice and corosync-qnetd dependency for revdeps CI test
-- Use make macros
-- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
 
-* Wed May 13 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.0-8
+* Mon May 13 2019 Jan Friesse <jfriesse@redhat.com> 3.0.0-3
-- Really rebuild for the new libqb
+- Related: rhbz#1682124
 
-* Wed May 13 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.0-7
+- Add gating tests
-- Rebuild for new libqb
 
-* Thu Mar 26 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.0-6
+* Wed Dec 12 2018 Jan Friesse <jfriesse@redhat.com> - 3.0.0-2
-- Add CI tests
+- Resolves: rhbz#1600919
-- Enable gating
 
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-5
+- Fix spec file 2.93.0-1 entry removal
-- 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
+- Resolves: rhbz#1600919
+
 - New upstream release
 
 * Fri Nov 23 2018 Jan Friesse <jfriesse@redhat.com> - 2.93.0-1
+- Related: rhbz#1600919
+
 - 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
 - New upstream release
 
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.91.0-2
+* Mon Jul 30 2018 Florian Weimer <fweimer@redhat.com> - 2.91.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+- Rebuild with fixed binutils
 
 * Fri Apr 27 2018 Jan Friesse <jfriesse@redhat.com> - 2.91.0-1
 - 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
 - Rebuild for new Corosync