From 3b12ba8f8d0696d8639f9e3f1118a841e297d8bb Mon Sep 17 00:00:00 2001
From: Jan Friesse <jfriesse@redhat.com>
Date: Thu, 26 Mar 2020 18:12:10 +0100
Subject: [PATCH 01/31] Add CI tests using the Standard Test Interface

---
 tests/.gitignore       |   3 +
 tests/smoke/runtest.sh | 348 +++++++++++++++++++++++++++++++++++++++++
 tests/tests.yml        |   9 ++
 3 files changed, 360 insertions(+)
 create mode 100644 tests/.gitignore
 create mode 100644 tests/smoke/runtest.sh
 create mode 100644 tests/tests.yml

diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 0000000..e6c79fd
--- /dev/null
+++ b/tests/.gitignore
@@ -0,0 +1,3 @@
+# Ignore tests runs/artefacts.
+artifacts/**
+**/*.retry
diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh
new file mode 100644
index 0000000..efdb5dc
--- /dev/null
+++ b/tests/smoke/runtest.sh
@@ -0,0 +1,348 @@
+#!/bin/bash
+
+# This file was autogenerated at 2019-05-13T13:43:38+02:00 from 90bd97ada89befa1a63133335a419ad7311c3d75
+
+# Copyright (c) 2019, Red Hat, Inc.
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND RED HAT, INC. DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL RED HAT, INC. BE LIABLE
+# FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Author: Jan Friesse <jfriesse@redhat.com>
+
+
+# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+# !!! Script overwrites corosync.conf, authkey and qdevice/qnetd certificates !!!
+# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+# Home https://github.com/jfriesse/csts/tree/master/smoke
+
+# -e is really important
+set -xe
+set -o pipefail
+
+# Variables changing test behavior
+PREFIX="/"
+
+COROSYNC_SYSCONFD="${PREFIX}etc/corosync"
+COROSYNC_CONF="${COROSYNC_SYSCONFD}/corosync.conf"
+COROSYNC_AUTHKEY="${COROSYNC_SYSCONFD}/authkey"
+COROSYNC_CLUSTER_NAME="smoketestcluster"
+
+TOKEN_TIMEOUT=1000
+MAX_REPEATS=60
+
+####################
+# Helper functions #
+####################
+get_ip() {
+    ip_res=$(ip route get 8.8.8.8)
+    # Format is "8.8.8.8 via ROUTE_IPADDR dev DEV src IPADDR uid NUMBER"
+    # Remove everything up to "src " and then everything after " "
+    addr=${ip_res##*src }
+    addr=${addr%% *}
+
+    echo "$addr"
+}
+
+# generate_corosync_conf crypto [token] [qdevice]
+# crypto can be on or off
+# when token is defined it is used for token timeout
+# when qdevice is set to on qdevice section is created and second node is added
+generate_corosync_conf() {
+    case "$1" in
+    "on")
+        cipher="aes256"
+        hash="sha256"
+        ;;
+    "off")
+        cipher="none"
+        hash="none"
+        ;;
+    *)
+        # Unknown crypto
+        exit 1
+    esac
+
+    token=$TOKEN_TIMEOUT
+    if [ ! -z "$2" ];then
+        token="$2"
+    fi
+    qdevice="$3"
+    true_command=`which true`
+
+cat << _EOF_
+    totem {
+        version: 2
+        cluster_name: $COROSYNC_CLUSTER_NAME
+        transport: knet
+        crypto_cipher: $cipher
+        crypto_hash: $hash
+        token: $token
+    }
+
+    logging {
+        to_logfile: yes
+        logfile: /var/log/cluster/corosync.log
+        to_syslog: yes
+    }
+
+    quorum {
+        provider: corosync_votequorum
+_EOF_
+
+    if [ "$qdevice" == "on" ];then
+cat << _EOF_
+        device {
+            votes: 1
+            model: net
+            net {
+                host: $LOCAL_IP
+                algorithm: ffsplit
+            }
+            heuristics {
+                mode: sync
+                exec_true: $true_command
+            }
+        }
+_EOF_
+    fi
+
+cat << _EOF_
+    }
+
+    nodelist {
+        node {
+            nodeid: 1
+            ring0_addr: $LOCAL_IP
+        }
+_EOF_
+
+    if [ "$qdevice" == "on" ];then
+cat << _EOF_
+        node {
+            nodeid: 2
+            ring0_addr: 192.0.2.2
+        }
+_EOF_
+    fi
+
+cat << _EOF_
+    }
+_EOF_
+}
+
+# service_start service
+service_start() {
+    # service service must be inactive
+    systemctl is-active "$1" && exit 1 || true
+
+    systemctl start "$1"
+
+    systemctl is-active "$1"
+}
+
+# service_stop service
+service_stop() {
+    systemctl is-active "$1" || exit 1
+
+    systemctl stop "$1"
+
+    systemctl is-active "$1" && exit 1 || true
+}
+
+######################
+# Computed variables #
+######################
+LOCAL_IP=$(get_ip)
+
+##################
+# C test sources #
+##################
+
+# Test sources are encoded as a base64 string and piped to base64 to store them in /tmp
+##################
+# Test functions #
+##################
+test_corosync_qdevice_h() {
+    # Check that corosync-qdevice(-tool) binary exists and -h returns help text
+    res=`corosync-qdevice -h || true`
+    [ "$res" != "${res/usage/}" ]
+    res=`corosync-qdevice-tool -h || true`
+    [ "$res" != "${res/usage/}" ]
+}
+
+test_corosync_qnetd_h() {
+    # Check that corosync-qnetd(-tool) binary exists and -h returns help text
+    res=`corosync-qnetd -h || true`
+    [ "$res" != "${res/usage/}" ]
+    res=`corosync-qnetd-tool -h || true`
+    [ "$res" != "${res/usage/}" ]
+}
+
+test_crt_creation() {
+    # Erase old certificates
+    rm -rf "$COROSYNC_SYSCONFD/qdevice/net/nssdb"
+    rm -rf "$COROSYNC_SYSCONFD/qnetd/nssdb"
+
+    corosync-qnetd-certutil -i
+    corosync-qdevice-net-certutil -i -c "$COROSYNC_SYSCONFD/qnetd/nssdb/qnetd-cacert.crt"
+    corosync-qdevice-net-certutil -r -n "$COROSYNC_CLUSTER_NAME"
+    corosync-qnetd-certutil -s -c "$COROSYNC_SYSCONFD/qdevice/net/nssdb/qdevice-net-node.crq" -n "$COROSYNC_CLUSTER_NAME"
+    corosync-qdevice-net-certutil -M -c "$COROSYNC_SYSCONFD/qnetd/nssdb/cluster-$COROSYNC_CLUSTER_NAME.crt"
+}
+
+test_qnetd_start() {
+    service_start "corosync-qnetd"
+}
+
+test_qdevice_start() {
+    service_start "corosync-qdevice"
+}
+
+test_corosync_start() {
+    generate_corosync_conf "off" "" "on" > "$COROSYNC_CONF"
+    cat "$COROSYNC_CONF"
+
+    service_start "corosync"
+}
+
+test_qdevice_stop() {
+    service_stop "corosync-qdevice"
+}
+
+test_qnetd_stop() {
+    service_stop "corosync-qnetd"
+}
+
+test_corosync_stop() {
+    service_stop "corosync"
+}
+
+# test_corosync_quorumtool quorate
+# quorate can be yes or no
+test_corosync_quorumtool() {
+    quorumtool_res_file=`mktemp`
+    # This is already fixed in upstream db38e3958c4f88d5d06e8f7c83d6d90334d9fbd2
+    (corosync-quorumtool -ips || true) | tee "$quorumtool_res_file"
+
+    # Ensure this is single node cluster
+    grep -qi '^Nodes:.*1$' "$quorumtool_res_file"
+    # Current node id is 1
+    grep -qi '^Node ID:.*1$' "$quorumtool_res_file"
+    # Is quorate (libquorum)
+    if [ "$1" == "yes" ];then
+        grep -qi '^Quorate:.*Yes$' "$quorumtool_res_file"
+    else
+        grep -qi '^Quorate:.*No$' "$quorumtool_res_file"
+    fi
+
+    # Quorum is 2
+    grep -qi '^Quorum:.*2' "$quorumtool_res_file"
+
+    # Is quorate (libvotequorum)
+    if [ "$1" == "yes" ];then
+        grep -qi '^Flags:.*Quorate' "$quorumtool_res_file"
+    fi
+
+    rm -f "$quorumtool_res_file"
+}
+
+# Test corosync-qdevice-tool by waiting for connected state and
+# checking heuristics results
+test_qdevice_tool() {
+    qdevice_tool_res_file=`mktemp`
+
+    cont=true
+    repeats=0
+
+    while $cont;do
+        corosync-qdevice-tool -s | tee "$qdevice_tool_res_file"
+
+        if grep -qi '^State:.*Connected' "$qdevice_tool_res_file";then
+            cont=false
+        else
+            repeats=$((repeats+1))
+            [ "$repeats" -le "$MAX_REPEATS" ]
+
+            sleep 1
+        fi
+    done
+
+    corosync-qdevice-tool -sv | tee "$qdevice_tool_res_file"
+    grep -qi '^Heuristics result:.*Pass ' "$qdevice_tool_res_file"
+
+    rm -f "$qdevice_tool_res_file"
+}
+
+# Test qnetd tool -s (check connected clients/clusters) and -l
+# (check node id, membership and heuristics)
+test_qnetd_tool() {
+    qnetd_tool_res_file=`mktemp`
+
+    corosync-qnetd-tool -s | tee "$qnetd_tool_res_file"
+
+    grep -qi '^Connected clients:.*1$' "$qnetd_tool_res_file"
+    grep -qi '^Connected clusters:.*1$' "$qnetd_tool_res_file"
+
+    corosync-qnetd-tool -sv | tee "$qnetd_tool_res_file"
+
+    corosync-qnetd-tool -l | tee "$qnetd_tool_res_file"
+
+    grep -qi "^Cluster \"$COROSYNC_CLUSTER_NAME\":\$" "$qnetd_tool_res_file"
+    grep -qi 'Node ID 1:$' "$qnetd_tool_res_file"
+    grep -qi 'Membership node list:.*1$' "$qnetd_tool_res_file"
+    grep -qi 'Heuristics:.*Pass$' "$qnetd_tool_res_file"
+
+    corosync-qnetd-tool -lv | tee "$qnetd_tool_res_file"
+
+    rm -f "$qnetd_tool_res_file" "$qnetd_tool_res_file"
+}
+
+test_qdevice_qnetd_man_pages() {
+    # At least these man pages should be installed
+    expected_mp="corosync-qnetd corosync-qnetd-certutil corosync-qnetd-tool
+        corosync-qdevice corosync-qdevice-net-certutil corosync-qdevice-tool"
+
+    for mp in $expected_mp;do
+        man -w "$mp"
+    done
+}
+
+########
+# main #
+########
+if [ -z "$PREFIX" ];then
+    echo "PREFIX not defined. Do not run *.inc.sh directly"
+    exit 1
+fi
+
+test_corosync_qdevice_h
+test_corosync_qnetd_h
+
+test_qdevice_qnetd_man_pages
+
+test_crt_creation
+
+test_qnetd_start
+test_corosync_start
+
+test_corosync_quorumtool "no"
+
+test_qdevice_start
+
+test_qdevice_tool
+test_qnetd_tool
+test_corosync_quorumtool "yes"
+
+test_qdevice_stop
+test_corosync_stop
+test_qnetd_stop
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..d58c8cd
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,9 @@
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    tests:
+    - smoke
+    required_packages:
+    - iproute

