* [gentoo-commits] gentoo-x86 commit in app-admin/conky/files: conky-1.8.1-maxinterfaces.patch
@ 2011-08-06 23:14 Daniel Pielmeier (billie)
0 siblings, 0 replies; 3+ messages in thread
From: Daniel Pielmeier (billie) @ 2011-08-06 23:14 UTC (permalink / raw
To: gentoo-commits
billie 11/08/06 23:14:18
Added: conky-1.8.1-maxinterfaces.patch
Log:
Add patch to increase the number of maximum network devices. This fixes bug #365287. Thanks to Markos Chandras for the report.
(Portage version: 2.1.10.3/cvs/Linux i686)
Revision Changes Path
1.1 app-admin/conky/files/conky-1.8.1-maxinterfaces.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch?rev=1.1&content-type=text/plain
Index: conky-1.8.1-maxinterfaces.patch
===================================================================
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",
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])
-AC_DEFINE(MAX_NET_INTERFACES, 16, [Maximum number of network devices])
+AC_DEFINE(MAX_NET_INTERFACES, 64, [Maximum number of network devices])
dnl
dnl Some functions
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-admin/conky/files: conky-1.8.1-maxinterfaces.patch
@ 2011-10-25 17:28 Daniel Pielmeier (billie)
0 siblings, 0 replies; 3+ messages in thread
From: Daniel Pielmeier (billie) @ 2011-10-25 17:28 UTC (permalink / raw
To: gentoo-commits
billie 11/10/25 17:28:42
Modified: conky-1.8.1-maxinterfaces.patch
Log:
Revison bump to fix bug #384505. Thanks to Renato Alves for the report and Cesar Garcia for the fix.
(Portage version: 2.1.10.31/cvs/Linux i686, RepoMan options: --force)
Revision Changes Path
1.2 app-admin/conky/files/conky-1.8.1-maxinterfaces.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch?r1=1.1&r2=1.2
Index: conky-1.8.1-maxinterfaces.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- conky-1.8.1-maxinterfaces.patch 6 Aug 2011 23:14:18 -0000 1.1
+++ conky-1.8.1-maxinterfaces.patch 25 Oct 2011 17:28:42 -0000 1.2
@@ -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 @@
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
+
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-admin/conky/files: conky-1.8.1-maxinterfaces.patch
@ 2011-10-28 17:25 Daniel Pielmeier (billie)
0 siblings, 0 replies; 3+ messages in thread
From: Daniel Pielmeier (billie) @ 2011-10-28 17:25 UTC (permalink / raw
To: gentoo-commits
billie 11/10/28 17:25:22
Modified: conky-1.8.1-maxinterfaces.patch
Log:
Apply Interfaces patch against configure.ac instead of configure.ac.in. Thanks to Markos Chandras for the note.
(Portage version: 2.1.10.31/cvs/Linux i686, RepoMan options: --force)
Revision Changes Path
1.3 app-admin/conky/files/conky-1.8.1-maxinterfaces.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch?r1=1.2&r2=1.3
Index: conky-1.8.1-maxinterfaces.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- conky-1.8.1-maxinterfaces.patch 25 Oct 2011 17:28:42 -0000 1.2
+++ conky-1.8.1-maxinterfaces.patch 28 Oct 2011 17:25:22 -0000 1.3
@@ -12,8 +12,8 @@
diff --git a/configure.ac.in b/configure.ac.in
index 0f00237..d52d998 100644
---- a/configure.ac.in
-+++ b/configure.ac.in
+--- a/configure.ac
++++ b/configure.ac
@@ -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.])
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-10-28 17:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-25 17:28 [gentoo-commits] gentoo-x86 commit in app-admin/conky/files: conky-1.8.1-maxinterfaces.patch Daniel Pielmeier (billie)
-- strict thread matches above, loose matches on Subject: below --
2011-10-28 17:25 Daniel Pielmeier (billie)
2011-08-06 23:14 Daniel Pielmeier (billie)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox