From e0e8eb42f78d02c0ac880493cf1b025a3c31acd9 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sat, 26 Nov 2022 18:01:44 +0100 Subject: [PATCH 01/11] Port configure script to C99 Related to: --- whowatch-configure-c99.patch | 36 ++++++++++++++++++++++++++++++++++++ whowatch.spec | 12 +++++++++--- 2 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 whowatch-configure-c99.patch diff --git a/whowatch-configure-c99.patch b/whowatch-configure-c99.patch new file mode 100644 index 0000000..bf7e25a --- /dev/null +++ b/whowatch-configure-c99.patch @@ -0,0 +1,36 @@ +Avoid claling the undeclared exit function. Implicit function +declarations were removed from the C language in 1999, and future +compilers will refuse to compile calls to undeclared functions. + +Submitted upstream: + +diff --git a/configure b/configure +index 81d5eb056f2e59d0..4455e5a0211eeb61 100755 +--- a/configure ++++ b/configure +@@ -5354,8 +5354,8 @@ fd_set rfds; + struct timeval tv = {1, 0}; + FD_ZERO(&rfds); FD_SET(0,&rfds); + select(1,&rfds,0,0,&tv); +-if(tv.tv_sec == 0) exit(0); +-else exit(1); ++if(tv.tv_sec == 0) return 0; ++else return 1; + } + + _ACEOF +diff --git a/configure.ac b/configure.ac +index 64fad6e1023bd541..7be34fd802e608cf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -103,8 +103,8 @@ fd_set rfds; + struct timeval tv = {1, 0}; + FD_ZERO(&rfds); FD_SET(0,&rfds); + select(1,&rfds,0,0,&tv); +-if(tv.tv_sec == 0) exit(0); +-else exit(1); ++if(tv.tv_sec == 0) return 0; ++else return 1; + } + ]])],[AC_MSG_RESULT(yes); AC_DEFINE([RETURN_TV_IN_SELECT],[1],[define if select() modifies the time value])],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)]) + diff --git a/whowatch.spec b/whowatch.spec index a70f288..1e8517d 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,11 +1,12 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2 URL: http://wizard.ae.krakow.pl/~mike/ Source0: https://github.com/mtsuszycki/whowatch/archive/whowatch-%{version}.tar.gz +Patch0: whowatch-configure-c99.patch BuildRequires: make BuildRequires: gcc @@ -20,10 +21,12 @@ idle time. You can watch processes tree, navigate in it and send INT and KILL signals. %prep - -%setup -q +%autosetup -p1 %build +# Avoid regenerating configure script because whowatch-configure-c99.patch +# updates it directly. +touch aclocal.m4 Makefile.in src/config.h.in %configure %{__make} %{?_smp_mflags} @@ -39,6 +42,9 @@ signals. %{_bindir}/whowatch %changelog +* Sat Nov 26 2022 Florian Weimer - 1.8.6-13 +- Port configure script to C99 + * Sat Jul 23 2022 Fedora Release Engineering - 1.8.6-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 0f77025f84ed2f46e51ede3f32f9f6fdfc00c0e4 Mon Sep 17 00:00:00 2001 From: Richard Fearn Date: Tue, 27 Dec 2022 18:28:51 +0000 Subject: [PATCH 02/11] Use SPDX license identifier --- whowatch.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/whowatch.spec b/whowatch.spec index 1e8517d..3496a9f 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,8 +1,8 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 13%{?dist} -License: GPLv2 +Release: 14%{?dist} +License: GPL-2.0-only URL: http://wizard.ae.krakow.pl/~mike/ Source0: https://github.com/mtsuszycki/whowatch/archive/whowatch-%{version}.tar.gz @@ -42,6 +42,9 @@ touch aclocal.m4 Makefile.in src/config.h.in %{_bindir}/whowatch %changelog +* Tue Dec 27 2022 Richard Fearn - 1.8.6-14 +- Use SPDX license identifier + * Sat Nov 26 2022 Florian Weimer - 1.8.6-13 - Port configure script to C99 From 81a1d0dc39fc1789f2d16bbbc24f156f631ab075 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:48:22 +0000 Subject: [PATCH 03/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 3496a9f..b29c009 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 14%{?dist} +Release: 15%{?dist} License: GPL-2.0-only URL: http://wizard.ae.krakow.pl/~mike/ @@ -42,6 +42,9 @@ touch aclocal.m4 Makefile.in src/config.h.in %{_bindir}/whowatch %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.8.6-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Dec 27 2022 Richard Fearn - 1.8.6-14 - Use SPDX license identifier From 45717015700bec67804a2262cfa538294856c82f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:11:37 +0000 Subject: [PATCH 04/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index b29c009..1c87191 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 15%{?dist} +Release: 16%{?dist} License: GPL-2.0-only URL: http://wizard.ae.krakow.pl/~mike/ @@ -42,6 +42,9 @@ touch aclocal.m4 Makefile.in src/config.h.in %{_bindir}/whowatch %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.8.6-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 1.8.6-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 181b5b191e0840d870a8092d8833d18f1e9beff6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:45:16 +0000 Subject: [PATCH 05/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 1c87191..8cee597 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 16%{?dist} +Release: 17%{?dist} License: GPL-2.0-only URL: http://wizard.ae.krakow.pl/~mike/ @@ -42,6 +42,9 @@ touch aclocal.m4 Makefile.in src/config.h.in %{_bindir}/whowatch %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.8.6-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 1.8.6-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From aaa55d6e879fb8c573cb22e3fc58fd3e04541a4e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:19:44 +0000 Subject: [PATCH 06/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 8cee597..40c3cc6 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 17%{?dist} +Release: 18%{?dist} License: GPL-2.0-only URL: http://wizard.ae.krakow.pl/~mike/ @@ -42,6 +42,9 @@ touch aclocal.m4 Makefile.in src/config.h.in %{_bindir}/whowatch %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.8.6-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 1.8.6-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 996010d0f3b430690e4da52b166433071a4cf16a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:00:16 +0000 Subject: [PATCH 07/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 40c3cc6..6eb6377 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 18%{?dist} +Release: 19%{?dist} License: GPL-2.0-only URL: http://wizard.ae.krakow.pl/~mike/ @@ -42,6 +42,9 @@ touch aclocal.m4 Makefile.in src/config.h.in %{_bindir}/whowatch %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.8.6-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 1.8.6-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From fae3020e419c28f74dd542b1ef2b9e4836e825f6 Mon Sep 17 00:00:00 2001 From: Richard Fearn Date: Sat, 25 Jan 2025 19:48:30 +0000 Subject: [PATCH 08/11] Fix FTBFS (bug #2341538) --- whowatch-gcc15-fixes.patch | 35 +++++++++++++++++++++++++++++++++++ whowatch.spec | 8 +++++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 whowatch-gcc15-fixes.patch diff --git a/whowatch-gcc15-fixes.patch b/whowatch-gcc15-fixes.patch new file mode 100644 index 0000000..8ec2e76 --- /dev/null +++ b/whowatch-gcc15-fixes.patch @@ -0,0 +1,35 @@ +diff -ur a/src/proctree.h b/src/proctree.h +--- a/src/proctree.h 2018-04-11 07:10:50.000000000 +0100 ++++ b/src/proctree.h 2025-01-25 18:55:39.018468480 +0000 +@@ -19,7 +19,6 @@ + }; + + int update_tree(void del(void*)); +-int update_tree(); + struct proc_t* find_by_pid(int pid); + struct proc_t* tree_start(int root, int start); + struct proc_t* tree_next(); +diff -ur a/src/whowatch.c b/src/whowatch.c +--- a/src/whowatch.c 2018-04-11 07:10:50.000000000 +0100 ++++ b/src/whowatch.c 2025-01-25 19:05:36.133313903 +0000 +@@ -222,7 +222,7 @@ + size_changed = 0; + } + +-static void winch_handler() ++static void winch_handler(int i) + { + size_changed++; + } +diff -ur a/src/whowatch.h b/src/whowatch.h +--- a/src/whowatch.h 2018-04-11 07:10:50.000000000 +0100 ++++ b/src/whowatch.h 2025-01-25 19:00:56.018861138 +0000 +@@ -164,7 +164,7 @@ + void curses_end(); + + /* proctree.c */ +-int update_tree(); ++int update_tree(void del(void*)); + + /* plist.c */ + void delete_tree_line(void *line); diff --git a/whowatch.spec b/whowatch.spec index 6eb6377..40ff351 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,13 +1,16 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 19%{?dist} +Release: 20%{?dist} License: GPL-2.0-only URL: http://wizard.ae.krakow.pl/~mike/ Source0: https://github.com/mtsuszycki/whowatch/archive/whowatch-%{version}.tar.gz Patch0: whowatch-configure-c99.patch +# Submitted upstream: https://github.com/mtsuszycki/whowatch/pull/13 +Patch1: whowatch-gcc15-fixes.patch + BuildRequires: make BuildRequires: gcc BuildRequires: ncurses-devel @@ -42,6 +45,9 @@ touch aclocal.m4 Makefile.in src/config.h.in %{_bindir}/whowatch %changelog +* Sat Jan 25 2025 Richard Fearn - 1.8.6-20 +- Fix FTBFS (bug #2341538) + * Sun Jan 19 2025 Fedora Release Engineering - 1.8.6-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 7d5e84cbae5a29eef1a16405981005fc9dae016d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:24:46 +0000 Subject: [PATCH 09/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 40ff351..ffd7835 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 20%{?dist} +Release: 21%{?dist} License: GPL-2.0-only URL: http://wizard.ae.krakow.pl/~mike/ @@ -45,6 +45,9 @@ touch aclocal.m4 Makefile.in src/config.h.in %{_bindir}/whowatch %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.8.6-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jan 25 2025 Richard Fearn - 1.8.6-20 - Fix FTBFS (bug #2341538) From 2febda3d1d86c7fb01b5b92dcd895621ae606d22 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:13:54 +0000 Subject: [PATCH 10/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index ffd7835..1dbdf13 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 21%{?dist} +Release: 22%{?dist} License: GPL-2.0-only URL: http://wizard.ae.krakow.pl/~mike/ @@ -45,6 +45,9 @@ touch aclocal.m4 Makefile.in src/config.h.in %{_bindir}/whowatch %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.8.6-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 1.8.6-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 2e05e25f19e05359fac341621685d918c9fa5f85 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:48:14 +0000 Subject: [PATCH 11/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- whowatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whowatch.spec b/whowatch.spec index 1dbdf13..66f7024 100644 --- a/whowatch.spec +++ b/whowatch.spec @@ -1,7 +1,7 @@ Summary: Display information about users currently logged on Name: whowatch Version: 1.8.6 -Release: 22%{?dist} +Release: 23%{?dist} License: GPL-2.0-only URL: http://wizard.ae.krakow.pl/~mike/ @@ -45,6 +45,9 @@ touch aclocal.m4 Makefile.in src/config.h.in %{_bindir}/whowatch %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.8.6-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 1.8.6-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild