Hello community, here is the log from the commit of package acct for openSUSE:Factory checked in at 2014-12-21 12:05:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/acct (Old) and /work/SRC/openSUSE:Factory/.acct.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "acct" Changes: -------- --- /work/SRC/openSUSE:Factory/acct/acct.changes 2014-09-03 19:30:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.acct.new/acct.changes 2014-12-21 12:04:53.000000000 +0100 @@ -1,0 +2,19 @@ +Fri Dec 19 13:01:30 UTC 2014 - [email protected] + +- Add back .keyring and .sig files; OBS verify them too + +------------------------------------------------------------------- +Sat Dec 13 20:57:10 UTC 2014 - [email protected] + +- Update to version 6.6.2 + + Link with -lm. + + Fix texi. + + The rest of fixes from 6.5.5 to 6.6.1. +- Update Url to new project home +- Use download Url +- Remove dependency on gpg-offline and keyring files; let OBS handle + source verification +- Adapt acct-hz.patch to upstream changes + > acct-6.6.2-hz.patch + +------------------------------------------------------------------- Old: ---- acct-6.6.1.tar.gz acct-6.6.1.tar.gz.sig acct-hz.patch New: ---- acct-6.6.2-hz.patch acct-6.6.2.tar.gz acct-6.6.2.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ acct.spec ++++++ --- /var/tmp/diff_new_pack.B5TeXc/_old 2014-12-21 12:04:54.000000000 +0100 +++ /var/tmp/diff_new_pack.B5TeXc/_new 2014-12-21 12:04:54.000000000 +0100 @@ -17,15 +17,14 @@ Name: acct -Version: 6.6.1 +Version: 6.6.2 Release: 0 -Source: %{name}-%{version}.tar.gz +Source: http://ftp.gnu.org/gnu/acct/%{name}-%{version}.tar.gz +Source4: http://ftp.gnu.org/gnu/acct/%{name}-%{version}.tar.gz.sig +Source5: %name.keyring Source1: acct.service Source2: logrotate.acct Source3: accton-create -Source10: %{name}-%{version}.tar.gz.sig -Source11: %{name}.keyring -BuildRequires: gpg-offline BuildRequires: libtool %if %suse_version >= 1310 BuildRequires: systemd-rpm-macros @@ -47,10 +46,10 @@ Requires(postun): %install_info_prereq Requires(postun): fileutils Requires(postun): coreutils -Patch: %{name}-hz.patch +Patch: %{name}-%{version}-hz.patch Patch2: %{name}-info.patch Patch3: %{name}-ac.patch -Url: http://www.gnu.org/directory/acct.html +Url: http://www.gnu.org/software/acct/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: User-Specific Process Accounting License: GPL-2.0+ @@ -61,7 +60,6 @@ accounting: sa, accton, and lastcomm. %prep -%gpg_verify %{SOURCE10} %setup -q %patch -p1 %patch2 -p1 ++++++ acct-6.6.2-hz.patch ++++++ Subject: acct-hz.patch --- lastcomm.c | 14 +++++++++++++- sa.c | 14 +++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) 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 @@ -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 */ -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); 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 @@ -190,7 +190,7 @@ 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? */ -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) @@ -1172,6 +1172,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) / CURR_AHZ; #endif ++++++ acct-6.6.1.tar.gz -> acct-6.6.2.tar.gz ++++++ ++++ 125480 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
