From 5e46f7cbc851475ba85a6be3c35c4a74de7d71f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 22:28:05 +0000 Subject: [PATCH 1/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- psacct.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/psacct.spec b/psacct.spec index d534c6c..4a1e74b 100644 --- a/psacct.spec +++ b/psacct.spec @@ -4,7 +4,7 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.6.4 -Release: 19%{?dist} +Release: 20%{?dist} License: GPL-3.0-or-later URL: http://www.gnu.org/software/acct/ @@ -124,6 +124,9 @@ touch /var/account/pacct && chmod 0600 /var/account/pacct %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 6.6.4-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jul 21 2023 Fedora Release Engineering - 6.6.4-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 2c61d30f6b4d181e401f375651db346437069dcd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 00:14:43 +0000 Subject: [PATCH 2/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- psacct.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/psacct.spec b/psacct.spec index 4a1e74b..d258014 100644 --- a/psacct.spec +++ b/psacct.spec @@ -4,7 +4,7 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.6.4 -Release: 20%{?dist} +Release: 21%{?dist} License: GPL-3.0-or-later URL: http://www.gnu.org/software/acct/ @@ -124,6 +124,9 @@ touch /var/account/pacct && chmod 0600 /var/account/pacct %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 6.6.4-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 6.6.4-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2efc86f292105ce88afcfd2d07609462424dcb9c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 08:36:35 +0000 Subject: [PATCH 3/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- psacct.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/psacct.spec b/psacct.spec index d258014..ca19e1b 100644 --- a/psacct.spec +++ b/psacct.spec @@ -4,7 +4,7 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.6.4 -Release: 21%{?dist} +Release: 22%{?dist} License: GPL-3.0-or-later URL: http://www.gnu.org/software/acct/ @@ -124,6 +124,9 @@ touch /var/account/pacct && chmod 0600 /var/account/pacct %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 6.6.4-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jan 26 2024 Fedora Release Engineering - 6.6.4-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 71dded1cc4f642f371096d67de33c1344380250d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 10:56:17 +0000 Subject: [PATCH 4/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- psacct.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/psacct.spec b/psacct.spec index ca19e1b..c1584f5 100644 --- a/psacct.spec +++ b/psacct.spec @@ -4,7 +4,7 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.6.4 -Release: 22%{?dist} +Release: 23%{?dist} License: GPL-3.0-or-later URL: http://www.gnu.org/software/acct/ @@ -124,6 +124,9 @@ touch /var/account/pacct && chmod 0600 /var/account/pacct %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 6.6.4-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 19 2024 Fedora Release Engineering - 6.6.4-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 9f8c92eb28b0124652848b778438c23052f07679 Mon Sep 17 00:00:00 2001 From: Jan Rybar Date: Fri, 24 Jan 2025 15:16:18 +0100 Subject: [PATCH 5/6] fix compile errors - stricter check, incompat types --- f42-fix-ftbfs.patch | 28 ++++++++++++++++++++++++++++ psacct.spec | 6 +++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 f42-fix-ftbfs.patch diff --git a/f42-fix-ftbfs.patch b/f42-fix-ftbfs.patch new file mode 100644 index 0000000..360d08e --- /dev/null +++ b/f42-fix-ftbfs.patch @@ -0,0 +1,28 @@ +commit c035a2754be2c9cdf7d802554d26e2171b25ee07 +Author: rpm-build +Date: Fri Jan 24 14:50:51 2025 +0100 + + f42-fix-ftbfs.patch + +diff --git a/sa.c b/sa.c +index e2e654e..a7f1cf1 100644 +--- a/sa.c ++++ b/sa.c +@@ -1506,7 +1506,7 @@ void print_user_list(void) + Remember to correct the number of elements to adjust... */ + + qsort (entry_array + 1, (size_t) num_users - 1, +- sizeof (struct hashtab_elem *), (int (*)()) compare_user_entry); ++ sizeof (struct hashtab_elem *), (int (*)(const void*, const void*)) compare_user_entry); + + /* Now we've got a sorted list of user entries. */ + +@@ -1686,7 +1686,7 @@ void print_command_list(void) + than the number of commands */ + + qsort (entry_array + 1, (size_t) num_commands - 1, +- sizeof (struct hashtab_entry *), (int (*)()) compare_sum_entry); ++ sizeof (struct hashtab_entry *), (int (*)(const void*, const void*)) compare_sum_entry); + + for (temp = 0; temp < num_commands; temp++) + { diff --git a/psacct.spec b/psacct.spec index c1584f5..6fcd370 100644 --- a/psacct.spec +++ b/psacct.spec @@ -4,7 +4,7 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.6.4 -Release: 23%{?dist} +Release: 24%{?dist} License: GPL-3.0-or-later URL: http://www.gnu.org/software/acct/ @@ -18,6 +18,7 @@ Patch2: psacct-6.6.1-SEGV-when-record-incomplete.patch Patch3: psacct-6.6.4-lastcomm-manpage-pid-twice.patch Patch4: psacct-6.6.4-sprintf-buffer-overflow.patch Patch5: psacct-6.6.4-specfile-tweaks-file-locs.patch +Patch6: f42-fix-ftbfs.patch Conflicts: filesystem < 3 Requires: coreutils @@ -124,6 +125,9 @@ touch /var/account/pacct && chmod 0600 /var/account/pacct %changelog +* Fri Jan 24 2025 Jan Rybar - 6.6.4-24 +- fix compile errors - stricter check, incompat types + * Sat Jan 18 2025 Fedora Release Engineering - 6.6.4-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From cb60b5063bb52d93d69acd88d989f353eda0ed75 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 06:12:46 +0000 Subject: [PATCH 6/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- psacct.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/psacct.spec b/psacct.spec index 6fcd370..79a4838 100644 --- a/psacct.spec +++ b/psacct.spec @@ -4,7 +4,7 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.6.4 -Release: 24%{?dist} +Release: 25%{?dist} License: GPL-3.0-or-later URL: http://www.gnu.org/software/acct/ @@ -125,6 +125,9 @@ touch /var/account/pacct && chmod 0600 /var/account/pacct %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 6.6.4-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 24 2025 Jan Rybar - 6.6.4-24 - fix compile errors - stricter check, incompat types