6 changed files with 53 additions and 161 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
-1
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,2 @@
-*~
-
-/.build-*
-
-/clog
-/watchdog-*.tar.gz
+/watchdog-5.15.tar.gz
+/watchdog-5.16.tar.gz
--- a/0004-watchdog-5.13-rhseldoc.patch
+++ b/0004-watchdog-5.13-rhseldoc.patch
@ -73,39 +73,19 @@ index 9b7c6e7..052b1e1 100644
 .SH "SEE ALSO"
 -.BR watchdog.conf (5)
 +.BR watchdog.conf (5), systemd.unit (5)
-diff --git a/watchdog.conf b/watchdog.conf
-index 207da3e..7dd3cb3 100644
--- a/watchdog.conf
-+++ b/watchdog.conf
-@@ -75,7 +75,9 @@ priority		= 1
- # If you have a custom binary/script to handle errors then uncomment
- # this line and provide the path. For 'v1' test binary files they also
- # handle error cases.
-
-+# With enforcing SELinux policy please use the /usr/libexec/watchdog/scripts/
-+	
-+# or /etc/watchdog.d/ for your test-binary and repair-binary configuration.
- #repair-binary		= /usr/sbin/repair
- #repair-timeout		= 60
- 
-@@ -175,6 +177,13 @@ priority		= 1
- #temperature-sensor	=
- #max-temperature	= 90
- 
-+# When using custom service pid check with custom service
-+# systemd unit file please be aware the "Requires="
-+# does dependent service deactivation.
-+# Using "Before=watchdog.service" or "Before=watchdog-ping.service"
-+# in the custom service unit file may be the desired operation instead.
-+# See man 5 systemd.unit for more details.
-+#
- # Check for a running process/daemon by its PID file. For example,
- # check if rsyslogd is still running by enabling the following line:
- 
 diff --git a/watchdog.conf.5 b/watchdog.conf.5
-index edf7c8b..72c3bc2 100644
+index edf7c8b..2803fee 100644
 --- a/watchdog.conf.5
 +++ b/watchdog.conf.5
+@@ -47,7 +47,7 @@ Be careful not to this parameter too low. To set a value less then the
+ predefined minimal value of 2, you have to use the \-f command line option.
+ .TP
+ min-memory = <minpage>
+-Set the minimal amount of memory that has to stay free. Note that
+Set the minimal amount of virtual memory that has to stay free. Note that
+ this is in memory pages (4kB on x86). Default value is 0 pages which means
+ this test is disabled. The page size is taken from the system include files.
+ The usable memory is computed from MemFree + Buffers + Cached since buffer
@@ -130,6 +130,7 @@ pidfile = <pidfilename>
 Set pidfile name for daemon test mode.
 This option can be given as often as you like to check several daemons, assuming
@ -140,3 +120,28 @@ index edf7c8b..72c3bc2 100644
 See the Test Directory section in watchdog(8) for more information.
 .TP
 log-dir = <log directory>
+@@ -202,23 +208,7 @@ large databases or virtual machines might need longer.
+ verbose = <level>
+ This overrides the command line \-\-verbose option. Generally the verbose mode is
+ only enabled for debugging as it creates a lot of syslog chatter, so use this option
+-with consideration. Zero is "normal" operation (quiet), while 1 is typically used
+-for debugging. Values of 2 or more usually generate far too many messages.
+-.TP
+-heartbeat-file = <filename>
+-For debugging this allows a rolling set of status values to be kept on disk
+-.TP
+-heartbeat-stamps = <interval>
+-For debugging this sets the number of entries in the <heartbeat-file>
+-.TP
+-log-killed-pids = <yes|no>
+-This acts like enabling 'verbose' logging, but only for a system reboot, where it
+-enables the logging of the PID values for all processes that are being killed. The
+-results are written to the killall5.log file in the log directory (if at all
+-possible) in this case.
+-Intended for debugging cases where you would like to know what was running at the
+-point the machine triggered the watchdog, but don't want syslog filling up with the
+-usual chatter of activity.
+with consideration.
+ .SH FILES
+ .TP
+ .I /etc/watchdog.conf
--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-10
+  - rhel-8
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
--- a/plans/tier1.fmf
+++ b/plans/tier1.fmf
@ -1,37 +0,0 @@
---
-
-summary: Tier1 plan for watchdog
-
-discover:
-  how: fmf
-  url: https://pkgs.devel.redhat.com/git/tests/watchdog
-  ref: master
-  filter: tier:1
-
-prepare:
-  # Enable beaker-tasks repository
-  - how: shell
-    script: |
-      set -euxo pipefail
-
-      ENABLE_REPO_CMD="yum-config-manager --enable"
-      if command -v dnf >/dev/null 2>&1; then
-        ENABLE_REPO_CMD="dnf config-manager --set-enabled"
-      fi
-
-      ${ENABLE_REPO_CMD} beaker-tasks || :
-
-  # Enable buildroot repository
-  - how: shell
-    script: |
-        set -exuo pipefail
-
-        if [[ -f /etc/os-release ]]; then
-          . /etc/os-release
-          if [[ "${ID:-}" == "rhel" && "${VERSION_ID%%.*}" -ge 8 ]]; then
-            dnf config-manager --enable rhel-CRB
-          fi
-        fi
-
-execute:
-  how: tmt
--- a/watchdog.spec
+++ b/watchdog.spec
@ -1,30 +1,23 @@
 Summary:          Software and/or Hardware watchdog daemon
 Name:             watchdog
 Version:          5.16
