previous patch had error.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 65 insertions, 44 deletions

diff --git a/app-admin/torsmo/ChangeLog b/app-admin/torsmo/ChangeLog
index 4696ad7c0c79..5b069cbc88f5 100644
--- a/app-admin/torsmo/ChangeLog
+++ b/app-admin/torsmo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/torsmo
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/ChangeLog,v 1.34 2005/06/21 11:01:17 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/ChangeLog,v 1.35 2005/06/22 11:00:55 dragonheart Exp $
+
+*torsmo-0.18-r6 (22 Jun 2005)
+
+  22 Jun 2005; Daniel Black <dragonheart@gentoo.org>
+  files/torsmo-0.18.avgsmp.patch, -torsmo-0.18-r5.ebuild,
+  +torsmo-0.18-r6.ebuild:
+  previous patch had error. Brenden Matthews emailed me a new patch
 
 *torsmo-0.18-r5 (21 Jun 2005)
 
diff --git a/app-admin/torsmo/Manifest b/app-admin/torsmo/Manifest
index 01dd6c85df10..88bef37e7e93 100644
--- a/app-admin/torsmo/Manifest
+++ b/app-admin/torsmo/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3ae1d458b28865b279173234676dfecd ChangeLog 6236
+MD5 344def10c8149cb1bcc6bf87ad72fec2 ChangeLog 6473
 MD5 e62755aeb2fcd53a4426e99d3af550ed metadata.xml 549
 MD5 002239c582893089c2347704fc6ed564 torsmo-0.18-r4.ebuild 1702
 MD5 b153c962309ce33f402b26076b8310a5 torsmo-0.18-r1.ebuild 1450
-MD5 81dbdad19ed6c6e73ca39ac103ffdb07 torsmo-0.18-r5.ebuild 1704
 MD5 796256d9236187ccfd18fd95f1118e84 torsmo-0.18-r3.ebuild 1657
+MD5 e36b217b049fb299632fd107c7ba2663 torsmo-0.18-r6.ebuild 1704
 MD5 19932267a722d71554454bb3779a9ae0 files/digest-torsmo-0.18-r1 62
 MD5 0aa744033b2091d42d3817cd1bb62f59 files/torsmo-0.18.i2c.patch 5254
 MD5 19932267a722d71554454bb3779a9ae0 files/digest-torsmo-0.18-r4 62
-MD5 17b31d62740e3f8202573c2b939e32d6 files/torsmo-0.18.avgsmp.patch 5971
-MD5 19932267a722d71554454bb3779a9ae0 files/digest-torsmo-0.18-r5 62
+MD5 ba979f27a7ea62133aa8fd0a7deeeaa9 files/torsmo-0.18.avgsmp.patch 6232
+MD5 19932267a722d71554454bb3779a9ae0 files/digest-torsmo-0.18-r6 62
 MD5 3345892556d2bc8fddf510c86d3c70f0 files/torsmo-0.18.xwin.patch 575
 MD5 665c68fb6d053d92d013ba44a84f394c files/torsmo-0.18.noswap.patch 524
 MD5 19932267a722d71554454bb3779a9ae0 files/digest-torsmo-0.18-r3 62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCt/OTmdTrptrqvGERAhNpAJ4oXtKOobDCunVNHdDX3gQdi2SMVQCffitJ
-V/ySQ6SX5gLCMVYMDMcgz9g=
-=bBKq
+iD8DBQFCuUT+mdTrptrqvGERAn6cAJ4hqfE5WIHGO/uglxyH+oDw2CoQmwCfcoEj
+ni1OcJACl2nVyEQA1R6/uhs=
+=5eLA
 -----END PGP SIGNATURE-----
diff --git a/app-admin/torsmo/files/digest-torsmo-0.18-r5 b/app-admin/torsmo/files/digest-torsmo-0.18-r6
index f2c1092e434d..f2c1092e434d 100644
--- a/app-admin/torsmo/files/digest-torsmo-0.18-r5
+++ b/app-admin/torsmo/files/digest-torsmo-0.18-r6
diff --git a/app-admin/torsmo/files/torsmo-0.18.avgsmp.patch b/app-admin/torsmo/files/torsmo-0.18.avgsmp.patch
index 6379dd6328cb..bfae73a6d290 100644
--- a/app-admin/torsmo/files/torsmo-0.18.avgsmp.patch
+++ b/app-admin/torsmo/files/torsmo-0.18.avgsmp.patch
@@ -1,19 +1,27 @@
 diff -ruN torsmo-0.18/linux.c torsmo-0.18.new/linux.c
 --- torsmo-0.18/linux.c	2004-12-21 14:20:07.000000000 -0700
