Compare commits

..

2 commits

Author SHA1 Message Date
Jan Rybar
b601bf12cd git in buildrequires 2023-05-02 16:10:22 +02:00
Jan Rybar
89e9db5587 migrate to autosetup; convert specfile script to a patch;
FORTIFY_SOURCE_3 detected a buffer overflow
Resolves: bz#2190057
2023-05-02 16:02:09 +02:00
2 changed files with 5 additions and 58 deletions

View file

@ -1,28 +0,0 @@
commit c035a2754be2c9cdf7d802554d26e2171b25ee07
Author: rpm-build <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++)
{

View file

@ -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: 15%{?dist}.2
License: GPLv3+
URL: http://www.gnu.org/software/acct/
Source: ftp://ftp.gnu.org/pub/gnu/acct/acct-%{version}.tar.gz
@ -18,7 +18,6 @@ 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
@ -125,38 +124,14 @@ touch /var/account/pacct && chmod 0600 /var/account/pacct
%changelog
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.4-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Tue May 02 2023 Jan Rybar <jrybar@redhat.com> - 6.6.4-15.2
- obviously, 'autosetup -S git' still explicitly needs git in buildrequires
* Fri Jan 24 2025 Jan Rybar <jrybar@redhat.com> - 6.6.4-24
- fix compile errors - stricter check, incompat types
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.4-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.4-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_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
* Tue May 02 2023 Jan Rybar <jrybar@redhat.com> - 6.6.4-15.1
- 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