diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index 6a5856e..ec4bfb1 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /corosync-qdevice-3.0.0.tar.gz /corosync-qdevice-3.0.1.tar.gz /corosync-qdevice-3.0.2.tar.gz +/corosync-qdevice-3.0.3.tar.gz +/corosync-qdevice-3.0.4.tar.gz diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec index 2fd69f0..21f7ae7 100644 --- a/corosync-qdevice.spec +++ b/corosync-qdevice.spec @@ -3,32 +3,23 @@ # to disable or enable specific features %bcond_without userflags %bcond_with runautogen -%bcond_without systemd - -%global gitver %{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}} -%global gittarver %{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}} Name: corosync-qdevice Summary: The Corosync Cluster Engine Qdevice -Version: 3.0.2 -Release: 1%{?gitver}%{?dist} -License: BSD +Version: 3.0.4 +Release: 1%{?dist} +License: BSD-3-Clause 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}/%{name}-%{version}.tar.gz # Runtime bits Requires: corosync >= 2.4.0 Requires: corosynclib >= 2.4.0 Requires: nss-tools -%if %{with systemd} %{?systemd_requires} BuildRequires: systemd BuildRequires: systemd-devel -%else -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -%endif # Build bits BuildRequires: gcc @@ -42,9 +33,10 @@ BuildRequires: nss-devel BuildRequires: autoconf automake libtool %endif BuildRequires: make +BuildRequires: git %prep -%setup -q -n %{name}-%{version}%{?gittarver} +%autosetup -S git_am %build %if %{with runautogen} @@ -55,9 +47,7 @@ BuildRequires: make %if %{with userflags} --enable-user-flags \ %endif -%if %{with systemd} --enable-systemd \ -%endif --enable-qdevices \ --enable-qnetd \ --with-initddir=%{_initrddir} \ @@ -80,41 +70,23 @@ install -p -m 644 init/corosync-qdevice.sysconfig.example \ install -p -m 644 init/corosync-qnetd.sysconfig.example \ %{buildroot}%{_sysconfdir}/sysconfig/corosync-qnetd -%if %{with systemd} sed -i -e 's/^#User=/User=/' \ %{buildroot}%{_unitdir}/corosync-qnetd.service -%else -sed -i -e 's/^COROSYNC_QNETD_RUNAS=""$/COROSYNC_QNETD_RUNAS="coroqnetd"/' \ - %{buildroot}%{_sysconfdir}/sysconfig/corosync-qnetd -%endif + +install -m0644 -D init/corosync-qnetd.sysusers.conf.example %{buildroot}%{_sysusersdir}/corosync-qnetd.conf %description This package contains the Corosync Cluster Engine Qdevice, script for creating NSS certificates and an init script. %post -%if %{with systemd} && 0%{?systemd_post:1} %systemd_post corosync-qdevice.service -%else -if [ $1 -eq 1 ]; then - /sbin/chkconfig --add corosync-qdevice || : -fi -%endif %preun -%if %{with systemd} && 0%{?systemd_preun:1} %systemd_preun corosync-qdevice.service -%else -if [ $1 -eq 0 ]; then - /sbin/service corosync-qdevice stop &>/dev/null || : - /sbin/chkconfig --del corosync-qdevice || : -fi -%endif %postun -%if %{with systemd} && 0%{?systemd_postun:1} %systemd_postun corosync-qdevice.service -%endif %files %license LICENSE @@ -125,11 +97,7 @@ fi %{_sbindir}/corosync-qdevice-net-certutil %{_sbindir}/corosync-qdevice-tool %config(noreplace) %{_sysconfdir}/sysconfig/corosync-qdevice -%if %{with systemd} %{_unitdir}/corosync-qdevice.service -%else -%{_initrddir}/corosync-qdevice -%endif %{_mandir}/man8/corosync-qdevice-tool.8* %{_mandir}/man8/corosync-qdevice-net-certutil.8* %{_mandir}/man8/corosync-qdevice.8* @@ -149,45 +117,22 @@ The Corosync Cluster Engine Qdevice %package -n corosync-qnetd Summary: The Corosync Cluster Engine Qdevice Network Daemon Requires: nss-tools -Requires(pre): shadow-utils -%if %{with systemd} %{?systemd_requires} -%endif %description -n corosync-qnetd This package contains the Corosync Cluster Engine Qdevice Network Daemon, script for creating NSS certificates and an init script. -%pre -n corosync-qnetd -getent group coroqnetd >/dev/null || groupadd -r coroqnetd -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 -%if %{with systemd} && 0%{?systemd_post:1} %systemd_post corosync-qnetd.service -%else -if [ $1 -eq 1 ]; then - /sbin/chkconfig --add corosync-qnetd || : -fi -%endif %preun -n corosync-qnetd -%if %{with systemd} && 0%{?systemd_preun:1} %systemd_preun corosync-qnetd.service -%else -if [ $1 -eq 0 ]; then - /sbin/service corosync-qnetd stop &>/dev/null || : - /sbin/chkconfig --del corosync-qnetd || : -fi -%endif %postun -n corosync-qnetd -%if %{with systemd} && 0%{?systemd_postun:1} %systemd_postun corosync-qnetd.service -%endif %files -n corosync-qnetd %license LICENSE @@ -197,16 +142,50 @@ fi %{_bindir}/corosync-qnetd-certutil %{_bindir}/corosync-qnetd-tool %config(noreplace) %{_sysconfdir}/sysconfig/corosync-qnetd -%if %{with systemd} %{_unitdir}/corosync-qnetd.service -%else -%{_initrddir}/corosync-qnetd -%endif %{_mandir}/man8/corosync-qnetd-tool.8* %{_mandir}/man8/corosync-qnetd-certutil.8* %{_mandir}/man8/corosync-qnetd.8* +%{_sysusersdir}/corosync-qnetd.conf %changelog +* Tue Nov 25 2025 Jan Friesse - 3.0.4-1 +- New upstream release + +* Wed Jul 23 2025 Fedora Release Engineering - 3.0.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Tue Feb 11 2025 Jan Friesse - 3.0.3-9 +- Change sysusers.d config file name to corosync-qnetd.conf +- Remove support for non-systemd builds + +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 3.0.3-8 +- Add sysusers.d config file to allow rpm to create users/groups automatically + +* Thu Jan 16 2025 Fedora Release Engineering - 3.0.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Jul 17 2024 Fedora Release Engineering - 3.0.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jan 24 2024 Fedora Release Engineering - 3.0.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 3.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 3.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 06 2023 Jan Friesse - 3.0.3-2 +- migrated to SPDX license + +* Wed Mar 22 2023 Jan Friesse - 3.0.3-1 +- New upstream release + +* Thu Jan 19 2023 Fedora Release Engineering - 3.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Nov 03 2022 Jan Friesse - 3.0.2-1 - New upstream release diff --git a/sources b/sources index 19e00b2..2dd25f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-qdevice-3.0.2.tar.gz) = ca2410b873f872ab40156ccb46ce4504e479db02ab3af56bbbfdb634a474ca9759db09b605356414467b3c22f7baad082613b2bf5d5d017e9fa532baa940c2e2 +SHA512 (corosync-qdevice-3.0.4.tar.gz) = a7e2e1fcab699c6deb0ae01725df6a1d3870c0f874b7dff96f657ac3e0d9fadb682ae145d6a9d29c592ca8f34ad12b8523c6adf9b14b0a01e59d998d8cb8c25f diff --git a/tests/.gitignore b/tests/.gitignore deleted file mode 100644 index e6c79fd..0000000 --- a/tests/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Ignore tests runs/artefacts. -artifacts/** -**/*.retry diff --git a/tests/plan.fmf b/tests/plan.fmf new file mode 100644 index 0000000..146fa12 --- /dev/null +++ b/tests/plan.fmf @@ -0,0 +1,11 @@ +summary: Run all smoke tests +discover: + how: fmf +execute: + how: tmt +prepare: + how: install + package: + - iproute + - corosync-qdevice + - corosync-qnetd diff --git a/tests/smoke/main.fmf b/tests/smoke/main.fmf new file mode 100644 index 0000000..c431594 --- /dev/null +++ b/tests/smoke/main.fmf @@ -0,0 +1,2 @@ +summary: Basic smoke test +test: ./runtest.sh diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh old mode 100644 new mode 100755 diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 9239dcf..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,11 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - tests: - - smoke - required_packages: - - iproute - - corosync-qdevice - - corosync-qnetd