Fix division by zero by Robert Trace (bug #323105).

Package-Manager: portage-2.1.9.24/cvs/Linux i686

4 files changed, 86 insertions, 6 deletions

diff --git a/sys-process/acct/ChangeLog b/sys-process/acct/ChangeLog
index 18d606be1555..f6a82e4255d1 100644
--- a/sys-process/acct/ChangeLog
+++ b/sys-process/acct/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/acct
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/ChangeLog,v 1.32 2010/06/26 16:42:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/ChangeLog,v 1.33 2010/11/05 16:21:00 jer Exp $
+
+*acct-6.5.4-r2 (05 Nov 2010)
+
+  05 Nov 2010; Jeroen Roovers <jer@gentoo.org> -acct-6.5.4-r1.ebuild,
+  +acct-6.5.4-r2.ebuild, +files/acct-6.5.4-nan.patch:
+  Fix division by zero by Robert Trace (bug #323105).
 
   26 Jun 2010; Raúl Porcel <armin76@gentoo.org> acct-6.5.4.ebuild:
   alpha stable wrt #316517
diff --git a/sys-process/acct/Manifest b/sys-process/acct/Manifest
index 45e78179ce9a..01f6e744286a 100644
--- a/sys-process/acct/Manifest
+++ b/sys-process/acct/Manifest
@@ -1,8 +1,9 @@
+AUX acct-6.5.4-nan.patch 2039 RMD160 ff7a31f92749a121cdb173af7af535d32a44fb19 SHA1 20d4296b6b3a609797826eea1983ff280bffa5f2 SHA256 d8a7aa4e0aeb844fdc43c9dc67538db62b43087212b31f7af08969bc2a5ac31a
 AUX acct.confd 389 RMD160 4059420389cfe442983e55f7e23e4a9df7473743 SHA1 0dd7b18b9c0a76218ceec46607fe34b63d80e4ba SHA256 03dec915e2f80746a5147f3a6ff34a5ce8d3dc4b0007a318a29c5f9ca91cdb31
 AUX acct.initd 671 RMD160 83b40ccf21a17b4f82869fb96c6643fae85fc4a6 SHA1 4a884120ede717b27c17c4a67985f31e4be870c2 SHA256 3a75ee3c969bdf894d82bd38e1b7932ca96b9c63a7641cd3fe8d79b463a239ab
 AUX acct.logrotate 456 RMD160 6e122665b574597094b4a55c113aeb3421199993 SHA1 342badaabecf6ca296ef9a7761b076a43699b587 SHA256 4ece5dd28e2e7e2a93217b2ba3e648f458527bbd13ea255eda84696bcbc1b4ea
 DIST acct-6.5.4.tar.gz 643605 RMD160 3750b49ced07f028ca5881e94d7b6e29c4c0a62d SHA1 0102c906160225303014af0d1f76d5542d305622 SHA256 6ac2f5d7dd327b8434b05671fe49815c19e14af920c860efc121529bc1d979bb
-EBUILD acct-6.5.4-r1.ebuild 1002 RMD160 8c4ae55aa3605aef31e70ecce3bbda275178cf2c SHA1 f154d7b1f00f8479ee6941caa68c3fa68747b1a9 SHA256 b50e1cd96234f7bd6b1874d0178801685ed31b6cf61837841799d29eefab98cb
+EBUILD acct-6.5.4-r2.ebuild 1072 RMD160 a8b6766cac2a8729bd5bcba5922bf48c5a5adab3 SHA1 d46b5ef064be02f331f83805a6844e36177e1874 SHA256 b84e0e6a81282ddc818ca3501e3b50dd20981e224454d8d6940d78449e1b4f82
 EBUILD acct-6.5.4.ebuild 930 RMD160 d6e90f265bed4533d77fdec2018922c7087fe949 SHA1 39ddfe0e67f034836b7a23197a5958bb605b9d5c SHA256 fb7563312ebfb05f8d209335ba187b8a48c1afd4dcd02437793736e26aa78ea0
-MISC ChangeLog 5395 RMD160 a1d329098198932803e8480d143179c6602b45ea SHA1 1b4cd090a7dafb7c7b241edfeff790051f63c90e SHA256 518cb0d10fa687baa15851a8c64878ded35c8955ba4cf516fb29ce2d9794dfb5
+MISC ChangeLog 5600 RMD160 062abd90768caee9f64a3fcd74a3ed3cc0376d1d SHA1 5fd4df39a1367cd61f6d6bb4d8bbd2c14d1d74b5 SHA256 46763604cc4d80c0d1490ed065e1d1477d616b9221500247b56dec86cc517b8c
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-process/acct/acct-6.5.4-r1.ebuild b/sys-process/acct/acct-6.5.4-r2.ebuild
index 880f3658f81c..f76e7d3bd2a5 100644
--- a/sys-process/acct/acct-6.5.4-r1.ebuild
+++ b/sys-process/acct/acct-6.5.4-r2.ebuild
@@ -1,6 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/acct-6.5.4-r1.ebuild,v 1.3 2010/06/10 02:50:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/acct-6.5.4-r2.ebuild,v 1.1 2010/11/05 16:21:00 jer Exp $
+
+EAPI="2"
+
+inherit eutils
 
 DESCRIPTION="GNU system accounting utilities"
 HOMEPAGE="https://savannah.gnu.org/projects/acct/"
@@ -11,9 +15,12 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
 IUSE=""
 
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-nan.patch
+}
+
+src_configure() {
 	econf --enable-linux-multiformat
-	emake || die
 }
 
 src_install() {
diff --git a/sys-process/acct/files/acct-6.5.4-nan.patch b/sys-process/acct/files/acct-6.5.4-nan.patch
new file mode 100644
index 000000000000..0c15c0171f03
--- /dev/null
+++ b/sys-process/acct/files/acct-6.5.4-nan.patch
@@ -0,0 +1,66 @@
+From: Dominique Brazziel <dbrazziel@snet.net>
+Subject: Fix for sa reporting 'inf' or 'nan' instead of correct values
+ because of division by clock values.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=581421
+Last-Updated: 2010-07-23
+
+--- acct-6.5.4.orig/sa.c	2010-02-11 20:55:14.000000000 -0500
++++ acct-6.5.4/sa.c	2010-07-22 14:08:26.000000000 -0400
+@@ -417,7 +417,6 @@
+           (void)printf("%s: GNU Accounting Utilities (release %s)\n",
+                        program_name, VERSION_STRING);
+           exit(EXIT_SUCCESS);
+-        case 4:
+           acct_file_name = optarg;
+           break;
+         case 'j':
+@@ -594,8 +593,11 @@
+       exit(EXIT_FAILURE);
+     }
+ 
++    /* Set HZ value from system */
++    hzval = sysconf(_SC_CLK_TCK);
++    
+   /* Print out some debugging information. */
+-
++  
+   if (debugging_enabled)
+     {
+       (void)fprintf (stddebug, "hzval -> %d\n", hzval);
+@@ -1162,31 +1164,30 @@
+ # define CURR_AHZ ((double)(ahz))
+ #endif
+ 
+-
+   if (debugging_enabled)
+     fprintf (stddebug, "\
+              ----------------------------------------------------------------------\n\
+              acct entries\n\
+              ----------------------------------------------------------------------\n\
+              ");
+-
++             
+   /* loop while there are entries to be had */
+   while ((rec = pacct_get_entry ()) != NULL)
+     {
+ #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
+ 
+ #ifdef HAVE_ACSTIME
+-      double st = comp_t_2_double (rec->ac_stime) / (double) hzval;
++      double st = comp_t_2_double (rec->ac_stime) / CURR_AHZ;
+ #endif
+ 
+ #ifdef HAVE_ACETIME
+-      double et = comp_t_2_double (rec->ac_etime) / (double) hzval;
++      double et = ACETIME_2_DOUBLE (rec->ac_etime) / CURR_AHZ;
+ #endif
+ 
+ #ifdef HAVE_ACIO
+-      double di = comp_t_2_double (rec->ac_io) / (double) hzval;
++      double di = comp_t_2_double (rec->ac_io) / CURR_AHZ;
+ #endif
+ 
+ #ifdef HAVE_ACMEM