rpms/conky/F-8 conky-1.6.1-ifaddrs.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 conky.spec, 1.9, 1.10 sources, 1.7, 1.8

[Miroslav Lichvar]

Author: mlichvar

Update of /cvs/pkgs/rpms/conky/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20212

Modified Files:
	.cvsignore conky.spec sources 
Added Files:
	conky-1.6.1-ifaddrs.patch 
Log Message:
- Update to 1.6.1
- Fix buffer overflow when reading interface addresses


conky-1.6.1-ifaddrs.patch:

--- NEW FILE conky-1.6.1-ifaddrs.patch ---
diff -up conky-1.6.1/src/linux.c.ifaddrs conky-1.6.1/src/linux.c
--- conky-1.6.1/src/linux.c.ifaddrs	2008-08-20 12:50:15.000000000 +0200
+++ conky-1.6.1/src/linux.c	2008-08-20 12:50:31.000000000 +0200
@@ -353,7 +353,7 @@ void update_net_stats(void)
 	for (i2 = 0; i2 < 16; i2++) {
 		struct net_stat *ns;
 		char *s, *p;
-		char temp_addr[17];
+		char temp_addr[18];
 		long long r, t, last_recv, last_trans;
 
 		if (fgets(buf, 255, net_dev_fp) == NULL) {
@@ -380,9 +380,9 @@ void update_net_stats(void)
 		memset(&(ns->addr.sa_data), 0, 14);
 
 		if(NULL == ns->addrs)
-			ns->addrs = (char*) malloc(17 * 16);
+			ns->addrs = (char*) malloc(17 * 16 + 1);
 		if(NULL != ns->addrs)
-			memset(ns->addrs, 0, 17 * 16); /* Up to 17 chars per ip, max 16 interfaces. Nasty memory usage... */
+			memset(ns->addrs, 0, 17 * 16 + 1); /* Up to 17 chars per ip, max 16 interfaces. Nasty memory usage... */
 
 		last_recv = ns->recv;
 		last_trans = ns->trans;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conky/F-8/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Jul 2008 16:51:39 -0000	1.7
+++ .cvsignore	26 Aug 2008 15:21:55 -0000	1.8
@@ -1 +1 @@
-conky-1.6.0.tar.bz2
+conky-1.6.1.tar.bz2


Index: conky.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conky/F-8/conky.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- conky.spec	22 Jul 2008 16:51:39 -0000	1.9
+++ conky.spec	26 Aug 2008 15:21:55 -0000	1.10
@@ -6,7 +6,7 @@
 %bcond_without wlan
 
 Name:           conky 
-Version:        1.6.0
+Version:        1.6.1
 Release:        1%{?dist}
 Summary:        A system monitor for X 
 
@@ -15,6 +15,7 @@
 URL:            http://conky.sf.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Patch0:         conky-1.6.0-rdtsc.patch
+Patch1:         conky-1.6.1-ifaddrs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libXft-devel
@@ -36,6 +37,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .rdtsc
+%patch1 -p1 -b .ifaddrs
 
 for i in AUTHORS ChangeLog; do
     iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}
@@ -72,6 +74,10 @@
 
 
 %changelog
+* Tue Aug 26 2008 Miroslav Lichvar <mlichvar at redhat.com> - 1.6.1-1
+- Update to 1.6.1
+- Fix buffer overflow when reading interface addresses
+
 * Tue Jul 22 2008 Miroslav Lichvar <mlichvar at redhat.com> - 1.6.0-1
 - Update to 1.6.0
 - Fix freq_dyn on x86_64


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conky/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Jul 2008 16:51:39 -0000	1.7
+++ sources	26 Aug 2008 15:21:55 -0000	1.8
@@ -1 +1 @@
-2872126a23c10083e0f91289bd8da103  conky-1.6.0.tar.bz2
+b2839f21cec18e5eaa338c7440a1ba28  conky-1.6.1.tar.bz2