From 52ff8a010da8244c226519efa5ec1a75bf0baf84 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 09:51:37 +0000 Subject: [PATCH 01/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- psacct.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/psacct.spec b/psacct.spec index 7047593..f0f8238 100644 --- a/psacct.spec +++ b/psacct.spec @@ -4,7 +4,7 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.6.4 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/acct/ @@ -132,6 +132,9 @@ touch /var/account/pacct && chmod 0600 /var/account/pacct %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 6.6.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 6.6.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 48389e9d466a667bca0f508bfde0f7f07e616317 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 23:05:15 +0000 Subject: [PATCH 02/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- psacct.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/psacct.spec b/psacct.spec index f0f8238..c168e03 100644 --- a/psacct.spec +++ b/psacct.spec @@ -4,7 +4,7 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.6.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/acct/ @@ -132,6 +132,9 @@ touch /var/account/pacct && chmod 0600 /var/account/pacct %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 6.6.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jan 30 2020 Fedora Release Engineering - 6.6.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 17366b88eb17ac43035c07e4cb43957bb4f5b9d2 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 19:34:38 +0000 Subject: [PATCH 03/20] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- psacct.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/psacct.spec b/psacct.spec index c168e03..fd61f66 100644 --- a/psacct.spec +++ b/psacct.spec @@ -23,6 +23,7 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +BuildRequires: make BuildRequires: autoconf BuildRequires: systemd BuildRequires: gcc From 64c85b2c40d5d1e990515dd8e0e418a7bb3f7800 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 08:39:46 +0000 Subject: [PATCH 04/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- psacct.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/psacct.spec b/psacct.spec index fd61f66..413ac0f 100644 --- a/psacct.spec +++ b/psacct.spec @@ -4,7 +4,7 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.6.4 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/acct/ @@ -133,6 +133,9 @@ touch /var/account/pacct && chmod 0600 /var/account/pacct %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 6.6.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 6.6.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From aaa37acfd1a18d51a788115ea0376381579a268d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:58 +0100 Subject: [PATCH 05/20] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- psacct.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/psacct.spec b/psacct.spec index 413ac0f..8cde0e5 100644 --- a/psacct.spec +++ b/psacct.spec @@ -4,7 +4,7 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.6.4 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/acct/ @@ -133,6 +133,10 @@ touch /var/account/pacct && chmod 0600 /var/account/pacct %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 6.6.4-10 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Wed Jan 27 2021 Fedora Release Engineering - 6.6.4-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 0a7ade5a2200b678eae56fc3fcd8def8e80df930 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 04:09:33 +0000 Subject: [PATCH 06/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- psacct.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/psacct.spec b/psacct.spec index 8cde0e5..a51b206 100644 --- a/psacct.spec +++ b/psacct.spec @@ -4,7 +4,7 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.6.4 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/acct/ @@ -133,6 +133,9 @@ touch /var/account/pacct && chmod 0600 /var/account/pacct %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 6.6.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 6.6.4-10 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From cb30237bfd0088c464948f2b2ca80d67f4357c4d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 09:33:11 +0000 Subject: [PATCH 07/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- psacct.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/psacct.spec b/psacct.spec index a51b206..1cec8bf 100644 --- a/psacct.spec +++ b/psacct.spec @@ -4,7 +4,7 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.6.4 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/acct/ @@ -133,6 +133,9 @@ touch /var/account/pacct && chmod 0600 /var/account/pacct %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 6.6.4-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 6.6.4-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 877cfd24112a8eeb3152326635eac5c05884c4a7 Mon Sep 17 00:00:00 2001 From: Jan Rybar Date: Wed, 8 Jun 2022 17:05:20 +0200 Subject: [PATCH 08/20] Spec file alignment with guidelines Resolves: bz#1965232 --- psacct.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/psacct.spec b/psacct.spec index 1cec8bf..0ad3979 100644 --- a/psacct.spec +++ b/psacct.spec @@ -4,7 +4,7 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.6.4 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/acct/ @@ -114,6 +114,7 @@ touch /var/account/pacct && chmod 0600 /var/account/pacct %{_sbindir}/sa %{_sbindir}/dump-utmp %{_sbindir}/dump-acct +%dir %{_libexecdir}/psacct %{_libexecdir}/psacct/accton-create %{_bindir}/ac %if %{with_last} @@ -133,6 +134,10 @@ touch /var/account/pacct && chmod 0600 /var/account/pacct %changelog +* Wed Jun 08 2022 Jan Rybar - 6.6.4-13 +- Spec file alignment with guidelines +- Resolves: bz#1965232 + * Fri Jan 21 2022 Fedora Release Engineering - 6.6.4-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From abc7b68fde6791f12d850031921e0cf21c95764d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 15:31:15 +0000 Subject: [PATCH 09/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- psacct.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/psacct.spec b/psacct.spec index 0ad3979..30fca32 100644 --- a/psacct.spec +++ b/psacct.spec @@ -4,7 +4,7 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.6.4 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/acct/ @@ -134,6 +134,9 @@ touch /var/account/pacct && chmod 0600 /var/account/pacct %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 6.6.4-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jun 08 2022 Jan Rybar - 6.6.4-13 - Spec file alignment with guidelines - Resolves: bz#1965232 From d16edd4658ef867b389f9b4b48aa36121520d204 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 10:23:07 +0000 Subject: [PATCH 10/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- psacct.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/psacct.spec b/psacct.spec index 30fca32..0ae0863 100644 --- a/psacct.spec +++ b/psacct.spec @@ -4,7 +4,7 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.6.4 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/acct/ @@ -134,6 +134,9 @@ touch /var/account/pacct && chmod 0600 /var/account/pacct %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 6.6.4-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 6.6.4-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From a89b0b540bc6ad58ad20bd0298119038681adf88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Mon, 24 Apr 2023 12:50:47 +0200 Subject: [PATCH 11/20] migrate to SPDX license format --- psacct.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/psacct.spec b/psacct.spec index 0ae0863..012ac6a 100644 --- a/psacct.spec +++ b/psacct.spec @@ -4,8 +4,8 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.6.4 -Release: 15%{?dist} -License: GPLv3+ +Release: 16%{?dist} +License: GPL-3.0-or-later URL: http://www.gnu.org/software/acct/ Source: ftp://ftp.gnu.org/pub/gnu/acct/acct-%{version}.tar.gz @@ -134,6 +134,9 @@ touch /var/account/pacct && chmod 0600 /var/account/pacct %changelog +* Mon Apr 24 2023 Lukáš Zaoral - 6.6.4-16 +- migrate to SPDX license format + * Fri Jan 20 2023 Fedora Release Engineering - 6.6.4-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From aeac50dc448dcc172fa05b2847666afa3d04bfe2 Mon Sep 17 00:00:00 2001 From: Jan Rybar Date: Tue, 2 May 2023 15:21:33 +0200 Subject: [PATCH 12/20] migrate to autosetup; convert specfile script to a patch; FORTIFY_SOURCE_3 detected a buffer overflow; Resolves: bz#2190057 --- psacct-6.6.4-sprintf-buffer-overflow.patch | 12 +++++++++++ psacct.spec | 25 +++++++++------------- 2 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 psacct-6.6.4-sprintf-buffer-overflow.patch diff --git a/psacct-6.6.4-sprintf-buffer-overflow.patch b/psacct-6.6.4-sprintf-buffer-overflow.patch new file mode 100644 index 0000000..d86d0eb --- /dev/null +++ b/psacct-6.6.4-sprintf-buffer-overflow.patch @@ -0,0 +1,12 @@ +diff -up ./dev_hash.c.ori ./dev_hash.c +--- ./dev_hash.c.ori 2023-05-02 10:40:45.509862165 +0200 ++++ ./dev_hash.c 2023-05-02 10:40:48.266876499 +0200 +@@ -147,7 +147,7 @@ static void setup_devices(char *dirname) + { + char *fullname = (char *) alloca ((strlen (dirname) + + NAMLEN (dp) +- + 1) * sizeof (char)); ++ + 2) * sizeof (char)); /* slash + null; Fedora BZ#2190057 */ + + (void)sprintf (fullname, "%s/%s", dirname, dp->d_name); + if (stat (fullname, &sp)) diff --git a/psacct.spec b/psacct.spec index 012ac6a..16e21e8 100644 --- a/psacct.spec +++ b/psacct.spec @@ -4,7 +4,7 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.6.4 -Release: 16%{?dist} +Release: 17%{?dist} License: GPL-3.0-or-later URL: http://www.gnu.org/software/acct/ @@ -16,6 +16,8 @@ Source3: accton-create Patch1: psacct-6.6.2-unnumberedsubsubsec.patch 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 Conflicts: filesystem < 3 Requires: coreutils @@ -27,6 +29,7 @@ BuildRequires: make BuildRequires: autoconf BuildRequires: systemd BuildRequires: gcc +BuildRequires: git %description @@ -40,20 +43,7 @@ commands. %prep -%setup -q -n acct-%{version} - -%patch1 -p1 -b .subsubsec -%patch2 -p1 -%patch3 -p1 - -# fixing 'gets' undeclared -sed -i 's|.*(gets,.*||g' lib/stdio.in.h - -# workaround for broken autotools stuff -sed -i 's|@ACCT_FILE_LOC@|/var/account/pacct|g' files.h.in -sed -i 's|@SAVACCT_FILE_LOC@|/var/account/savacct|g' files.h.in -sed -i 's|@USRACCT_FILE_LOC@|/var/account/usracct|g' files.h.in - +%autosetup -S git -n acct-%{version} %build %configure --enable-linux-multiformat @@ -134,6 +124,11 @@ touch /var/account/pacct && chmod 0600 /var/account/pacct %changelog +* Tue May 02 2023 Jan Rybar - 6.6.4-17 +- migrate to autosetup; convert specfile script to a patch +- FORTIFY_SOURCE_3 detected a buffer overflow +- Resolves: bz#2190057 + * Mon Apr 24 2023 Lukáš Zaoral - 6.6.4-16 - migrate to SPDX license format From d21b6d1b58f86034b0f05bc3e029dd80e7b8c36c Mon Sep 17 00:00:00 2001 From: Jan Rybar Date: Tue, 2 May 2023 15:32:14 +0200 Subject: [PATCH 13/20] add missed patch to dist git --- psacct-6.6.4-specfile-tweaks-file-locs.patch | 43 ++++++++++++++++++++ psacct.spec | 5 ++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 psacct-6.6.4-specfile-tweaks-file-locs.patch diff --git a/psacct-6.6.4-specfile-tweaks-file-locs.patch b/psacct-6.6.4-specfile-tweaks-file-locs.patch new file mode 100644 index 0000000..270c7da --- /dev/null +++ b/psacct-6.6.4-specfile-tweaks-file-locs.patch @@ -0,0 +1,43 @@ +From fcc034e5674dfedebcdace114d059a77d312c0de Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Tue, 2 May 2023 13:11:07 +0200 +Subject: [PATCH] files locates specfile tweak + +--- + files.h.in | 6 +++--- + lib/stdio.in.h | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/files.h.in b/files.h.in +index 900ad29..9800222 100644 +--- a/files.h.in ++++ b/files.h.in +@@ -31,9 +31,9 @@ + #include + + #define WTMP_FILE_LOC "@WTMP_FILE_LOC@" +-#define ACCT_FILE_LOC "@ACCT_FILE_LOC@" +-#define SAVACCT_FILE_LOC "@SAVACCT_FILE_LOC@" +-#define USRACCT_FILE_LOC "@USRACCT_FILE_LOC@" ++#define ACCT_FILE_LOC "/var/account/pacct" ++#define SAVACCT_FILE_LOC "/var/account/savacct" ++#define USRACCT_FILE_LOC "/var/account/usracct" + + /* Workaround for a kernel includes problem */ + #if defined(__linux__) && defined(__alpha__) +diff --git a/lib/stdio.in.h b/lib/stdio.in.h +index d6af99c..e58d026 100644 +--- a/lib/stdio.in.h ++++ b/lib/stdio.in.h +@@ -700,7 +700,7 @@ _GL_WARN_ON_USE (getline, "getline is unportable - " + removed it. */ + #undef gets + #if HAVE_RAW_DECL_GETS +-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); ++ + #endif + + +-- +2.40.0 + diff --git a/psacct.spec b/psacct.spec index 16e21e8..79dccfc 100644 --- a/psacct.spec +++ b/psacct.spec @@ -4,7 +4,7 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.6.4 -Release: 17%{?dist} +Release: 18%{?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 +* Tue May 02 2023 Jan Rybar - 6.6.4-18 +- forgot to add the second patch... again + * Tue May 02 2023 Jan Rybar - 6.6.4-17 - migrate to autosetup; convert specfile script to a patch - FORTIFY_SOURCE_3 detected a buffer overflow From 3204cc8370903173b986f6973e292732153bad47 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 06:24:19 +0000 Subject: [PATCH 14/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- psacct.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/psacct.spec b/psacct.spec index 79dccfc..d534c6c 100644 --- a/psacct.spec +++ b/psacct.spec @@ -4,7 +4,7 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.6.4 -Release: 18%{?dist} +Release: 19%{?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 21 2023 Fedora Release Engineering - 6.6.4-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue May 02 2023 Jan Rybar - 6.6.4-18 - forgot to add the second patch... again From 5e46f7cbc851475ba85a6be3c35c4a74de7d71f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 22:28:05 +0000 Subject: [PATCH 15/20] 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 16/20] 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 17/20] 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 18/20] 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 19/20] 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 20/20] 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