diff --git a/f42-fix-ftbfs.patch b/f42-fix-ftbfs.patch deleted file mode 100644 index 360d08e..0000000 --- a/f42-fix-ftbfs.patch +++ /dev/null @@ -1,28 +0,0 @@ -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-6.6.4-specfile-tweaks-file-locs.patch b/psacct-6.6.4-specfile-tweaks-file-locs.patch deleted file mode 100644 index 270c7da..0000000 --- a/psacct-6.6.4-specfile-tweaks-file-locs.patch +++ /dev/null @@ -1,43 +0,0 @@ -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-6.6.4-sprintf-buffer-overflow.patch b/psacct-6.6.4-sprintf-buffer-overflow.patch deleted file mode 100644 index d86d0eb..0000000 --- a/psacct-6.6.4-sprintf-buffer-overflow.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 79a4838..7047593 100644 --- a/psacct.spec +++ b/psacct.spec @@ -4,8 +4,8 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.6.4 -Release: 25%{?dist} -License: GPL-3.0-or-later +Release: 6%{?dist} +License: GPLv3+ URL: http://www.gnu.org/software/acct/ Source: ftp://ftp.gnu.org/pub/gnu/acct/acct-%{version}.tar.gz @@ -16,9 +16,6 @@ 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 -Patch6: f42-fix-ftbfs.patch Conflicts: filesystem < 3 Requires: coreutils @@ -26,11 +23,9 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -BuildRequires: make BuildRequires: autoconf BuildRequires: systemd BuildRequires: gcc -BuildRequires: git %description @@ -44,7 +39,20 @@ commands. %prep -%autosetup -S git -n acct-%{version} +%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 + %build %configure --enable-linux-multiformat @@ -105,7 +113,6 @@ 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} @@ -125,67 +132,6 @@ 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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. - -* 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 - -* 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