Revison bump to fix bug #384505. Thanks to Renato Alves for the report and Cesar...

Package-Manager: portage-2.1.10.31/cvs/Linux i686
RepoMan-Options: --force

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 03c5d27a964ee642bdf8ec51b79795f4340e1b67..24a1571c6306307296684ae314801af5e99f717f 100644 (file)
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.166 2011/10/13 18:45:04 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.167 2011/10/25 17:28:41 billie Exp $
+
+*conky-1.8.1-r3 (25 Oct 2011)
+
+  25 Oct 2011; Daniel Pielmeier <billie@gentoo.org> -conky-1.8.1-r2.ebuild,
+  +conky-1.8.1-r3.ebuild, files/conky-1.8.1-maxinterfaces.patch:
+  Revison bump to fix bug #384505. Thanks to Renato Alves for the report and
+  Cesar Garcia for the fix.
 
   13 Oct 2011; Daniel Pielmeier <billie@gentoo.org> -conky-1.8.0-r1.ebuild,
   -files/conky-1.8.0-audacious-2.3.patch, -files/conky-1.8.0-ncurses.patch:

diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 3ef18e12b6e630ac7c039189813bc10b65260884..3772eb3ceb74b51baeb4e446fa17a787b9881e6c 100644 (file)
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -3,18 +3,18 @@ Hash: SHA256
 
 AUX conky-1.8.1-acpitemp.patch 2415 RMD160 dcef233f8ba2ca192bfac3b16f0c671e1381fffe SHA1 d5000bfdddb134c4cd61e90e8bcc3bce5866c33c SHA256 57815044cd972139171b76e75267792821c783e03537eb6cf7ba8105c46cdf8d
 AUX conky-1.8.1-curl-headers.patch 494 RMD160 26c0e9060991a9ece1e38a552da828109566daa3 SHA1 0cb58b354bbd91a44af183e4ac7022246843552d SHA256 53ff30aa933163a1feb646720ea21b4727d515e33521ac53e77b8bd9d0473eba
-AUX conky-1.8.1-maxinterfaces.patch 720 RMD160 85a267900576b3e80d0e7f55ce3ac454383a5d79 SHA1 528e8547fcecd64bd82ba8e2f6249655fd78ab91 SHA256 e732dee459cf0e9901f65af1b2c322d526b8a22f55229c68152d2ab38acd2ad4
+AUX conky-1.8.1-maxinterfaces.patch 1611 RMD160 91129daabea4877cd344f9165b76d1673e23df32 SHA1 b21b6dd793299b362373ac8be0389873359218dc SHA256 53bf1866a309402148d122f718a5e278cc094223ccbf338ed57cdf519b338fc2
 AUX conky-1.8.1-nvidia-x.patch 883 RMD160 f6e85e117ba5b895ba23db0d6e4160a0c0141c21 SHA1 1e3dc3f2a8e44d62e25ab2ab22726e0e91ecf666 SHA256 290ffdf4094167715bf11b86ee2cf73574a3af32ffb50fa09517d89c56bc0853
 AUX conky-1.8.1-secunia-SA43225.patch 1620 RMD160 3206a288819bc33048d9eee2444308b04b25fc1b SHA1 7c88144711911a6b38465311c7cf8cf6b0e6d45f SHA256 61c2d204796f51d0d51cd62e9a37a9f4f318e8fe8f955278ef86b64d5b2ff99f
 AUX conky-1.8.1-xmms2.patch 1190 RMD160 6ec093e08f55c198b5b2321acc7f3d1d7f74e267 SHA1 0e05fe363521145bde14eca99d3aebc28e258833 SHA256 1b64047f04239dbf24b3171fcd8d5c950e9f8aa6af5e94cd4836cd14c70e2bdc
 DIST conky-1.8.1.tar.bz2 612481 RMD160 f3203131e2d8f3756eb29f5c5a9034b9c269fdc6 SHA1 9581419b1a53a8a7e37b0291cd4e55ab166d221a SHA256 f85a278f2869596b1fd68b6d26d58c93af8dcc39d5186bbcfd587d4c545e5e43
