Hello community,
here is the log from the commit of package acct for openSUSE:Factory checked in at 2017-04-11 09:46:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/acct (Old)
and /work/SRC/openSUSE:Factory/.acct.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "acct"
Tue Apr 11 09:46:17 2017 rev:39 rq:486151 version:6.6.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/acct/acct.changes 2016-07-18 21:24:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.acct.new/acct.changes 2017-04-11 09:46:20.351113499 +0200
@@ -1,0 +2,18 @@
+Thu Apr 6 11:59:18 UTC 2017 - mpluskal@suse.com
+
+- Update to version 6.6.3:
+ * Fixed manuals.
+- Refresh patches:
+ * acct-6.6.2-hz.patch
+ * acct-info.patch
+- Drop no longer needed:
+ * acct-ac.patch
+ * acct-timestamp.patch
+
+-------------------------------------------------------------------
+Wed Mar 29 11:22:15 UTC 2017 - kstreitova@suse.com
+
+- cleanup with spec-cleaner
+- get rid of %{name} and %{version} macros from the patch names
+
+-------------------------------------------------------------------
Old:
----
acct-6.6.2.tar.gz
acct-6.6.2.tar.gz.sig
acct-ac.patch
acct-timestamp.patch
New:
----
acct-6.6.3.tar.gz
acct-6.6.3.tar.gz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ acct.spec ++++++
--- /var/tmp/diff_new_pack.Nea9Jw/_old 2017-04-11 09:46:20.999021973 +0200
+++ /var/tmp/diff_new_pack.Nea9Jw/_new 2017-04-11 09:46:20.999021973 +0200
@@ -1,7 +1,7 @@
#
# spec file for package acct
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,22 +17,19 @@
Name: acct
-Version: 6.6.2
+Version: 6.6.3
Release: 0
Summary: User-Specific Process Accounting
License: GPL-2.0+
Group: System/Base
-Url: http://www.gnu.org/software/acct/
-Source: http://ftp.gnu.org/gnu/acct/%{name}-%{version}.tar.gz
+Url: https://www.gnu.org/software/acct/
+Source: https://ftp.gnu.org/gnu/acct/%{name}-%{version}.tar.gz
Source1: acct.service
Source2: logrotate.acct
-Source3: http://ftp.gnu.org/gnu/acct/%{name}-%{version}.tar.gz.sig
-Source4: %{name}.keyring
-Patch0: %{name}-%{version}-hz.patch
-Patch2: %{name}-info.patch
-Patch3: %{name}-ac.patch
-Patch4: acct-timestamp.patch
-BuildRequires: libtool
+Source3: https://ftp.gnu.org/gnu/acct/%{name}-%{version}.tar.gz.sig
+Source4: acct.keyring
+Patch0: acct-6.6.2-hz.patch
+Patch2: acct-info.patch
BuildRequires: makeinfo
BuildRequires: systemd-rpm-macros
Requires: logrotate
@@ -47,13 +44,10 @@
%prep
%setup -q
-%patch0 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%patch0
+%patch2
%build
-autoreconf -ivf
%configure
make %{?_smp_mflags}
@@ -93,7 +87,7 @@
%files
%defattr(-, root, root)
%doc README NEWS
-%{_infodir}/*.info.*
+%{_infodir}/*.info%{ext_info}
%{_mandir}/man1/ac*
%{_mandir}/man1/lastcomm*
%{_mandir}/man8/*
++++++ acct-6.6.2-hz.patch ++++++
--- /var/tmp/diff_new_pack.Nea9Jw/_old 2017-04-11 09:46:21.027018018 +0200
+++ /var/tmp/diff_new_pack.Nea9Jw/_new 2017-04-11 09:46:21.027018018 +0200
@@ -5,11 +5,11 @@
sa.c | 14 +++++++++++++-
2 files changed, 26 insertions(+), 2 deletions(-)
-Index: acct-6.6.1/lastcomm.c
+Index: 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
-@@ -71,7 +75,7 @@ int debugging_enabled = 0; /* Nonzero me
+--- lastcomm.c.orig
++++ 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 */
int print_controls = 0; /* don't print control characters */
@@ -18,7 +18,7 @@
char *program_name; /* name of the program, for usage & errs */
-@@ -328,6 +332,14 @@ void parse_entries(void)
+@@ -328,6 +328,14 @@ void parse_entries(void)
print_pacct_record (rec, stddebug);
}
@@ -33,11 +33,11 @@
if (desired_entry (this_uid, this_dev, rec->ac_comm))
{
double ut = ACUTIME_2_DOUBLE (rec->ac_utime);
-Index: acct-6.6.1/sa.c
+Index: 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
-@@ -190,7 +190,7 @@
+--- sa.c.orig
++++ 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? */
int group_summary_flag = 0; /* are we printing a group summary? */
@@ -46,7 +46,7 @@
#if defined(HAVE_ACUTIME) && defined(HAVE_ACSTIME)
-@@ -1172,6 +1172,18 @@ void parse_acct_entries (void)
+@@ -1180,6 +1180,18 @@ void parse_acct_entries (void)
/* loop while there are entries to be had */
while ((rec = pacct_get_entry ()) != NULL)
{
++++++ acct-6.6.2.tar.gz -> acct-6.6.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/ChangeLog new/acct-6.6.3/ChangeLog
--- old/acct-6.6.2/ChangeLog 2014-09-13 02:52:54.000000000 +0200
+++ new/acct-6.6.3/ChangeLog 2017-04-05 23:15:04.000000000 +0200
@@ -1,3 +1,16 @@
+Sat April 05 21:13:04 2017 Markus Gothe
+
+ * Integrated patchsets from SUSE and Red Hat.
+
+Sun Nov 09 13:09:44 2014 Colin Panisset
+
+ * Add delimiter character between PID and PPID in print_pacct_record.
+
+Sun Nov 09 13:09:44 2014 Jaromír Cápík
+
+ * Add missing man-page for dump-acct. Fix missing switches
+ in man pages or / and usage.
+
Sat Nov 08 05:23:44 2014 Markus Gothe
* Link with -lm when needed. Thanks to René Rhéaume.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/Makefile.am new/acct-6.6.3/Makefile.am
--- old/acct-6.6.2/Makefile.am 2014-11-08 05:46:08.000000000 +0100
+++ new/acct-6.6.3/Makefile.am 2014-11-09 13:23:43.000000000 +0100
@@ -24,12 +24,12 @@
accton_SOURCES = accton.c common.c
-dump_acct_SOURCES = dump-acct.c common.c file_rd.c \
- pacct_rd.c
+dump_acct_SOURCES = dump-acct.c common.c dev_hash.c file_rd.c \
+ hashtab.c pacct_rd.c
dump_acct_LDADD = $(LDADD) -lm
-dump_utmp_SOURCES = dump-utmp.c common.c file_rd.c \
- utmp_rd.c
+dump_utmp_SOURCES = dump-utmp.c common.c dev_hash.c file_rd.c \
+ hashtab.c utmp_rd.c
#dump_utmpx_SOURCES = dump-utmpx.c
@@ -40,7 +40,7 @@
hashtab.c pacct_rd.c uid_hash.c
lastcomm_LDADD = $(LDADD) -lm
-sa_SOURCES = sa.c common.c file_rd.c hashtab.c \
+sa_SOURCES = sa.c common.c file_rd.c dev_hash.c hashtab.c \
pacct_rd.c uid_hash.c
sa_LDADD = $(LDADD) -lm
@@ -51,8 +51,8 @@
info_TEXINFOS = accounting.texi
-man_MANS = ac.1 last.1 dump-utmp.8 @ACCTON_MAN@ @LASTCOMM_MAN@ @SA_MAN@
-EXTRA_DIST = ac.1 dump-utmp.8 accton.8 last.1 lastcomm.1 sa.8 TODO m4/gnulib-cache.m4
+man_MANS = ac.1 last.1 dump-utmp.8 dump-acct.8 @ACCTON_MAN@ @LASTCOMM_MAN@ @SA_MAN@
+EXTRA_DIST = ac.1 dump-utmp.8 dump-acct.8 accton.8 last.1 lastcomm.1 sa.8 TODO m4/gnulib-cache.m4
## Extra stuff to remove when cleaning
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/Makefile.in new/acct-6.6.3/Makefile.in
--- old/acct-6.6.2/Makefile.in 2014-11-08 05:55:51.000000000 +0100
+++ new/acct-6.6.3/Makefile.in 2017-04-05 23:11:10.000000000 +0200
@@ -127,11 +127,13 @@
accton_LDADD = $(LDADD)
accton_DEPENDENCIES = lib/libgnu.la
am_dump_acct_OBJECTS = dump-acct.$(OBJEXT) common.$(OBJEXT) \
- file_rd.$(OBJEXT) pacct_rd.$(OBJEXT)
+ dev_hash.$(OBJEXT) file_rd.$(OBJEXT) hashtab.$(OBJEXT) \
+ pacct_rd.$(OBJEXT)
dump_acct_OBJECTS = $(am_dump_acct_OBJECTS)
dump_acct_DEPENDENCIES = $(LDADD)
am_dump_utmp_OBJECTS = dump-utmp.$(OBJEXT) common.$(OBJEXT) \
- file_rd.$(OBJEXT) utmp_rd.$(OBJEXT)
+ dev_hash.$(OBJEXT) file_rd.$(OBJEXT) hashtab.$(OBJEXT) \
+ utmp_rd.$(OBJEXT)
dump_utmp_OBJECTS = $(am_dump_utmp_OBJECTS)
dump_utmp_LDADD = $(LDADD)
dump_utmp_DEPENDENCIES = lib/libgnu.la
@@ -146,7 +148,8 @@
lastcomm_OBJECTS = $(am_lastcomm_OBJECTS)
lastcomm_DEPENDENCIES = $(LDADD)
am_sa_OBJECTS = sa.$(OBJEXT) common.$(OBJEXT) file_rd.$(OBJEXT) \
- hashtab.$(OBJEXT) pacct_rd.$(OBJEXT) uid_hash.$(OBJEXT)
+ dev_hash.$(OBJEXT) hashtab.$(OBJEXT) pacct_rd.$(OBJEXT) \
+ uid_hash.$(OBJEXT)
sa_OBJECTS = $(am_sa_OBJECTS)
sa_DEPENDENCIES = $(LDADD)
DEFAULT_INCLUDES = -I.@am__isrc@
@@ -941,12 +944,12 @@
utmp_rd.c
accton_SOURCES = accton.c common.c
-dump_acct_SOURCES = dump-acct.c common.c file_rd.c \
- pacct_rd.c
+dump_acct_SOURCES = dump-acct.c common.c dev_hash.c file_rd.c \
+ hashtab.c pacct_rd.c
dump_acct_LDADD = $(LDADD) -lm
-dump_utmp_SOURCES = dump-utmp.c common.c file_rd.c \
- utmp_rd.c
+dump_utmp_SOURCES = dump-utmp.c common.c dev_hash.c file_rd.c \
+ hashtab.c utmp_rd.c
#dump_utmpx_SOURCES = dump-utmpx.c
@@ -957,7 +960,7 @@
hashtab.c pacct_rd.c uid_hash.c
lastcomm_LDADD = $(LDADD) -lm
-sa_SOURCES = sa.c common.c file_rd.c hashtab.c \
+sa_SOURCES = sa.c common.c file_rd.c dev_hash.c hashtab.c \
pacct_rd.c uid_hash.c
sa_LDADD = $(LDADD) -lm
@@ -967,8 +970,8 @@
# What documentation should we include?
info_TEXINFOS = accounting.texi
-man_MANS = ac.1 last.1 dump-utmp.8 @ACCTON_MAN@ @LASTCOMM_MAN@ @SA_MAN@
-EXTRA_DIST = ac.1 dump-utmp.8 accton.8 last.1 lastcomm.1 sa.8 TODO m4/gnulib-cache.m4
+man_MANS = ac.1 last.1 dump-utmp.8 dump-acct.8 @ACCTON_MAN@ @LASTCOMM_MAN@ @SA_MAN@
+EXTRA_DIST = ac.1 dump-utmp.8 dump-acct.8 accton.8 last.1 lastcomm.1 sa.8 TODO m4/gnulib-cache.m4
DISTCLEANFILES = files.h version.h
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/NEWS new/acct-6.6.3/NEWS
--- old/acct-6.6.2/NEWS 2014-11-08 05:51:19.000000000 +0100
+++ new/acct-6.6.3/NEWS 2017-04-05 23:14:49.000000000 +0200
@@ -1,3 +1,7 @@
+New in 6.6.3:
+
+ * Fixed manuals.
+
New in 6.6.2:
* Link with -lm.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/ac.1 new/acct-6.6.3/ac.1
--- old/acct-6.6.2/ac.1 2011-03-16 23:50:13.000000000 +0100
+++ new/acct-6.6.3/ac.1 2017-02-08 23:34:35.000000000 +0100
@@ -115,7 +115,7 @@
.LP
GNU
.B ac
-works nearly the same u*x
+works nearly the same UNIX
.BR ac ,
though it's a little
smarter in several ways. You should therefore expect differences in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/ac.c new/acct-6.6.3/ac.c
--- old/acct-6.6.2/ac.c 2011-03-16 23:50:13.000000000 +0100
+++ new/acct-6.6.3/ac.c 2014-11-09 13:07:00.000000000 +0100
@@ -343,12 +343,29 @@
void give_usage(void)
{
- (void)printf("\
- Usage: %s [-dhpVy] [-f <file>] [people] ...\n\
- [--daily-totals] [--individual-totals] [--file <file>]\n\
- [--complain] [--reboots] [--supplants] [--timewarps] [--print-year]\n\
- [--compatibility] [--print-zeros] [--debug] [--tw-leniency <value>]\n\
- [--tw-suspicious <value>] [--version] [--help]\n", program_name);
+ (void)printf(
+ "\n"
+ "Usage: %s [OPTION] ...\n"
+ "\n"
+ "OPTIONS:\n"
+ " -d, --daily-totals Print totals for each day\n"
+ " -p, --individual-totals Print time totals for each user\n"
+ " -f, --file <file> Read from <file>\n"
+ " --complain Print errors for whatever problem\n"
+ " --reboots Count the time between login and reboot\n"
+ " --supplants Count the time between logins on the terminal\n"
+ " --timewarps Count the time between login and time warp\n"
+ " --compatibility Shortcut for --reboots --supplants --timewarps\n"
+ " -a, --all-days Do not skip days without login activity\n"
+ " --tw-leniency <value> Set the time warp leniency <value> in seconds\n"
+ " --tw-suspicious <value> Set the time warp suspicious <value> in seconds\n"
+ " --print-year Print year when displaying dates\n"
+ " --print-zeros Don't suppress zeros in category totals\n"
+ " --debug Print verbose internal information\n"
+ " -V, --version Show version and exit\n"
+ " -h, --help Show help and exit\n"
+ , program_name);
+
print_wtmp_file_location();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/accounting.info new/acct-6.6.3/accounting.info
--- old/acct-6.6.2/accounting.info 2014-11-08 05:56:31.000000000 +0100
+++ new/acct-6.6.3/accounting.info 2017-04-05 23:15:21.000000000 +0200
@@ -6,6 +6,11 @@
* acct: (accounting). The GNU Accounting utilities for process and login accounting
END-INFO-DIR-ENTRY
+INFO-DIR-SECTION Miscellaneous
+START-INFO-DIR-ENTRY
+* acct: (accounting). User specific process accounting.
+END-INFO-DIR-ENTRY
+
GNU Accounting Utilities Copyright (C) 1993, 1996, 1997, 1998, 2005,
2008, 2009, 2010 Free Software Foundation, Inc.
@@ -31,8 +36,7 @@
information about any of the applications, see the chapter with the
program's name.
- This is Edition 6.6.2 of the documentation, updated 8 November 2014
-for version 6.6.2 of the GNU Accounting Utilities.
+ This is version 6.6.3 of the GNU Accounting Utilities.
* Menu:
@@ -70,18 +74,6 @@
The accounting utilities were born.
- Years later Markus Gothe was a facing the CEO at his work, keep
-asking him where and how he got the information on other employees
-payrolls. There was indeed a conflict, Markus denied all the modus
-operandi on how to get held of such copies or information. Plans was
-made up to frame him, by interception.
-
- This momement Markus realized the words of Rob Savoye "You cannot
-buy yourself free from guilt." He left the room with pride, for making
-a stand. However, sadly enogh, the CEO never realized that meaning. You
-cannot buy yourself free from guilt; A new revival had come for the GNU
-acccounting utilities and so a POSIX-standard.
-
Seriously though, the accouting utilities can provide a system
administrator with useful information about system usage--connections,
programs executed, and utilization of system resources.
@@ -914,12 +906,12 @@
Tag Table:
-Node: Top1028
-Node: Preface1871
-Node: ac10853
-Node: accton19167
-Node: lastcomm19713
-Node: sa22887
-Node: dump-acct29264
+Node: Top1174
+Node: Preface1953
+Node: ac10292
+Node: accton18606
+Node: lastcomm19152
+Node: sa22326
+Node: dump-acct28703
End Tag Table
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/accounting.texi new/acct-6.6.3/accounting.texi
--- old/acct-6.6.2/accounting.texi 2014-11-08 05:46:16.000000000 +0100
+++ new/acct-6.6.3/accounting.texi 2017-04-06 00:03:37.000000000 +0200
@@ -11,6 +11,11 @@
@include version.texi
+@dircategory Miscellaneous
+@direntry
+* acct: (accounting). User specific process accounting.
+@end direntry
+
@ifinfo
GNU Accounting Utilities
Copyright (C) 1993, 1996, 1997, 1998, 2005, 2008, 2009, 2010
@@ -74,9 +79,7 @@
information about any of the applications, see the chapter with the
program's name.
-This is Edition @value{EDITION} of the documentation, updated
-@value{UPDATED} for version @value{VERSION} of the GNU Accounting
-Utilities.
+This is version @value{VERSION} of the GNU Accounting Utilities.
@end ifnottex
@menu
@@ -117,18 +120,6 @@
The accounting utilities were born.
-Years later Markus Gothe was a facing the CEO at his work, keep asking
-him where and how he got the information on other employees payrolls.
-There was indeed a conflict, Markus denied all the modus operandi on how
-to get held of such copies or information. Plans was made up to frame
-him, by interception.
-
-This momement Markus realized the words of Rob Savoye ``You cannot
-buy yourself free from guilt.'' He left the room with pride, for
-making a stand. However, sadly enogh, the CEO never realized that
-meaning. You cannot buy yourself free from guilt; A new revival had
-come for the GNU acccounting utilities and so a POSIX-standard.
-
Seriously though, the accouting utilities can provide a system
administrator with useful information about system usage---connections,
programs executed, and utilization of system resources.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/aclocal.m4 new/acct-6.6.3/aclocal.m4
--- old/acct-6.6.2/aclocal.m4 2014-11-08 05:55:49.000000000 +0100
+++ new/acct-6.6.3/aclocal.m4 2017-04-05 23:11:07.000000000 +0200
@@ -20,8 +20,8 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
-# po.m4 serial 20 (gettext-0.18.2)
-dnl Copyright (C) 1995-2012 Free Software Foundation, Inc.
+# po.m4 serial 22 (gettext-0.19)
+dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -47,11 +47,12 @@
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AC_PROG_INSTALL])dnl
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+ AC_REQUIRE([AC_PROG_SED])dnl
AC_REQUIRE([AM_NLS])dnl
dnl Release version of the gettext macros. This is used to ensure that
dnl the gettext macros and po/Makefile.in.in are in sync.
- AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
dnl Perform the following tests also if --disable-nls has been given,
dnl because they are needed for "make dist" to work.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/config.guess new/acct-6.6.3/config.guess
--- old/acct-6.6.2/config.guess 2013-03-09 00:38:37.000000000 +0100
+++ new/acct-6.6.3/config.guess 2014-11-09 13:21:17.000000000 +0100
@@ -2,13 +2,13 @@
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# 2011, 2012, 2013 Free Software Foundation, Inc.
-timestamp='2012-09-25'
+timestamp='2012-12-30'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -22,19 +22,17 @@
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner. Please send patches (context
-# diff format) to and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
#
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
+# Originally written by Per Bothner.
#
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess...
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -55,8 +53,8 @@
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/config.h new/acct-6.6.3/config.h
--- old/acct-6.6.2/config.h 2014-11-08 05:56:24.000000000 +0100
+++ new/acct-6.6.3/config.h 2017-04-05 23:11:45.000000000 +0200
@@ -431,7 +431,7 @@
#define HAVE_RAW_DECL_GETPAGESIZE 1
/* Define to 1 if gets is declared even after undefining macros. */
-#define HAVE_RAW_DECL_GETS 1
+/* #undef HAVE_RAW_DECL_GETS */
/* Define to 1 if getsubopt is declared even after undefining macros. */
#define HAVE_RAW_DECL_GETSUBOPT 1
@@ -569,7 +569,7 @@
#define HAVE_RAW_DECL_RPMATCH 1
/* Define to 1 if secure_getenv is declared even after undefining macros. */
-/* #undef HAVE_RAW_DECL_SECURE_GETENV */
+#define HAVE_RAW_DECL_SECURE_GETENV 1
/* Define to 1 if setenv is declared even after undefining macros. */
#define HAVE_RAW_DECL_SETENV 1
@@ -970,7 +970,7 @@
#define PACKAGE_NAME "acct"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "acct 6.6.2"
+#define PACKAGE_STRING "acct 6.6.3"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "acct"
@@ -979,7 +979,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "6.6.2"
+#define PACKAGE_VERSION "6.6.3"
/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
'ptrdiff_t'. */
@@ -1079,7 +1079,7 @@
/* Version number of package */
-#define VERSION "6.6.2"
+#define VERSION "6.6.3"
/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
'wchar_t'. */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/config.sub new/acct-6.6.3/config.sub
--- old/acct-6.6.2/config.sub 2013-03-09 00:38:37.000000000 +0100
+++ new/acct-6.6.3/config.sub 2014-11-09 13:21:17.000000000 +0100
@@ -2,23 +2,19 @@
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# 2011, 2012, 2013 Free Software Foundation, Inc.
-timestamp='2012-10-10'
+timestamp='2013-01-11'
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine. It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see http://www.gnu.org/licenses/.
@@ -26,11 +22,12 @@
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
-# Please send patches to . Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -74,8 +71,8 @@
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -259,8 +256,10 @@
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- | be32 | be64 \
+ | arc \
+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+ | avr | avr32 \
+ | be32 | be64 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx | dvp \
@@ -291,6 +290,7 @@
| mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
+ | mipsr5900 | mipsr5900el \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| moxie \
@@ -408,6 +408,7 @@
| mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipsr5900-* | mipsr5900el-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
| mt-* \
@@ -1042,7 +1043,11 @@
basic_machine=i586-unknown
os=-pw32
;;
- rdos)
+ rdos | rdos64)
+ basic_machine=x86_64-pc
+ os=-rdos
+ ;;
+ rdos32)
basic_machine=i386-pc
os=-rdos
;;
@@ -1369,7 +1374,7 @@
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- | -sym* | -kopensolaris* \
+ | -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1515,9 +1520,6 @@
-aros*)
os=-aros
;;
- -kaos*)
- os=-kaos
- ;;
-zvmoe)
os=-zvmoe
;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/configure new/acct-6.6.3/configure
--- old/acct-6.6.2/configure 2014-11-08 05:55:50.000000000 +0100
+++ new/acct-6.6.3/configure 2017-04-05 23:11:09.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for acct 6.6.2.
+# Generated by GNU Autoconf 2.69 for acct 6.6.3.
#
# Report bugs to .
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='acct'
PACKAGE_TARNAME='acct'
-PACKAGE_VERSION='6.6.2'
-PACKAGE_STRING='acct 6.6.2'
+PACKAGE_VERSION='6.6.3'
+PACKAGE_STRING='acct 6.6.3'
PACKAGE_BUGREPORT='nietzsche@lysator.liu.se'
PACKAGE_URL=''
@@ -1875,7 +1875,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures acct 6.6.2 to adapt to many kinds of systems.
+\`configure' configures acct 6.6.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1946,7 +1946,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of acct 6.6.2:";;
+ short | recursive ) echo "Configuration of acct 6.6.3:";;
esac
cat <<\_ACEOF
@@ -2054,7 +2054,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-acct configure 6.6.2
+acct configure 6.6.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2960,7 +2960,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by acct $as_me 6.6.2, which was
+It was created by acct $as_me 6.6.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3915,7 +3915,7 @@
# Define the identity of the package.
PACKAGE='acct'
- VERSION='6.6.2'
+ VERSION='6.6.3'
cat >>confdefs.h <<_ACEOF
@@ -29692,8 +29692,10 @@
# endif
#endif
+int
main ()
{
+
FILE *fp;
fp = fopen ("locs", "w");
fprintf (fp, "WTMP_FILE_LOC=%s\n", WTMP_FILE);
@@ -29701,9 +29703,10 @@
fprintf (fp, "SAVACCT_FILE_LOC=%s\n", SAVACCT_FILE);
fprintf (fp, "USRACCT_FILE_LOC=%s\n", USRACCT_FILE);
fclose (fp);
- exit(0);
-}
+ ;
+ return 0;
+}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
. ./locs; rm locs
@@ -30725,7 +30728,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by acct $as_me 6.6.2, which was
+This file was extended by acct $as_me 6.6.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -30791,7 +30794,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-acct config.status 6.6.2
+acct config.status 6.6.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/configure.ac new/acct-6.6.3/configure.ac
--- old/acct-6.6.2/configure.ac 2014-11-08 05:55:05.000000000 +0100
+++ new/acct-6.6.3/configure.ac 2017-04-05 23:10:56.000000000 +0200
@@ -1,5 +1,5 @@
dnl/*
-dnl Copyright (C) 2009, 2010, 2011, 2013, 2014
+dnl Copyright (C) 2009, 2010, 2011, 2013, 2014,2017
dnl Markus Gothe
dnl
dnl This program is free software: you can redistribute it and/or modify
@@ -17,12 +17,12 @@
dnl */
-dnl $Id: configure.ac 84 2014-11-08 04:52:39Z nihilus $
+dnl $Id: configure.ac 97 2017-04-05 21:10:58Z nihilus $
dnl Process this file with autoconf to produce a configure script.
dnl init autoconf
AC_REQ(2.63)
-AC_INIT([acct],[6.6.2],[nietzsche@lysator.liu.se])
+AC_INIT([acct],[6.6.3],[nietzsche@lysator.liu.se])
dnl AH_HEADER
AC_CONFIG_HEADERS([config.h:config.h.in])
AC_CONFIG_SRCDIR([ac.c])
@@ -232,7 +232,7 @@
dnl
dnl find out where utmp/pacct are stored
dnl
-AC_RUN_IFELSE([AC_LANG_SOURCE([[
+AC_RUN_IFELSE([AC_LANG_PROGRAM([[
#include
#include
#include
@@ -311,9 +311,7 @@
# endif
# endif
#endif
-
-main ()
-{
+]], [[
FILE *fp;
fp = fopen ("locs", "w");
fprintf (fp, "WTMP_FILE_LOC=%s\n", WTMP_FILE);
@@ -321,8 +319,6 @@
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 ])
dnl types
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/dump-acct.8 new/acct-6.6.3/dump-acct.8
--- old/acct-6.6.2/dump-acct.8 1970-01-01 01:00:00.000000000 +0100
+++ new/acct-6.6.3/dump-acct.8 2017-02-08 23:23:31.000000000 +0100
@@ -0,0 +1,53 @@
+.\" Copyright (C) 2009 Red Hat, Inc. All Rights Reserved.
+.\" Written by Ivana Hutarova Varekova
+.TH DUMP_ACCT 8 "2009 December 2" "Linux accounting system"
+
+.SH NAME
+dump\-acct \- print an acct/pacct file in human-readable format
+
+.SH SYNOPSIS
+.B dump-acct
+[\fB\-r\fR|\fB\-\-reverse\fR]
+[\fB\-R\fR|\fB\-\-raw\fR]
+[\fB\-n\fR|\fB\-\-num\fR\ \fIrecs\fR]
+[\fB\-\-byte\-swap\fR]
+[\fB\-\-format\fR]
+[\fB\-\-ahz\fR\ \fIfreq\fR]
+[\fB\-h\fR|\fB\-\-help\fR]
+[\fIfiles\fR]
+
+.SH DESCRIPTION
+The dump-acct command transforms the output \fBfile\fR from the
+accton format to the human-readable format: one record per line.
+Each record consists of severald fields which are separated by
+character "|" (the meaning of concreate field depends on the
+version of kernel package - with which the accton file was created).
+
+.SH OPTIONS
+The following options are supported:
+.TP
+.B -r, --reverse
+Print the output in reverse order.
+.TP
+.B -R, --raw
+The records will be printed without any parsing.
+.TP
+.B -n, --num NUMRECS
+Display only the first NUMRECS number of records.
+.TP
+.B --byteswap
+Swap the bytes (relative to your system's native byte order) in --raw output.
+.TP
+.B --format
+Set output format with --raw option.
+.TP
+.B --ahz FREQ
+Set the AHZ (platform dependent frequency in Hertz) to FREQ.
+.TP
+.B -h, --help
+Print a help message and the default location of the process accounting file
+and exit.
+
+.SH SEE ALSO
+accton (8), lastcomm (1)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/dump-acct.c new/acct-6.6.3/dump-acct.c
--- old/acct-6.6.2/dump-acct.c 2011-03-16 23:50:13.000000000 +0100
+++ new/acct-6.6.3/dump-acct.c 2014-11-09 13:07:00.000000000 +0100
@@ -50,8 +50,9 @@
[--num <recs>] [--raw] [--reverse] [--help]\n",
program_name);
#ifdef LINUX_MULTIFORMAT
- printf (" [--format <version>] [--byteswap]\n");
+ printf (" [--format <version>] [--byteswap]\n");
#endif
+ printf (" [--ahz <freq>]\n");
print_acct_file_location ();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/dump-utmp.8 new/acct-6.6.3/dump-utmp.8
--- old/acct-6.6.2/dump-utmp.8 2011-03-16 23:50:13.000000000 +0100
+++ new/acct-6.6.3/dump-utmp.8 2017-02-08 23:24:19.000000000 +0100
@@ -1,65 +1,29 @@
-.TH DUMP-UTMP 8 "2006-04-22" "6.5.1" "GNU Accounting Utilities"
+.\" Copyright (C) 2009 Red Hat, Inc. All Rights Reserved.
+.\" Written by Ivana Hutarova Varekova
+.TH DUMP_UTMP 8 "2009 December 2" "Linux accounting system"
.SH NAME
-dump-utmp \- print an utmp file in human-readable format.
+dump\-utmp \- print a utmp file in human-readable format
-.SH SYNOPSIS
-.B dump-acct
-.RB [\| \-r \||\| \-\-reverse \|]
-.RB [\| \-R \||\| \-\-raw \|]
-.RB [\| \-n \||\| \-\-num
-.IR recs \|]
-.RB [\| \-h \||\| \-\-help \|]
-.RB [\|
-.IR files \|]
-
-.SH DESCRIPTION
-.B dump-acct
-.I filename
-prints a list of all logins. This list is usually written in
-.IR /var/log/wtmp .
-.LP
-All fields are separated by vertical line. Fields are:
-.IR "user name" ,
-.IR tty ,
-.IR type ,
-.IR id ,
-.IR pid ,
-.IR hostaddr ,
-.IR host ,
-.IR time .
+.SH SYNOPSYS
+\fBdump-utmp\fR [\fB-hrR\fR] [\fB-n\fR <\fIrecs\fR>] <\fBfiles\fR>
+ [\fB--num\fR <\fIrecs\fR>] [\fB--raw\fR] [\fB--reverse\fR] [\fB--help\fR]
.SH OPTIONS
+The following options are supported:
.TP
-.B \-h, \-\-help
-Prints the usage string and default locations of system files to standard output
-and exits.
-.TP
-.B \-n, \-\-num recs
-Number of lines to print.
+.B -h, --help
+Print a help message and the default location of the process accounting file
+and exit.
.TP
-.B \-r, \-\-reverse
-Start printing from last records.
+.B -r, --reverse
+Print the output in reverse order.
.TP
-.B \-R, \-\-raw
-Print raw records, not human-readable.
-
-.SH FILES
+.B -R, --raw
+The records will be printed without any parsing.
.TP
-.I wtmp
-The system wide login record file. See
-.BR wtmp (5)
-for further details.
+.B -n, --num NUMRECS
+Display only the first NUMRECS number of records.
.SH SEE ALSO
-.BR login (1),
-.BR wtmp (5),
-.BR init (8),
-.BR sa (8).
-
-.SH AUTHOR
-The GNU accounting utilities were written by Noel Cragg .
-.PP
-This manual page was written by Ognyan Kulev and updated
-by Daniel Baumann for the Debian project (but may be used by
-others).
+accton (8), lastcomm (1), utmp (5)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/lastcomm.1 new/acct-6.6.3/lastcomm.1
--- old/acct-6.6.2/lastcomm.1 2011-03-16 23:50:13.000000000 +0100
+++ new/acct-6.6.3/lastcomm.1 2017-02-08 23:28:06.000000000 +0100
@@ -18,54 +18,7 @@
.I terminal-name ...
]
.br
-[
-.B \-\-strict-match
-]
-.br
-[
-.B \-\-forwards
-]
-.br
-[
-.BI \-f " filename"
-|
-.BI \-\-file " filename"
-]
-[
-.BI \-\-ahz " hz"
-]
-.br
-[
-.B \-\-user
-.I name
-]
-[
-.B \-\-command
-.I name
-]
-[
-.B \-\-tty
-.I name
-]
-.br
-[
-.B \p
-|
-.B \-\-show_paging
-]
-[
-.B \-\-debug
-]
-[
-.B \-V
-|
-.B \-\-version
-]
-[
-.B \-h
-|
-.B \-\-help
-]
+[ OPTION ... ]
.ad b
.hy 1
.SH DESCRIPTION
@@ -111,14 +64,17 @@
D -- command terminated with the generation of a core file
X -- command was terminated with the signal SIGTERM
+ the name of the user who ran the process
- + time the process exited
+ + time the process started
.SH OPTIONS
.PD 0
.TP
-.B \-\-strict-match
+.B \-\-strict\-match
Print only entries that match *all* of the arguments on the command
line.
.TP
+.B \-\-print\-controls
+Print control characters.
+.TP
.BI \-\-user " name"
List records for user with
.I name.
@@ -168,6 +124,12 @@
.B \-p, \-\-show\-paging
Print paging statistics
.TP
+.B \-\-pid
+Add pid of the process and pid of the process parent to the output
+(pid is the last but one and parent pid the last column).
+These values are shown only when they are generated by acct function
+(depends on the version of kernel)
+.TP
.B \-\-debug
Print verbose internal information.
.TP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/lastcomm.c new/acct-6.6.3/lastcomm.c
--- old/acct-6.6.2/lastcomm.c 2011-03-16 23:50:13.000000000 +0100
+++ new/acct-6.6.3/lastcomm.c 2017-04-05 23:06:33.000000000 +0200
@@ -304,7 +304,7 @@
#ifdef HAVE_PAGING
"[--show-paging] "
#endif
- "[--version] [--help]\n", program_name);
+ "[--ahz <freq>] [--version] [--help]\n", program_name);
print_acct_file_location ();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/pacct_rd.c new/acct-6.6.3/pacct_rd.c
--- old/acct-6.6.2/pacct_rd.c 2011-03-16 23:50:13.000000000 +0100
+++ new/acct-6.6.3/pacct_rd.c 2014-11-09 13:16:42.000000000 +0100
@@ -30,6 +30,7 @@
static struct file_rd_info *pacct_info = NULL;
extern int ahz;
+char *dev_gnu_name (long);
#define BUFFERED_RECS 256
@@ -86,6 +87,7 @@
void print_pacct_record(struct acct *rec, FILE *out)
{
time_t btime = (time_t)rec->ac_btime;
+ char *this_dev = dev_gnu_name ((long) rec->ac_tty);
(void)fprintf(out, "%-*.*s|", COMM_LEN, COMM_LEN, rec->ac_comm);
@@ -119,9 +121,50 @@
#endif
#ifdef LINUX_MULTIFORMAT
- (void)fprintf(out, "%8d %8d|", rec->ac_pid, rec->ac_ppid);
+ (void)fprintf(out, "%8d|%8d|", rec->ac_pid, rec->ac_ppid);
#endif
+#ifdef ASU
+ if (rec->ac_flag & ASU)
+ (void)putchar('S');
+ else
+#endif
+ (void)putchar(' ');
+
+#ifdef AFORK
+ if (rec->ac_flag & AFORK)
+ (void)putchar('F');
+ else
+#endif
+ (void)putchar(' ');
+
+#ifdef ACOMPAT
+ if (rec->ac_flag & ACOMPAT)
+ (void)putchar('C');
+ else
+#endif
+ (void)putchar(' ');
+
+#ifdef ACORE
+ if (rec->ac_flag & ACORE)
+ (void)putchar('D');
+ else
+#endif
+ (void)putchar(' ');
+
+#ifdef AXSIG
+ if (rec->ac_flag & AXSIG)
+ (void)putchar('X');
+ else
+#endif
+ (void)putchar(' ');
+
+ (void)putchar('|');
+
+ (void)fprintf(out, "%8d|", (rec->ac_exitcode >> 8));
+
+ (void)fprintf(out, "%-8.8s|", this_dev);
+
(void)fprintf(out, "%s", ctime (&btime));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/sa.8 new/acct-6.6.3/sa.8
--- old/acct-6.6.2/sa.8 2011-03-16 23:50:13.000000000 +0100
+++ new/acct-6.6.3/sa.8 2017-02-08 23:19:28.000000000 +0100
@@ -43,7 +43,7 @@
[
.B \-i
|
-.B \-\-dont-read-summary-file
+.B \-\-dont-read-summary-files
]
.br
[
@@ -282,7 +282,7 @@
When using the `\-\-threshold' option, assume that all answers to
interactive queries will be affirmative.
.TP
-.B \-i, \-\-dont-read-summary-file
+.B \-i, \-\-dont-read-summary-files
Don't read the information in the system's default
.I savacct
file.
@@ -386,7 +386,7 @@
.I SAVACCT
file.
.TP
-.BI \-\-other-file " filename"
+.BI \-\-other-acct-file " filename"
Read from the file
.I filename
instead of the system's default
@@ -397,8 +397,6 @@
.I acct
The raw system wide process accounting file. See
.BR acct (5)
-(or
-.BR pacct (5))
for further details.
.TP
.I savacct
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/sa.c new/acct-6.6.3/sa.c
--- old/acct-6.6.2/sa.c 2013-07-28 09:43:34.000000000 +0200
+++ new/acct-6.6.3/sa.c 2017-04-05 23:12:31.000000000 +0200
@@ -1,7 +1,8 @@
/* sa.c -- everyone's favorite hairball */
/*
-Copyright (C) 1993, 1996, 1997, 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 1993, 1996, 1997, 2008, 2009, 2010, 2013, 2014
+ Free Software Foundation, Inc.
This file is part of the GNU Accounting Utilities
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/stamp-vti new/acct-6.6.3/stamp-vti
--- old/acct-6.6.2/stamp-vti 2014-11-08 05:56:31.000000000 +0100
+++ new/acct-6.6.3/stamp-vti 2017-04-05 23:15:21.000000000 +0200
@@ -1,4 +1,4 @@
-@set UPDATED 8 November 2014
-@set UPDATED-MONTH November 2014
-@set EDITION 6.6.2
-@set VERSION 6.6.2
+@set UPDATED 6 April 2017
+@set UPDATED-MONTH April 2017
+@set EDITION 6.6.3
+@set VERSION 6.6.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acct-6.6.2/version.texi new/acct-6.6.3/version.texi
--- old/acct-6.6.2/version.texi 2014-11-08 05:56:31.000000000 +0100
+++ new/acct-6.6.3/version.texi 2017-04-05 23:11:52.000000000 +0200
@@ -1,4 +1,4 @@
-@set UPDATED 8 November 2014
-@set UPDATED-MONTH November 2014
-@set EDITION 6.6.2
-@set VERSION 6.6.2
+@set UPDATED 6 April 2017
+@set UPDATED-MONTH April 2017
+@set EDITION 6.6.3
+@set VERSION 6.6.3
++++++ acct-info.patch ++++++
--- /var/tmp/diff_new_pack.Nea9Jw/_old 2017-04-11 09:46:21.218990899 +0200
+++ /var/tmp/diff_new_pack.Nea9Jw/_new 2017-04-11 09:46:21.222990334 +0200
@@ -4,13 +4,13 @@
accounting.texi | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
-diff --git a/accounting.texi b/accounting.texi
-index f580f6f..5c8df0d 100644
---- a/accounting.texi
-+++ b/accounting.texi
-@@ -11,6 +11,11 @@
-
- @include version.texi
+Index: accounting.texi
+===================================================================
+--- accounting.texi.orig
++++ accounting.texi
+@@ -16,6 +16,11 @@
+ * acct: (accounting). User specific process accounting.
+ @end direntry
+@dircategory Miscellaneous
+@direntry
@@ -20,6 +20,3 @@
@ifinfo
GNU Accounting Utilities
Copyright (C) 1993, 1996, 1997, 1998, 2005, 2008, 2009, 2010
---
-1.7.7
-