commit acct for openSUSE:Factory

Hello community, here is the log from the commit of package acct for openSUSE:Factory checked in at 2012-02-07 14:44:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/acct (Old) and /work/SRC/openSUSE:Factory/.acct.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "acct", Maintainer is "MKudlvasr@novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/acct/acct.changes 2011-10-04 18:06:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.acct.new/acct.changes 2012-02-07 14:44:46.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Jan 23 08:43:45 UTC 2012 - bart.vanassche@gmail.com + +- switch from acct-6.3.5 to acct-6.5.5. From the upstream acct ChangeLog: + * Fix potential buffer-overflows. + * UNIX 98 pty support. + * Add Linux multiformat support. + * lastcomm.c: integrated patch from Paul Jones which adds + paging and swapping support to lastcomm and sa + +------------------------------------------------------------------- Old: ---- acct-6.3.5-ac.dif acct-6.3.5-acct_v3-fix.diff acct-6.3.5-axp.dif acct-6.3.5-hz.patch acct-6.3.5-info.diff acct-6.3.5-time-fix.diff acct-6.3.5-warning.patch acct-6.3.5.tar.bz2 New: ---- acct-6.5.5.tar.gz acct-ac.patch acct-axp.patch acct-hz.patch acct-info.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ acct.spec ++++++ --- /var/tmp/diff_new_pack.11H38v/_old 2012-02-07 14:44:48.000000000 +0100 +++ /var/tmp/diff_new_pack.11H38v/_new 2012-02-07 14:44:48.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package acct # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,19 +21,16 @@ License: GPL-2.0+ Group: System/Base PreReq: %insserv_prereq %fillup_prereq fileutils %install_info_prereq -Version: 6.3.5 -Release: 829 -Source: %{name}-%{version}.tar.bz2 +Version: 6.5.5 +Release: 830 +Source: %{name}-%{version}.tar.gz Source1: rc.acct Source2: logrotate.acct BuildRequires: libtool -Patch: %{name}-%{version}-axp.dif -Patch1: %{name}-%{version}-ac.dif -Patch2: %{name}-%{version}-info.diff -Patch3: %{name}-%{version}-acct_v3-fix.diff -Patch4: %{name}-%{version}-time-fix.diff -Patch5: %{name}-%{version}-hz.patch -Patch6: %{name}-%{version}-warning.patch +Patch: %{name}-hz.patch +Patch1: %{name}-axp.patch +Patch2: %{name}-info.patch +Patch3: %{name}-ac.patch Url: http://www.gnu.org/directory/acct.html BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: User-Specific Process Accounting @@ -44,22 +41,16 @@ %prep %setup -q -%patch -%patch1 -%patch2 -%patch3 -%patch4 -%patch5 -%patch6 +%patch -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %define prefix /usr %define sysconfdir /etc %{suse_update_config} -libtoolize -f -aclocal -automake -a -autoconf +autoreconf -ivf CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure \ --mandir=%{_mandir} \ --prefix=%{prefix} \ ++++++ acct-ac.patch ++++++ 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, 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 @@ -241,9 +241,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ # endif # endif #endif - -main () -{ +]], [[ FILE *fp; fp = fopen ("locs", "w"); fprintf (fp, "WTMP_FILE_LOC=%s\n", WTMP_FILE); @@ -251,8 +249,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 ++++++ acct-axp.patch ++++++ Subject: acct-axp.patch --- accton.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/accton.c b/accton.c index eeb503d..4c8e2eb 100644 --- a/accton.c +++ b/accton.c @@ -21,6 +21,7 @@ MA 02139, USA. #include "config.h" +#include #include #include #include -- 1.7.7 ++++++ acct-hz.patch ++++++ Subject: acct-hz.patch --- lastcomm.c | 14 +++++++++++++- 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 @@ -49,6 +49,10 @@ MA 02139, USA. */ #include +#ifdef HAVE_UNISTD_H +#include +#endif + #include "common.h" #include "files.h" #include "uid_hash.h" @@ -71,7 +75,7 @@ int debugging_enabled = 0; /* Nonzero means print internal 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 */ -int ahz = AHZ; /* for viewing logs from another system */ +int ahz = 0; /* for viewing logs from another system */ char *program_name; /* name of the program, for usage & errs */ @@ -328,6 +332,14 @@ void parse_entries(void) print_pacct_record (rec, stddebug); } + if (!ahz) // if this is the first cycle run, ahz is not set yet + { + if (rec->ac_version == 3) + ahz = 100; // value AHZ = 100 is hardcoded in acct.h, but in #ifdef __KERNEL__ block. too bad + else + ahz = sysconf(_SC_CLK_TCK); + } + 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 @@ -189,7 +189,7 @@ int dont_read_summary_files = 0; int print_users = 0; int percentages = 0; /* include percentages in printout */ int user_summary_flag = 0; /* are we printing a user summary? */ -int ahz = AHZ; /* for viewing logs from another system */ +int ahz = 0; /* for viewing logs from another system */ #if defined(HAVE_ACUTIME) && defined(HAVE_ACSTIME) @@ -1173,6 +1173,18 @@ void parse_acct_entries (void) /* loop while there are entries to be had */ while ((rec = pacct_get_entry ()) != NULL) { + if (!ahz) // if this is the first cycle run, ahz is not set yet + { + if (rec->ac_version == 3) + ahz = 100; // value AHZ = 100 is hardcoded in acct.h, but in #ifdef __KERNEL__ block. too bad + else + ahz = sysconf(_SC_CLK_TCK); + + if (debugging_enabled) + { + fprintf (stddebug, "AHZ -> %d\n", ahz); + } + } #ifdef HAVE_ACUTIME double ut = comp_t_2_double (rec->ac_utime) / (double) hzval; #endif -- 1.7.7 ++++++ acct-info.patch ++++++ Subject: Add @dircategory and @direntry --- 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 +@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 -- 1.7.7 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org