migrate to autosetup; convert specfile script to a patch;

FORTIFY_SOURCE_3 detected a buffer overflow;
Resolves: bz#2190057
This commit is contained in:
Jan Rybar 2023-05-02 15:21:33 +02:00
parent a89b0b540b
commit aeac50dc44
2 changed files with 22 additions and 15 deletions

View File

@ -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))

View File

@ -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 <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