rpm/acct
SHA256
1
0
Fork 0
forked from pool/acct
Code Pull Requests Activity

Accepting request 212088 from Base:System

Browse Source 
- update to 6.6.1
  * Fixed vulnabilities, due to autmake. Thanks to Karl Berry
    for pointing this out.
  * Update gnulib to latest git.
- dropped acct-stdio.h.patch (upstream)
- add gpg verification (forwarded request 211966 from vitezslav_cizek)

OBS-URL: https://build.opensuse.org/request/show/212088
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/acct?expand=0&rev=28
This commit is contained in:
Stephan Kulow 2013-12-23 21:23:21 +00:00 committed by Git OBS Bridge
commit 8d576830bb
9 changed files with 96 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
acct-6.5.5.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4163c87b9e92a73a65eaeadc6c41caa4626da782ff26d6e7a945edcc140a6fd5
size 747225

3
acct-6.6.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:554515611ef9299012b7510050868a48fc178ce1544947123ab46ec50230ffcb
size 2869677

8
acct-6.6.1.tar.gz.sig Normal file
View File

@ -0,0 +1,8 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
Comment: GPGTools - http://gpgtools.org
iD8DBQBROn/g6I0XmJx2NrwRArv8AJ98juuCc9UfuKoIurlvpNcL+bBGyQCgzO1K
xdF+iq2sbYh/kM+Dd6vddP0=
=VPi0
-----END PGP SIGNATURE-----

21
acct-ac.patch
View File

@ -4,11 +4,11 @@ Subject: configure.ac: Change AC_LANG_SOURCE() into AC_LANG_PROGRAM()
configure.ac | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 743fe29..c150ca3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,7 +162,7 @@ AC_CHECK_HEADER(sys/acct.h,
Index: acct-6.6.1/configure.ac
===================================================================
--- acct-6.6.1.orig/configure.ac 2013-03-09 00:19:37.000000000 +0100
+++ acct-6.6.1/configure.ac 2013-12-21 23:54:54.896897230 +0100
@@ -231,7 +231,7 @@ AC_CHECK_HEADER(sys/acct.h,
dnl
dnl find out where utmp/pacct are stored
dnl
@ -17,7 +17,7 @@ index 743fe29..c150ca3 100644
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
@@ -241,9 +241,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
@@ -310,9 +310,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
# endif
# endif
#endif
@ -28,15 +28,12 @@ index 743fe29..c150ca3 100644
FILE *fp;
fp = fopen ("locs", "w");
fprintf (fp, "WTMP_FILE_LOC=%s\n", WTMP_FILE);
@@ -251,8 +249,6 @@ main ()
@@ -320,8 +318,6 @@ main ()
fprintf (fp, "SAVACCT_FILE_LOC=%s\n", SAVACCT_FILE);
fprintf (fp, "USRACCT_FILE_LOC=%s\n", USRACCT_FILE);
fclose (fp);
- exit(0);
-}
]])],[. ./locs; rm locs],[echo "Error -- could not locate your wtmp and acct files."; exit 1],[echo "Sorry -- you cannot cross-compile this package (FIXME)."; exit 1 ])
AC_TYPE_PID_T dnl for sys/acct.h
AC_TYPE_UID_T dnl same as above
--
1.7.7
dnl types

25
acct-hz.patch
View File

