Accepting request 1279752 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1279752
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/acct?expand=0&rev=48

acct-6.6.2-hz.patch

@@ -7,8 +7,8 @@ Subject: acct-hz.patch
 
 Index: lastcomm.c
 ===================================================================
---- lastcomm.c.orig
-+++ lastcomm.c
+--- a/lastcomm.c
++++ b/lastcomm.c
 @@ -71,7 +71,7 @@ int debugging_enabled = 0;	/* Nonzero me
  int strict_match_flag = 0;	/* Nonzero if each record has to match
  				   all items on the command line */
@@ -35,8 +35,8 @@ Index: lastcomm.c
            double ut = ACUTIME_2_DOUBLE (rec->ac_utime);
 Index: sa.c
 ===================================================================
---- sa.c.orig
-+++ sa.c
+--- a/sa.c
++++ b/sa.c
 @@ -191,7 +191,7 @@ int print_users = 0;
  int percentages = 0;		/* include percentages in printout */
  int user_summary_flag = 0;	/* are we printing a user summary? */

acct-gcc15.patch

@@ -0,0 +1,21 @@
+--- acct-6.6.4.orig/sa.c	2025-05-05 14:16:31.365703678 +0000
++++ acct-6.6.4/sa.c	2025-05-05 14:17:40.382751367 +0000
+@@ -1518,7 +1518,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. */
+ 
+@@ -1698,7 +1698,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++)
+     {
+

acct-sprintf-buffer-overflow.patch

@@ -0,0 +1,13 @@
+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))
+

acct.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Fri May 16 09:52:33 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Fix changelog format: the line immediately after the dashed line
+  is supposed to be the header with date/author info.
+
+-------------------------------------------------------------------
+Mon May  5 14:18:56 UTC 2025 - pgajdos@suse.com
+
+- added patches
+  build with gcc15
+  + acct-gcc15.patch
+
+-------------------------------------------------------------------
+Wed Mar 12 12:49:48 UTC 2025 - pgajdos@suse.com
+
+- modified patches
+  % acct-6.6.2-hz.patch (-p1)
+- added patches
+  fix [bug#1233891]
+  + acct-sprintf-buffer-overflow.patch
+
 -------------------------------------------------------------------
 Tue Feb 20 09:57:34 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 
@@ -207,13 +229,11 @@ Wed Dec 23 20:22:47 UTC 2009 - coolo@novell.com
 - remove the moblin hack that fixes something not in this package
 
 -------------------------------------------------------------------
-
 Fri Nov  6 03:42:04 UTC 2009 - gregkh@suse.de
 
 - fix mode on /etc/logrotate.d/acct to not be executable.
 
 -------------------------------------------------------------------
-
 Wed Nov  4 04:01:04 UTC 2009 - gregkh@suse.de
 
 - do not enable acct to start automatically on Moblin.  We don't

acct.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package acct
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,6 +29,10 @@ Source2:        logrotate.acct
 Source3:        https://ftp.gnu.org/gnu/acct/%{name}-%{version}.tar.gz.sig
 Source4:        http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=acct&download=1#/acct.keyring
 Patch0:         acct-6.6.2-hz.patch
+# [bug#1233891]
+Patch1:         acct-sprintf-buffer-overflow.patch
+# build with gcc15
+Patch2:         acct-gcc15.patch
 BuildRequires:  makeinfo
 BuildRequires:  systemd-rpm-macros
 Requires:       logrotate
@@ -41,7 +45,7 @@ This package contains the programs necessary for user-specific process
 accounting: sa, accton, and lastcomm.
 
 %prep
-%autosetup
+%autosetup -p1
 
 %build
 %configure