-EBUILD conky-1.8.1-r2.ebuild 4080 RMD160 f9ad842b52ade41f3955398a654ea79a3c031574 SHA1 fa0f0755ec0b528acb8f7ac298a8feee47cd7854 SHA256 5350840bc4c00bfa8c778fa8d2642981aa196c43368955cb3e3d7efe675af364
-MISC ChangeLog 25368 RMD160 e4975ba2e8274776cc7cced88306c05a69594683 SHA1 c9aac7232a62d46565ded6c25985dc4def6d3318 SHA256 c013b7cad7088eeead74d243a03f269332f04f3c011887895c0028f53d9b75d6
+EBUILD conky-1.8.1-r3.ebuild 4080 RMD160 8b15c223824b8fd36f9ea5168afaf5020b250af9 SHA1 b7ab6f93df4bf503d55e1d3728c44b7d21f8de62 SHA256 c72e4c3432ee431d30cbf168d5c856dcbafc5e6a88a5c064fbd97fe3738072e6
+MISC ChangeLog 25646 RMD160 3af3345f4194771ca4820c9003a0c41353155195 SHA1 aa5ed3a380b2f278b56923170d614af82e1cdb77 SHA256 d49356db320092f4417134392edd5030aef115ac108a8e1055d8d2b43dfedab9
 MISC metadata.xml 2035 RMD160 c4c5aca3e9d74df22ceec820eab9b1f25798cdb0 SHA1 791f5991269e7d531c11c3f9eeb784607a3730b0 SHA256 7629c0d86a74d086f1b9934919881b5ee82c285e94d58d4a802694633ea11302
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk6XMdAACgkQlcuUeyFa0U1AfgCdFVCu/HGLTZJpDkYp1zIGHgOT
-c3IAoNY+Kl2y3EFR3GAQztDKMx4FnLWk
-=uvYF
+iEYEAREIAAYFAk6m8dUACgkQlcuUeyFa0U2o7wCg+lcmAiU/bHyFenofKcekI9ti
+5ugAoK2Yv5vHQ/0V2iATXYwAxI3a2xzs
+=DdJu
 -----END PGP SIGNATURE-----

diff --git a/app-admin/conky/conky-1.8.1-r2.ebuild b/app-admin/conky/conky-1.8.1-r3.ebuild
similarity index 98%
rename from app-admin/conky/conky-1.8.1-r2.ebuild
rename to app-admin/conky/conky-1.8.1-r3.ebuild
index a2c21f88e4416badbc3eec85b98def6954dcfefb..6a5d0c75c7d9b33ac16f0ea2c15be9ff702ab34b 100644 (file)
--- a/app-admin/conky/conky-1.8.1-r2.ebuild
+++ b/app-admin/conky/conky-1.8.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.1-r2.ebuild,v 1.8 2011/08/06 23:14:18 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.1-r3.ebuild,v 1.1 2011/10/25 17:28:41 billie Exp $
 
 EAPI=2
 

diff --git a/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch b/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch
index 41bb9584ab12056a7cb478f29b160053facf94a8..97c58460114fb0bb1f5dd0c2ca42cbf5c529ab4d 100644 (file)
--- a/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch
+++ b/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch
@@ -1,8 +1,20 @@
-Index: conky-1.8.1/configure.ac
-===================================================================
---- conky-1.8.1.orig/configure.ac
-+++ conky-1.8.1/configure.ac
-@@ -790,7 +790,7 @@ AC_DEFINE(CONFIG_FILE, "$HOME/.conkyrc",
+From f6aac5981e70118dc28b3c7a1fe6065955fe3dcb Mon Sep 17 00:00:00 2001
+From: Pavel Labath <pavelo@centrum.sk>
+Date: Tue, 25 Oct 2011 18:53:09 +0200
+Subject: [PATCH] Increase MAX_NET_INTERFACES to 64
+
+also change a magic constant in net_stat.h to reflect the fact that it depends on
+MAX_NET_INTERFACES. For more info, see sf.net #2872682 and gentoo bug #384505
+---
+ configure.ac.in |    2 +-
+ src/net_stat.h  |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac.in b/configure.ac.in
+index 0f00237..d52d998 100644
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -802,7 +802,7 @@ AC_DEFINE(CONFIG_FILE, "$HOME/.conkyrc", [Configfile of the user])
  AC_DEFINE(MAX_SPECIALS_DEFAULT, 512, [Default maximum number of special things, e.g. fonts, offsets, aligns, etc.])
  AC_DEFINE(MAX_USER_TEXT_DEFAULT, 16384, [Default maximum size of config TEXT buffer, i.e. below TEXT line.])
  AC_DEFINE(DEFAULT_TEXT_BUFFER_SIZE, 256, [Default size used for temporary, static text buffers])
@@ -11,3 +23,19 @@ Index: conky-1.8.1/configure.ac
  
  dnl
  dnl Some functions
+diff --git a/src/net_stat.h b/src/net_stat.h
+index 463e7db..6f5533c 100644
+--- a/src/net_stat.h
++++ b/src/net_stat.h
+@@ -41,7 +41,7 @@ struct net_stat {
+         double recv_speed, trans_speed;
+         struct sockaddr addr;
+ #if defined(__linux__)
+-        char addrs[273];
++        char addrs[17 * MAX_NET_INTERFACES + 1];
+ #endif /* __linux__ */
+         double net_rec[15], net_trans[15];
+         // wireless extensions
+-- 
+1.7.0.4
+