-Release:          11%{?dist}
-License:          GPL-2.0-or-later
+Release:          1%{?dist}
+License:          GPLv2+

 URL:              http://sourceforge.net/projects/watchdog/
 Source0:          http://downloads.sourceforge.net/watchdog/watchdog-%{version}.tar.gz
+Source1:          watchdog.init
 Source2:          README.watchdog.ipmi
 Source3:          README.Fedora
 Source4:          watchdog.service
 Source5:          watchdog-ping.service

-# Fixes building on glibc without RPC.  Sent upstream 2019-02-06.
 Patch1:           0001-Choose-libtirpc-or-another-RPC-library-for-XDR-heade.patch
-# Fixes potentional mem leak
 Patch2:           0002-mem-leak-verbose.patch
+Patch4:           0004-watchdog-5.13-rhseldoc.patch

-# Non-upstream patch to document SELinux support.
-Patch99:          0099-watchdog-5.16-rhseldoc.patch
-
-BuildRequires: make
-BuildRequires:    gcc
 BuildRequires:    libtirpc-devel
 BuildRequires:    systemd-units
-# Required because patches touch configure.ac and Makefile.am:
-BuildRequires:    autoconf, automake

 Requires(post): systemd
 Requires(preun): systemd
@ -37,7 +30,7 @@ or may be alternately used with a hardware watchdog device such as the
 IPMI hardware watchdog driver interface to a resident Baseboard 
 Management Controller (BMC).  watchdog periodically writes to /dev/watchdog; 
 the interval between writes to /dev/watchdog is configurable through settings 
-in the watchdog config file.  This configuration file is also used to 
+in the watchdog sysconfig file.  This configuration file is also used to 
 set the watchdog to be used as a hardware watchdog instead of its default 
 software watchdog operation.  In either case, if the device is open but not 
 written to within the configured time period, the watchdog timer expiration 
@ -50,10 +43,9 @@ expiration) initiated by the BMC.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch 1 -p1
-%patch 2 -p1
-%patch 99 -p1 -b .rhseldoc
-autoreconf -i
+%patch1 -p1 -b .xdr-header
+%patch2 -p1 -b .verbose
+%patch4 -p1 -b .rhseldoc

 cp %{SOURCE2} .
 cp %{SOURCE3} .
@ -76,10 +68,10 @@ make %{?_smp_mflags}
 install -d -m0755 ${RPM_BUILD_ROOT}%{_sysconfdir}
 install -d -m0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/watchdog.d
 make DESTDIR=${RPM_BUILD_ROOT} install
+install -Dp -m0644 %{name}.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/watchdog
 install -Dp -m0644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_unitdir}/watchdog.service
 install -Dp -m0644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_unitdir}/watchdog-ping.service
 install -Dd -m0755 ${RPM_BUILD_ROOT}%{_libexecdir}/watchdog/scripts
-rm %{name}.sysconfig


 %post
@ -113,6 +105,7 @@ rm %{name}.sysconfig
 %doc README.Fedora
 %endif
 %config(noreplace) %{_sysconfdir}/watchdog.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/watchdog
 %{_sysconfdir}/watchdog.d
 %{_sbindir}/watchdog
 %{_sbindir}/wd_identify
@ -127,75 +120,11 @@ rm %{name}.sysconfig


 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 5.16-11
- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
+* Thu Feb 23 2023 Josef Ridky <jridky@redhat.com> - 5.16-1
+- Rebase to version 5.16 (#2149701)

-* Wed Jun 26 2024 Josef Ridky <jridky@redhat.com> - 5.16-10
- Add gating.yaml file
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 5.16-9
- Bump release for June 2024 mass rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jul 19 2023 Josef Ridky <jridky@redhat.com> - 5.16-6
- Migrate to SPDX license format
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Oct 14 2021 Josef Ridky <jridky@redhat.com> - 5.16-2
- fix memory leak when verbose mode is on
-
-* Tue Aug 10 2021 Josef Ridky <jridky@redhat.com> - 5.16-1
- New upstream release 5.16
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.15-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.15-10
- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.15-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.15-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Feb 03 2020 Václav Doležal <vdolezal@redhat.com> - 5.15-7
- Clean up old SysV-init related files
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.15-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.15-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Feb 06 2019 Richard W.M. Jones <rjones@redhat.com> - 5.15-5
- Add all upstream patches since 5.15.
- Fix RPC/libtirpc (again?).
- Remove .rhsel patch.  Equivalent added upstream in 7310afccc1.
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.15-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Dec 03 2018 Josef Ridky <jridky@redhat.com> - 5.15-3
- update service files (#1542632)
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Wed Apr 21 2021 Than Ngo <than@redhat.com> - 5.15-2
+- Resolves: #1846110 - remove deprecated stanza in unit files

 * Tue Feb 13 2018 Richard W.M. Jones <rjones@redhat.com> - 5.15-1
 - Rebase to watchdog 5.15.