@ -5,10 +5,10 @@ Subject: acct-hz.patch
sa.c | 14 +++++++++++++-
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/lastcomm.c b/lastcomm.c
index 276f9fa..993118d 100644
--- a/lastcomm.c
+++ b/lastcomm.c
Index: acct-6.6.1/lastcomm.c
===================================================================
--- acct-6.6.1.orig/lastcomm.c 2011-03-16 23:50:13.000000000 +0100
+++ acct-6.6.1/lastcomm.c 2013-12-21 23:54:26.496776873 +0100
@@ -49,6 +49,10 @@ MA 02139, USA. */
#include <pwd.h>
@ -20,7 +20,7 @@ index 276f9fa..993118d 100644
#include "common.h"
#include "files.h"
#include "uid_hash.h"
@@ -71,7 +75,7 @@ int debugging_enabled = 0; /* Nonzero means print internal
@@ -71,7 +75,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 */
int print_controls = 0; /* don't print control characters */
@ -44,10 +44,10 @@ index 276f9fa..993118d 100644
if (desired_entry (this_uid, this_dev, rec->ac_comm))
{
double ut = ACUTIME_2_DOUBLE (rec->ac_utime);
diff --git a/sa.c b/sa.c
index 55b1a23..8891a50 100644
--- a/sa.c
+++ b/sa.c
Index: acct-6.6.1/sa.c
===================================================================
--- acct-6.6.1.orig/sa.c 2011-03-16 23:50:13.000000000 +0100
+++ acct-6.6.1/sa.c 2013-12-21 23:54:26.497776877 +0100
@@ -189,7 +189,7 @@ int dont_read_summary_files = 0;
int print_users = 0;
int percentages = 0; /* include percentages in printout */
@ -57,7 +57,7 @@ index 55b1a23..8891a50 100644
#if defined(HAVE_ACUTIME) && defined(HAVE_ACSTIME)
@@ -1173,6 +1173,18 @@ void parse_acct_entries (void)
@@ -1172,6 +1172,18 @@ void parse_acct_entries (void)
/* loop while there are entries to be had */
while ((rec = pacct_get_entry ()) != NULL)
{
@ -74,8 +74,5 @@ index 55b1a23..8891a50 100644
+ }
+ }
#ifdef HAVE_ACUTIME
double ut = comp_t_2_double (rec->ac_utime) / (double) hzval;
double ut = comp_t_2_double (rec->ac_utime) / CURR_AHZ;
#endif
--
1.7.7

14
acct-stdio.h.patch
View File

@ -1,14 +0,0 @@
Index: acct-6.5.5/lib/stdio.in.h
===================================================================
--- acct-6.5.5.orig/lib/stdio.in.h
+++ acct-6.5.5/lib/stdio.in.h
@@ -142,7 +142,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not
so any use of gets warrants an unconditional warning. Assume it is
always declared, since it is required by C89. */
#undef gets
+#if HAVE_RAW_DECL_GETS
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+#endif
#if @GNULIB_FOPEN@
# if @REPLACE_FOPEN@

10
acct.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sat Dec 21 22:53:20 UTC 2013 - vcizek@suse.com
- update to 6.6.1
* Fixed vulnabilities, due to autmake. Thanks to Karl Berry
for pointing this out.
* Update gnulib to latest git.
- dropped acct-stdio.h.patch (upstream)
- add gpg verification
-------------------------------------------------------------------
Sat Oct 19 14:56:27 UTC 2013 - p.drouand@gmail.com

50
acct.keyring Normal file
View File

@ -0,0 +1,50 @@
pub 1024D/9C7636BC 2004-05-26
uid Markus Gothe <nietzsche@lysator.liu.se>
uid Markus Gothe <markus@dovado.com>
uid [ revoked] Markus Gothe <margo284@student.liu.se>
uid Markus Gothe (Work) <markus@dovado.com>
uid [ revoked] Markus Gothe (Work) <markus@secon24.com>
uid [ revoked] Markus Gothe (Work) <markus.gothe@27m.se>
uid [ revoked] Markus Gothe (Work) <markus.gothe@hps.se>
sub 1024g/7AC6FE28 2004-05-26
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.22 (GNU/Linux)
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
=cwJ4
-----END PGP PUBLIC KEY BLOCK-----

8
acct.spec
View File

@ -18,11 +18,14 @@
Name: acct
PreReq: fileutils %install_info_prereq
Version: 6.5.5
Version: 6.6.1
Release: 0
Source: %{name}-%{version}.tar.gz
Source1: acct.service
Source2: logrotate.acct
Source10: %{name}-%{version}.tar.gz.sig
Source11: %{name}.keyring
BuildRequires: gpg-offline
BuildRequires: libtool
BuildRequires: systemd
%{?systemd_requires}
@ -33,7 +36,6 @@ Requires: logrotate
Patch: %{name}-hz.patch
Patch2: %{name}-info.patch
Patch3: %{name}-ac.patch
Patch4: acct-stdio.h.patch
Url: http://www.gnu.org/directory/acct.html
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: User-Specific Process Accounting
@ -45,11 +47,11 @@ This package contains the programs necessary for user-specific process
accounting: sa, accton, and lastcomm.
%prep
%gpg_verify %{SOURCE10}
%setup -q
%patch -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
%define prefix /usr