-+++ torsmo-0.18.new/linux.c	2005-06-20 05:46:40.000000000 -0600
-@@ -115,7 +115,11 @@
++++ torsmo-0.18.new/linux.c	2005-06-21 19:28:17.000000000 -0600
+@@ -115,7 +115,9 @@
  
  void update_net_stats() {
    static int rep;
+-  unsigned int i;
 +  // FIXME: arbitrary size chosen to keep code simple.
-+  static float net_rec[15];
-+  static float net_trans[15];
-   unsigned int i;
-+  unsigned int curtmp;
++  unsigned int i, i2;
++  unsigned int curtmp1, curtmp2;
    char buf[256];
    double delta;
  
-@@ -174,9 +178,31 @@
+@@ -134,7 +136,7 @@
+   fgets(buf, 255, net_dev_fp); /* garbage (field names) */
+ 
+   /* read each interface */
+-  for (i=0; i<16; i++) {
++  for (i2=0; i2<16; i2++) {
+     struct net_stat *ns;
+     char *s, *p;
+     long long r, t, last_recv, last_trans;
+@@ -174,9 +176,28 @@
        ns->trans += (t - ns->last_read_trans);
      ns->last_read_trans = t;
  
@@ -22,32 +30,29 @@ diff -ruN torsmo-0.18/linux.c torsmo-0.18.new/linux.c
      /* calculate speeds */
 -    ns->recv_speed = (ns->recv - last_recv) / delta;
 -    ns->trans_speed = (ns->trans - last_trans) / delta;
-+    net_rec[0] = (ns->recv - last_recv) / delta;
-+    net_trans[0] = (ns->trans - last_trans) / delta;
-+    curtmp = 0;
++    ns->net_rec[0] = (ns->recv - last_recv) / delta;
++    ns->net_trans[0] = (ns->trans - last_trans) / delta;
++    curtmp1 = 0;
++    curtmp2 = 0;
 +    // get an average
-+    for (i=0;i<info.net_rec_avg_samples;i++)
-+	curtmp += net_rec[i];
-+    ns->recv_speed = curtmp / (double)info.net_rec_avg_samples;
-+    curtmp = 0;
-+    for (i=0;i<info.net_trans_avg_samples;i++)
-+	curtmp += net_trans[i];
-+    ns->trans_speed = curtmp / (double)info.net_trans_avg_samples;
-+    if (info.net_rec_avg_samples > 1) {
-+      for (i=info.net_rec_avg_samples;i>1;i--)
-+	    net_rec[i-1] = net_rec[i-2];
++    for (i=0;i<info.net_rec_avg_samples;i++) {
++	curtmp1 += ns->net_rec[i];
++	curtmp2 += ns->net_trans[i];
 +    }
-+    if (info.net_trans_avg_samples > 1) {
-+      for (i=info.net_trans_avg_samples;i>1;i--)
-+	    net_trans[i-1] = net_trans[i-2];
++    ns->recv_speed = curtmp1 / (double)info.net_rec_avg_samples;
++    ns->trans_speed = curtmp2 / (double)info.net_trans_avg_samples;
++    if (info.net_rec_avg_samples > 1) {
++      for (i=info.net_rec_avg_samples;i>1;i--) {
++	    ns->net_rec[i-1] = ns->net_rec[i-2];
++	    ns->net_trans[i-1] = ns->net_trans[i-2];
++      }
 +    }
-+	//printf("net %i %i\n", info.net_trans_avg_samples, info.net_rec_avg_samples);
 +    
 +    
    }
  
    /* fclose(net_dev_fp); net_dev_fp = NULL; */
-@@ -193,8 +219,12 @@
+@@ -193,8 +214,12 @@
  static FILE *stat_fp;
  
  static void update_stat() {
@@ -60,7 +65,7 @@ diff -ruN torsmo-0.18/linux.c torsmo-0.18.new/linux.c
  
    if (stat_fp == NULL)
      stat_fp = open_file("/proc/stat", &rep);
-@@ -228,10 +258,16 @@
+@@ -228,10 +253,15 @@
  
      if (clock_ticks == 0)
        clock_ticks = sysconf(_SC_CLK_TCK);
@@ -75,14 +80,13 @@ diff -ruN torsmo-0.18/linux.c torsmo-0.18.new/linux.c
      last_cpu_sum = cpu_user+cpu_nice+cpu_system;
 +    for (i=info.cpu_avg_samples;i>1;i--)
 +	    cpu_val[i-1] = cpu_val[i-2];
-+    //printf("cpu %i\n", info.cpu_avg_samples);
 +	    
    }
  }
  
 diff -ruN torsmo-0.18/torsmo.c torsmo-0.18.new/torsmo.c
 --- torsmo-0.18/torsmo.c	2004-12-21 15:14:46.000000000 -0700
-+++ torsmo-0.18.new/torsmo.c	2005-06-20 05:46:42.000000000 -0600
++++ torsmo-0.18.new/torsmo.c	2005-06-21 19:14:26.000000000 -0600
 @@ -61,6 +61,8 @@
  
  static long default_fg_color, default_bg_color, default_out_color;
@@ -151,8 +155,16 @@ diff -ruN torsmo-0.18/torsmo.c torsmo-0.18.new/torsmo.c
        use_xdbe = string_to_bool(value);
 diff -ruN torsmo-0.18/torsmo.h torsmo-0.18.new/torsmo.h
 --- torsmo-0.18/torsmo.h	2004-12-21 14:49:17.000000000 -0700
-+++ torsmo-0.18.new/torsmo.h	2005-06-20 05:47:29.000000000 -0600
-@@ -30,6 +30,7 @@
++++ torsmo-0.18.new/torsmo.h	2005-06-21 19:14:49.000000000 -0600
+@@ -19,6 +19,7 @@
+   long long last_read_recv, last_read_trans;
+   long long recv, trans;
+   double recv_speed, trans_speed;
++  double net_rec[15], net_trans[15];
+ };
+ 
+ struct fs_stat {
+@@ -30,6 +31,7 @@
  
  struct cpu_stat {
    unsigned int user, nice, system, idle, iowait, irq, softirq;
@@ -160,7 +172,7 @@ diff -ruN torsmo-0.18/torsmo.h torsmo-0.18.new/torsmo.h
  };
  
  enum {
-@@ -71,6 +72,9 @@
+@@ -71,6 +73,9 @@
    float cpu_usage;
    struct cpu_stat cpu_summed;
    unsigned int cpu_count;
@@ -172,17 +184,19 @@ diff -ruN torsmo-0.18/torsmo.h torsmo-0.18.new/torsmo.h
  
 diff -ruN torsmo-0.18/torsmorc.sample torsmo-0.18.new/torsmorc.sample
 --- torsmo-0.18/torsmorc.sample	2004-12-21 14:56:12.000000000 -0700
-+++ torsmo-0.18.new/torsmorc.sample	2005-06-20 05:50:09.000000000 -0600
-@@ -75,6 +75,14 @@
++++ torsmo-0.18.new/torsmorc.sample	2005-06-21 19:19:28.000000000 -0600
+@@ -75,6 +75,16 @@
  # set to yes if you want all text to be in uppercase
  uppercase no
  
 +# number of cpu samples to average
++# set to 1 to disable averaging
 +cpu_avg_samples 4
 +
 +# number of net samples to average
++# set to 1 to disable averaging
 +net_rec_avg_samples 4 # receiving
-+net_trans_avg_samples # transmitting
++net_trans_avg_samples 4 # transmitting
 +
 +
  # boinc (seti) dir
@@ -190,7 +204,7 @@ diff -ruN torsmo-0.18/torsmorc.sample torsmo-0.18.new/torsmorc.sample
  
 diff -ruN torsmo-0.18/x11.c torsmo-0.18.new/x11.c
 --- torsmo-0.18/x11.c	2004-12-21 15:19:55.000000000 -0700
-+++ torsmo-0.18.new/x11.c	2005-06-20 04:47:00.000000000 -0600
++++ torsmo-0.18.new/x11.c	2005-06-21 19:14:26.000000000 -0600
 @@ -64,15 +64,6 @@
  
      XFree(buf); buf = 0;
diff --git a/app-admin/torsmo/torsmo-0.18-r5.ebuild b/app-admin/torsmo/torsmo-0.18-r6.ebuild
index 610aec3b6c84..316640f1338a 100644
--- a/app-admin/torsmo/torsmo-0.18-r5.ebuild
+++ b/app-admin/torsmo/torsmo-0.18-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/torsmo-0.18-r5.ebuild,v 1.1 2005/06/21 11:01:17 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/torsmo-0.18-r6.ebuild,v 1.1 2005/06/22 11:00:55 dragonheart Exp $
 
 inherit eutils