From 01348e52f1880a50fdfc7a330a46b248e186d75a Mon Sep 17 00:00:00 2001
From: Jan Friesse <jfriesse@redhat.com>
Date: Thu, 19 Mar 2020 14:51:48 +0100
Subject: [PATCH 02/31] Enable gating

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
---
 gating.yaml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 gating.yaml

diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..f075ad7
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,15 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}

From 67d4a69ec2377af98d549d919c280cd9437864ad Mon Sep 17 00:00:00 2001
From: Jan Friesse <jfriesse@redhat.com>
Date: Thu, 26 Mar 2020 18:37:13 +0100
Subject: [PATCH 03/31] Test build with CI gating enabled

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
---
 corosync-qdevice.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index 5ff52c1..5afb9cb 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -10,7 +10,7 @@
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
 Version: 3.0.0
-Release: 5%{?gitver}%{?dist}
+Release: 6%{?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
@@ -190,6 +190,10 @@ fi
 %{_mandir}/man8/corosync-qnetd.8*
 
 %changelog
+* Thu Mar 26 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.0-6
+- Add CI tests
+- Enable gating
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From 703f19635a84f08222bf08480648b437b28f2b06 Mon Sep 17 00:00:00 2001
From: Jan Friesse <jfriesse@redhat.com>
Date: Fri, 27 Mar 2020 11:37:25 +0100
Subject: [PATCH 04/31] Add rpmlint error whitelist

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
---
 corosync-qdevice.rpmlintrc | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 corosync-qdevice.rpmlintrc

diff --git a/corosync-qdevice.rpmlintrc b/corosync-qdevice.rpmlintrc
new file mode 100644
index 0000000..7445ec2
--- /dev/null
+++ b/corosync-qdevice.rpmlintrc
@@ -0,0 +1,17 @@
+# qdevice coroqnetd group directories
+addFilter(r'corosync-qdevice\.[^:]+: (E|W): non-standard-dir-perm /etc/corosync/qdevice/net 770')
+addFilter(r'corosync-qdevice\.[^:]+: (E|W): dir-or-file-in-var-run /var/run/corosync-qdevice')
+addFilter(r'corosync-qdevice\.[^:]+: (E|W): non-standard-dir-perm /var/run/corosync-qdevice 770')
+
+# qnetd coroqnetd group directories
+addFilter(r'corosync-qnetd\.[^:]+: (E|W): non-standard-(u|g)id /etc/corosync/qnetd coroqnetd')
+addFilter(r'corosync-qnetd\.[^:]+: (E|W): non-standard-(u|g)id /var/run/corosync-qnetd coroqnetd')
+addFilter(r'corosync-qnetd\.[^:]+: (E|W): non-standard-dir-perm /etc/corosync/qnetd 770')
+addFilter(r'corosync-qnetd\.[^:]+: (E|W): dir-or-file-in-var-run /var/run/corosync-qnetd')
+addFilter(r'corosync-qnetd\.[^:]+: (E|W): non-standard-dir-perm /var/run/corosync-qnetd 770')
+
+# Empty %postun
+addFilter(r'W: empty-%postun')
+
+# Spelling error init
+addFilter(r'W: spelling-error %description -l en_US init')

From 166aa809ea2294f0b26af4a0776f5b8465ccdfca Mon Sep 17 00:00:00 2001
From: Jan Friesse <jfriesse@redhat.com>
Date: Fri, 24 Apr 2020 11:49:57 +0200
Subject: [PATCH 05/31] Add required packages for CI revdeps test

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
---
 tests/tests.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/tests.yml b/tests/tests.yml
index d58c8cd..9239dcf 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -7,3 +7,5 @@
     - smoke
     required_packages:
     - iproute
+    - corosync-qdevice
+    - corosync-qnetd

From 6d32525220aa40e70404ac45f1d9cf7ca3c0b788 Mon Sep 17 00:00:00 2001
From: Jan Friesse <jfriesse@redhat.com>
Date: Wed, 13 May 2020 10:40:06 +0200
Subject: [PATCH 06/31] Rebuild for new libqb

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
---
 corosync-qdevice.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index 5afb9cb..7b5156e 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -10,7 +10,7 @@
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
 Version: 3.0.0
-Release: 6%{?gitver}%{?dist}
+Release: 7%{?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
@@ -190,6 +190,9 @@ fi
 %{_mandir}/man8/corosync-qnetd.8*
 
 %changelog
+* Wed May 13 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.0-7
+- Rebuild for new libqb
+
 * Thu Mar 26 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.0-6
 - Add CI tests
 - Enable gating

From a48a9277fc8efa5154685fd70fbe970bab6e4836 Mon Sep 17 00:00:00 2001
From: Jan Friesse <jfriesse@redhat.com>
Date: Wed, 13 May 2020 11:00:20 +0200
Subject: [PATCH 07/31] Really rebuild for the new libqb

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
---
 corosync-qdevice.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index 7b5156e..22d1f62 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -10,7 +10,7 @@
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
 Version: 3.0.0
-Release: 7%{?gitver}%{?dist}
+Release: 8%{?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
@@ -190,6 +190,9 @@ fi
 %{_mandir}/man8/corosync-qnetd.8*
 
 %changelog
+* Wed May 13 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.0-8
+- Really rebuild for the new libqb
+
 * Wed May 13 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.0-7
 - Rebuild for new libqb
 

From 5912992bc1c24c9ea56f62439053f5f64a9194ba Mon Sep 17 00:00:00 2001
From: Jan Friesse <jfriesse@redhat.com>
Date: Wed, 22 Jul 2020 10:38:13 +0200
Subject: [PATCH 08/31] Use make macros

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
---
 corosync-qdevice.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index 22d1f62..47965ee 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -10,7 +10,7 @@
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
 Version: 3.0.0
-Release: 8%{?gitver}%{?dist}
+Release: 9%{?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
@@ -59,10 +59,10 @@ BuildRequires: autoconf automake libtool
 	--with-systemddir=%{_unitdir} \
 	--docdir=%{_docdir}
 
-make %{_smp_mflags}
+%make_build
 
 %install
-make install DESTDIR=%{buildroot}
+%make_install
 
 ## tree fixup
 # drop docs and html docs for now
@@ -190,6 +190,10 @@ fi
 %{_mandir}/man8/corosync-qnetd.8*
 
 %changelog
+* Wed Jul 22 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.0-9
+- Use make macros
+- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
+
 * Wed May 13 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.0-8
 - Really rebuild for the new libqb
 

From 7282512e9c41c4defcada2e1e95960fa3be1bf21 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 27 Jul 2020 14:36:02 +0000
Subject: [PATCH 09/31] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 corosync-qdevice.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index 47965ee..2fe3cc3 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -10,7 +10,7 @@
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
 Version: 3.0.0
-Release: 9%{?gitver}%{?dist}
+Release: 10%{?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
@@ -190,6 +190,9 @@ fi
 %{_mandir}/man8/corosync-qnetd.8*
 
 %changelog
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Wed Jul 22 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.0-9
 - Use make macros
 - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro

From 699c2064595a589145ae48f78542acf23648a4c4 Mon Sep 17 00:00:00 2001
From: Jan Friesse <jfriesse@redhat.com>
Date: Mon, 23 Nov 2020 09:10:29 +0100
Subject: [PATCH 10/31] New upstream release

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
---
 .gitignore                 |  1 +
 corosync-qdevice.rpmlintrc |  3 +++
 corosync-qdevice.spec      | 23 +++++++++++++++++++++--
 sources                    |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 48f4ee4..44c2524 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /corosync-qdevice-2.92.0.tar.gz
 /corosync-qdevice-2.93.0.tar.gz
 /corosync-qdevice-3.0.0.tar.gz
+/corosync-qdevice-3.0.1.tar.gz
diff --git a/corosync-qdevice.rpmlintrc b/corosync-qdevice.rpmlintrc
index 7445ec2..ff8083c 100644
--- a/corosync-qdevice.rpmlintrc
+++ b/corosync-qdevice.rpmlintrc
@@ -15,3 +15,6 @@ addFilter(r'W: empty-%postun')
 
 # Spelling error init
 addFilter(r'W: spelling-error %description -l en_US init')
+
+# No docs for qdevice devel sub-package
+addFilter(r'corosync-qdevice-devel\.[^:]+: W: no-documentation')
diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index 2fe3cc3..8cb7d11 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -1,6 +1,7 @@
 # Conditionals
 # Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>"
 # to disable or enable specific features
+%bcond_without userflags
 %bcond_with runautogen
 %bcond_without systemd
 
@@ -9,8 +10,8 @@
 
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
-Version: 3.0.0
-Release: 10%{?gitver}%{?dist}
+Version: 3.0.1
+Release: 1%{?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
@@ -50,6 +51,9 @@ BuildRequires: autoconf automake libtool
 %endif
 
 %{configure} \
+%if %{with userflags}
+	--enable-user-flags \
+%endif
 %if %{with systemd}
 	--enable-systemd \
 %endif
@@ -129,6 +133,18 @@ fi
 %{_mandir}/man8/corosync-qdevice-net-certutil.8*
 %{_mandir}/man8/corosync-qdevice.8*
 
+%package -n corosync-qdevice-devel
+Summary: The Corosync Cluster Engine Qdevice Network Development Kit
+Requires: pkgconfig
+
+%description -n corosync-qdevice-devel
+This package contains files used to develop using
+The Corosync Cluster Engine Qdevice
+
+%files -n corosync-qdevice-devel
+%license LICENSE
+%{_datadir}/pkgconfig/corosync-qdevice.pc
+
 %package -n corosync-qnetd
 Summary: The Corosync Cluster Engine Qdevice Network Daemon
 Requires: nss-tools
@@ -190,6 +206,9 @@ fi
 %{_mandir}/man8/corosync-qnetd.8*
 
 %changelog
+* Mon Nov 23 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.1-1
+- New upstream release
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 8f3a73c..90426a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (corosync-qdevice-3.0.0.tar.gz) = fca0e9be41cd7d938c7003e62b585cd67ac082dd546ea86a77d48747aeb89caca5fb87a4753bcb968c2b9de584361d0dc44b35a88c1465fc041c2fdf0bf61cd4
+SHA512 (corosync-qdevice-3.0.1.tar.gz) = 677aff51b5b3cae693ccf342494077cb5ee5ba16ff71c6d8da17f5ab54bc31e0df5c8e0fd4292125c0bffeaa25371d58360a7ec8b122534f92818d3658b46c98

From f36778de10e513fa5b57f79d96ed87c0f1cb8cfe Mon Sep 17 00:00:00 2001
From: Jan Friesse <jfriesse@redhat.com>
Date: Mon, 23 Nov 2020 09:27:57 +0100
Subject: [PATCH 11/31] New upstream release

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
---
 .gitignore            |  1 +
 corosync-qdevice.spec | 23 +++++++++++++++++++++--
 sources               |  2 +-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 48f4ee4..44c2524 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /corosync-qdevice-2.92.0.tar.gz
 /corosync-qdevice-2.93.0.tar.gz
 /corosync-qdevice-3.0.0.tar.gz
+/corosync-qdevice-3.0.1.tar.gz
diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index 5ff52c1..0870582 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -1,6 +1,7 @@
 # Conditionals
 # Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>"
 # to disable or enable specific features
+%bcond_without userflags
 %bcond_with runautogen
 %bcond_without systemd
 
@@ -9,8 +10,8 @@
 
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
-Version: 3.0.0
-Release: 5%{?gitver}%{?dist}
+Version: 3.0.1
+Release: 1%{?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
@@ -50,6 +51,9 @@ BuildRequires: autoconf automake libtool
 %endif
 
 %{configure} \
+%if %{with userflags}
+	--enable-user-flags \
+%endif
 %if %{with systemd}
 	--enable-systemd \
 %endif
@@ -129,6 +133,18 @@ fi
 %{_mandir}/man8/corosync-qdevice-net-certutil.8*
 %{_mandir}/man8/corosync-qdevice.8*
 
+%package -n corosync-qdevice-devel
+Summary: The Corosync Cluster Engine Qdevice Network Development Kit
+Requires: pkgconfig
+
+%description -n corosync-qdevice-devel
+This package contains files used to develop using
+The Corosync Cluster Engine Qdevice
+
+%files -n corosync-qdevice-devel
+%license LICENSE
+%{_datadir}/pkgconfig/corosync-qdevice.pc
+
 %package -n corosync-qnetd
 Summary: The Corosync Cluster Engine Qdevice Network Daemon
 Requires: nss-tools
@@ -190,6 +206,9 @@ fi
 %{_mandir}/man8/corosync-qnetd.8*
 
 %changelog
+* Mon Nov 23 2020 Jan Friesse <jfriesse@redhat.com> - 3.0.1-1
+- New upstream release
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 8f3a73c..90426a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (corosync-qdevice-3.0.0.tar.gz) = fca0e9be41cd7d938c7003e62b585cd67ac082dd546ea86a77d48747aeb89caca5fb87a4753bcb968c2b9de584361d0dc44b35a88c1465fc041c2fdf0bf61cd4
+SHA512 (corosync-qdevice-3.0.1.tar.gz) = 677aff51b5b3cae693ccf342494077cb5ee5ba16ff71c6d8da17f5ab54bc31e0df5c8e0fd4292125c0bffeaa25371d58360a7ec8b122534f92818d3658b46c98

From cb7dbcfb920fdea59fa16d2d6b08576cab38c910 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Sat, 19 Dec 2020 05:29:11 +0000
Subject: [PATCH 12/31] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 corosync-qdevice.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index 8cb7d11..ae83571 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -41,6 +41,7 @@ BuildRequires: nss-devel
 %if %{with runautogen}
 BuildRequires: autoconf automake libtool
 %endif
+BuildRequires: make
 
 %prep
 %setup -q -n %{name}-%{version}%{?gittarver}

From f55fa33dcdc3751b6e0074f9d86cc6f88fcd5753 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 26 Jan 2021 02:34:36 +0000
Subject: [PATCH 13/31] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 corosync-qdevice.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index ae83571..5d0dc51 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -11,7 +11,7 @@
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
 Version: 3.0.1
-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
@@ -207,6 +207,9 @@ fi
 %{_mandir}/man8/corosync-qnetd.8*
 
 %changelog
+* 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
 - New upstream release
 

From a9a70766a2bbbd2de3029386f4aa859b6526779b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 15:05:38 +0000
Subject: [PATCH 14/31] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

From 90816ff24e89a8ff7758506c2885b61f7adcd38b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jan 2022 23:51:34 +0000
Subject: [PATCH 15/31] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 corosync-qdevice.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index 5d0dc51..04505f8 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -11,7 +11,7 @@
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
 Version: 3.0.1
-Release: 2%{?gitver}%{?dist}
+Release: 3%{?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
@@ -207,6 +207,9 @@ fi
 %{_mandir}/man8/corosync-qnetd.8*
 
 %changelog
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From b683d58792f7bd5400fc0facbbb7d6683ecffa8c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 20 Jul 2022 23:36:14 +0000
Subject: [PATCH 16/31] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 corosync-qdevice.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index 04505f8..4566a21 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -11,7 +11,7 @@
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
 Version: 3.0.1
-Release: 3%{?gitver}%{?dist}
+Release: 4%{?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
@@ -207,6 +207,9 @@ fi
 %{_mandir}/man8/corosync-qnetd.8*
 
 %changelog
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 8da824c2758d2644c6e81713645a030983111e10 Mon Sep 17 00:00:00 2001
From: Jan Friesse <jfriesse@redhat.com>
Date: Thu, 3 Nov 2022 17:09:12 +0100
Subject: [PATCH 17/31] New upstream release

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
---
 .gitignore            | 1 +
 corosync-qdevice.spec | 7 +++++--
 sources               | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 44c2524..6a5856e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /corosync-qdevice-2.93.0.tar.gz
 /corosync-qdevice-3.0.0.tar.gz
 /corosync-qdevice-3.0.1.tar.gz
+/corosync-qdevice-3.0.2.tar.gz
diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index 4566a21..2fd69f0 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -10,8 +10,8 @@
 
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
-Version: 3.0.1
-Release: 4%{?gitver}%{?dist}
+Version: 3.0.2
+Release: 1%{?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
@@ -207,6 +207,9 @@ fi
 %{_mandir}/man8/corosync-qnetd.8*
 
 %changelog
+* Thu Nov 03 2022 Jan Friesse <jfriesse@redhat.com> - 3.0.2-1
+- New upstream release
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index 90426a1..19e00b2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (corosync-qdevice-3.0.1.tar.gz) = 677aff51b5b3cae693ccf342494077cb5ee5ba16ff71c6d8da17f5ab54bc31e0df5c8e0fd4292125c0bffeaa25371d58360a7ec8b122534f92818d3658b46c98
+SHA512 (corosync-qdevice-3.0.2.tar.gz) = ca2410b873f872ab40156ccb46ce4504e479db02ab3af56bbbfdb634a474ca9759db09b605356414467b3c22f7baad082613b2bf5d5d017e9fa532baa940c2e2

From 11806258cbf687794acff84255b5f9b9d41b9d7f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 19 Jan 2023 00:31:39 +0000
Subject: [PATCH 18/31] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 corosync-qdevice.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index 2fd69f0..f0c90c8 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -11,7 +11,7 @@
 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
@@ -207,6 +207,9 @@ fi
 %{_mandir}/man8/corosync-qnetd.8*
 
 %changelog
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Thu Nov 03 2022 Jan Friesse <jfriesse@redhat.com> - 3.0.2-1
 - New upstream release
 

From 6f06896f5c7f1dcce8f2c5cf51cc4c5fafde3cf8 Mon Sep 17 00:00:00 2001
From: Jan Friesse <jfriesse@redhat.com>
Date: Wed, 22 Mar 2023 17:08:11 +0100
Subject: [PATCH 19/31] New upstream release

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
---
 .gitignore            | 1 +
 corosync-qdevice.spec | 7 +++++--
 sources               | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6a5856e..ccc9e53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /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
diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index f0c90c8..1bbc9b3 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -10,8 +10,8 @@
 
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
-Version: 3.0.2
-Release: 2%{?gitver}%{?dist}
+Version: 3.0.3
+Release: 1%{?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
@@ -207,6 +207,9 @@ fi
 %{_mandir}/man8/corosync-qnetd.8*
 
 %changelog
+* Wed Mar 22 2023 Jan Friesse <jfriesse@redhat.com> - 3.0.3-1
+- New upstream release
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/sources b/sources
index 19e00b2..1da74cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (corosync-qdevice-3.0.2.tar.gz) = ca2410b873f872ab40156ccb46ce4504e479db02ab3af56bbbfdb634a474ca9759db09b605356414467b3c22f7baad082613b2bf5d5d017e9fa532baa940c2e2
+SHA512 (corosync-qdevice-3.0.3.tar.gz) = f9b63f249199679397d52550540b96d15ea11a417c0b8bfb8c62059bd802c2b6857c4f61e9e3c344c1a6d354e33bb051d32787dead8ceb6fb89062b123761160

From b49cdd5cd7c4e64e01a1cc40fdcb3283458705b6 Mon Sep 17 00:00:00 2001
From: Jan Friesse <jfriesse@redhat.com>
Date: Tue, 6 Jun 2023 11:27:26 +0200
Subject: [PATCH 20/31] Migrated to SPDX license

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
---
 corosync-qdevice.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index 1bbc9b3..fd19bbd 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -11,8 +11,8 @@
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
 Version: 3.0.3
-Release: 1%{?gitver}%{?dist}
-License: BSD
+Release: 2%{?gitver}%{?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
 
@@ -207,6 +207,9 @@ fi
 %{_mandir}/man8/corosync-qnetd.8*
 
 %changelog
+* Tue Jun 06 2023 Jan Friesse <jfriesse@redhat.com> - 3.0.3-2
+- migrated to SPDX license
+
 * Wed Mar 22 2023 Jan Friesse <jfriesse@redhat.com> - 3.0.3-1
 - New upstream release
 

From b85940e85664414a465a3acbe6f3fa938df5a269 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jul 2023 16:24:44 +0000
Subject: [PATCH 21/31] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 corosync-qdevice.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index fd19bbd..bbbd431 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -11,7 +11,7 @@
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
 Version: 3.0.3
-Release: 2%{?gitver}%{?dist}
+Release: 3%{?gitver}%{?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
@@ -207,6 +207,9 @@ fi
 %{_mandir}/man8/corosync-qnetd.8*
 
 %changelog
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Tue Jun 06 2023 Jan Friesse <jfriesse@redhat.com> - 3.0.3-2
 - migrated to SPDX license
 

From 3025b3da66fdb467c8bfb65f014434c74dc00342 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jan 2024 16:12:30 +0000
Subject: [PATCH 22/31] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 corosync-qdevice.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index bbbd431..28ca3df 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -11,7 +11,7 @@
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
 Version: 3.0.3
-Release: 3%{?gitver}%{?dist}
+Release: 4%{?gitver}%{?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
@@ -207,6 +207,9 @@ fi
 %{_mandir}/man8/corosync-qnetd.8*
 
 %changelog
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 0780fe592c58cbe430ceedd78f58b4771480ce4d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 24 Jan 2024 08:07:54 +0000
Subject: [PATCH 23/31] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 corosync-qdevice.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index 28ca3df..2a70cb7 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -11,7 +11,7 @@
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
 Version: 3.0.3
-Release: 4%{?gitver}%{?dist}
+Release: 5%{?gitver}%{?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
@@ -207,6 +207,9 @@ fi
 %{_mandir}/man8/corosync-qnetd.8*
 
 %changelog
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From a0cf013e9e802b79e9b5ba7252780111af06fce2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 17 Jul 2024 20:01:14 +0000
Subject: [PATCH 24/31] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 corosync-qdevice.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index 2a70cb7..fd3cc85 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -11,7 +11,7 @@
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
 Version: 3.0.3
-Release: 5%{?gitver}%{?dist}
+Release: 6%{?gitver}%{?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
@@ -207,6 +207,9 @@ fi
 %{_mandir}/man8/corosync-qnetd.8*
 
 %changelog
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 49d748a73a511f330b1803737df8003aa7de7f7c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jan 2025 14:33:18 +0000
Subject: [PATCH 25/31] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 corosync-qdevice.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index fd3cc85..f146b00 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -11,7 +11,7 @@
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
 Version: 3.0.3
-Release: 6%{?gitver}%{?dist}
+Release: 7%{?gitver}%{?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
@@ -207,6 +207,9 @@ fi
 %{_mandir}/man8/corosync-qnetd.8*
 
 %changelog
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From 19bb6b33200138120afd642dd7daf8909479d5d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 11 Feb 2025 14:36:22 +0100
Subject: [PATCH 26/31] Add sysusers.d config file to allow rpm to create
 users/groups automatically

See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers.
---
 corosync-qdevice.spec | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index f146b00..5acf0b6 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -11,7 +11,7 @@
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
 Version: 3.0.3
-Release: 7%{?gitver}%{?dist}
+Release: 8%{?gitver}%{?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
@@ -46,6 +46,11 @@ BuildRequires: make
 %prep
 %setup -q -n %{name}-%{version}%{?gittarver}
 
+# Create a sysusers.d config file
+cat >corosync-qdevice.sysusers.conf <<EOF
+u coroqnetd - 'User for corosync-qnetd' - -
+EOF
+
 %build
 %if %{with runautogen}
 ./autogen.sh
@@ -88,6 +93,8 @@ sed -i -e 's/^COROSYNC_QNETD_RUNAS=""$/COROSYNC_QNETD_RUNAS="coroqnetd"/' \
    %{buildroot}%{_sysconfdir}/sysconfig/corosync-qnetd
 %endif
 
+install -m0644 -D corosync-qdevice.sysusers.conf %{buildroot}%{_sysusersdir}/corosync-qdevice.conf
+
 %description
 This package contains the Corosync Cluster Engine Qdevice, script for creating
 NSS certificates and an init script.
@@ -149,7 +156,6 @@ 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}
@@ -159,11 +165,6 @@ Requires(pre): shadow-utils
 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}
@@ -205,8 +206,12 @@ fi
 %{_mandir}/man8/corosync-qnetd-tool.8*
 %{_mandir}/man8/corosync-qnetd-certutil.8*
 %{_mandir}/man8/corosync-qnetd.8*
+%{_sysusersdir}/corosync-qdevice.conf
 
 %changelog
+* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.0.3-8
+- Add sysusers.d config file to allow rpm to create users/groups automatically
+
 * Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From a57c62da6cf2713aa85a8ca281a5048422f10234 Mon Sep 17 00:00:00 2001
From: Jan Friesse <jfriesse@redhat.com>
Date: Tue, 11 Feb 2025 17:23:31 +0100
Subject: [PATCH 27/31] Modernize specfile a bit

- Change sysusers.d config file name to corosync-qnetd.conf
- Remove support for non-systemd builds

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
---
 corosync-qdevice.spec | 65 ++++++-------------------------------------
 1 file changed, 8 insertions(+), 57 deletions(-)

diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index 5acf0b6..773164f 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -3,7 +3,6 @@
 # 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}}
@@ -11,7 +10,7 @@
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
 Version: 3.0.3
-Release: 8%{?gitver}%{?dist}
+Release: 9%{?gitver}%{?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
@@ -21,14 +20,9 @@ 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
@@ -47,7 +41,7 @@ BuildRequires: make
 %setup -q -n %{name}-%{version}%{?gittarver}
 
 # Create a sysusers.d config file
-cat >corosync-qdevice.sysusers.conf <<EOF
+cat >corosync-qnetd.sysusers.conf <<EOF
 u coroqnetd - 'User for corosync-qnetd' - -
 EOF
 
@@ -60,9 +54,7 @@ EOF
 %if %{with userflags}
 	--enable-user-flags \
 %endif
-%if %{with systemd}
 	--enable-systemd \
-%endif
 	--enable-qdevices \
 	--enable-qnetd \
 	--with-initddir=%{_initrddir} \
@@ -85,43 +77,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 corosync-qdevice.sysusers.conf %{buildroot}%{_sysusersdir}/corosync-qdevice.conf
+install -m0644 -D corosync-qnetd.sysusers.conf %{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
@@ -132,11 +104,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*
@@ -157,9 +125,7 @@ The Corosync Cluster Engine Qdevice
 Summary: The Corosync Cluster Engine Qdevice Network Daemon
 Requires: nss-tools
 
-%if %{with systemd}
 %{?systemd_requires}
-%endif
 
 %description -n corosync-qnetd
 This package contains the Corosync Cluster Engine Qdevice Network Daemon,
@@ -167,28 +133,13 @@ script for creating NSS certificates and an init script.
 
 
 %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
@@ -198,17 +149,17 @@ 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-qdevice.conf
+%{_sysusersdir}/corosync-qnetd.conf
 
 %changelog
+* Tue Feb 11 2025 Jan Friesse <jfriesse@redhat.com> - 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 <zbyszek@in.waw.pl> - 3.0.3-8
 - Add sysusers.d config file to allow rpm to create users/groups automatically
 

From c5d8dbc5afb5c021a89358f1a66bf5ac5f5d69d4 Mon Sep 17 00:00:00 2001
From: Jan Friesse <jfriesse@redhat.com>
Date: Tue, 25 Mar 2025 15:31:31 +0100
Subject: [PATCH 28/31] Use autosetup

- Add git build dependency required for autosetup git_am
- Remove unused gitver and gittarver

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
---
 corosync-qdevice.spec | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index 773164f..50b8dda 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -4,16 +4,13 @@
 %bcond_without userflags
 %bcond_with runautogen
 
-%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.3
-Release: 9%{?gitver}%{?dist}
+Release: 9%{?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
@@ -36,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
 
 # Create a sysusers.d config file
 cat >corosync-qnetd.sysusers.conf <<EOF

From fe1df010c518d094ccc7577545b6210f2287712b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 18:40:57 +0000
Subject: [PATCH 29/31] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 corosync-qdevice.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/corosync-qdevice.spec b/corosync-qdevice.spec
index 50b8dda..9cff1ff 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -7,7 +7,7 @@
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
 Version: 3.0.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: BSD-3-Clause
 URL: https://github.com/corosync/corosync-qdevice
 Source0: https://github.com/corosync/corosync-qdevice/releases/download/v%{version}/%{name}-%{version}.tar.gz
@@ -154,6 +154,9 @@ script for creating NSS certificates and an init script.
 %{_sysusersdir}/corosync-qnetd.conf
 
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Tue Feb 11 2025 Jan Friesse <jfriesse@redhat.com> - 3.0.3-9
 - Change sysusers.d config file name to corosync-qnetd.conf
 - Remove support for non-systemd builds

From d8fb649535ea647747884871a87497dc501dca73 Mon Sep 17 00:00:00 2001
From: Jan Friesse <jfriesse@redhat.com>
Date: Mon, 28 Jul 2025 09:11:40 +0200
Subject: [PATCH 30/31] Migrate tests from STI to TMT format

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
---
 .fmf/version           |  1 +
 tests/.gitignore       |  3 ---
 tests/plan.fmf         | 11 +++++++++++
 tests/smoke/main.fmf   |  2 ++
 tests/smoke/runtest.sh |  0
 tests/tests.yml        | 11 -----------
 6 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 .fmf/version
 delete mode 100644 tests/.gitignore
 create mode 100644 tests/plan.fmf
 create mode 100644 tests/smoke/main.fmf
 mode change 100644 => 100755 tests/smoke/runtest.sh
 delete mode 100644 tests/tests.yml

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/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

From a437de7c91a370736e580d91de870f9cec9ee50c Mon Sep 17 00:00:00 2001
From: Jan Friesse <jfriesse@redhat.com>
Date: Tue, 25 Nov 2025 10:44:14 +0100
Subject: [PATCH 31/31] New upstream release

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
---
 .gitignore            |  1 +
 corosync-qdevice.spec | 14 ++++++--------
 sources               |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index ccc9e53..ec4bfb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /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 9cff1ff..21f7ae7 100644
--- a/corosync-qdevice.spec
+++ b/corosync-qdevice.spec
@@ -6,8 +6,8 @@
 
 Name: corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
-Version: 3.0.3
-Release: 10%{?dist}
+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}/%{name}-%{version}.tar.gz
@@ -38,11 +38,6 @@ BuildRequires: git
 %prep
 %autosetup -S git_am
 
-# Create a sysusers.d config file
-cat >corosync-qnetd.sysusers.conf <<EOF
-u coroqnetd - 'User for corosync-qnetd' - -
-EOF
-
 %build
 %if %{with runautogen}
 ./autogen.sh
@@ -78,7 +73,7 @@ install -p -m 644 init/corosync-qnetd.sysconfig.example \
 sed -i -e 's/^#User=/User=/' \
    %{buildroot}%{_unitdir}/corosync-qnetd.service
 
-install -m0644 -D corosync-qnetd.sysusers.conf %{buildroot}%{_sysusersdir}/corosync-qnetd.conf
+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
@@ -154,6 +149,9 @@ script for creating NSS certificates and an init script.
 %{_sysusersdir}/corosync-qnetd.conf
 
 %changelog
+* Tue Nov 25 2025 Jan Friesse <jfriesse@redhat.com> - 3.0.4-1
+- New upstream release
+
 * Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 
diff --git a/sources b/sources
index 1da74cd..2dd25f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (corosync-qdevice-3.0.3.tar.gz) = f9b63f249199679397d52550540b96d15ea11a417c0b8bfb8c62059bd802c2b6857c4f61e9e3c344c1a6d354e33bb051d32787dead8ceb6fb89062b123761160
+SHA512 (corosync-qdevice-3.0.4.tar.gz) = a7e2e1fcab699c6deb0ae01725df6a1d3870c0f874b7dff96f657ac3e0d9fadb682ae145d6a9d29c592ca8f34ad12b8523c6adf9b14b0a01e59d998d8cb8c25f