5 changed files with 103 additions and 26 deletions
--- a/SOURCES/psacct-6.6.4-specfile-tweaks-file-locs.patch
+++ b/SOURCES/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 <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 <utmp.h>
+ 
+ #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
+
--- a/SOURCES/psacct-6.6.4-sprintf-buffer-overflow.patch
+++ b/SOURCES/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))
--- a/SOURCES/psacct-logrotate.in
+++ b/SOURCES/psacct-logrotate.in
@ -9,7 +9,7 @@
    create 0600 root root
    postrotate
       if %{_bindir}/systemctl --quiet is-active psacct.service ; then
-           %{_bindir}/systemctl reload psacct.service
+           %{_sbindir}/accton /var/account/pacct | %{_bindir}/grep -v "Turning on process accounting, file set to '/var/account/pacct'." | %{_bindir}/cat
       fi
    endscript
 }
--- a/SOURCES/psacct.service
+++ b/SOURCES/psacct.service
@ -7,7 +7,6 @@ ConditionPathExists=/var/account
 Type=oneshot
 ExecStartPre=/usr/libexec/psacct/accton-create
 ExecStart=/usr/sbin/accton /var/account/pacct
-ExecReload=/usr/sbin/accton /var/account/pacct
 ExecStop=/usr/sbin/accton off
 RemainAfterExit=yes

--- a/SPECS/psacct.spec
+++ b/SPECS/psacct.spec
@ -4,8 +4,8 @@
 Summary: Utilities for monitoring process activities
 Name: psacct
 Version: 6.6.4
-Release: 12%{?dist}
-License: GPLv3+
+Release: 22%{?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
@ -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
@ -114,6 +104,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,16 +124,48 @@ touch /var/account/pacct && chmod 0600 /var/account/pacct


 %changelog
-* Thu Oct 28 2021 Jan Rybar <jrybar@redhat.com> - 6.6.4-12
- post-rotate script aligned with systemd usage
- Resolves: rhbz#2015020
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 6.6.4-22
+- Bump release for June 2024 mass rebuild
+
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.4-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.4-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.4-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue May 02 2023 Jan Rybar <jrybar@redhat.com> - 6.6.4-18
+- forgot to add the second patch... again
+
+* Tue May 02 2023 Jan Rybar <jrybar@redhat.com> - 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 <lzaoral@redhat.com> - 6.6.4-16
+- migrate to SPDX license format
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.4-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.4-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jun 08 2022 Jan Rybar <jrybar@redhat.com> - 6.6.4-13
+- Spec file alignment with guidelines
+- Resolves: bz#1965232
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.4-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 6.6.4-11
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.4-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 6.6.4-10
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.6.4-10
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.

 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.4-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild